bel_parser 1.0.8 → 1.1.1

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

@@ -10,14 +10,14 @@
   action add_ident_param_value {
     trace('PARAMETER add_ident_param_value')
     ident = @buffers.delete(:ident)
-    value_node = value(ident, complete: ident.complete)
+    value_node = value(ident, complete: ident.complete, character_range: ident.character_range)
     @buffers[:param_value] = value_node
   }
 
   action add_string_param_value {
     trace('PARAMETER add_string_param_value')
     string_node = @buffers.delete(:string)
-    value_node = value(string_node, complete: string_node.complete)
+    value_node = value(string_node, complete: string_node.complete, character_range: string_node.character_range)
     @buffers[:param_value] = value_node
   }
 
@@ -32,6 +32,7 @@
         trace('PN incomplete')
         completed = false
       end
+      param_start = prefix_node.range_start
     else
       prefix_node          = prefix(nil)
       prefix_node.complete = true
@@ -48,6 +49,8 @@
         trace('VN incomplete')
         completed = false
       end
+      param_start ||= value_node.range_start
+      param_node.character_range = [param_start, value_node.range_end]
     else
       completed = false
     end
@@ -59,7 +62,7 @@
   action add_prefix {
     trace('PARAMETER add_prefix')
     ident = @buffers.delete(:ident)
-    prefix_node = prefix(ident, complete: ident.complete)
+    prefix_node = prefix(ident, complete: ident.complete, character_range: ident.character_range)
     @buffers[:param_prefix] = prefix_node
   }
 

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

@@ -46,8 +46,8 @@ class << self
 	private :_bel_trans_keys, :_bel_trans_keys=
 end
 self._bel_trans_keys = [
-	0, 0, 33, 126, 33, 126, 
-	0
+	0, 0, 33, 126, 10, 126, 
+	0, 0, 0
 ]
 
 class << self
@@ -55,7 +55,7 @@ class << self
 	private :_bel_key_spans, :_bel_key_spans=
 end
 self._bel_key_spans = [
-	0, 94, 94
+	0, 94, 117, 0
 ]
 
 class << self
@@ -63,7 +63,7 @@ class << self
 	private :_bel_index_offsets, :_bel_index_offsets=
 end
 self._bel_index_offsets = [
-	0, 0, 95
+	0, 0, 95, 213
 ]
 
 class << self
@@ -83,18 +83,21 @@ self._bel_indicies = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 1, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 1, 0
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 3, 3, 3, 3, 
+	3, 3, 3, 3, 1, 1, 0
 ]
 
 class << self
@@ -102,7 +105,7 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	2, 0, 2
+	2, 0, 3, 2
 ]
 
 class << self
@@ -110,7 +113,7 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	1, 0, 0
+	1, 0, 3, 0
 ]
 
 class << self
@@ -118,7 +121,7 @@ class << self
 	private :_bel_eof_actions, :_bel_eof_actions=
 end
 self._bel_eof_actions = [
-	0, 0, 2
+	0, 0, 2, 4
 ]
 
 class << self
@@ -205,6 +208,14 @@ begin
     trace('RELATIONSHIP start_relationship')
     p_start = p;
   		end
+	when 3 then
+		begin
+
+    trace('RELATIONSHIP stop_relationship')
+    # It's not you, it's me. You're a p and I'm a non-protein coding r. It
+    # would never work, I just can't reach you.
+    p_end = p;
+  		end
 	end
 	end
 	end
@@ -222,6 +233,19 @@ begin
 	if _goto_level <= _test_eof
 	if p == eof
 	  case _bel_eof_actions[cs]
+	when 4 then
+		begin
+
+    trace('RELATIONSHIP relationship_end')
+    chars = data[p_start...p_end]
+    completed = !chars.empty?
+    ast_node = relationship(utf8_string(chars), complete: completed)
+    @buffers[:relationship] = ast_node
+  		end
+		begin
+
+    yield @buffers[:relationship]
+  		end
 	when 2 then
 		begin
 

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

@@ -33,6 +33,7 @@
     RELATIONSHIP
     >start_relationship
     %stop_relationship
+    NL?
     ;
 
   relationship_node :=