Fix order of working set rules. Now they are printed in the right order and numbered from 0 upwards.

Author: reb-ddm

core/grammar/cst.ml

@@ -13,7 +13,7 @@ let add_working_set_guard guard k loc =
   | None -> Some guard_param, guard_name
   | Some guard -> Some (Logical_formulae.AND (guard_param, guard)), guard_name
 
-let append_to_ast_compil rev_instr compil =
+let append_to_ast_compil (nr_working_set_rules, rev_instr) compil =
   fst
   @@ List.fold_left
        (fun (r, k) -> function
@@ -30,7 +30,7 @@ let append_to_ast_compil rev_instr compil =
                    Mods.StringMap.add new_guard_p_name true
                      r.Ast.guard_param_values;
                },
-               k + 1 )
+               k - 1 )
            ) else
              ( { r with Ast.rules = (label, guard, (rule, loc)) :: r.Ast.rules },
                k )
@@ -86,4 +86,5 @@ let append_to_ast_compil rev_instr compil =
                  (agent, site1, site2) :: r.Ast.sequential_bonds;
              },
              k ))
-       (compil, 0) (List.rev rev_instr)
+       (compil, nr_working_set_rules - 1)
+       (List.rev rev_instr)

core/grammar/cst.mli

@@ -7,4 +7,4 @@
 (******************************************************************************)
 
 val append_to_ast_compil :
-  Ast.parsing_instruction list -> Ast.parsing_compil -> Ast.parsing_compil
+  int * Ast.parsing_instruction list -> Ast.parsing_compil -> Ast.parsing_compil

core/grammar/klexer4.mli

@@ -1,5 +1,6 @@
 val model :
-  Lexing.lexbuf -> Ast.parsing_instruction list * string Loc.annoted list
+  Lexing.lexbuf ->
+  (int * Ast.parsing_instruction list) * string Loc.annoted list
 
 val compile :
   Format.formatter ->

core/grammar/kparser4.mly

@@ -15,10 +15,16 @@
   let end_pos = Parsing.rhs_end_pos
   let start_pos = Parsing.rhs_start_pos
 
+  let nr_working_set_rules = ref 0
+  let inc_working_set_rules () = nr_working_set_rules := !nr_working_set_rules + 1
+
   let internal_memory = ref []
   let add x = internal_memory := x :: !internal_memory
   let output () =
-    let o = List.rev !internal_memory in let () = internal_memory := [] in o
+    let o = (!nr_working_set_rules, List.rev !internal_memory) in 
+    let () = internal_memory := [] in 
+    let () = nr_working_set_rules := 0 in 
+    o
 %}
 
 %token EOF COMMA DOT OP_PAR CL_PAR OP_CUR CL_CUR OP_BRA CL_BRA AT SEMICOLON
@@ -35,7 +41,7 @@
 %token <string> SPACE COMMENT
 
 %start model
-%type <Ast.parsing_instruction list> model
+%type <int * Ast.parsing_instruction list> model
 
 %start interactive_command
 %type <(Ast.mixture,Ast.mixture,string,Ast.rule) Ast.command> interactive_command
@@ -812,10 +818,13 @@ perturbation_declaration:
           ($1,None,e,post) }
   ;
 
+working_set_rule:
+  | LABEL annoted rule 
+    {let guard, rule = $3 in add (Ast.RULE (Some ($1, rhs_pos 1), guard, rule, true)); inc_working_set_rules () }
+  | rule { let guard, rule = $1 in add (Ast.RULE (None, guard, rule, true)); inc_working_set_rules () }
+
 working_set:
-  | LABEL annoted rule working_set
-    { add (let guard, rule = $3 in Ast.RULE(Some ($1, rhs_pos 1),guard, rule, true)) }
-  | rule working_set { let guard,rule = $1 in add (Ast.RULE (None, guard, rule, true)) }
+  | working_set_rule working_set { }
   | { }
 
 sentence: