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

fix again the %import + module name problem, now it works.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7557 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-09-30 13:22:48 +00:00
commit d1663ed6ed
1 changed files with 17 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -167,9 +167,7 @@ static String *class_rename = 0;
#define CPLUS_PROTECTED 3 #define CPLUS_PROTECTED 3
/* include types */ /* include types */
#define INCLUDE_MODE 1 static int import_mode = 0;
#define IMPORT_MODE 2
static int include_type = 1;
void SWIG_typemap_lang(const char *tm_lang) { void SWIG_typemap_lang(const char *tm_lang) {
typemap_lang = Swig_copy_string(tm_lang); typemap_lang = Swig_copy_string(tm_lang);
@ -1750,43 +1748,33 @@ include_directive: includetype options string LBRACKET {
cparse_file = Swig_copy_string($3); cparse_file = Swig_copy_string($3);
cparse_line = 0; cparse_line = 0;
} interface RBRACKET { } interface RBRACKET {
String *modulename = 0;
$$ = $6; $$ = $6;
cparse_file = $1.filename; cparse_file = $1.filename;
cparse_line = $1.line; cparse_line = $1.line;
if (strcmp($1.type,"include") == 0) { if (strcmp($1.type,"include") == 0) set_nodeType($$,"include");
set_nodeType($$,"include"); if (strcmp($1.type,"import") == 0) {
} else if (strcmp($1.type,"import") == 0) {
set_nodeType($$,"import"); set_nodeType($$,"import");
/* try to get the modulename from the options */ if (import_mode) --import_mode;
modulename = $2 ? Getattr($2,"module") : 0;
/*
we return to include type only here since an
%imported file can also %include other files
*/
include_type = INCLUDE_MODE;
} }
Setattr($$,"name",$3); Setattr($$,"name",$3);
Setattr($$,"options",$2); /* Search for the module (if any) */
if (!modulename) { {
/* Search for the first module node (if any) */ Node *n = firstChild($$);
Node *n = firstChild($$); while (n) {
while (n) { if (Strcmp(nodeType(n),"module") == 0) {
if (Strcmp(nodeType(n),"module") == 0) { Setattr($$,"module",Getattr(n,"name"));
modulename = Getattr(n,"name"); break;
break; }
n = nextSibling(n);
} }
n = nextSibling(n);
}
} }
Setattr($$,"module",Copy(modulename)); Setattr($$,"options",$2);
} }
; ;
includetype : INCLUDE { $$.type = (char *) "include"; } includetype : INCLUDE { $$.type = (char *) "include"; }
| IMPORT { $$.type = (char *) "import"; include_type = IMPORT_MODE;} | IMPORT { $$.type = (char *) "import"; ++import_mode;}
; ;
/* ------------------------------------------------------------ /* ------------------------------------------------------------
@ -1891,10 +1879,10 @@ module_directive: MODULE options idstring {
} }
} }
if (!ModuleName) ModuleName = NewString($3); if (!ModuleName) ModuleName = NewString($3);
if (include_type == INCLUDE_MODE) { if (!import_mode) {
/* first module included, we apply global /* first module included, we apply global
ModuleName, which can be modify by -module */ ModuleName, which can be modify by -module */
Setattr($$,"name",ModuleName); Setattr($$,"name",Copy(ModuleName));
} else { } else {
/* import mode, we just pass the idstring */ /* import mode, we just pass the idstring */
Setattr($$,"name",$3); Setattr($$,"name",$3);