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

Fixed parsing problem with = &x[]. This was causing the

Browse source 
Java java-lib_various.i test to fail.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5419 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2003-11-26 19:54:09 +00:00
commit 69d88a944c
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3502,26 +3502,28 @@ def_args : EQUAL definetype {
$$.throws = 0; $$.throws = 0;
} }
} }
| EQUAL AND idcolon { | EQUAL AND declarator {
Node *n = Swig_symbol_clookup($3,0); Node *n = Swig_symbol_clookup($3.id,0);
if (n) { if (n) {
String *q = Swig_symbol_qualified(n); String *q = Swig_symbol_qualified(n);
if (Getattr(n,"access")) { if (Getattr(n,"access")) {
if (cplus_mode == CPLUS_PUBLIC) { if (cplus_mode == CPLUS_PUBLIC) {
Swig_warning(WARN_PARSE_PRIVATE, cparse_file, cparse_line,"'%s' is private in this context.\n", $3); Swig_warning(WARN_PARSE_PRIVATE, cparse_file, cparse_line,"'%s' is private in this context.\n", $3.id);
Swig_warning(WARN_PARSE_BAD_DEFAULT, cparse_file, cparse_line,"Can't set default argument value (ignored)\n"); Swig_warning(WARN_PARSE_BAD_DEFAULT, cparse_file, cparse_line,"Can't set default argument value (ignored)\n");
} }
$$.val = 0; $$.val = 0;
} else { } else {
if (q) { if (q) {
$$.val = NewStringf("&%s::%s", q,Getattr(n,"name")); String *temp = NewStringf("%s::%s", q, Getattr(n,"name"));
$$.val = NewStringf("&%s", SwigType_str($3.type,temp));
Delete(q); Delete(q);
Delete(temp);
} else { } else {
$$.val = NewStringf("&%s", $3); $$.val = NewStringf("&%s", SwigType_str($3.type,$3.id));
} }
} }
} else { } else {
$$.val = NewStringf("&%s",$3); $$.val = NewStringf("&%s",SwigType_str($3.type,$3.id));
} }
$$.rawval = 0; $$.rawval = 0;
$$.type = T_USER; $$.type = T_USER;