More consistent use of DOH namespace
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13940 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
dac89e16d4
commit
092e2104c7
6 changed files with 7 additions and 7 deletions
|
|
@ -1051,10 +1051,10 @@ String *CFFI::convert_literal(String *literal, String *type, bool try_to_split)
|
||||||
|
|
||||||
if (Len(num) >= 2 && s[0] == '0') { /* octal or hex */
|
if (Len(num) >= 2 && s[0] == '0') { /* octal or hex */
|
||||||
if (s[1] == 'x'){
|
if (s[1] == 'x'){
|
||||||
DohReplace(num,"0","#",DOH_REPLACE_FIRST);
|
Replace(num,"0","#",DOH_REPLACE_FIRST);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
DohReplace(num,"0","#o",DOH_REPLACE_FIRST);
|
Replace(num,"0","#o",DOH_REPLACE_FIRST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return num;
|
return num;
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ char cvsroot_lua_cxx[] = "$Id$";
|
||||||
void display_mapping(DOH *d) {
|
void display_mapping(DOH *d) {
|
||||||
if (d == 0 || !DohIsMapping(d))
|
if (d == 0 || !DohIsMapping(d))
|
||||||
return;
|
return;
|
||||||
for (DohIterator it = DohFirst(d); it.item; it = DohNext(it)) {
|
for (Iterator it = First(d); it.item; it = Next(it)) {
|
||||||
if (DohIsString(it.item))
|
if (DohIsString(it.item))
|
||||||
Printf(stdout, " %s = %s\n", it.key, it.item);
|
Printf(stdout, " %s = %s\n", it.key, it.item);
|
||||||
else if (DohIsMapping(it.item))
|
else if (DohIsMapping(it.item))
|
||||||
|
|
|
||||||
|
|
@ -1669,7 +1669,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Split the input text into lines */
|
/* Split the input text into lines */
|
||||||
List *clist = DohSplitLines(temp);
|
List *clist = SplitLines(temp);
|
||||||
Delete(temp);
|
Delete(temp);
|
||||||
int initial = 0;
|
int initial = 0;
|
||||||
String *s = 0;
|
String *s = 0;
|
||||||
|
|
|
||||||
|
|
@ -1107,7 +1107,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Split the input text into lines */
|
/* Split the input text into lines */
|
||||||
List *clist = DohSplitLines(temp);
|
List *clist = SplitLines(temp);
|
||||||
Delete(temp);
|
Delete(temp);
|
||||||
int initial = 0;
|
int initial = 0;
|
||||||
String *s = 0;
|
String *s = 0;
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ public:
|
||||||
Language::top(n);
|
Language::top(n);
|
||||||
Printf(out, "\n");
|
Printf(out, "\n");
|
||||||
Printf(out, ";;; Lisp parse tree produced by SWIG\n");
|
Printf(out, ";;; Lisp parse tree produced by SWIG\n");
|
||||||
print_circle_hash = DohNewHash();
|
print_circle_hash = NewHash();
|
||||||
print_circle_count = 0;
|
print_circle_count = 0;
|
||||||
hanging_parens = 0;
|
hanging_parens = 0;
|
||||||
need_whitespace = 0;
|
need_whitespace = 0;
|
||||||
|
|
|
||||||
|
|
@ -338,7 +338,7 @@ String *Swig_file_extension(const_String_or_char_ptr filename) {
|
||||||
|
|
||||||
String *Swig_file_basename(const_String_or_char_ptr filename) {
|
String *Swig_file_basename(const_String_or_char_ptr filename) {
|
||||||
String *extension = Swig_file_extension(filename);
|
String *extension = Swig_file_extension(filename);
|
||||||
String *basename = DohNewStringWithSize(filename, Len(filename) - Len(extension));
|
String *basename = NewStringWithSize(filename, Len(filename) - Len(extension));
|
||||||
Delete(extension);
|
Delete(extension);
|
||||||
return basename;
|
return basename;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue