tla-sbuilder 0.2.2 → 0.3.4

data/mustache/setup/operator_run.mustache

@@ -1,9 +1,5 @@
 (* Control execution *)
 
 \* RunProcessRunning( stepdefs ) ==  { e.process : e \in Head( stepdefs ) }
-RunProcessRunning( stepdefs ) ==  (CHOOSE s \in Head( stepdefs ): TRUE ).process
-RunProcessEnabled( stepdefs, s ) == Len( stepdefs ) # 0 /\ s =  RunProcessRunning( stepdefs )
-RunProcessesToRun( stepdefs ) == Tail( stepdefs )
-RunProcessParameter( stepdefs ) == Head( stepdefs )
 
 RunInTransaction == tx_running                   \* state variable tx_running records transaction state

data/mustache/setup/steps_run.mustache

@@ -11,9 +11,10 @@
 RunSteps == <<
 {{#steps}}
 
- { [ process  |-> "p_{{process}}",
-     bindRule |-> {{>setup/steps_run_bind_rule.mustache }},
-     bindSet  |-> {{>setup/steps_run_bind_set.mustache }}
+ { [ process  |-> "p_{{process}}"
+     , bindRule |-> {{>setup/steps_run_bind_rule.mustache }}
+     , bindSet  |-> {{>setup/steps_run_bind_set.mustache }}
+     , ctx      |-> Nil
    ]
  } {{_comma}}  (* interface/process : {{process}} *)
 {{/steps}}

data/mustache/setup/steps_run_parameterBind.mustache

@@ -22,15 +22,15 @@
 
     Case 1:
   
-}}{{#domain_element}}{{parameter_name}}|->"{{domain_element}}"{{_comma}}{{/domain_element}}{{!
+}}{{#domain_element}}{{#parameter_name}}{{parameter_name}}|->{{/parameter_name}}"{{domain_element}}"{{_comma}}{{/domain_element}}{{!
 
     Case 2:
     
-}}{{#domain_value}}{{parameter_name}}|->{{domain_value}}{{_comma}}{{/domain_value}}{{!
+}}{{#domain_value}}{{#parameter_name}}{{parameter_name}}|->{{/parameter_name}}{{{domain_value}}}{{_comma}}{{/domain_value}}{{!
 
     Case 3:
     
-}}{{^domain_value}}{{^domain_element}}{{^columns.length}}{{^rows.length}}{{parameter_name}}|->Nil{{_comma}}{{/rows.length}}{{/columns.length}}{{/domain_element}}{{/domain_value}}{{!
+}}{{^domain_value}}{{^domain_element}}{{^columns.length}}{{^rows.length}}{{#parameter_name}}{{parameter_name}}|->{{/parameter_name}}Nil{{_comma}}{{/rows.length}}{{/columns.length}}{{/domain_element}}{{/domain_value}}{{!
 
   
    Case 4: Record
@@ -70,13 +70,21 @@ NOTICE: no newline --> parameter nicely on one line
 
 Start array parameter
 
-}}{{#rows.length}} _rows |-> { [ key |-> "{{parameter_name}}", set |-> { {{/rows.length}}{{!
+}}{{#rows.length}} _rows |-> { [ key |-> "{{parameter_name}}", row_types |-> "{{row_types}}", set |-> { {{/rows.length}}{{!
 
    iterate rows
    [  <recursion> ] _comma
 
-}}{{#rows}} [ {{#columns}} {{>setup/steps_run_parameterBind.mustache}} {{/columns}} ] {{_comma}} {{/rows}}{{!
+}}{{#rows}}{{!
+      row with singleton elements (i.e. columns: false )
+}}{{^columns.length}}{{>setup/steps_run_parameterBind.mustache}} {{/columns.length}}{{!
+
+   row with hash element starts (i.e. columns.length defined )
+   
+}}{{#columns.length}}[ {{/columns.length}}{{#columns}}{{>setup/steps_run_parameterBind.mustache}} {{/columns}} {{!
+      row with hash element ends
+}}{{#columns.length}} ]{{_comma}}{{/columns.length}} {{/rows}}{{!
 
    End of rows
 
-}}{{#rows.length}} } ]} {{/rows.length}}
+}}{{#rows.length}} } ]}{{_comma}} {{/rows.length}}

data/mustache/setup/steps_run_parameterExact.mustache

@@ -53,7 +53,7 @@
 
     - output: domain_value
     
-}}{{#domain_value}}{{domain_value}}{{/domain_value}}{{!
+}}{{#domain_value}}{{{domain_value}}}{{/domain_value}}{{!
 
     Case 3: no domain_value, no domain_elment, no rows, no columns
 
@@ -65,7 +65,11 @@
    - iterate rows [ <recursion> ]
    - output }
 
-}}{{#rows.length}} {  {{/rows.length}}{{#rows}}[ {{>setup/steps_run_parameterExact.mustache}} ]{{_comma}}{{/rows}}{{#rows.length}} }{{/rows.length}}{{!
+}}{{#rows.length}} {  {{/rows.length}}{{#rows}}{{!
+
+       when iterating rows check if row defines columns (i.e. columns.length given ) --> surround with  [ ... ]
+       
+}}{{#columns.length}}[ {{/columns.length}} {{>setup/steps_run_parameterExact.mustache}} {{#columns.length}} ]{{/columns.length}}{{_comma}}{{/rows}}{{#rows.length}} }{{/rows.length}}{{!
 
    Case 5: columns
    - output [
@@ -76,4 +80,4 @@
 
   End of columns (add comma)
 
-}}{{_comma}}{{/columns}}
+}}{{_comma}}{{/columns}}{{! no new line }}

