@@ -28,7 +28,7 @@ static String *methods_tab = 0; /* Methods table */
28
28
static String *attr_tab = 0 ; /* Attribute table */
29
29
static String *prefix = 0 ;
30
30
static String *module = 0 ;
31
- static int nspace = 0 ;
31
+ static int namespace_option = 0 ;
32
32
static String *init_name = 0 ;
33
33
static String *ns_name = 0 ;
34
34
static int have_constructor;
@@ -97,7 +97,7 @@ class TCL8:public Language {
97
97
i++;
98
98
}
99
99
} else if (strcmp (argv[i], " -namespace" ) == 0 ) {
100
- nspace = 1 ;
100
+ namespace_option = 1 ;
101
101
Swig_mark_arg (i);
102
102
} else if (strcmp (argv[i], " -itcl" ) == 0 ) {
103
103
itcl = 1 ;
@@ -204,7 +204,7 @@ class TCL8:public Language {
204
204
205
205
Printf (f_header, " #define SWIG_init %s\n " , init_name);
206
206
Printf (f_header, " #define SWIG_name \" %s\"\n " , module);
207
- if (nspace ) {
207
+ if (namespace_option ) {
208
208
Printf (f_header, " #define SWIG_prefix \" %s::\"\n " , ns_name);
209
209
Printf (f_header, " #define SWIG_namespace \" %s\"\n\n " , ns_name);
210
210
} else {
@@ -666,15 +666,15 @@ class TCL8:public Language {
666
666
virtual int constantWrapper (Node *n) {
667
667
String *name = Getattr (n, " name" );
668
668
String *iname = Getattr (n, " sym:name" );
669
- String *nsname = !nspace ? Copy (iname) : NewStringf (" %s::%s" , ns_name, iname);
669
+ String *nsname = !namespace_option ? Copy (iname) : NewStringf (" %s::%s" , ns_name, iname);
670
670
SwigType *type = Getattr (n, " type" );
671
671
String *rawval = Getattr (n, " rawval" );
672
672
String *value = rawval ? rawval : Getattr (n, " value" );
673
673
String *tm ;
674
674
675
675
if (!addSymbol (iname, n))
676
676
return SWIG_ERROR;
677
- if (nspace )
677
+ if (namespace_option )
678
678
Setattr (n, " sym:name" , nsname);
679
679
680
680
/* Special hook for member pointer */
@@ -865,7 +865,7 @@ class TCL8:public Language {
865
865
Printv (ptrclass, attributes, NIL);
866
866
867
867
// base class swig_getset was being called for complex inheritance trees
868
- if (nspace ) {
868
+ if (namespace_option ) {
869
869
870
870
Printv (ptrclass, " protected method " , class_name, " _swig_getset {var name1 name2 op} {\n " , NIL);
871
871
@@ -1018,7 +1018,7 @@ class TCL8:public Language {
1018
1018
1019
1019
if (Len (dv) > 0 ) {
1020
1020
String *defval = NewString (dv);
1021
- if (nspace ) {
1021
+ if (namespace_option ) {
1022
1022
Insert (defval, 0 , " ::" );
1023
1023
Insert (defval, 0 , ns_name);
1024
1024
}
@@ -1036,7 +1036,7 @@ class TCL8:public Language {
1036
1036
}
1037
1037
Printv (imethods, " ] " , NIL);
1038
1038
1039
- if (nspace ) {
1039
+ if (namespace_option ) {
1040
1040
Printv (imethods, " { " , ns_name, " ::" , class_name, " _" , realname, " $swigobj" , NIL);
1041
1041
} else {
1042
1042
Printv (imethods, " { " , class_name, " _" , realname, " $swigobj" , NIL);
@@ -1164,7 +1164,7 @@ class TCL8:public Language {
1164
1164
// Call to constructor wrapper and parent Ptr class
1165
1165
// [BRE] add -namespace/-prefix support
1166
1166
1167
- if (nspace ) {
1167
+ if (namespace_option ) {
1168
1168
Printv (constructor, " " , realname, " Ptr::constructor [" , ns_name, " ::new_" , realname, NIL);
1169
1169
} else {
1170
1170
Printv (constructor, " " , realname, " Ptr::constructor [new_" , realname, NIL);
@@ -1231,7 +1231,7 @@ class TCL8:public Language {
1231
1231
if (!temp)
1232
1232
temp = NewString (" " );
1233
1233
Clear (temp);
1234
- if (nspace ) {
1234
+ if (namespace_option ) {
1235
1235
Printf (temp, " %s::%s " , ns_name, iname);
1236
1236
} else {
1237
1237
Printf (temp, " %s " , iname);
0 commit comments