bel_parser 1.0.0.alpha.38 → 1.0.0.alpha.39

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

@@ -7,26 +7,176 @@
   include 'identifier.rl';
   include 'string.rl';
 
-  action prefix {
-    @buffers[:parameter] = parameter(prefix(@buffers[:ident]))
+  action add_ident_param_value {
+    trace('PARAMETER add_ident_param_value')
+    ident = @buffers.delete(:ident)
+    value_node = value(ident, complete: ident.complete)
+    @buffers[:param_value] = value_node
   }
 
-  action string {
-    @buffers[:parameter] ||= parameter(prefix(nil))
-    @buffers[:parameter]   = @buffers[:parameter] << value(@buffers[:string])
+  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)
+    @buffers[:param_value] = value_node
   }
 
-  action ident {
-    @buffers[:parameter] ||= parameter(prefix(nil))
-    @buffers[:parameter]   = @buffers[:parameter] << value(@buffers[:ident])
+  action parameter_end {
+    trace('PARAMETER parameter_end')
+    param_node = parameter()
+    completed = true
+    prefix_node = @buffers.delete(:param_prefix)
+    unless prefix_node.nil?
+      param_node <<= prefix_node
+      unless prefix_node.complete
+        trace('PN incomplete')
+        completed = false
+      end
+    end
+
+    value_node = @buffers.delete(:param_value)
+    unless value_node.nil?
+      param_node <<= value_node
+      unless value_node.complete
+        trace('VN incomplete')
+        completed = false
+      end
+    else
+      completed = false
+    end
+
+    param_node.complete = completed
+    @buffers[:parameter] = param_node
   }
 
-  action yield_parameter_ast {
+  action add_prefix {
+    trace('PARAMETER add_prefix')
+    ident = @buffers.delete(:ident)
+    prefix_node = prefix(ident, complete: ident.complete)
+    @buffers[:param_prefix] = prefix_node
+  }
+
+  action a_parameter_eof {
+    trace("PARAMETER a_parameter_eof")
+    param_node = parameter()
+    completed = true
+    prefix_node = @buffers.delete(:param_prefix)
+    unless prefix_node.nil?
+      param_node <<= prefix_node
+      unless prefix_node.complete
+        completed = false
+      end
+    end
+
+    string_value_node = @buffers.delete(:string)
+    unless string_value_node.nil?
+      param_node <<= string_value_node
+      unless string_value_node.complete
+        completed = false
+      end
+    else
+      completed = false
+    end
+
+    param_node.complete = completed
+    @buffers[:parameter] = param_node
+  }
+
+  action parameter_node_eof {
+    trace("PARAMETER parameter_node_eof")
+    param_node = parameter()
+    completed = true
+    prefix_node = @buffers.delete(:param_prefix)
+    unless prefix_node.nil?
+      param_node <<= prefix_node
+      unless prefix_node.complete
+        completed = false
+      end
+    end
+
+    string_value_node = @buffers.delete(:string)
+    unless string_value_node.nil?
+      param_node <<= string_value_node
+      unless string_value_node.complete
+        completed = false
+      end
+    else
+      completed = false
+    end
+
+    param_node.complete = completed
+    yield param_node
+  }
+
+  action yield_parameter {
+    trace('PARAMETER yield_parameter')
     yield @buffers[:parameter]
   }
 
-  BEL_PARAMETER  = (IDENT ':')? @prefix SP* (STRING %string | IDENT %ident);
-  bel_parameter := BEL_PARAMETER %yield_parameter_ast NL;
+  prefix =
+    an_ident
+    COLON
+    ;
+
+  ident_value =
+    an_ident
+    %add_ident_param_value
+    ;
+
+  string_value =
+    a_string
+    %add_string_param_value
+    ;
+
+  value =
+    ident_value |
+    string_value
+    ;
+
+  parameter_prefix_value =
+    prefix
+    %add_prefix
+    SP*
+    value
+    ;
+
+  parameter_prefix_maybe_value =
+    prefix
+    %add_prefix
+    SP*
+    value?
+    ;
+
+  parameter_value =
+    SP*
+    value
+    ;
+
+  a_parameter =
+    (
+      parameter_prefix_value |
+      parameter_value |
+      parameter_prefix_maybe_value
+    )
+
+    @eof(a_parameter_eof)
+    %parameter_end
+    ;
+
+  parameter_node :=
+    (
+      parameter_prefix_value |
+      parameter_value |
+      parameter_prefix_maybe_value
+    )
+    @eof(parameter_node_eof)
+    %parameter_end
+    %yield_parameter
+    NL?
+    ;
+
+  #BEL_PARAMETER  = (an_ident ':')? @prefix SP* (a_string %string | an_ident %ident);
+  #bel_parameter := BEL_PARAMETER %yield_parameter_ast NL;
 }%%
 =end
 # end: ragel
@@ -34,6 +184,7 @@
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -59,25 +210,31 @@ module BELParser
           include Enumerable
           include BELParser::Parsers::Buffer
           include BELParser::Parsers::AST::Sexp
+          include BELParser::Parsers::Tracer
 
           def initialize(content)
             @content = content
-      # begin: ragel        
+      # begin: ragel
             %% write data;
-      # end: ragel        
+      # end: ragel
           end
 
           def each
-            @buffers = {}
-            data     = @content.unpack('C*')
-            p        = 0
-            pe       = data.length
-            eof      = data.length
-
-      # begin: ragel        
+            @buffers    = {}
+            @incomplete = {}
+            data        = @content.unpack('C*')
+            p           = 0
+            pe          = data.length
+            p_start     = 0
+            p_end       = 0
+            id_start    = 0
+            id_end      = 0
+            eof         = data.length
+
+      # begin: ragel
             %% write init;
             %% write exec;
-      # end: ragel        
+      # end: ragel
           end
         end
       end

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

@@ -9,6 +9,7 @@
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -34,18 +35,19 @@ module BELParser
           include Enumerable
           include BELParser::Parsers::Buffer
           include BELParser::Parsers::AST::Sexp
+          include BELParser::Parsers::Tracer
 
           def initialize(content)
             @content = content
-      # begin: ragel        
+      # begin: ragel
             
 class << self
 	attr_accessor :_bel_trans_keys
 	private :_bel_trans_keys, :_bel_trans_keys=
 end
 self._bel_trans_keys = [
-	0, 0, 33, 126, 10, 126, 
-	0, 0, 0
+	0, 0, 33, 126, 33, 126, 
+	0
 ]
 
 class << self
@@ -53,7 +55,7 @@ class << self
 	private :_bel_key_spans, :_bel_key_spans=
 end
 self._bel_key_spans = [
-	0, 94, 117, 0
+	0, 94, 94
 ]
 
 class << self
@@ -61,7 +63,7 @@ class << self
 	private :_bel_index_offsets, :_bel_index_offsets=
 end
 self._bel_index_offsets = [
-	0, 0, 95, 213
+	0, 0, 95
 ]
 
 class << self
@@ -81,21 +83,18 @@ 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, 
-	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
+	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
 ]
 
 class << self
