bel_parser 1.0.0.alpha.32-java → 1.0.0.alpha.34-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51de3b1d211717716339a58423cbcb80506f2ecc
-  data.tar.gz: bca993ddd718dad0fbfe000405f1e039680f1571
+  metadata.gz: 996f6947dea38645e71e33efaebcead06ee5bab2
+  data.tar.gz: 09735f4b89e359c1a9c1a1b6e3d8b064ac451e33
 SHA512:
-  metadata.gz: 879656e3829aecf18065e91dc86e33bc773ca103347af4c6208fc50e090586cb4ec0c15475e6b637df2e373838ca9fbec081e5bd30810c63b884dc6f9ac3fc7d
-  data.tar.gz: 3bb0dd918a31e3de3e34d0adc4c75e45649ae61f32856a6258bb95094b7d024685d4d509956b6bdf80d30fd9eb22e374eb0168e0f3d31ade2a9d926edc37e6ba
+  metadata.gz: 41199f5fed91e227ad6d61d7b1b1d5d45cba45ee1b7424766e69f720510a1af09162898e96ed5be1d38f53c3befc0ba738491adcc4b9002d7319b0709e3b08ce
+  data.tar.gz: ef610f25771dcc034027b84099f40e0470b7529d858d068db7347864a93b58bc14aaca118e873a998c5b9eba83c8bff86fa175689b0476d24519bdf81cfd9716

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: java
 authors:
 - Anthony Bargnesi