bel_parser 1.1.1-java → 1.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17fcac70824801862008244e63511f2818c7c25
-  data.tar.gz: 9b75fc330bc14548130fefee3f2e374a7b3b61be
+  metadata.gz: bb2a803a13bd42b985838558503578325e587a58
+  data.tar.gz: 7fe65e474cc81fa6323229b2756decb1a1d42773
 SHA512:
-  metadata.gz: 339e98c13500e442006feb3e7cb929197affcf17c23d24e89e4d09a1c74ea7581821907df4a66445d5f306453755d426a3cd99797adb623fb691d31f350fa65a
-  data.tar.gz: deb11d3e785b69bbfb4f072ed7647275fd7f0be3f029357459ec68ba9a066148d4ef05cd026253378efbd2855a10c2d8a707e376b97c8ce10654066f006d3047
+  metadata.gz: e225df1e6c14acbee00e6aaea0cf70294bc9f0255c83caa2a0b06f7382e7bb7a2fd87e2157e4de4228d6dadb3f4c690ee3bf507db4e395b068242764c769ef64
+  data.tar.gz: 326598da98982adffee32cf1ecd4ffe2363562cbcb56ebea842d721f81eee9d6d94cadb0bdafd121b4fd1ce458285b2f55efe62af02af06b57be5ad22d54f1c6

data/.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
                                  'Anthony Bargnesi',
                                  'Nick Bargnesi',
                                ]
-  spec.date                  = %q{2017-01-13}
+  spec.date                  = %q{2017-01-23}
   spec.email                 = %q{abargnesi@selventa.com}
   spec.files                 = [
                                  Dir.glob('lib/**/*.{rb,rl}'),

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/bel_parser/language/expression_validator.rb

@@ -28,31 +28,41 @@ module BELParser
         case expression_node
         when BELParser::Parsers::AST::SimpleStatement
           SimpleStatementResult.new(
+            expression_node,
             validate(expression_node.statement.subject.term),
             validate(expression_node.statement.object.child),
             syntax(expression_node),
             semantics(expression_node))
         when BELParser::Parsers::AST::ObservedTerm
           ObservedTermResult.new(
+            expression_node,
             validate(expression_node.statement.subject.term),
             syntax(expression_node),
             semantics(expression_node))
         when BELParser::Parsers::AST::NestedStatement
           NestedStatementResult.new(
+            expression_node,
             validate(expression_node.statement.subject.term),
             validate(expression_node.statement.object.child),
             syntax(expression_node),
             semantics(expression_node))
         when BELParser::Parsers::AST::Statement
           SimpleStatementResult.new(
+            expression_node,
             validate(expression_node.subject.term),
             validate(expression_node.object.child),
             syntax(expression_node),
             semantics(expression_node))
         when BELParser::Parsers::AST::Term
-          TermResult.new(syntax(expression_node), semantics(expression_node))
+          TermResult.new(
+            expression_node,
+            syntax(expression_node),
+            semantics(expression_node))
         when BELParser::Parsers::AST::Parameter
-          ParameterResult.new(syntax(expression_node), semantics(expression_node))
+          ParameterResult.new(
+            expression_node,
+            syntax(expression_node),
+            semantics(expression_node))
         else
           nil
         end
@@ -87,16 +97,17 @@ module BELParser
 
         def valid_signature_mappings
           @semantics_results
-            .select do |res|
+            .select { |res|
               res.is_a?(Semantics::SignatureMappingSuccess)
-            end.uniq
+            }
+            .uniq
         end
 
         def invalid_signature_mappings
           @semantics_results
-            .select do |res|
+            .select { |res|
               res.is_a?(Semantics::SignatureMappingWarning)
-            end
+            }
         end
 
         def detail
@@ -135,7 +146,8 @@ module BELParser
         attr_reader :syntax_results, :semantics_results
         include Result
 
-        def initialize(syntax_results, semantics_results)
+        def initialize(expression_node, syntax_results, semantics_results)
+          @expression_node   = expression_node
           @syntax_results    = syntax_results
           @semantics_results = semantics_results
         end
@@ -153,14 +165,15 @@ module BELParser
         attr_reader :syntax_results, :semantics_results
         include Result
 
-        def initialize(syntax_results, semantics_results)
+        def initialize(expression_node, syntax_results, semantics_results)
+          @expression_node   = expression_node
           @syntax_results    = syntax_results
           @semantics_results = semantics_results
         end
 
         def valid_semantics?
           @semantics_results.any? do |res|
-            res.is_a?(Semantics::SignatureMappingSuccess)
+            res.is_a?(Semantics::SignatureMappingSuccess) && res.expression_node == @expression_node
           end
         end
 
@@ -189,7 +202,8 @@ module BELParser
         attr_reader :syntax_results, :semantics_results
         include Result
 
-        def initialize(subject_result, syntax, semantics)
+        def initialize(expression_node, subject_result, syntax, semantics)
+          @expression_node   = expression_node
           @subject_result    = subject_result
           @syntax_results    = syntax
           @semantics_results =
@@ -236,7 +250,8 @@ module BELParser
         attr_reader :syntax_results, :semantics_results
         include Result
 
-        def initialize(subject_result, object_result, syntax, semantics)
+        def initialize(expression_node, subject_result, object_result, syntax, semantics)
+          @expression_node   = expression_node
           @subject_result    = subject_result
           @object_result     = object_result
           @syntax_results    = syntax
@@ -342,7 +357,8 @@ module BELParser
         attr_reader :syntax_results, :semantics_results
         include Result
 
-        def initialize(subject_result, object_result, syntax, semantics)
+        def initialize(expression_node, subject_result, object_result, syntax, semantics)
+          @expression_node   = expression_node
           @subject_result    = subject_result
           @object_result     = object_result
           @syntax_results    = syntax

data/lib/bel_parser/language/semantics/nested_statement_without_object.rb

@@ -17,7 +17,7 @@ module BELParser
 
           nested = node.object.child
 
-          if nested.object?
+          unless nested.object?
             NestedStatementWithoutObjectWarning.new(node, spec)
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: java
 authors:
 - Anthony Bargnesi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement