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

fix def_arg case broken with last &/* fix

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8058 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-12-23 18:21:18 +00:00
commit aaedd30000
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Examples/test-suite/constant_pointers.i
View file

@ -113,6 +113,9 @@ int* const globalRet2() {return &GlobalInt;}
%{ %{
static int wxEVT_COMMAND_BUTTON_CLICKEDv; static int wxEVT_COMMAND_BUTTON_CLICKEDv;
static int **wxEVT_COMMAND_BUTTON_CLICKEDp; static int **wxEVT_COMMAND_BUTTON_CLICKEDp;
char *langs[] ={"Hello"};
%} %}
@ -121,6 +124,7 @@ static int **wxEVT_COMMAND_BUTTON_CLICKEDp;
const int* wxEVENT_COMMAND_BUTTON_CLICKEDr = (int*) &wxEVT_COMMAND_BUTTON_CLICKEDv; const int* wxEVENT_COMMAND_BUTTON_CLICKEDr = (int*) &wxEVT_COMMAND_BUTTON_CLICKEDv;
const int* wxEVENT_COMMAND_BUTTON_CLICKEDp = (int*) *wxEVT_COMMAND_BUTTON_CLICKEDp; const int* wxEVENT_COMMAND_BUTTON_CLICKEDp = (int*) *wxEVT_COMMAND_BUTTON_CLICKEDp;
char **languages1 = &langs[0];
char **languages2 = (char **)&langs[0];
} }

16
Source/CParse/parser.y
View file

@ -4440,6 +4440,20 @@ def_args : EQUAL definetype {
$$.throwf = 0; $$.throwf = 0;
} }
} }
| EQUAL definetype LBRACKET expr RBRACKET {
$$ = $2;
if ($2.type == T_ERROR) {
Swig_warning(WARN_PARSE_BAD_DEFAULT,cparse_file, cparse_line, "Can't set default argument (ignored)\n");
$$ = $2;
$$.val = 0;
$$.rawval = 0;
$$.bitfield = 0;
$$.throws = 0;
$$.throwf = 0;
} else {
$$.val = NewStringf("%s[%s]",$2.val,$4.val);
}
}
| EQUAL LBRACE { | EQUAL LBRACE {
skip_balanced('{','}'); skip_balanced('{','}');
$$.val = 0; $$.val = 0;
@ -5318,9 +5332,11 @@ expr : exprnum { $$ = $1; }
} }
} }
| AND expr { | AND expr {
$$ = $2;
$$.val = NewStringf("&%s",$2.val); $$.val = NewStringf("&%s",$2.val);
} }
| STAR expr { | STAR expr {
$$ = $2;
$$.val = NewStringf("*%s",$2.val); $$.val = NewStringf("*%s",$2.val);
} }
; ;