@@ -103,7 +102,7 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	2, 0, 3, 2
+	2, 0, 2
 ]
 
 class << self
@@ -111,7 +110,15 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	1, 0, 2, 3
+	1, 0, 0
+]
+
+class << self
+	attr_accessor :_bel_eof_actions
+	private :_bel_eof_actions, :_bel_eof_actions=
+end
+self._bel_eof_actions = [
+	0, 0, 2
 ]
 
 class << self
@@ -121,29 +128,33 @@ self.bel_start = 1;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 3;
+self.bel_first_final = 2;
 class << self
 	attr_accessor :bel_error
 end
 self.bel_error = 0;
 
 class << self
-	attr_accessor :bel_en_relationship
+	attr_accessor :bel_en_relationship_node
 end
-self.bel_en_relationship = 1;
+self.bel_en_relationship_node = 1;
 
 
-      # end: ragel        
+      # end: ragel
           end
 
           def each
-            @buffers = {}
-            stack    = []
-            data     = @content.unpack('C*')
-            p        = 0
-            pe       = data.length
-
-      # begin: ragel        
+            @buffers    = {}
+            @incomplete = {}
+            stack       = []
+            data        = @content.unpack('C*')
+            p           = 0
+            p_start     = 0
+            p_end       = 0
+            pe          = data.length
+            eof         = data.length
+
+      # begin: ragel
             
 begin
 	p ||= 0
@@ -188,29 +199,11 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 3 then
-		begin
-
-    @buffers[:relationship] << data[p].ord
-  		end
 	when 1 then
 		begin
 
-    @buffers[:relationship] = []
-  		end
-		begin
-
-    @buffers[:relationship] << data[p].ord
-  		end
-	when 2 then
-		begin
-
-    @buffers[:relationship] = relationship(
-                                utf8_string(@buffers[:relationship]))
-  		end
-		begin
-
-    yield @buffers[:relationship]
+    trace('RELATIONSHIP start_relationship')
+    p_start = p;
   		end
 	end
 	end
@@ -227,6 +220,31 @@ begin
 	end
 	end
 	if _goto_level <= _test_eof
+	if p == eof
+	  case _bel_eof_actions[cs]
+	when 2 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
+		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
+	  end
+	end
+
 	end
 	if _goto_level <= _out
 		break
@@ -234,7 +252,7 @@ begin
 end
 	end
 
-      # end: ragel        
+      # end: ragel
           end
         end
       end
@@ -244,7 +262,7 @@ end
 
 if __FILE__ == $0
   $stdin.each_line do |line|
-    BELParser::Parsers::Expression::Relationship.parse(line) { |obj|
+    BELParser::Parsers::Expression::Relationship.parse(line.strip) { |obj|
       puts obj.inspect
     }
   end