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

Fix 3 shift/reduce conflicts

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9328 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2006-09-23 06:23:41 +00:00
commit 407b791c23
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/CParse/parser.y
View file

@ -4975,12 +4975,12 @@ pointer : STAR type_qualifier pointer {
} }
; ;
type_qualifier : type_qualifier_raw { type_qualifier : type_qualifier_raw {
$$ = NewStringEmpty(); $$ = NewStringEmpty();
if ($1) SwigType_add_qualifier($$,$1); if ($1) SwigType_add_qualifier($$,$1);
} }
| type_qualifier_raw type_qualifier { | type_qualifier_raw type_qualifier {
$$ = $2; $$ = $2;
if ($1) SwigType_add_qualifier($$,$1); if ($1) SwigType_add_qualifier($$,$1);
} }
; ;
@ -5004,6 +5004,15 @@ rawtype : type_qualifier type_right {
SwigType_push($$,$1); SwigType_push($$,$1);
} }
| type_right { $$ = $1; } | type_right { $$ = $1; }
| type_right type_qualifier {
$$ = $1;
SwigType_push($$,$2);
}
| type_qualifier type_right type_qualifier {
$$ = $2;
SwigType_push($$,$3);
SwigType_push($$,$1);
}
; ;
type_right : primitive_type { $$ = $1; type_right : primitive_type { $$ = $1;
@ -5014,10 +5023,6 @@ type_right : primitive_type { $$ = $1;
| TYPE_TYPEDEF template_decl { $$ = NewStringf("%s%s",$1,$2); } | TYPE_TYPEDEF template_decl { $$ = NewStringf("%s%s",$1,$2); }
| ENUM idcolon { $$ = NewStringf("enum %s", $2); } | ENUM idcolon { $$ = NewStringf("enum %s", $2); }
| TYPE_RAW { $$ = $1; } | TYPE_RAW { $$ = $1; }
| type_right type_qualifier {
$$ = $1;
SwigType_push($$,$2);
}
| idcolon { | idcolon {
$$ = $1; $$ = $1;