DHBW
/
gemstone
mirror of https://github.com/Servostar/gemstone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53 from Servostar/52-fix-shiftreduce-confilcts 

fixed shift reduce conflicts by removing epsilon functions
This commit is contained in:
servostar 2024-05-07 13:51:35 +00:00 committed by GitHub
parent f8c888216a 02628a56d6
commit 95de445406
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/yacc/parser.y
View File

@ -73,57 +73,61 @@ expr: ValFloat
| operation; | operation;
exprlist: expr ',' exprlist exprlist: expr ',' exprlist
| expr | expr;
| ;
paramlist: paramlist '(' exprlist ')' paramlist: '(' exprlist ')' paramlist
| ; | '(' exprlist ')';
funcall: Ident paramlist { DEBUG("Function call"); }; funcall: Ident paramlist { DEBUG("Function call"); };
assign: Ident '=' expr { DEBUG("Assignment"); }; statementlist: statement statementlist
| statement;
statementlist: statementlist statement
| ;
statement: assign statement: assign
| decl | decl
| definition | definition
| branch; | branch
| funcall;
branchif: KeyIf expr '{' statementlist '}' { DEBUG("if"); }; branchif: KeyIf expr '{' statementlist '}' { DEBUG("if"); };
branchelse: KeyElse '{' statementlist '}' { DEBUG("if-else"); }; branchelse: KeyElse '{' statementlist '}' { DEBUG("if-else"); };
branchelseif: KeyElse KeyIf expr '{' statementlist '}' { DEBUG("else-if"); }; branchelseif: KeyElse KeyIf expr '{' statementlist '}' { DEBUG("else-if"); };
branchelseifs: branchelseifs branchelseif branchelseifs: branchelseifs branchelseif
| ; | branchelseif;
branch: branchif branchelseifs branch: branchif branchelseifs
| branchif branchelseifs branchelse; | branchif branchelseifs branchelse;
identlist: Ident ',' identlist identlist: Ident ',' identlist
| Ident | Ident;
| ;
decl: type ':' identlist { DEBUG("Declaration"); }; decl: type ':' identlist;
definition: decl '=' expr { DEBUG("Definition"); }; definition: decl '=' expr { DEBUG("Definition"); };
assign: Ident '=' expr { DEBUG("Assignment"); }; assign: Ident '=' expr { DEBUG("Assignment"); };
sign: KeySigned sign: KeySigned
| KeyUnsigned | KeyUnsigned;
| ;
scale: scale KeyShort scale: scale KeyShort
| scale KeyHalf | scale KeyHalf
| scale KeyLong | scale KeyLong
| scale KeyDouble | scale KeyDouble
| ; | KeyShort
| KeyHalf
| KeyLong
| KeyDouble;
type: sign scale Ident typekind: Ident
| sign scale KeyInt | KeyInt
| sign scale KeyFloat; | KeyFloat;
type: typekind
| scale typekind
| sign typekind
| sign scale typekind;
operation: oparith operation: oparith
| oplogic | oplogic