Changes between Version 68 and Version 69 of IR2

Timestamp:

05/04/21 07:58:39 (5 years ago)

Author:

siegel

Comment:

--

IR2

@@ -46 +46 @@
   struct ID '{' decl* '}' ';'
   | union ID '{' decl* '}' ';'
-  | 'typedef' type-specifier declarator ';'
-  ;
-decl: qualifier* type-specifier declarator contract-clause* ';' ;
-function-definition: qualifier* type-specifier declarator contract-clause* block ;
+  | type-param-list? 'typedef' type-specifier declarator ';'
+  ;
+decl: type-param-list? qualifier* type-specifier declarator contract-clause* ';' ;
+function-definition: type-param-list? qualifier* type-specifier declarator contract-clause* block ;
 qualifier:
     '$input'  /* input variable; only for global decls */
@@ -68 +68 @@
 expression-list: expr (',' expr)* ;
 gotoStmt: 'goto' ID ;
+type-param-list: '<' ID (',' ID)* '>' ;
 INT: ... /* integer constant */
 ID: ... /* identifier */
@@ -121 +122 @@
 {{{
 type-specifier:
-    ID  /* typedef use */
+    ID  /* typedef use or type parameter */
   | '$int'  /* mathematical integers */
   | '$bool'  /* boolean type ($true and $false, unrelated to integers) */
@@ -171 +172 @@
     ';'  /* noop */
   | lvalue '=' expr ';'  /* assignment */
-  | expr '(' arg-list? ')' ';'  /* function call */
-  | (lvalue '=')? '$spawn' expr '(' expression-list? ')' ';'  /* process creation */
+  | expr type-arg-list? '(' arg-list? ')' ';'  /* function call */
+  | (lvalue '=')? '$spawn' expr type-arg-list? '(' expression-list? ')' ';'  /* process creation */
   | '$wait' expr ';'  /* wait until p terminates */
   | 'return' expr? ';'  /* return from function call */
@@ -183 +184 @@
   | '$assume' expr ';'  /* assumption */
   ;
+type-arg-list: '<' type-list '>' ;
 
 }}}