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

allow the parser.y to be compiled with c++ (throw->throwf)

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8019 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-12-21 02:07:36 +00:00
commit 574f03bbdd
1 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1390,7 +1390,7 @@ static void default_arguments(Node *n) {
String *qualifier; String *qualifier;
String *bitfield; String *bitfield;
Parm *throws; Parm *throws;
String *throw; String *throwf;
} dtype; } dtype;
struct { struct {
char *type; char *type;
@ -1404,7 +1404,7 @@ static void default_arguments(Node *n) {
ParmList *parms; ParmList *parms;
short have_parms; short have_parms;
ParmList *throws; ParmList *throws;
String *throw; String *throwf;
} decl; } decl;
Parm *tparms; Parm *tparms;
struct { struct {
@ -2826,7 +2826,7 @@ c_decl : storage_class type declarator initializer c_decl_tail {
Setattr($$,"parms",$3.parms); Setattr($$,"parms",$3.parms);
Setattr($$,"value",$4.val); Setattr($$,"value",$4.val);
Setattr($$,"throws",$4.throws); Setattr($$,"throws",$4.throws);
Setattr($$,"throw",$4.throw); Setattr($$,"throw",$4.throwf);
if (!$5) { if (!$5) {
if (Len(scanner_ccode)) { if (Len(scanner_ccode)) {
String *code = Copy(scanner_ccode); String *code = Copy(scanner_ccode);
@ -2889,7 +2889,7 @@ c_decl_tail : SEMI {
Setattr($$,"parms",$2.parms); Setattr($$,"parms",$2.parms);
Setattr($$,"value",$3.val); Setattr($$,"value",$3.val);
Setattr($$,"throws",$3.throws); Setattr($$,"throws",$3.throws);
Setattr($$,"throw",$3.throw); Setattr($$,"throw",$3.throwf);
if ($3.bitfield) { if ($3.bitfield) {
Setattr($$,"bitfield", $3.bitfield); Setattr($$,"bitfield", $3.bitfield);
} }
@ -2913,25 +2913,25 @@ initializer : def_args {
$$ = $1; $$ = $1;
$$.qualifier = 0; $$.qualifier = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
| type_qualifier def_args { | type_qualifier def_args {
$$ = $2; $$ = $2;
$$.qualifier = $1; $$.qualifier = $1;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
| THROW LPAREN parms RPAREN def_args { | THROW LPAREN parms RPAREN def_args {
$$ = $5; $$ = $5;
$$.qualifier = 0; $$.qualifier = 0;
$$.throws = $3; $$.throws = $3;
$$.throw = NewString("1"); $$.throwf = NewString("1");
} }
| type_qualifier THROW LPAREN parms RPAREN def_args { | type_qualifier THROW LPAREN parms RPAREN def_args {
$$ = $6; $$ = $6;
$$.qualifier = $1; $$.qualifier = $1;
$$.throws = $4; $$.throws = $4;
$$.throw = NewString("1"); $$.throwf = NewString("1");
} }
; ;
@ -3081,7 +3081,7 @@ c_constructor_decl : storage_class type LPAREN parms RPAREN ctor_end {
Setattr($$,"value",$6.defarg); Setattr($$,"value",$6.defarg);
} }
Setattr($$,"throws",$6.throws); Setattr($$,"throws",$6.throws);
Setattr($$,"throw",$6.throw); Setattr($$,"throw",$6.throwf);
err = 0; err = 0;
} }
} }
@ -3961,7 +3961,7 @@ cpp_constructor_decl : storage_class type LPAREN parms RPAREN ctor_end {
SwigType_add_function(decl,$4); SwigType_add_function(decl,$4);
Setattr($$,"decl",decl); Setattr($$,"decl",decl);
Setattr($$,"throws",$6.throws); Setattr($$,"throws",$6.throws);
Setattr($$,"throw",$6.throw); Setattr($$,"throw",$6.throwf);
if (Len(scanner_ccode)) { if (Len(scanner_ccode)) {
String *code = Copy(scanner_ccode); String *code = Copy(scanner_ccode);
Setattr($$,"code",code); Setattr($$,"code",code);
@ -3993,7 +3993,7 @@ cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end {
Delete(decl); Delete(decl);
} }
Setattr($$,"throws",$6.throws); Setattr($$,"throws",$6.throws);
Setattr($$,"throw",$6.throw); Setattr($$,"throw",$6.throwf);
add_symbols($$); add_symbols($$);
} }
@ -4016,7 +4016,7 @@ cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end {
Setattr($$,"name",name); Setattr($$,"name",name);
Delete(name); Delete(name);
Setattr($$,"throws",$7.throws); Setattr($$,"throws",$7.throws);
Setattr($$,"throw",$7.throw); Setattr($$,"throw",$7.throwf);
if ($7.val) { if ($7.val) {
Setattr($$,"value","0"); Setattr($$,"value","0");
} }
@ -4238,12 +4238,12 @@ cpp_swig_directive: pragma_directive { $$ = $1; }
cpp_end : cpp_const SEMI { cpp_end : cpp_const SEMI {
Clear(scanner_ccode); Clear(scanner_ccode);
$$.throws = $1.throws; $$.throws = $1.throws;
$$.throw = $1.throw; $$.throwf = $1.throwf;
} }
| cpp_const LBRACE { | cpp_const LBRACE {
skip_balanced('{','}'); skip_balanced('{','}');
$$.throws = $1.throws; $$.throws = $1.throws;
$$.throw = $1.throw; $$.throwf = $1.throwf;
} }
; ;
@ -4253,7 +4253,7 @@ cpp_vend : cpp_const SEMI {
$$.qualifier = $1.qualifier; $$.qualifier = $1.qualifier;
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = $1.throws; $$.throws = $1.throws;
$$.throw = $1.throw; $$.throwf = $1.throwf;
} }
| cpp_const EQUAL definetype SEMI { | cpp_const EQUAL definetype SEMI {
Clear(scanner_ccode); Clear(scanner_ccode);
@ -4261,7 +4261,7 @@ cpp_vend : cpp_const SEMI {
$$.qualifier = $1.qualifier; $$.qualifier = $1.qualifier;
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = $1.throws; $$.throws = $1.throws;
$$.throw = $1.throw; $$.throwf = $1.throwf;
} }
| cpp_const LBRACE { | cpp_const LBRACE {
skip_balanced('{','}'); skip_balanced('{','}');
@ -4269,7 +4269,7 @@ cpp_vend : cpp_const SEMI {
$$.qualifier = $1.qualifier; $$.qualifier = $1.qualifier;
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = $1.throws; $$.throws = $1.throws;
$$.throw = $1.throw; $$.throwf = $1.throwf;
} }
; ;
@ -4437,7 +4437,7 @@ def_args : EQUAL definetype {
$$.rawval = 0; $$.rawval = 0;
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
} }
| EQUAL LBRACE { | EQUAL LBRACE {
@ -4447,7 +4447,7 @@ def_args : EQUAL definetype {
$$.type = T_INT; $$.type = T_INT;
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
| COLON expr { | COLON expr {
$$.val = 0; $$.val = 0;
@ -4455,7 +4455,7 @@ def_args : EQUAL definetype {
$$.type = 0; $$.type = 0;
$$.bitfield = $2.val; $$.bitfield = $2.val;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
| empty { | empty {
$$.val = 0; $$.val = 0;
@ -4463,7 +4463,7 @@ def_args : EQUAL definetype {
$$.type = T_INT; $$.type = T_INT;
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
; ;
@ -5149,7 +5149,7 @@ definetype : { /* scanner_check_typedef(); */ } expr {
} }
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
scanner_ignore_typedef(); scanner_ignore_typedef();
} }
/* | string { /* | string {
@ -5158,7 +5158,7 @@ definetype : { /* scanner_check_typedef(); */ } expr {
$$.type = T_STRING; $$.type = T_STRING;
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
*/ */
| CHARCONST { | CHARCONST {
@ -5173,7 +5173,7 @@ definetype : { /* scanner_check_typedef(); */ } expr {
$$.type = T_CHAR; $$.type = T_CHAR;
$$.bitfield = 0; $$.bitfield = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
; ;
@ -5502,22 +5502,22 @@ opt_virtual : VIRTUAL
cpp_const : type_qualifier { cpp_const : type_qualifier {
$$.qualifier = $1; $$.qualifier = $1;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
| THROW LPAREN parms RPAREN { | THROW LPAREN parms RPAREN {
$$.qualifier = 0; $$.qualifier = 0;
$$.throws = $3; $$.throws = $3;
$$.throw = NewString("1"); $$.throwf = NewString("1");
} }
| type_qualifier THROW LPAREN parms RPAREN { | type_qualifier THROW LPAREN parms RPAREN {
$$.qualifier = $1; $$.qualifier = $1;
$$.throws = $4; $$.throws = $4;
$$.throw = NewString("1"); $$.throwf = NewString("1");
} }
| empty { | empty {
$$.qualifier = 0; $$.qualifier = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
; ;
@ -5526,14 +5526,14 @@ ctor_end : cpp_const ctor_initializer SEMI {
$$.have_parms = 0; $$.have_parms = 0;
$$.defarg = 0; $$.defarg = 0;
$$.throws = $1.throws; $$.throws = $1.throws;
$$.throw = $1.throw; $$.throwf = $1.throwf;
} }
| cpp_const ctor_initializer LBRACE { | cpp_const ctor_initializer LBRACE {
skip_balanced('{','}'); skip_balanced('{','}');
$$.have_parms = 0; $$.have_parms = 0;
$$.defarg = 0; $$.defarg = 0;
$$.throws = $1.throws; $$.throws = $1.throws;
$$.throw = $1.throw; $$.throwf = $1.throwf;
} }
| LPAREN parms RPAREN SEMI { | LPAREN parms RPAREN SEMI {
Clear(scanner_ccode); Clear(scanner_ccode);
@ -5541,7 +5541,7 @@ ctor_end : cpp_const ctor_initializer SEMI {
$$.have_parms = 1; $$.have_parms = 1;
$$.defarg = 0; $$.defarg = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
| LPAREN parms RPAREN LBRACE { | LPAREN parms RPAREN LBRACE {
skip_balanced('{','}'); skip_balanced('{','}');
@ -5549,13 +5549,13 @@ ctor_end : cpp_const ctor_initializer SEMI {
$$.have_parms = 1; $$.have_parms = 1;
$$.defarg = 0; $$.defarg = 0;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
| EQUAL definetype SEMI { | EQUAL definetype SEMI {
$$.have_parms = 0; $$.have_parms = 0;
$$.defarg = $2.val; $$.defarg = $2.val;
$$.throws = 0; $$.throws = 0;
$$.throw = 0; $$.throwf = 0;
} }
; ;