bel_parser 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 918e134aad64f9a085893f1efe594fc7c7bc8176
-  data.tar.gz: 58c493d5631689b4230e9055dbe443381abe9e75
+  metadata.gz: '01823862bc1188b0af06777dde1af62657b3bc1c'
+  data.tar.gz: 0a6f806d2ab8db3cbf6f20125a223b4da645edc1
 SHA512:
-  metadata.gz: 747d0dfc27dae01731d43e7d464819d935be23d96a78321a88d6e82947a8a3389745381e1a23343a96494c25d43308807f8af31076e9a09e82598e6ee0ab4924
-  data.tar.gz: ff4584aa710cdba505a0ec05c24d731b8c8b058608178432cbd42d108bf054080372f3d1d6ae0e78a49105fed85dd793c27d3235207e9adec5f2da8ac103bd39
+  metadata.gz: 153744fb2ceab06399607a2472abe20dda031b0dea91074f4cd054a1a2a3f6aaba76bc9906558df1852fd7a4f83f0554484db1ffb13fde88a39a2dcdac55c2a2
+  data.tar.gz: 289f6c1934ffdcc61fb4a2d6c9a0705c77a3613afb79f44ce219c6cef2d3d73dd5c6b1e92cb39821440b5c1d569bf98aa39baa9e73cde0acbc5357fb13c92f16

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: ruby
 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
   name: sparql-client