bel_parser 1.0.0.alpha.40-java → 1.0.0.alpha.41-java

data/lib/bel_parser/parsers/bel_script/set.rl

@@ -11,25 +11,25 @@
   action add_name {
     trace('SET add_name')
     key = @buffers.delete(:ident)
-    @buffers[:set_name] = key
+    @buffers[:set_name] = name(key)
   }
 
   action add_ident_value {
     trace('SET add_ident_value')
     ident = @buffers.delete(:ident)
-    @buffers[:set_value] = ident
+    @buffers[:set_value] = value(ident)
   }
 
   action add_string_value {
     trace('SET add_string_value')
     string = @buffers.delete(:string)
-    @buffers[:set_value] = string
+    @buffers[:set_value] = value(string)
   }
 
   action add_list_value {
     trace('SET add_list_value')
     list = @buffers.delete(:list)
-    @buffers[:set_value] = list
+    @buffers[:set_value] = value(list)
   }
 
   action set_end {
@@ -120,6 +120,7 @@
     @eof(set_node_eof)
     %set_end
     %yield_set
+    NL
     ;
 }%%
 =end

data/lib/bel_parser/script/state/set.rb

@@ -19,27 +19,25 @@ module BELParser
 
         def self.consume(ast_node, script_context)
           return nil unless ast_node.is_a?(TARGET_NODE)
-          name, value = ast_node.children
-          name_string = name.identifier.string_literal
-          value_node  = ast_node.value.children[0]
+          name_node, value_node = ast_node.children
+          name_string           = name_node.identifier.string_literal
           case
           when is_citation?(name_string)
             handle_citation(value_node, script_context)
           when is_support?(name_string)
             handle_support(value_node, script_context)
           when value_node.is_a?(LIST_NODE)
-            value_node
+            value.node
               .list_items.map { |li| li.children[0].string_literal }
               .each do |string|
                 handle_annotation(name_string, string, script_context)
               end
           else
-            value_string = value_node.string_literal
             case name_string
             when /\ASTATEMENT_GROUP\Z/
-              handle_statement_group(value_string, script_context)
+              handle_statement_group(value_node, script_context)
             else
-              handle_annotation(name_string, value_string, script_context)
+              handle_annotation(name_string, value_node, script_context)
             end
           end
         end
@@ -57,18 +55,18 @@ module BELParser
         end
 
         def self.handle_support(value_node, script_context)
-          script_context[:support] = value_node.string_literal
+          script_context[:support] = value_node.children[0].string_literal
         end
 
-        def self.handle_annotation(name, value, script_context)
+        def self.handle_annotation(name_string, value_node, script_context)
           # add to annotation state
-          script_context[:annotations]       ||= Concurrent::Hash.new
-          script_context[:annotations][name]   = value
+          script_context[:annotations]              ||= Concurrent::Hash.new
+          script_context[:annotations][name_string]   = value_node.children[0].string_literal
         end
         private_class_method :handle_annotation
 
-        def self.handle_statement_group(value, script_context)
-          script_context[:statement_group] = value
+        def self.handle_statement_group(value_node, script_context)
+          script_context[:statement_group] = value_node.children[0].string_literal
 
           # clear annotation state
           script_context[:annotations]     ||= Concurrent::Hash.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.40
+  version: 1.0.0.alpha.41
 platform: java
 authors:
 - Anthony Bargnesi
@@ -12,33 +12,33 @@ cert_chain: []
 date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sparql-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+  name: sparql-client
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: dbm-mapdb3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0.beta
+  name: dbm-mapdb3
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0.beta
-  prerelease: false
-  type: :runtime
 description: Implements language versions 1.0 and 2.0.
 email: abargnesi@selventa.com
 executables: