jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

template ext mode on for all languages, not just Python now

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7130 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-04-01 19:46:06 +00:00
commit 34a035e3f1
6 changed files with 3 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SWIG/Source/CParse/parser.y
View file

@ -2423,13 +2423,9 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
String *nname = NewStringf("__dummy_%d__", cnt++); String *nname = NewStringf("__dummy_%d__", cnt++);
Swig_cparse_template_expand(templnode,nname,temparms,tscope); Swig_cparse_template_expand(templnode,nname,temparms,tscope);
Setattr(templnode,"sym:name",nname); Setattr(templnode,"sym:name",nname);
if (!Swig_template_extmode()) {
Setattr(templnode,"feature:ignore","1");
} else {
Setattr(templnode,"feature:onlychildren", Setattr(templnode,"feature:onlychildren",
"typemap,typemapitem,typemapcopy,typedef,types,fragment"); "typemap,typemapitem,typemapcopy,typedef,types,fragment");
} }
}
Delattr(templnode,"templatetype"); Delattr(templnode,"templatetype");
Setattr(templnode,"template",nn); Setattr(templnode,"template",nn);
tnode = templnode; tnode = templnode;

12
SWIG/Source/Modules/lang.cxx
View file

@ -20,7 +20,6 @@ char cvsroot_lang_cxx[] = "$Header$";
static int director_mode = 0; /* set to 0 on default */ static int director_mode = 0; /* set to 0 on default */
static int director_protected_mode = 0; /* set to 0 on default */ static int director_protected_mode = 0; /* set to 0 on default */
static int template_extmode = 0; /* set to 0 on default */
/* Set director_protected_mode */ /* Set director_protected_mode */
void Wrapper_director_mode_set(int flag) { void Wrapper_director_mode_set(int flag) {
@ -31,10 +30,6 @@ void Wrapper_director_protected_mode_set(int flag) {
director_protected_mode = flag; director_protected_mode = flag;
} }
void Wrapper_template_extmode_set(int flag) {
template_extmode = flag;
}
extern "C" { extern "C" {
int Swig_director_mode() int Swig_director_mode()
{ {
@ -45,11 +40,6 @@ extern "C" {
{ {
return director_protected_mode; return director_protected_mode;
} }
int Swig_template_extmode()
{
return template_extmode;
}
} }
@ -2585,7 +2575,7 @@ Language::classLookup(SwigType *s) {
Delete(base); Delete(base);
Delete(prefix); Delete(prefix);
} }
if (n && (Getattr(n,"feature:ignore"))) { if (n && (Getattr(n,"feature:ignore") || Getattr(n,"feature:onlychildren"))) {
n = 0; n = 0;
} }

4
SWIG/Source/Modules/main.cxx
View file

@ -671,10 +671,6 @@ int SWIG_main(int argc, char *argv[], Language *l) {
Wrapper_director_mode_set(0); Wrapper_director_mode_set(0);
Wrapper_director_protected_mode_set(0); Wrapper_director_protected_mode_set(0);
/* Turn off template extmode */
Wrapper_template_extmode_set(0);
// Check for SWIG_LIB environment variable // Check for SWIG_LIB environment variable
if ((c = getenv("SWIG_LIB")) == (char *) 0) { if ((c = getenv("SWIG_LIB")) == (char *) 0) {

5
SWIG/Source/Modules/python.cxx
View file

@ -107,11 +107,6 @@ public:
SWIG_library_directory("python"); SWIG_library_directory("python");
/* Turn on template extmode */
Wrapper_template_extmode_set(1);
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
if (argv[i]) { if (argv[i]) {
if(strcmp(argv[i],"-interface") == 0) { if(strcmp(argv[i],"-interface") == 0) {

1
SWIG/Source/Modules/swigmod.h
View file

@ -350,7 +350,6 @@ int is_member_director(Node* member);
void Wrapper_virtual_elimination_mode_set(int); void Wrapper_virtual_elimination_mode_set(int);
void Wrapper_director_mode_set(int); void Wrapper_director_mode_set(int);
void Wrapper_director_protected_mode_set(int); void Wrapper_director_protected_mode_set(int);
void Wrapper_template_extmode_set(int);
void clean_overloaded(Node *n); void clean_overloaded(Node *n);

1
SWIG/Source/Swig/swig.h
View file

@ -532,7 +532,6 @@ extern void Swig_fragment_emit(String *name);
/* hacks defined in C++ ! */ /* hacks defined in C++ ! */
extern int Swig_need_protected(); extern int Swig_need_protected();
extern int Swig_director_mode(); extern int Swig_director_mode();
extern int Swig_template_extmode();
#ifdef __cplusplus #ifdef __cplusplus
} }