tla-parser-s 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e456bcc271a0ec3f6a7b5f71112eb11b33ae320
-  data.tar.gz: b4dfe0d536c58a28f9963c149d350e291583dfdd
+  metadata.gz: ebb55209f382a77488d0541f147f82616795a2b7
+  data.tar.gz: 9b3b143c43fb410967b4e2a2e88f67673207e63b
 SHA512:
-  metadata.gz: 8401edf952eedba3bfc76ae0a08ffbab159dbd90481c82d48de19123bb90a9167369d01d624d16c63ed7c43956371f18ca182e9aedcfdf657ea5dab2a67f9bdf
-  data.tar.gz: c2e9d8063ef23e14c45f430568281f58e10b3eb6c72af478cb420828ca3eceb4443faa21e6ed0e312a012233149e3e2f0d35ad2a478ad9be22b76b171ba83eba
+  metadata.gz: df3858b3f83b89c097f715a1987cf56f7a319807fd8dafdacc1ff83876fe61803de8f0b1d1a9857406cf5d9f41b83cf31c23065c72e524f2c4448c80ed28f82e
+  data.tar.gz: 55fea89b643ea8d308c3b518e5f905018b2d990dbabd650e82ba7db9667836cd115eda59ed524a3ae29c586a2e5310505ffb488684640a004d2e767a02db8be4

data/README.md

@@ -1,8 +1,8 @@
 <link href="../site.css" rel="stylesheet"></link>
-[Up](../index.php) [Readme](README.html) [Releases](RELEASES.html) [Todo](TODO.html)
+[Readme](README.md) [Releases](RELEASES.md) [Todo](TODO.md)
 
 
-# tla-parser-s - TLA+ language parser (for tla-sbuilder) - $Release:0.2.2$
+# tla-parser-s - TLA+ language parser (for tla-sbuilder) - $Release:0.2.5$
 
 A Ruby library for parsing
 [TLA+ language](http://research.microsoft.com/en-us/um/people/lamport/tla/book.html).

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.5

data/lib/parser/parser_sexp.treetop

@@ -148,14 +148,21 @@ end
 
 
 rule unit_expression
-   sequence_expression / set_expression / set_expression_map / set_constructor / record_expression / operator_expression / quantify_expression / choose_expression
-     / function_expression
-     / let_expression
-     / if_expression
-     / identifier 
-     / record_self
-     / original_value
-     / string / integer / (  '(' space? expression space? ')' <ParenthesisExpression>)  <UnitExpression> 
+   sequence_expression
+   / set_expression
+   / set_expression_map
+   / set_constructor
+   / record_expression
+   / operator_expression
+   / quantify_expression
+   / choose_expression
+   / function_expression
+   / let_expression
+   / if_expression
+   / identifier / 'DOMAIN' space* identifier <Identifier>
+   / record_self
+   / original_value
+   / string / integer / (  '(' space? expression space? ')' <ParenthesisExpression>)  <UnitExpression> 
 
 end
 
@@ -250,6 +257,7 @@ rule set_constructor
     '{' space* expression_list? space*  '}' space* <SetConstructor>
 end
 
+
 rule bound_expression
     identifier space* '\in' space+ 'DOMAIN'? space? expression  space* <BoundInExpression> 
 end

data/spec/fixtures/resolver1/op_domain.tla

@@ -0,0 +1 @@
+op_domain(rec) == "x" \in DOMAIN rec \/ op_let

data/spec/parser/parser_spec.rb

@@ -267,6 +267,9 @@ describe  TlaParserS::Parser do
       # manually traverse quantified expression
       quantified_expression = node.quantified_expression.traverse { |m, node_type, enode, node_val| m.concat( expression_value(node_type, enode, node_val )) }
       "#{node_val} #{binds.join(', ')} : #{quantified_expression}"
+
+    when "BoundInExpression"
+     raise "BoundInExpression missing implemetation"
     when "IntegerValue"
       "#{node_val}"
     else
@@ -1684,6 +1687,29 @@ describe  TlaParserS::Parser do
           :expression => "TRUE"
         },
       },
+      {
+        :str => 'operator(rec) == "x" \in rec',
+        :desc => "in-set",
+        :start => :operator,
+        :exception => nil,
+        :debug => false,
+        :expect => {
+          :parameters=>{:node_type=>"Parameters", :value=>[{:node_type=>"Identifier", :value=>'rec'}]},
+          :expression => '"x"\\inrec'
+        },
+      },
+
+      {
+        :str => 'operator(rec) == "x" \in DOMAIN rec',
+        :desc => "in-set",
+        :start => :operator,
+        :exception => nil,
+        :debug => false,
+        :expect => {
+          :parameters=>{:node_type=>"Parameters", :value=>[{:node_type=>"Identifier", :value=>'rec'}]},
+          :expression => '"x"\\inDOMAIN rec'
+        },
+      },
 
       {
         :str => "itWork( param1 )  == TRUE",

data/spec/semantics/resolver_spec.rb

@@ -274,6 +274,12 @@ describe  TlaParserS::Resolver do
           :expect => [ "op_let.tla", "var4.tla", "directives.tla", "directives.cfg" ]
         },
 
+        {
+          :desc => "Domain expression",
+          :entrypoints => ["op_domain"],
+          :expect => [ "op_domain.tla", "op_let.tla", "directives.tla",  "var4.tla", "directives.cfg" ]
+        },
+
         
         {
           :desc => "RECURSIVE directive",

data/tla-parser-s.gemspec

@@ -34,8 +34,9 @@ EOF
 
   s.required_ruby_version = '~> 2'
 
+  s.add_runtime_dependency 'ffi', '~>1.9', ">=1.9.18"    
   s.add_runtime_dependency 'thor', '~>0.19', ">=0.19.1"
-  s.add_runtime_dependency 'treetop', '~>1.6', ">=1.6.3"  
-
+  s.add_runtime_dependency 'treetop', '~>1.6', ">=1.6.3"
+  
 
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: tla-parser-s
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - jarjuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.18
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.18
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +114,7 @@ files:
 - spec/fixtures/resolver1/op2.tla
 - spec/fixtures/resolver1/op3.tla
 - spec/fixtures/resolver1/op4.tla
+- spec/fixtures/resolver1/op_domain.tla
 - spec/fixtures/resolver1/op_let.tla
 - spec/fixtures/resolver1/op_tail_chg.tla
 - spec/fixtures/resolver1/proc1.tla
@@ -157,9 +178,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: Treetop parser & sematic routines to resolve modules+
 test_files: []
-has_rdoc: