Begin of new interpret with more imperative concepts. Scope activation 'n stuff.

1 files changed, 17 insertions, 17 deletions

diff --git a/frontend/ast.ml b/frontend/ast.ml
index 8392bc6..fbf099c 100644
--- a/frontend/ast.ml
+++ b/frontend/ast.ml
@@ -62,18 +62,18 @@ type var_def = bool * (id ext) * typ
 
 type automaton = id * state ext list * id list
 and  state = {
-    initial : bool;
-    name    : id;
-    locals  : var_def list;
-    body    : eqn ext list;
-    until   : transition list;
+    initial   : bool;
+    st_name   : id;
+    st_locals : var_def list;
+    body      : eqn ext list;
+    until     : transition list;
 }
 and transition = (expr ext) * (id ext) * bool   (* bool : does it reset ? *)
 
 and activate_block = {
-    id        : id;
-    locals    : var_def list;
-    body      : eqn ext list;
+    act_id     : id;
+    act_locals : var_def list;
+    body       : eqn ext list;
 }
 and activate_if =
     | AST_activate_body of activate_block
@@ -82,23 +82,23 @@ and activate = activate_if * id list
 
 and eqn =
     | AST_assign     of (id ext list) * (expr ext)
-    | AST_guarantee  of (id ext) * (expr ext)
     | AST_assume     of (id ext) * (expr ext)
+    | AST_guarantee  of (id ext) * (expr ext)
     | AST_automaton  of automaton
     | AST_activate   of activate
 
 type node_decl = {
-    name : id;
-    args : var_def list;
-    ret  : var_def list;
-    var  : var_def list;
-    body : eqn ext list;
+    n_name : id;
+    args   : var_def list;
+    ret    : var_def list;
+    var    : var_def list;
+    body   : eqn ext list;
 }
 
 type const_decl = {
-    name  : id;
-    typ   : typ;
-    value : expr ext;
+    c_name : id;
+    typ    : typ;
+    value  : expr ext;
 }
 
 type toplevel =