Changes between Version 75 and Version 76 of IR2

Timestamp:

05/06/21 09:39:04 (5 years ago)

Author:

siegel

Comment:

--

IR2

@@ -118 +118 @@
 {{{
 type-specifier:
-    ID ('<' type-list '>')?  /* type parameter or (possibly parameterized) typedef use */
+    ID type-args?  /* type parameter or (possibly parameterized) typedef use */
   | '$int'  /* mathematical integers */
   | '$bool'  /* boolean type ($true and $false, unrelated to integers) */
@@ -135 +135 @@
   | '$set' '<' type-name '>'  /* set of T */
   | '$map' '<' type-name ',' type-name '>'  /* partial function from T1 to T2 */
-  | '$rel' '<' type-list '>'  /* relation: set of n-tuples with specified component types */
+  | '$rel' type-args  /* relation: set of n-tuples with specified component types */
   ;
 declarator '*'* direct-declarator ;
@@ -145 +145 @@
   ;
 type-name: ... /* same as declarator but without the ID */
-type-list: type-name (',' type-name)* ;
+type-args: '<' type-name (',' type-name)* '>';
 parameter-type-list: type-specifier declarator (type-specifier declarator)* ;
+
 }}}
 
@@ -167 +168 @@
     ';'  /* noop */
   | lvalue '=' expr ';'  /* assignment */
-  | (lvalue '=')? expr type-arg-list? '(' arg-list? ')' ';'  /* function call */
-  | (lvalue '=')? '$spawn' expr type-arg-list? '(' expression-list? ')' ';'  /* process creation */
+  | (lvalue '=')? expr type-args? '(' expression-list? ')' ';'  /* function call */
+  | (lvalue '=')? '$spawn' expr type-args? '(' expression-list? ')' ';'  /* process creation */
   | '$wait' expr ';'  /* wait until p terminates */
   | 'return' expr? ';'  /* return from function call */
@@ -179 +180 @@
   | '$assume' expr ';'  /* assumption */
   ;
-type-arg-list: '<' type-list '>' ;
 
 }}}
@@ -225 +225 @@
   | '*' expr  /* pointer dereference */
   | '&' lvalue  /* address-of */
-  | expr '(' expression-list? ')'  /* application of abstract function (and perhaps other functions?) */
+  | expr type-args? '(' expression-list? ')'  /* application of abstract function (and perhaps other functions?) */
   | $new(type-name)  /* returns a new arbitrary value of the given type */
   | '$forall' '(' decl expr? ')' expr  /* universal quantification */