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

A few comment tweaks.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9348 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2006-09-24 17:33:32 +00:00
commit 4b497408aa
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2501,22 +2501,22 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
Node *tnode = 0; Node *tnode = 0;
Symtab *tscope = 0; Symtab *tscope = 0;
int specialized = 0; int specialized = 0;
$$ = 0; $$ = 0;
tscope = Swig_symbol_current(); /* Get the current scope */ tscope = Swig_symbol_current(); /* Get the current scope */
/* If the class name is qualified. We need to create or lookup namespace entries */ /* If the class name is qualified, we need to create or lookup namespace entries */
if (!inclass) { if (!inclass) {
$5 = resolve_node_scope($5); $5 = resolve_node_scope($5);
} }
/* /*
we use the new namespace entry 'nscope' only to We use the new namespace entry 'nscope' only to
emit the template node. The template parameters are emit the template node. The template parameters are
resolved in the current 'tscope'. resolved in the current 'tscope'.
this is closer to the C++ (typedef) behavior. This is closer to the C++ (typedef) behavior.
*/ */
n = Swig_cparse_template_locate($5,$7,tscope); n = Swig_cparse_template_locate($5,$7,tscope);
@ -2543,7 +2543,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
Setattr(p,k_value,value); Setattr(p,k_value,value);
Delete(value); Delete(value);
} }
p = nextSibling(p); p = nextSibling(p);
} }
@ -2628,12 +2628,12 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
Setattr(templnode,k_symtypename,"1"); Setattr(templnode,k_symtypename,"1");
} }
if ($3) { if ($3) {
/* /*
Comment this out for 1.3.28. We need to Comment this out for 1.3.28. We need to
re-enable it later but first we need to re-enable it later but first we need to
move %ignore from using %rename to use move %ignore from using %rename to use
%feature(ignore). %feature(ignore).
String *symname = Swig_name_make(templnode,0,$3,0,0); String *symname = Swig_name_make(templnode,0,$3,0,0);
*/ */
String *symname = $3; String *symname = $3;
@ -2654,14 +2654,14 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
Setfile(templnode,cparse_file); Setfile(templnode,cparse_file);
Setline(templnode,cparse_line); Setline(templnode,cparse_line);
Delete(temparms); Delete(temparms);
add_symbols_copy(templnode); add_symbols_copy(templnode);
if (Strcmp(nodeType(templnode),"class") == 0) { if (Strcmp(nodeType(templnode),"class") == 0) {
/* Identify pure abstract methods */ /* Identify pure abstract methods */
Setattr(templnode,k_abstract, pure_abstract(firstChild(templnode))); Setattr(templnode,k_abstract, pure_abstract(firstChild(templnode)));
/* Set up inheritance in symbol table */ /* Set up inheritance in symbol table */
{ {
Symtab *csyms; Symtab *csyms;
@ -2676,7 +2676,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
Symtab *st = Getattr(s.item,k_symtab); Symtab *st = Getattr(s.item,k_symtab);
if (st) { if (st) {
Setfile(st,Getfile(s.item)); Setfile(st,Getfile(s.item));
Setline(st,Getline(s.item)); Setline(st,Getline(s.item));
Swig_symbol_inherit(st); Swig_symbol_inherit(st);
} }
} }
@ -2687,10 +2687,10 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
} }
/* Merge in addmethods for this class */ /* Merge in addmethods for this class */
/* !!! This may be broken. We may have to add the addmethods at the beginning of /* !!! This may be broken. We may have to add the
the class */ addmethods at the beginning of the class */
if (extendhash) { if (extendhash) {
String *stmp = 0; String *stmp = 0;
String *clsname; String *clsname;
@ -2751,7 +2751,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
nn = Getattr(nn,"sym:nextSibling"); /* repeat for overloaded templated functions. If a templated class there will never be a sibling. */ nn = Getattr(nn,"sym:nextSibling"); /* repeat for overloaded templated functions. If a templated class there will never be a sibling. */
} }
} }
Swig_symbol_setscope(tscope); Swig_symbol_setscope(tscope);
Delete(Namespaceprefix); Delete(Namespaceprefix);
Namespaceprefix = Swig_symbol_qualifiedscopename(0); Namespaceprefix = Swig_symbol_qualifiedscopename(0);
} }