data/mustache/state_type_invariant-infrastructure-service.mustache

@@ -17,15 +17,20 @@
 
     iterate infrastructureServices
 
-    - output: <interface_name> |-> Nil, 
+    - output: <interface-name> |-> Nil, 
 
 
-}}{{#infrastructureServices}}InfrastructureService_TypeInvariant_{{interface_name}} == responses.{{>name_process.mustache}}.response \in { Nil }{{!
+}}{{#infrastructureServices}}InfrastructureService_TypeInvariant_{{#SPEC_NAME}}infra_services.{{interface_operation}}{{/SPEC_NAME}} == responses.{{#SPEC_NAME}}infra_services.{{interface_operation}}{{/SPEC_NAME}}.response \in { Nil }{{!
 
     iterate response definitions
+    
 }}{{#response_definitions}}{{!
+
         end of response definitions
-}} \union {{namespace}}{{type}}{{/response_definitions}}{{!
+
+        add ???
+	
+}} \union {{#SPEC_NAME}}{{metatype}}.{{type}}{{/SPEC_NAME}}{{/response_definitions}}{{!
 
     end of intefaces
     
@@ -39,7 +44,7 @@
    Iterate infrastructureServices again to create call
 
 }}InfrastructureService_TypeInvariant == TRUE {{#infrastructureServices}}
-                                  /\ InfrastructureService_TypeInvariant_{{interface_name}}{{/infrastructureServices}}
+                                  /\ InfrastructureService_TypeInvariant_{{#SPEC_NAME}}infra_services.{{interface_operation}}{{/SPEC_NAME}}{{/infrastructureServices}}
 
 {{!
 

data/mustache/tla/const_def.mustache

@@ -2,4 +2,4 @@
 
 CONSTANTS WildCard        \* bind to any value
 CONSTANTS Nil             \* no value
-
+CONSTANTS Abort           \* response.status error

data/mustache/tla/macro_run.mustache

@@ -11,10 +11,13 @@
       await ProcessEnabled( steps, s );
       
       (* process entered, remove head from sequence 'steps' *)
-      step  := ProcessRunning( steps ); \* Head( steps );
+      step  := ProcessRunning( steps ); \* Head( steps ).process;
       step_parameter  := ProcessParameter( steps );
       \* steps := ProcessesToRun( steps ); \* Tail( steps );
 
+      \* Context to resume to from Head(steps ), Nil = not resuming
+      resume_context  := ProcessStep( steps ).ctx;      
+
       (* Reset infrastructure service responses on process entry *)
       responses := InfrastructureServiceInit;
 
@@ -38,6 +41,9 @@
     macro process_done( s ) {
     
         steps := ProcessesToRun( steps ); \* Tail( steps );
+
+        \* process must clear resume context
+	assert( resume_context = Nil );
 	
 	(* Flag Transaction started *)
         tx_running := FALSE;

data/mustache/tla/module_header.mustache

@@ -5,5 +5,5 @@ Generation timestemp: {{META.timestamp}}
 
 ------------------------------ MODULE model ------------------------------
 
-EXTENDS TLC, FiniteSets, Sequences, Naturals
+EXTENDS TLC, FiniteSets, Sequences, Integers
 

data/mustache/tla/operator_run.mustache

@@ -1,9 +1,12 @@
-(* Override in extending model *)
 
-ProcessEnabled( stepdefs, s ) == FALSE
-ProcessRunning( stepdefs )    == {}     \* Head( stepdefs )
-ProcessParameter( stepdefs )  == {}     \* Head( stepdefs )
-ProcessesToRun( stepdefs )    == {}     \* Tail( stepdefs )
+(* schedule operators  *)
+
+\* Notice:  cardinality of +steps+ sequence elements is 1, change in future?
+ProcessStep( stepdefs ) ==  (CHOOSE s \in Head( stepdefs ): TRUE )
+ProcessRunning( stepdefs ) ==  ProcessStep( stepdefs ).process
+ProcessEnabled( stepdefs, s ) == Len( stepdefs ) # 0 /\ s =  ProcessRunning( stepdefs )
+ProcessesToRun( stepdefs ) == Tail( stepdefs )
+ProcessParameter( stepdefs ) == ProcessStep( stepdefs )
 
 TickNext( t )   == t + 1                \* advance time (when process start)
 InTransaction   == FALSE                \* TRUE when application service running, FALSE when not

data/mustache/tla/plc_define_run.mustache

@@ -1,19 +1,23 @@
        
-       (* 
-           Current time in state variable now gets ticked
-           when process starts.
-       *)
-       currentTime == now
+     (* 
+	 Current time in state variable now gets ticked
+	 when process starts.
+     *)
+     currentTime == now
 
      (*
-        Variable step_parameter' contains a record with field 'bindSet', which
-        contains a set with input for the process. If 'bindSet' is 'Nil' return
-        whole 'inputSet'
-     *)
-     ProcessParameterInput( inputSet ) == IF (CHOOSE s \in step_parameter': TRUE).bindSet = Nil
-                                            THEN inputSet
-					    ELSE (CHOOSE s \in step_parameter': TRUE).bindSet
+	 Return set of possible bindings to an enabled process
 
+	 @param [Set] inputSet set of all possible inputs to a process
+	 @return first that matches
+	   - inputSet                if step_parameter.bindSet  == Nil
+	   - step_parameter.bindSet  if step_parameter.bindSet  != Nil
+     *)
+     ProcessParameterInput( inputSet ) ==
+	 IF step_parameter'.bindSet = Nil
+	      THEN inputSet
+	      ELSE step_parameter'.bindSet
+		    
      (* All record fields in 'bindDef' must bind with corresponding fields in 'inputParam' *)
      \* ProcessParameterEnablesTst( inputParam, bindDefs ) == \A key \in  { k \in DOMAIN bindDefs : k # "_key" }:  bindDefs[key] = inputParam[key] 
 
@@ -22,36 +26,41 @@
 
        - all 'normal' field in 'bindDefs' are found in 'inputParam'
        - and all subrecords  can be validated recursively using 'ProcessParameterEnables' using a the set in field '_key'
-       - and each record in the set in field '_rows' validates at least one row in 'inputParam'
-          -- cardinality of inputParam[key] = cardinality _row.set
+       - and for each record in the set in field '_rows'
+             -- validates at least one row in 'inputParam'
+                --- cardinality of inputParam[key] = cardinality _row.set
+	     -- OR  equals 'values' set
 
-       
-     
        Recurse one level down  in 'inputParam' using keys 'bindDefs._key.key'.
        Recursion is done only if 'bindDefs' defines field '_key'.
 
+
      *)
      RECURSIVE ProcessParameterEnables( _, _ )
-     ProcessParameterEnables( inputParam, bindDefs ) == ( \A key \in  { k \in DOMAIN bindDefs : Len(k)<4 \/ (SubSeq(k,1,4) # "_key" /\ k # "_rows" )}:  bindDefs[key] = inputParam[key]  )
+     ProcessParameterEnables( inputParam, bindDefs ) ==
+                      ( \A key \in  { k \in DOMAIN bindDefs : Len(k)<4 \/ (SubSeq(k,1,4) # "_key" /\ k # "_rows" )}:  bindDefs[key] = inputParam[key]  )
                    /\ ( \A reckey \in { k \in DOMAIN bindDefs : Len(k)>3 /\SubSeq(k,1,4)  = "_key"  }: \A r \in bindDefs[reckey] : ProcessParameterEnables( inputParam[r.key], r.rec ) )
-                   /\ ( \A reckey \in { k \in DOMAIN bindDefs : k = "_rows" }: \A r \in bindDefs[reckey] : 
-                      Cardinality( r.set ) = Cardinality( inputParam[r.key] ) /\  \A bDef \in r.set: \E ip \in inputParam[r.key]: ProcessParameterEnables( ip, bDef ) 
-	           )
+                   /\ ( \A reckey \in { k \in DOMAIN bindDefs : k = "_rows" }: \A r \in bindDefs[reckey] :
+                              (r.row_types = "singletons" /\ r.set = inputParam[r.key]  )
+                           \/ (r.row_types = "hashes" /\ Cardinality( r.set ) = Cardinality( inputParam[r.key] ) /\  \A bDef \in r.set: \E ip \in inputParam[r.key]: ProcessParameterEnables( ip, bDef ) )
+	              )
 
 
-    (* ProcessParameterBind operator
-       
-       Bind 'inputParam' for the process currently being executed with values in 'step_parameter'.
-
-       Bind to inputParameter allowed if one the following matches
-           - step parameter WildCard
-           - process parameter = WildCard
-           - predicate 'ProcessParameterEnables' resolves TRUE for some paramter set in 'step_parameter'
-	   
-       *)
-     ProcessParameterBind( inputParam ) == step_parameter' = WildCard 
-                       \/ { processEnabledInStep \in step_parameter' : 
-                              processEnabledInStep.process = step' 
-                              /\ ( processEnabledInStep.bindRule = WildCard 
-                                   \/ ProcessParameterEnables( inputParam, processEnabledInStep.bindRule ) )   } # {}
-          
+    (*
+    
+     Predicate to filter elements in ProcessParameterInput set to pass
+     to +steps+ element in +step_parameter' variable.
+     
+     Pass +inputParameter+ to a process if one the following matches
+	 - resume_contex # Nil (i.e. process execution is resuming)
+	 - step_parameter = WildCard  (i.e. Head elemend of +steps+ sequence is WildCard, allow everything )
+	 - step_parameter.bindSet = WildCard (i.e. Head element defines bindSet element)
+	 - predicate 'ProcessParameterEnables' resolves TRUE for  step_parameter'.bindRule
+     *)
+
+     ProcessParameterBind( inputParam ) ==
+		       \/  resume_context' # Nil
+		       \/  step_parameter' = WildCard  
+		       \/  step_parameter'.bindRule = WildCard
+		       \/  ProcessParameterEnables( inputParam, step_parameter'.bindRule )
+

data/mustache/tla/plc_run_state.mustache

@@ -5,8 +5,15 @@
  ******************************************************************)
 
 variables
-       steps             = Steps; \* sequence of [ { process |-> {}, parameter |-> {} }]
-       step              = Nil;   \* processes currently enabled
-       step_parameter    = {};    \* paramter binding for currently enabled processes
-       now               = 0;     \* current time
-       tx_running        = FALSE; \* TRUE when process is running   
+  \* sequence of [ { process |-> {}, parameter |-> {} }]
+  steps             = Steps;
+  \* process currently running = self with _ replcing non-numeric
+  step              = Nil;
+  \* head from +steps+ sequence used to schedule +step+
+  step_parameter    = {};
+  \* current time tick, each process run in own tick
+  now               = 0;
+  \* TRUE when process is running   
+  tx_running        = FALSE;
+  \* rec [ ret_ctx |->  stack entry push in resume ], when resuming, Nil when not
+  resume_context    = Nil;   

data/src-extend/extend/extend_assumptions.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Assumption partials: {{#ACTIONS.dump_partials}}assumptions{{/ACTIONS.dump_partials}}
+
 *)
 
 {{>assumption}}

data/src-extend/extend/extend_const.mustache

@@ -2,4 +2,7 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Const partials: {{#ACTIONS.dump_partials}}const{{/ACTIONS.dump_partials}}
+
  ******************************************************************)

data/src-extend/extend/extend_implementation.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Implementation partials: {{#ACTIONS.dump_partials}}Implementation{{/ACTIONS.dump_partials}}
+
 *)
 
 

data/src-extend/extend/extend_invariant.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Invariant partials: {{#ACTIONS.dump_partials}}invariant{{/ACTIONS.dump_partials}}
+
 *)
 
 \* Operators for correctness 

data/src-extend/extend/extend_macros.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Macro partials: {{#ACTIONS.dump_partials}}macros{{/ACTIONS.dump_partials}}
+
 *)
 
 (* ******************************************************************

data/src-extend/extend/extend_operations.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Operation partials: {{#ACTIONS.dump_partials}}operations{{/ACTIONS.dump_partials}}
+
 *)
 
 

data/src-extend/extend/extend_state.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ State partials: {{#ACTIONS.dump_partials}}state{{/ACTIONS.dump_partials}}
+
 *)
 
 {{>state}}

data/src/pet/extend/extend_assumptions.mustache

@@ -2,6 +2,10 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Assumption partials: {{#ACTIONS.dump_partials}}assumptions{{/ACTIONS.dump_partials}}
+
 *)
 
+
 {{>assumption}}

data/src/pet/extend/extend_implementation.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Implementation partials: {{#ACTIONS.dump_partials}}Implementation{{/ACTIONS.dump_partials}}
+ 
 *)
 
 

data/src/pet/extend/extend_invariant.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Invariant partials: {{#ACTIONS.dump_partials}}invariant{{/ACTIONS.dump_partials}}
+
 *)
 
 \* Operators for correctness 

data/src/pet/extend/extend_macros.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Macro partials: {{#ACTIONS.dump_partials}}macros{{/ACTIONS.dump_partials}}
+
 *)
 
 (* ******************************************************************

data/src/pet/extend/extend_operations.mustache

@@ -2,6 +2,10 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ Operation partials: {{#ACTIONS.dump_partials}}operations{{/ACTIONS.dump_partials}}
+
+
 *)
 
 

data/src/pet/extend/extend_state.mustache

@@ -2,6 +2,9 @@
  {{META.desc}}
  - modelData {{META.modelData}}
  - template  {{META.template}}
+
+ State partials: {{#ACTIONS.dump_partials}}state{{/ACTIONS.dump_partials}}
+ 
 *)
 
 {{>state}}