tla-sbuilder 0.3.4 → 0.3.7

data/mustache/tla/const_def.mustache

@@ -3,3 +3,4 @@
 CONSTANTS WildCard        \* bind to any value
 CONSTANTS Nil             \* no value
 CONSTANTS Abort           \* response.status error
+CONSTANTS SetStepInput    \* Set variable step_input at process start

data/mustache/tla/macro_run.mustache

@@ -8,11 +8,19 @@
     macro enable( s ) {
       (* head in sequence 'steps' enable processes *)
       \* await Len( steps ) # 0 /\ ProcessEnabled( steps, s );
+      \* NOTICE deterministic .await and with NON-determ choice below
+      \* MUST \ s1,s2 \ steps: s1.process = s2.process
       await ProcessEnabled( steps, s );
       
       (* process entered, remove head from sequence 'steps' *)
-      step  := ProcessRunning( steps ); \* Head( steps ).process;
-      step_parameter  := ProcessParameter( steps );
+      with ( r \in Head( steps ) ) {
+	 \* step  := ProcessRunning( steps ); \* Head( steps ).process;
+	 \* step_parameter  := ProcessParameter( steps );
+	 \* await( r.process = s);
+         step := r.process;
+	 step_parameter := r;
+      };
+      
       \* steps := ProcessesToRun( steps ); \* Tail( steps );
 
       \* Context to resume to from Head(steps ), Nil = not resuming

data/mustache/tla/plc_run_state.mustache

@@ -11,6 +11,8 @@ variables
   step              = Nil;
   \* head from +steps+ sequence used to schedule +step+
   step_parameter    = {};
+  \* input to process - modified if check_possibility
+  step_input        = Nil;
   \* current time tick, each process run in own tick
   now               = 0;
   \* TRUE when process is running   

data/src/pet/infrastructure_id_get.tla

@@ -10,7 +10,9 @@ infrastructure_id_get_start:
     if ( Cardinality( v_ids[ id_type ] ) = 0 ) {
 
         \* response:  404 & Nil
-        InfrastructureServiceReturn(  "/id/{type}(get)",  "status_404", Nil );
+        \* InfrastructureServiceReturn(  "/id/{type}(get)",  "status_404", Nil );
+        InfrastructureServiceReturn(  "/id/{type}(get)",  "status_404", [ status_200 |-> [ id |-> Nil] , status_404 |-> [code |-> Nil, message |-> Nil ]]);
+	
     }
     else {
 
@@ -18,7 +20,9 @@ infrastructure_id_get_start:
         v_ids := [  v_ids EXCEPT ![id_type] = @ \ { Next_id( id_type ) } ] ;
 
 	\* response: 200 && generated id
-        InfrastructureServiceReturn( "/id/{type}(get)", "status_200", [ id |-> Next_id( id_type ) ] );
+        \* InfrastructureServiceReturn( "/id/{type}(get)", "status_200", [ status_200 |-> Next_id( id_type ) ] );
+        InfrastructureServiceReturn( "/id/{type}(get)", "status_200", [ status_200 |-> [ id |-> Next_id( id_type ) ], status_404 |-> [code |-> Nil, message |-> Nil ]  ] );
+	
      };
     return;
 }

data/src/pet/service_pet_post.tla

