Changes between Version 14 and Version 15 of IR2

Timestamp:

04/25/21 17:07:39 (5 years ago)

Author:

siegel

Comment:

--

IR2

@@ -8 +8 @@
 
 {{{
-program: typedef* vardecl* fundef+ ;
+program: typedef* decl* fundef+ ;
+typedef:
+    enum ID '{' idnetifier-list '}' ';'
+  | struct ID '{' decl* '}' ';'
+  | union ID '{' decl* '}' ';'
+  | 'typedef' type-specifier declarator ';'
+  ;
+decl: type-qualifier? type-specifier declarator ';' ;
+type-qualifier: '$input' | '$output' ;
+type-specifier:
+    ID
+  | '$int'
+  | '$bool'
+  | '$char'
+  | '$int'
+  | '$real'
+  | '$float' '<' INT ',' INT '>'
+  | '$herbrand' '<' type-name '>'
+  | '$proc'
+  | '$bundle'
+  | '$heap'
+  | '$range'
+  | '$domain'
+  | '$mem'
+  | 'enum' ID
+  | 'struct' ID
+  | 'union' ID
+  | 'void'
+  | '$seq' '<' type-name '>'
+  | '$set' '<' type-name '>'
+  | '$map' '<' type-name ',' type-name '>'
+  | '$rel' '<' type-list '>'
+  ;
+declarator: '*'* ID ('[' ']' | '(' type-list? ')')* ;
+type-name: type-specifier '*'* ('[' ']' | '(' type-list? ')')* ;
+type-list: type-name (',' type-name)* ;
+complete-type-name: type-specifier '*'* ('[' expr ']' | '(' type-list? ')')* ;
+fundef: type-specifier declarator block ;  
 block: '{' typedef* vardecl* fundef* statement* '}' ;
-statement: block | basicStmt ;
-basicStmt:  (ID ':')? (simpleStmt | chooseStmt)| gotoStmt? ;
+statement: block | simpleStmt | chooseStmt ;
+simpleStmt: label? guard? primitiveStmt gotoStmt? ;
+chooseStmt: label? '$choose' '{' simpleStmt* '}' ;
+label: ID ':' ;
+guard: '$when' '(' expr ')' ;  
 gotoStmt: 'goto' ID ;
-simpleStmt: guardedStmt | primitiveStmt ;
-guardedStmt: '$when' '(' expr ')' primitiveStmt ;
-chooseStmt: '$choose' '{' (simpleStmt gotoStmt?)+ '}' ;
-typedef: 'typedef' decl;
-fundef:  (same as C)
+expr:
+simpleStmt:
+INT /* integer constant */
+ID /* identifier */
 conclause : 'assigns' expr ';' 
           | 'requires' expr ';'