bel_parser 1.0.0.alpha.32 → 1.0.0.alpha.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66bc44f1bc14ae59649f2453be3ea4a9c9889b57
-  data.tar.gz: be0ba1cc9e461acca0e5a5b179b89d525c826b28
+  metadata.gz: 4e1e76aac6cddc28a72044c48817cd06f64fbb46
+  data.tar.gz: 7f94685c8bea050f62113df06eff30289fe7b23a
 SHA512:
-  metadata.gz: 4d4dcd9d845bbc71d7a33d4c165e59cf569b96bac62b2b98283fd125b5ad7569c3dfdda496f0c48c3925929faa857572e60ef74936ee4bde100bd83ab24f8fe3
-  data.tar.gz: f8ffdafefdb50d6f2313e46ab268958bc5ce706a71439da753792434c250f631ece1a4fb89fe2ddd36b038bef13cd6a92d26f829189f7389be515aba719018b5
+  metadata.gz: 25c0e44cc23e2713315123438330356a8730a263ef513f8948610732f2932f095d65cad1d13b2aa55ce1ae7fd7c65eaf30eed56d1027b5c46fc0aaa556f5a6f7
+  data.tar.gz: ac99e19b7d99d34ef9309675debf385d0c4391f28614192c3307896fa866b33189b6a945eaa233cc7b8aed5091980999cabfc6b404552a86ca9d47902c692097

data/.gemspec

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

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.32
+1.0.0.alpha.34

data/lib/bel_parser/expression/model/statement.rb

@@ -128,13 +128,14 @@ module BELParser
             end
           return nil if statement.nil?
 
-          spec ||= BELParser::Language.latest_supported_specification
+          spec  ||= BELParser::Language.latest_supported_specification
+          comment = statement.comment && statement.comment.children[0]
 
           Statement.new(
             ast_to_term(statement.subject.term, spec, namespaces),
             convert_relationship(statement.relationship, spec),
             convert_object(statement.object, spec, namespaces),
-            statement.comment && statement.comment.children[0])
+            comment)
         end
 
         def convert_relationship(ast, spec)

data/lib/bel_parser/parsers/expression/nested_statement.rb

@@ -1558,7 +1558,9 @@ begin
 	when 23 then
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 11 then
 		begin
@@ -1762,7 +1764,9 @@ begin
   		end
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 18 then
 		begin
@@ -1873,7 +1877,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -2024,7 +2028,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -2062,7 +2066,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -3774,7 +3778,9 @@ begin
 	when 23 then
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 11 then
 		begin
@@ -3978,7 +3984,9 @@ begin
   		end
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 18 then
 		begin
@@ -4089,7 +4097,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -4240,7 +4248,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -4278,7 +4286,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -5990,7 +5998,9 @@ begin
 	when 23 then
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 11 then
 		begin
@@ -6194,7 +6204,9 @@ begin
   		end
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 18 then
 		begin
@@ -6305,7 +6317,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -6456,7 +6468,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -6494,7 +6506,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -8206,7 +8218,9 @@ begin
 	when 23 then
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 11 then
 		begin
@@ -8410,7 +8424,9 @@ begin
   		end
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 18 then
 		begin
@@ -8521,7 +8537,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -8672,7 +8688,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -8710,7 +8726,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -10422,7 +10438,9 @@ begin
 	when 23 then
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 11 then
 		begin
@@ -10626,7 +10644,9 @@ begin
   		end
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 18 then
 		begin
@@ -10737,7 +10757,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -10888,7 +10908,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -10926,7 +10946,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -12638,7 +12658,9 @@ begin
 	when 23 then
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 11 then
 		begin
@@ -12842,7 +12864,9 @@ begin
   		end
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 18 then
 		begin
@@ -12953,7 +12977,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -13104,7 +13128,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -13142,7 +13166,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -14854,7 +14878,9 @@ begin
 	when 23 then
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 11 then
 		begin
@@ -15058,7 +15084,9 @@ begin
   		end
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 18 then
 		begin
@@ -15169,7 +15197,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -15320,7 +15348,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -15358,7 +15386,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -17122,7 +17150,9 @@ begin
 	when 23 then
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 11 then
 		begin
@@ -17326,7 +17356,9 @@ begin
   		end
 		begin
 
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   		end
 	when 18 then
 		begin
@@ -17437,7 +17469,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -17588,7 +17620,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 
@@ -17626,7 +17658,7 @@ begin
   		end
 		begin
 
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   		end
 		begin
 

data/lib/bel_parser/parsers/expression/nested_statement.rl

@@ -22,7 +22,7 @@
   }
 
   action ast_object {
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(@buffers[:object])
+    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
   }
 
   action statement_object_statement {
@@ -41,7 +41,9 @@
   }
 
   action yield_nested_statement {
-    yield nested_statement(@buffers[:statement_stack][-1])
+    comment   = @buffers[:comment] ||= comment(nil)
+    statement = @buffers[:statement_stack][-1] << comment
+    yield nested_statement(statement)
   }
 
   inner_statement :=

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.32
+  version: 1.0.0.alpha.34
 platform: ruby
 authors:
 - Anthony Bargnesi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparql-client