Changes between Version 21 and Version 22 of IR2

Timestamp:

04/26/21 15:08:15 (5 years ago)

Author:

siegel

Comment:

--

IR2

@@ -15 +15 @@
   | 'typedef' type-specifier declarator ';'
   ;
-decl: type-qualifier? type-specifier declarator ';' ;
-fundef: type-specifier declarator block ;  
-block: '{' typedef* vardecl* fundef* statement* '}' ;
+decl: qualifier? type-specifier declarator contract-clause* ';' ;
+qualifier: '$input' | '$output' | '$abstract' | '$system' '<' STRING ',' STRING '>' ;
+function-definition: '$atomic_f'? type-specifier declarator contract-clause* block ;
+block: '{' typedef* decl* function-definition* statement* '}' ;
 statement: block | simpleStmt | chooseStmt ;
 simpleStmt: label? guard? primitiveStmt gotoStmt? ;
@@ -24 +25 @@
 guard: '$when' '(' expr ')' ;  
 gotoStmt: 'goto' ID ;
-expr:
-simpleStmt:
-INT /* integer constant */
-ID /* identifier */
-conclause : 'assigns' expr ';' 
-          | 'requires' expr ';'
-          | 'ensures' expr ';'
-          ...
+INT: ... /* integer constant */
+ID: ... /* identifier */
+contract-clause :
+    '$assigns' expr ';' 
+  | '$requires' expr ';'
+  | '$ensures' expr ';'
+   ...
 
 }}}
@@ -60 +60 @@
   | '$rel' '<' type-list '>'  /* relation: set of n-tuples with specified component types */
   ;
-type-qualifier: '$input' | '$output' ;
 declarator: '*'* ID ('[' ']' | '(' type-list? ')')* ;
 type-name: type-specifier '*'* ('[' ']' | '(' type-list? ')')* ;
@@ -82 +81 @@
 
 {{{
-simple-statement:
+primitiveStmt:
     ';'  /* noop */
   | lvalue '=' expr ';'  /* assignment */
@@ -103 +102 @@
 }}}
 
+=== Expressions ===
+
+{{{
+  expr:
+
+}}}
+
+
+