Skip to content

Commit b966af2

Browse files
committed
Variable name change to remove confusion in preparation for a future commit
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11866 626c5289-ae23-0410-ae9c-e8d60b6d4f22
1 parent d64d31a commit b966af2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Source/Modules/tcl8.cxx

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static String *methods_tab = 0; /* Methods table */
2828
static String *attr_tab = 0; /* Attribute table */
2929
static String *prefix = 0;
3030
static String *module = 0;
31-
static int nspace = 0;
31+
static int namespace_option = 0;
3232
static String *init_name = 0;
3333
static String *ns_name = 0;
3434
static int have_constructor;
@@ -97,7 +97,7 @@ class TCL8:public Language {
9797
i++;
9898
}
9999
} else if (strcmp(argv[i], "-namespace") == 0) {
100-
nspace = 1;
100+
namespace_option = 1;
101101
Swig_mark_arg(i);
102102
} else if (strcmp(argv[i], "-itcl") == 0) {
103103
itcl = 1;
@@ -204,7 +204,7 @@ class TCL8:public Language {
204204

205205
Printf(f_header, "#define SWIG_init %s\n", init_name);
206206
Printf(f_header, "#define SWIG_name \"%s\"\n", module);
207-
if (nspace) {
207+
if (namespace_option) {
208208
Printf(f_header, "#define SWIG_prefix \"%s::\"\n", ns_name);
209209
Printf(f_header, "#define SWIG_namespace \"%s\"\n\n", ns_name);
210210
} else {
@@ -666,15 +666,15 @@ class TCL8:public Language {
666666
virtual int constantWrapper(Node *n) {
667667
String *name = Getattr(n, "name");
668668
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);
670670
SwigType *type = Getattr(n, "type");
671671
String *rawval = Getattr(n, "rawval");
672672
String *value = rawval ? rawval : Getattr(n, "value");
673673
String *tm;
674674

675675
if (!addSymbol(iname, n))
676676
return SWIG_ERROR;
677-
if (nspace)
677+
if (namespace_option)
678678
Setattr(n, "sym:name", nsname);
679679

680680
/* Special hook for member pointer */
@@ -865,7 +865,7 @@ class TCL8:public Language {
865865
Printv(ptrclass, attributes, NIL);
866866

867867
// base class swig_getset was being called for complex inheritance trees
868-
if (nspace) {
868+
if (namespace_option) {
869869

870870
Printv(ptrclass, " protected method ", class_name, "_swig_getset {var name1 name2 op} {\n", NIL);
871871

@@ -1018,7 +1018,7 @@ class TCL8:public Language {
10181018

10191019
if (Len(dv) > 0) {
10201020
String *defval = NewString(dv);
1021-
if (nspace) {
1021+
if (namespace_option) {
10221022
Insert(defval, 0, "::");
10231023
Insert(defval, 0, ns_name);
10241024
}
@@ -1036,7 +1036,7 @@ class TCL8:public Language {
10361036
}
10371037
Printv(imethods, "] ", NIL);
10381038

1039-
if (nspace) {
1039+
if (namespace_option) {
10401040
Printv(imethods, "{ ", ns_name, "::", class_name, "_", realname, " $swigobj", NIL);
10411041
} else {
10421042
Printv(imethods, "{ ", class_name, "_", realname, " $swigobj", NIL);
@@ -1164,7 +1164,7 @@ class TCL8:public Language {
11641164
// Call to constructor wrapper and parent Ptr class
11651165
// [BRE] add -namespace/-prefix support
11661166

1167-
if (nspace) {
1167+
if (namespace_option) {
11681168
Printv(constructor, " ", realname, "Ptr::constructor [", ns_name, "::new_", realname, NIL);
11691169
} else {
11701170
Printv(constructor, " ", realname, "Ptr::constructor [new_", realname, NIL);
@@ -1231,7 +1231,7 @@ class TCL8:public Language {
12311231
if (!temp)
12321232
temp = NewString("");
12331233
Clear(temp);
1234-
if (nspace) {
1234+
if (namespace_option) {
12351235
Printf(temp, "%s::%s ", ns_name, iname);
12361236
} else {
12371237
Printf(temp, "%s ", iname);

0 commit comments

Comments
 (0)