Fix many instances of "delimeter" to "delimiter".
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9967 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts
parent
427a4945be
commit
3777b685a6
7 changed files with 24 additions and 24 deletions
2
CHANGES
2
CHANGES
|
|
@ -3353,7 +3353,7 @@ Version 1.3.26 (October 9, 2005)
|
|||
07/22/2005: wsfulton
|
||||
[C#, Java] Fix SWIG_exception usage to work with compilers that don't support empty macro
|
||||
arguments. Unfortunately this fix will stop usage of SWIG_exception being used within typemaps
|
||||
that use "" or %{ %} delimeters, but continues to work with typemaps using {} delimeters.
|
||||
that use "" or %{ %} delimiters, but continues to work with typemaps using {} delimiters.
|
||||
Please use the SWIG_CSharpSetPendingExceptionArgument or SWIG_JavaThrowException methods instead
|
||||
as SWIG_exception is really intended as a platform independent macro for the SWIG library writers.
|
||||
|
||||
|
|
|
|||
|
|
@ -269,8 +269,8 @@ static void set_outdir(const String *c_wrapper_file_dir) {
|
|||
// Add file delimiter if not present in output directory name
|
||||
if (outdir && Len(outdir) != 0) {
|
||||
const char *outd = Char(outdir);
|
||||
if (strcmp(outd + strlen(outd) - strlen(SWIG_FILE_DELIMETER), SWIG_FILE_DELIMETER) != 0)
|
||||
Printv(outdir, SWIG_FILE_DELIMETER, NIL);
|
||||
if (strcmp(outd + strlen(outd) - strlen(SWIG_FILE_DELIMITER), SWIG_FILE_DELIMITER) != 0)
|
||||
Printv(outdir, SWIG_FILE_DELIMITER, NIL);
|
||||
}
|
||||
// Use the C wrapper file's directory if the output directory has not been set by user
|
||||
if (!outdir)
|
||||
|
|
@ -878,19 +878,19 @@ int SWIG_main(int argc, char *argv[], Language *l) {
|
|||
// Add language dependent directory to the search path
|
||||
{
|
||||
String *rl = NewString("");
|
||||
Printf(rl, ".%sswig_lib%s%s", SWIG_FILE_DELIMETER, SWIG_FILE_DELIMETER, LangSubDir);
|
||||
Printf(rl, ".%sswig_lib%s%s", SWIG_FILE_DELIMITER, SWIG_FILE_DELIMITER, LangSubDir);
|
||||
Swig_add_directory(rl);
|
||||
if (SwigLibWin) {
|
||||
rl = NewString("");
|
||||
Printf(rl, "%s%s%s", SwigLibWin, SWIG_FILE_DELIMETER, LangSubDir);
|
||||
Printf(rl, "%s%s%s", SwigLibWin, SWIG_FILE_DELIMITER, LangSubDir);
|
||||
Swig_add_directory(rl);
|
||||
}
|
||||
rl = NewString("");
|
||||
Printf(rl, "%s%s%s", SwigLib, SWIG_FILE_DELIMETER, LangSubDir);
|
||||
Printf(rl, "%s%s%s", SwigLib, SWIG_FILE_DELIMITER, LangSubDir);
|
||||
Swig_add_directory(rl);
|
||||
}
|
||||
|
||||
Swig_add_directory((String *) "." SWIG_FILE_DELIMETER "swig_lib");
|
||||
Swig_add_directory((String *) "." SWIG_FILE_DELIMITER "swig_lib");
|
||||
if (SwigLibWin)
|
||||
Swig_add_directory((String *) SwigLibWin);
|
||||
Swig_add_directory((String *) SwigLib);
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ public:
|
|||
}
|
||||
|
||||
void PrintIncludeArg() {
|
||||
Printv(stdout, SWIG_LIB, SWIG_FILE_DELIMETER, ocaml_path, "\n", NIL);
|
||||
Printv(stdout, SWIG_LIB, SWIG_FILE_DELIMITER, ocaml_path, "\n", NIL);
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -651,11 +651,11 @@ static String *get_filename(String *str, int *sysfile) {
|
|||
}
|
||||
#if defined(_WIN32) || defined(MACSWIG)
|
||||
/* accept Unix path separator on non-Unix systems */
|
||||
Replaceall(fn, "/", SWIG_FILE_DELIMETER);
|
||||
Replaceall(fn, "/", SWIG_FILE_DELIMITER);
|
||||
#endif
|
||||
#if defined(__CYGWIN__)
|
||||
/* accept Windows path separator in addition to Unix path separator */
|
||||
Replaceall(fn, "\\", SWIG_FILE_DELIMETER);
|
||||
Replaceall(fn, "\\", SWIG_FILE_DELIMITER);
|
||||
#endif
|
||||
Seek(fn, 0, SEEK_SET);
|
||||
return fn;
|
||||
|
|
@ -1610,7 +1610,7 @@ String *Preprocessor_parse(String *s) {
|
|||
if (sysfile || !strlen(dirname))
|
||||
dirname = 0;
|
||||
if (dirname) {
|
||||
dirname[strlen(dirname) - 1] = 0; /* Kill trailing directory delimeter */
|
||||
dirname[strlen(dirname) - 1] = 0; /* Kill trailing directory delimiter */
|
||||
Swig_push_directory(dirname);
|
||||
}
|
||||
s2 = Preprocessor_parse(s1);
|
||||
|
|
@ -1746,7 +1746,7 @@ String *Preprocessor_parse(String *s) {
|
|||
if (sysfile || !strlen(dirname))
|
||||
dirname = 0;
|
||||
if (dirname) {
|
||||
dirname[strlen(dirname) - 1] = 0; /* Kill trailing directory delimeter */
|
||||
dirname[strlen(dirname) - 1] = 0; /* Kill trailing directory delimiter */
|
||||
Swig_push_directory(dirname);
|
||||
}
|
||||
s2 = Preprocessor_parse(s1);
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@ char cvsroot_include_c[] = "$Id$";
|
|||
|
||||
#include "swig.h"
|
||||
|
||||
/* Delimeter used in accessing files and directories */
|
||||
|
||||
static List *directories = 0; /* List of include directories */
|
||||
static String *lastpath = 0; /* Last file that was included */
|
||||
static List *pdirectories = 0; /* List of pushed directories */
|
||||
|
|
@ -110,9 +108,9 @@ static List *Swig_search_path_any(int syspath) {
|
|||
filename = NewStringEmpty();
|
||||
assert(filename);
|
||||
#ifdef MACSWIG
|
||||
Printf(filename, "%s", SWIG_FILE_DELIMETER);
|
||||
Printf(filename, "%s", SWIG_FILE_DELIMITER);
|
||||
#else
|
||||
Printf(filename, ".%s", SWIG_FILE_DELIMETER);
|
||||
Printf(filename, ".%s", SWIG_FILE_DELIMITER);
|
||||
#endif
|
||||
Append(slist, filename);
|
||||
Delete(filename);
|
||||
|
|
@ -122,7 +120,7 @@ static List *Swig_search_path_any(int syspath) {
|
|||
ilen = Len(pdirectories);
|
||||
for (i = 0; i < ilen; i++) {
|
||||
filename = NewString(Getitem(pdirectories,i));
|
||||
Append(filename,SWIG_FILE_DELIMETER);
|
||||
Append(filename,SWIG_FILE_DELIMITER);
|
||||
Append(slist,filename);
|
||||
Delete(filename);
|
||||
}
|
||||
|
|
@ -131,7 +129,7 @@ static List *Swig_search_path_any(int syspath) {
|
|||
ilen = Len(directories);
|
||||
for (i = 0; i < ilen; i++) {
|
||||
filename = NewString(Getitem(directories,i));
|
||||
Append(filename,SWIG_FILE_DELIMETER);
|
||||
Append(filename,SWIG_FILE_DELIMITER);
|
||||
if (syspath) {
|
||||
/* If doing a system include, put the system directories first */
|
||||
Insert(slist,i,filename);
|
||||
|
|
@ -350,7 +348,7 @@ char *Swig_file_basename(const String_or_char *filename) {
|
|||
* ----------------------------------------------------------------------------- */
|
||||
char *Swig_file_filename(const String_or_char *filename) {
|
||||
static char tmp[1024];
|
||||
const char *delim = SWIG_FILE_DELIMETER;
|
||||
const char *delim = SWIG_FILE_DELIMITER;
|
||||
char *c;
|
||||
|
||||
strcpy(tmp, Char(filename));
|
||||
|
|
@ -367,7 +365,7 @@ char *Swig_file_filename(const String_or_char *filename) {
|
|||
* ----------------------------------------------------------------------------- */
|
||||
char *Swig_file_dirname(const String_or_char *filename) {
|
||||
static char tmp[1024];
|
||||
const char *delim = SWIG_FILE_DELIMETER;
|
||||
const char *delim = SWIG_FILE_DELIMITER;
|
||||
char *c;
|
||||
strcpy(tmp, Char(filename));
|
||||
if (!strstr(tmp, delim)) {
|
||||
|
|
|
|||
|
|
@ -28,10 +28,12 @@ extern char *Swig_file_basename(const String_or_char *filename);
|
|||
extern char *Swig_file_filename(const String_or_char *filename);
|
||||
extern char *Swig_file_dirname(const String_or_char *filename);
|
||||
|
||||
/* Delimiter used in accessing files and directories */
|
||||
|
||||
#if defined(MACSWIG)
|
||||
# define SWIG_FILE_DELIMETER ":"
|
||||
# define SWIG_FILE_DELIMITER ":"
|
||||
#elif defined(_WIN32)
|
||||
# define SWIG_FILE_DELIMETER "\\"
|
||||
# define SWIG_FILE_DELIMITER "\\"
|
||||
#else
|
||||
# define SWIG_FILE_DELIMETER "/"
|
||||
# define SWIG_FILE_DELIMITER "/"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ SwigType *NewSwigType(const String_or_char *initial) {
|
|||
* static element_size()
|
||||
*
|
||||
* This utility function finds the size of a single type element in a type string.
|
||||
* Type elements are always delimeted by periods, but may be nested with
|
||||
* Type elements are always delimited by periods, but may be nested with
|
||||
* parentheses. A nested element is always handled as a single item.
|
||||
*
|
||||
* Returns the integer size of the element (which can be used to extract a
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue