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

fix several memory leaks and add template+nested class warning, but disable it since it generates 4 extra shift/reduce

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7037 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-03-07 20:41:02 +00:00
commit 98695ef366
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,7 +140,9 @@ static Node *copy_node(Node *n) {
} }
if ((Strcmp(key,"parms") == 0) || (Strcmp(key,"pattern") == 0) || (Strcmp(key,"throws") == 0) if ((Strcmp(key,"parms") == 0) || (Strcmp(key,"pattern") == 0) || (Strcmp(key,"throws") == 0)
|| (Strcmp(key,"kwargs") == 0)) { || (Strcmp(key,"kwargs") == 0)) {
Setattr(nn,key,CopyParmList(k.item)); ParmList *pl = CopyParmList(k.item);
Setattr(nn,key,pl);
Delete(pl);
continue; continue;
} }
/* Looks okay. Just copy the data using Copy */ /* Looks okay. Just copy the data using Copy */
@ -1073,6 +1075,7 @@ static void single_new_feature(const char *featurename, String *val, Hash *featu
} else { } else {
Swig_feature_set(features_hash, name, decl, fname, val, featureattribs); Swig_feature_set(features_hash, name, decl, fname, val, featureattribs);
} }
Delete(decl);
} else if (SwigType_ispointer(t)) { } else if (SwigType_ispointer(t)) {
String *nname = NewStringf("*%s",name); String *nname = NewStringf("*%s",name);
Swig_feature_set(features_hash,nname,0,fname,val, featureattribs); Swig_feature_set(features_hash,nname,0,fname,val, featureattribs);
@ -1177,7 +1180,9 @@ static void default_arguments(Node *n) {
{ {
Node *throws = Getattr(function,"throws"); Node *throws = Getattr(function,"throws");
if (throws) Setattr(new_function,"throws",CopyParmList(throws)); ParmList *pl = CopyParmList(throws);
if (throws) Setattr(new_function,"throws",pl);
Delete(pl);
} }
/* copy specific attributes for global (or in a namespace) template functions - these are not templated class methods */ /* copy specific attributes for global (or in a namespace) template functions - these are not templated class methods */
@ -1968,6 +1973,7 @@ rename_directive : rename_namewarn declarator idstring SEMI {
namewarn_add(Char(fixname),decl,$3); namewarn_add(Char(fixname),decl,$3);
} }
} }
Delete(decl);
} else if (SwigType_ispointer(t)) { } else if (SwigType_ispointer(t)) {
String *nname = NewStringf("*%s",fixname); String *nname = NewStringf("*%s",fixname);
if ($1) { if ($1) {
@ -2116,6 +2122,7 @@ varargs_directive : VARARGS LPAREN varargs_parms RPAREN declarator cpp_const SEM
} else { } else {
Swig_feature_set(features_hash, name, decl, "feature:varargs", val, 0); Swig_feature_set(features_hash, name, decl, "feature:varargs", val, 0);
} }
Delete(decl);
} else if (SwigType_ispointer(t)) { } else if (SwigType_ispointer(t)) {
String *nname = NewStringf("*%s",name); String *nname = NewStringf("*%s",name);
Swig_feature_set(features_hash,nname,0,"feature:varargs",val, 0); Swig_feature_set(features_hash,nname,0,"feature:varargs",val, 0);
@ -3258,6 +3265,7 @@ cpp_template_decl : TEMPLATE LESSTHAN template_parms GREATERTHAN { template_para
p1 = nextSibling(p1); p1 = nextSibling(p1);
} }
Setattr($$,"templateparms",tp); Setattr($$,"templateparms",tp);
Delete(tp);
} }
#if 0 #if 0
/* Patch the parameter list */ /* Patch the parameter list */
@ -3277,6 +3285,7 @@ cpp_template_decl : TEMPLATE LESSTHAN template_parms GREATERTHAN { template_para
p1 = nextSibling(p1); p1 = nextSibling(p1);
} }
Setattr($$,"templateparms",tp); Setattr($$,"templateparms",tp);
Delete(tp);
} else { } else {
Setattr($$,"templateparms",$3); Setattr($$,"templateparms",$3);
} }
@ -3859,6 +3868,15 @@ cpp_nested : storage_class cpptype ID LBRACE { cparse_start_line = cparse_line
Swig_warning(WARN_PARSE_NESTED_CLASS,cparse_file, cparse_line,"Nested class not currently supported (ignored)\n"); Swig_warning(WARN_PARSE_NESTED_CLASS,cparse_file, cparse_line,"Nested class not currently supported (ignored)\n");
} }
} }
/*
| TEMPLATE LESSTHAN template_parms GREATERTHAN cpptype idcolon LBRACE { cparse_start_line = cparse_line; skip_balanced('{','}');
} SEMI {
$$ = 0;
if (cplus_mode == CPLUS_PUBLIC) {
Swig_warning(WARN_PARSE_NESTED_CLASS,cparse_file, cparse_line,"Nested class not currently supported (ignored)\n");
}
}
*/
; ;
nested_decl : declarator { $$ = $1;} nested_decl : declarator { $$ = $1;}