velvox
/
cobol-interpreter-lab
mirror of https://github.com/rileyallyn/cobol-interpreter-lab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reducing conflicts

This commit is contained in:
Josh 2024-11-12 15:48:10 -08:00
parent 2f9ed95311
commit 2d3dfc621c
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lab-4/parser.bison
View File

@ -99,20 +99,26 @@ assignment_stmt : TOKEN_EQUAL ext_function
| TOKEN_EQUAL function | TOKEN_EQUAL function
| TOKEN_KEYWORD_TO op_parms | TOKEN_KEYWORD_TO op_parms
; ;
op_parms : op_parms TOKEN_ADD op_parms op_parms : mathmaticalexpr
| op_parms TOKEN_SUB op_parms | booleanexpr
| op_parms TOKEN_MULTIPLY op_parms | otherexpr
| op_parms TOKEN_DIVIDE op_parms | type_expr
| op_parms TOKEN_EXPONENTIAL op_parms ;
| op_parms TOKEN_LESS_THAN op_parms mathmaticalexpr : type_expr TOKEN_ADD type_expr
| type_expr TOKEN_SUB type_expr
| type_expr TOKEN_MULTIPLY type_expr
| type_expr TOKEN_DIVIDE type_expr
| type_expr TOKEN_EXPONENTIAL type_expr
| TOKEN_SUB type_expr
;
booleanexpr : op_parms TOKEN_LESS_THAN op_parms
| op_parms TOKEN_GREATER_THAN op_parms | op_parms TOKEN_GREATER_THAN op_parms
| op_parms TOKEN_EQUAL op_parms | op_parms TOKEN_EQUAL op_parms
| TOKEN_SUB op_parms ;
| TOKEN_LEFT_PARENTHESIS op_parms TOKEN_RIGHT_PARENTHESIS otherexpr : TOKEN_LEFT_PARENTHESIS op_parms TOKEN_RIGHT_PARENTHESIS
| expr
| op_parms op_parms | op_parms op_parms
; ;
expr : TOKEN_IDENT type_expr : TOKEN_IDENT
| TOKEN_INTEGER | TOKEN_INTEGER
| TOKEN_STRING | TOKEN_STRING
| TOKEN_SPACE | TOKEN_SPACE

11
lab-5/parser.bison
View File

@ -131,11 +131,12 @@ op_parms : mathmaticalexpr
| otherexpr | otherexpr
| type_expr | type_expr
; ;
mathmaticalexpr : op_parms TOKEN_ADD op_parms mathmaticalexpr : type_expr TOKEN_ADD type_expr
| op_parms TOKEN_SUB op_parms | type_expr TOKEN_SUB type_expr
| op_parms TOKEN_MULTIPLY op_parms | type_expr TOKEN_MULTIPLY type_expr
| op_parms TOKEN_DIVIDE op_parms | type_expr TOKEN_DIVIDE type_expr
| op_parms TOKEN_EXPONENTIAL op_parms | type_expr TOKEN_EXPONENTIAL type_expr
| TOKEN_SUB type_expr
; ;
booleanexpr : op_parms TOKEN_LESS_THAN op_parms booleanexpr : op_parms TOKEN_LESS_THAN op_parms
| op_parms TOKEN_GREATER_THAN op_parms | op_parms TOKEN_GREATER_THAN op_parms