Remove ifelse_statement

Co-authored-by: Ezequiel Bellver <ebellver@itba.edu.ar>
Co-authored-by: Juan Barmasch <jbarmasch@itba.edu.ar>
This commit is contained in:
Santiago Lo Coco 2022-04-20 10:34:27 -03:00
parent f64cc51e38
commit 54e1c0e715
1 changed files with 11 additions and 15 deletions

View File

@ -80,7 +80,6 @@ statement: evaluate SEMICOLON
| derivative SEMICOLON | derivative SEMICOLON
| declare_function SEMICOLON | declare_function SEMICOLON
| if_statement | if_statement
| ifelse_statement
| for_statement | for_statement
| while_statement | while_statement
| printCSV SEMICOLON | printCSV SEMICOLON
@ -169,7 +168,7 @@ arrayNumArray: OPEN_BRACKETS numArrays CLOSE_BRACKETS
stringArray: OPEN_BRACKETS strings CLOSE_BRACKETS stringArray: OPEN_BRACKETS strings CLOSE_BRACKETS
; ;
escapeString: ESCAPESTRING escapeString: ESCAPESTRING
| ESCAPESTRING ADD escapeString | ESCAPESTRING ADD escapeString
; ;
@ -198,7 +197,7 @@ integrate: INTEGRATE STRING BETWEEN OPEN_PARENTHESIS expression AND_INT expressi
squotes: SQUOTE squotes: SQUOTE
| SQUOTE squotes | SQUOTE squotes
; ;
print: PRINT OPEN_PARENTHESIS expression CLOSE_PARENTHESIS print: PRINT OPEN_PARENTHESIS expression CLOSE_PARENTHESIS
| PRINT OPEN_PARENTHESIS escapeString CLOSE_PARENTHESIS | PRINT OPEN_PARENTHESIS escapeString CLOSE_PARENTHESIS
@ -217,25 +216,22 @@ derivative: DERIVATIVE STRING IN OPEN_PARENTHESIS expression CLOSE_PARENTHESIS
| derivative ERR positive_constant | derivative ERR positive_constant
; ;
if_statement: IF OPEN_PARENTHESIS boolean CLOSE_PARENTHESIS statement block: OPEN_BRACES statements CLOSE_BRACES
| IF OPEN_PARENTHESIS boolean CLOSE_PARENTHESIS OPEN_BRACKETS statements CLOSE_BRACKETS | statement
; ;
ifelse_statement: if_statement ELSE statement if_statement: IF OPEN_PARENTHESIS boolean CLOSE_PARENTHESIS block
| if_statement ELSE OPEN_BRACKETS statements CLOSE_BRACKETS | IF OPEN_PARENTHESIS boolean CLOSE_PARENTHESIS block ELSE block
; ;
for_statement: FOR OPEN_PARENTHESIS declare_variable SEMICOLON boolean SEMICOLON assign_variable CLOSE_PARENTHESIS OPEN_BRACES statements CLOSE_BRACES for_statement: FOR OPEN_PARENTHESIS declare_variable SEMICOLON boolean SEMICOLON assign_variable CLOSE_PARENTHESIS block
| FOR OPEN_PARENTHESIS SEMICOLON boolean SEMICOLON assign_variable CLOSE_PARENTHESIS OPEN_BRACES statements CLOSE_BRACES | FOR OPEN_PARENTHESIS SEMICOLON boolean SEMICOLON assign_variable CLOSE_PARENTHESIS block
| FOR OPEN_PARENTHESIS declare_variable SEMICOLON boolean SEMICOLON assign_variable CLOSE_PARENTHESIS statement
| FOR OPEN_PARENTHESIS SEMICOLON boolean SEMICOLON assign_variable CLOSE_PARENTHESIS statement
; ;
taylor: TAYLOR INTEGER STRING taylor: TAYLOR INTEGER STRING
; ;
while_statement: WHILE OPEN_PARENTHESIS boolean CLOSE_PARENTHESIS OPEN_BRACKETS statements CLOSE_BRACKETS while_statement: WHILE OPEN_PARENTHESIS boolean CLOSE_PARENTHESIS block
| WHILE OPEN_PARENTHESIS boolean CLOSE_PARENTHESIS statement
; ;
declare_variable: VAR STRING declare_variable: VAR STRING
@ -252,6 +248,6 @@ assign_variable: STRING ADD_ASSIGN expression
| STRING INCREMENT | STRING INCREMENT
| STRING DECREMENT | STRING DECREMENT
| STRING ASSIGN expression | STRING ASSIGN expression
; ;
%% %%