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

better fix for seg. fault in OSS

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8688 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-03 07:35:02 +00:00
commit fb5c388df6
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ static Hash *extendhash = 0; /* Hash table of added methods */
static Hash *classes = 0; /* Hash table of classes */ static Hash *classes = 0; /* Hash table of classes */
static Symtab *prev_symtab = 0; static Symtab *prev_symtab = 0;
static Node *current_class = 0; static Node *current_class = 0;
static Node *class_decl = 0;
String *ModuleName = 0; String *ModuleName = 0;
static Node *module_node = 0; static Node *module_node = 0;
static String *Classprefix = 0; static String *Classprefix = 0;
@ -60,6 +59,9 @@ static int compact_default_args = 0;
static int template_reduce = 0; static int template_reduce = 0;
static int cparse_externc = 0; static int cparse_externc = 0;
static int class_level = 0;
static Node *class_decl[16];
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Assist Functions * Assist Functions
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
@ -326,7 +328,7 @@ static void add_symbols(Node *n) {
Delete(prefix); Delete(prefix);
} }
if (!Getattr(n,k_parentnode)) set_parentNode(n,current_class ? current_class : class_decl); if (0 && !Getattr(n,k_parentnode) && class_level) set_parentNode(n,class_decl[class_level - 1]);
Setattr(n,"ismember","1"); Setattr(n,"ismember","1");
} }
} }
@ -3200,17 +3202,17 @@ cpp_class_decl :
Delete(tpname); Delete(tpname);
} }
} }
class_decl[class_level++] = $$;
inclass = 1; inclass = 1;
current_class = class_decl = $$;
} cpp_members RBRACE cpp_opt_declarators { } cpp_members RBRACE cpp_opt_declarators {
Node *p; Node *p;
SwigType *ty; SwigType *ty;
Symtab *cscope = prev_symtab; Symtab *cscope = prev_symtab;
Node *am = 0; Node *am = 0;
String *scpname = 0; String *scpname = 0;
$$ = class_decl; $$ = class_decl[--class_level];
inclass = 0; inclass = 0;
current_class = 0;
/* Check for pure-abstract class */ /* Check for pure-abstract class */
Setattr($$,k_abstract, pure_abstract($7)); Setattr($$,k_abstract, pure_abstract($7));
@ -3338,8 +3340,8 @@ cpp_class_decl :
} }
Swig_symbol_newscope(); Swig_symbol_newscope();
cparse_start_line = cparse_line; cparse_start_line = cparse_line;
class_decl[class_level++] = $$;
inclass = 1; inclass = 1;
current_class = class_decl = $$;
Classprefix = NewStringEmpty(); Classprefix = NewStringEmpty();
Delete(Namespaceprefix); Delete(Namespaceprefix);
Namespaceprefix = Swig_symbol_qualifiedscopename(0); Namespaceprefix = Swig_symbol_qualifiedscopename(0);
@ -3347,9 +3349,8 @@ cpp_class_decl :
String *unnamed; String *unnamed;
Node *n; Node *n;
Classprefix = 0; Classprefix = 0;
$$ = class_decl; $$ = class_decl[--class_level];
inclass = 0; inclass = 0;
current_class = 0;
unnamed = Getattr($$,k_unnamed); unnamed = Getattr($$,k_unnamed);
/* Check for pure-abstract class */ /* Check for pure-abstract class */