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

Alternate function syntax parsing improvement

Browse source 
This was incorrectly accepting qualifiers and exception specifications
in the wrong place.
This commit is contained in:
William S Fulton 2017-08-26 23:39:34 +01:00
commit 0e50ef30b1
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/CParse/parser.y
View file

@ -1629,7 +1629,7 @@ static String *add_qualifier_to_declarator(SwigType *type, SwigType *qualifier)
%type <node> lambda_introducer lambda_body; %type <node> lambda_introducer lambda_body;
%type <pl> lambda_tail; %type <pl> lambda_tail;
%type <node> optional_constant_directive; %type <node> optional_constant_directive;
%type <str> virt_specifier_seq; %type <str> virt_specifier_seq virt_specifier_seq_opt;
%% %%
@ -3166,7 +3166,7 @@ c_decl : storage_class type declarator cpp_const initializer c_decl_tail {
} }
/* Alternate function syntax introduced in C++11: /* Alternate function syntax introduced in C++11:
auto funcName(int x, int y) -> int; */ auto funcName(int x, int y) -> int; */
| storage_class AUTO declarator cpp_const ARROW cpp_alternate_rettype cpp_const initializer c_decl_tail { | storage_class AUTO declarator cpp_const ARROW cpp_alternate_rettype virt_specifier_seq_opt initializer c_decl_tail {
$$ = new_node("cdecl"); $$ = new_node("cdecl");
if ($4.qualifier) SwigType_push($3.type, $4.qualifier); if ($4.qualifier) SwigType_push($3.type, $4.qualifier);
Setattr($$,"refqualifier",$4.refqualifier); Setattr($$,"refqualifier",$4.refqualifier);
@ -6627,6 +6627,14 @@ virt_specifier_seq : OVERRIDE {
} }
; ;
virt_specifier_seq_opt : virt_specifier_seq {
$$ = 0;
}
| empty {
$$ = 0;
}
;
exception_specification : THROW LPAREN parms RPAREN { exception_specification : THROW LPAREN parms RPAREN {
$$.throws = $3; $$.throws = $3;
$$.throwf = NewString("1"); $$.throwf = NewString("1");