@@ -61,12 +61,12 @@ procedure s_post_pet( input ) {
   post_pet_ok:
 
       assert(     InfrastructureServiceGetStatus( "/id/{type}(get)" ) = "status_200"
-	           /\  ValidatePet( New_Pet( input.pet, InfrastructureServiceGetResponse( "/id/{type}(get)" ).id ) )
+	           /\  ValidatePet( New_Pet( input.pet, InfrastructureServiceGetResponse( "/id/{type}(get)" ).status_200.id ) )
        );
 
 
         (* Database transaction: create pet *) 
-       enter_pet( New_Pet( input.pet, InfrastructureServiceGetResponse( "/id/{type}(get)" ).id ));
+       enter_pet( New_Pet( input.pet, InfrastructureServiceGetResponse( "/id/{type}(get)" ).status_200.id ));
 
        {{^PREFERENCES.debug-output}}\* {{/PREFERENCES.debug-output}} print <<"Pet post, SUCCESS!!, v_pets=", v_pets >>;
       

data/src/pet/service_tag_post.tla

@@ -45,7 +45,7 @@ procedure s_post_tag( input ) {
   post_tag_ok:
 
        (* All checks passed: enter into database *) 
-       enter_tag( New_Tag( input.tag, InfrastructureServiceGetResponse( "/id/{type}(get)" ).id ) );
+       enter_tag( New_Tag( input.tag, InfrastructureServiceGetResponse( "/id/{type}(get)" ).status_200.id ) );
 
   post_tag_done:
 

data/tla-sbuilder.gemspec

@@ -31,7 +31,7 @@ EOF
 
   s.homepage              = "https://github.com/jarjuk/tla-sbuilder"
   
-  s.required_ruby_version = '~> 2'
+  s.required_ruby_version = '~> 2', ">=2.3.1"
 
   s.add_runtime_dependency 'mustache', '~>1.0', ">=1.0.3"
   s.add_runtime_dependency 'hashie', '~>3.3', ">=3.3.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tla-sbuilder
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
 platform: ruby
 authors:
 - jarjuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -204,6 +204,17 @@ files:
 - mustache/cfg/macro_run.mustache
 - mustache/cfg/module_footer.mustache
 - mustache/cfg/module_header.mustache
+- mustache/config/assumptions_activate.mustache
+- mustache/config/domains_run.mustache
+- mustache/config/module_footer.mustache
+- mustache/config/module_header.mustache
+- mustache/config/operator_run.mustache
+- mustache/config/operator_tick.mustache
+- mustache/config/steps_run.mustache
+- mustache/config/steps_run_bind_rule.mustache
+- mustache/config/steps_run_bind_set.mustache
+- mustache/config/steps_run_parameterBind.mustache
+- mustache/config/steps_run_parameterExact.mustache
 - mustache/data-model-dump.mustache
 - mustache/data-model-footer.mustache
 - mustache/data-model-header.mustache
@@ -220,9 +231,11 @@ files:
 - mustache/extend/extend_state.mustache
 - mustache/infrastructure-service-init.mustache
 - mustache/infrastructure-service-variables.mustache
+- mustache/inherit/inherit_config.mustache
 - mustache/interface_processes.mustache
 - mustache/interface_stubs_dummy.mustache
 - mustache/interface_types.mustache
+- mustache/interfaces/interface_mapper.mustache
 - mustache/invariant_activate.mustache
 - mustache/markdown-header.mustache
 - mustache/markdown-toc.mustache
@@ -233,6 +246,7 @@ files:
 - mustache/possibility/module_extends.mustache
 - mustache/possibility/module_footer.mustache
 - mustache/possibility/module_header.mustache
+- mustache/possibility/operator_set_step_input.mustache
 - mustache/possibility/possibility_definition.mustache
 - mustache/possibility/possibility_directive.mustache
 - mustache/possibility/possility_setup.mustache
@@ -240,17 +254,9 @@ files:
 - mustache/resources/schedule_process_macro.tla
 - mustache/resources/schedule_process_procedure.tla
 - mustache/resources/schedule_throw.tla
-- mustache/setup/assumptions_activate.mustache
-- mustache/setup/domains_run.mustache
 - mustache/setup/module_footer.mustache
 - mustache/setup/module_header.mustache
-- mustache/setup/operator_run.mustache
-- mustache/setup/operator_tick.mustache
-- mustache/setup/steps_run.mustache
-- mustache/setup/steps_run_bind_rule.mustache
-- mustache/setup/steps_run_bind_set.mustache
-- mustache/setup/steps_run_parameterBind.mustache
-- mustache/setup/steps_run_parameterExact.mustache
+- mustache/setup/operator_set_step_input.mustache
 - mustache/state_type_invariant-infrastructure-service.mustache
 - mustache/state_type_invariant_cfg.mustache
 - mustache/tla/const_def.mustache
@@ -368,6 +374,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - "~>"
     - !ruby/object:Gem::Version
       version: '2'
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -375,9 +384,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Specification builder for TLA+ language
 test_files: []
-has_rdoc: 

data/mustache/setup/steps_run.mustache

@@ -1,23 +0,0 @@
-
-(******************************************************************
- Environment model running the steps
- 
- {{META.desc}}
- - modelData {{META.modelData}}
- - template  {{META.template}}
- ******************************************************************)
-
-
-RunSteps == <<
-{{#steps}}
-
- { [ process  |-> "p_{{process}}"
-     , bindRule |-> {{>setup/steps_run_bind_rule.mustache }}
-     , bindSet  |-> {{>setup/steps_run_bind_set.mustache }}
-     , ctx      |-> Nil
-   ]
- } {{_comma}}  (* interface/process : {{process}} *)
-{{/steps}}
-
->>
-