Changes between Version 13 and Version 14 of IR2

Timestamp:

04/19/21 21:06:42 (5 years ago)

Author:

siegel

Comment:

--

IR2

@@ -11 +11 @@
 block: '{' typedef* vardecl* fundef* statement* '}' ;
 statement: block | basicStmt ;
-basicStmt:  (ID ':')? (simpleStmt | chooseStmt | gotoStmt) ;
+basicStmt:  (ID ':')? (simpleStmt | chooseStmt)| gotoStmt? ;
 gotoStmt: 'goto' ID ;
-simpleStmt: (guardedStmt | primitiveStmt) gotoStmt? ;
-guardedStmt: 'when' expr 'do' primitiveStmt ;
-chooseStmt: 'begin choose' simpleStmt+ 'end choose' ;
-typedef: 'type' ID '=' typeName ';' ;
-vardecl: 'var' varopts? ID ':' typeName ';' ;
-varopts: '[' varopt+ ']' ;
-varopt: 'input' | 'output' ;
-fundef:  'fun' funopts? ID '(' paramlist ')' (':' typeName)? conclause* block ;
-funopts: '[' funopt+ ']' ;
+simpleStmt: guardedStmt | primitiveStmt ;
+guardedStmt: '$when' '(' expr ')' primitiveStmt ;
+chooseStmt: '$choose' '{' (simpleStmt gotoStmt?)+ '}' ;
+typedef: 'typedef' decl;
+fundef:  (same as C)
 conclause : 'assigns' expr ';' 
           | 'requires' expr ';'