Changes between Version 14 and Version 15 of CIVLite

Timestamp:

09/28/23 11:20:51 (3 years ago)

Author:

siegel

Comment:

--

CIVLite

@@ -27 +27 @@
 vardecl: typedvar ';'
 formallist: typedvar (',' typedvar)*
-function: type ID '(' formallist? ')' '{' (typedvar ';')* labelnode* '}'
-labelnode: (ID ':')? node
-node: transition ('or' transition)* // multiple transitions may depart a node
-transition: ((expr | 'else') '->')? action ('goto' ID ';')?
-// if guard is missing, guard is 1 (true)
-// else guard holds when all other guards are false
-// if goto is missing, goto the next location
-action: assignment call spawn noop return wait begin_atomic end_atomic assertion print
-assignment: lval '=' expr ';'
+function: type ID '(' formallist? ')' '{' (typedvar ';')* labelnode* label? '}'
+label: ID ':'
+labelnode: label? node
+node: transition | block
+transition: action ('goto' ID)? ';'
+block: 'choose' '{' guardedaction+ '}'
+guardedaction: (expr | 'else') '->' transition
+action: 'noop' assign call spawn return wait begin_atomic end_atomic assert print
+assign: lval '=' expr
 invocation: ID '(' exprlist? ')'
-call: (lval '=')? 'call' invocation ';'
-spawn: (lval '=')? 'spawn' invocation ';'
-noop: ';'
-return: 'return' expr? ';'
-wait : 'wait' expr ';'
-begin_atomic: 'begin_atomic' ';'
-end_atomic: 'end_atomic' ';'
-assertion: 'assert' expr ';'
-print: 'print' exprstrlst ';'
+call: (lval '=')? 'call' invocation
+spawn: (lval '=')? 'spawn' invocation
+return: 'return' expr?
+wait : 'wait' expr
+begin_atomic: 'begin_atomic'
+end_atomic: 'end_atomic'
+assert: 'assert' expr
+print: 'print' exprstrlst
 exprstrlst: exprstr (',' exprstr)*
 exprstr: expr | string
@@ -90 +89 @@
   print "t0 is before the barrier\n";
   %s0 = 1;
-  %s1 -> %s1 = 0;
+  choose {
+    %s1 -> %s1 = 0;
+  }
   print "t0 is after the barrier\n";
 }
@@ -96 +97 @@
 void %t1() {
   print "t1 is before the barrier\n";
-  %s0 -> %s0 = 0;
+  choose {
+    %s0 -> %s0 = 0;
+  }
   %s1 = 1;
   print "t1 is after the barrier\n";
@@ -126 +129 @@
 int %y;
 void %main() {
-  %x>0 -> ;
-  or
-  else -> ; goto @L1;
+  choose {
+    %x>0 -> noop;
+    else -> noop goto @L1;
+  }
   %y=1;
-  %z=2; goto @L2;
+  %z=2 goto @L2;
 @L1:
   %y=0;
   %z=3;
-@L2: ;
+@L2:
 }
 }}}