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

data/lib/bel_parser/parsers/common/list.rl

@@ -3,79 +3,134 @@
 %%{
   machine bel;
 
+  include 'common.rl';
   include 'identifier.rl';
   include 'string.rl';
 
-  action clear {
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+  action start_list {
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   }
 
-  action string {
-    @buffers[:list_arg] = list_item(@buffers[:string])
+  action stop_list {
+    trace('LIST stop_list')
+    @list_closed = true
   }
 
-  action ident {
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+  action add_string {
+    trace('LIST add_string')
+    string = @buffers.delete(:string)
+    item = list_item(string, complete: string.complete)
+    @incomplete[:list] <<= item
   }
 
-  action start_list {
-    @buffers[:list] = list()
+  action add_ident {
+    trace('LIST add_ident')
+    ident = @buffers.delete(:ident)
+    item = list_item(ident, complete: ident.complete)
+    @incomplete[:list] <<= item
   }
 
-  action append_list {
-    # Append list argument if its value is not empty.
-    if @buffers[:list_arg]
-      list_arg_value = @buffers[:list_arg].children[0].children[0]
-      if list_arg_value != ''
-        @buffers[:list] <<= @buffers[:list_arg]
-      end
+  action list_end {
+    trace('LIST list_end')
+    if @list_opened && @list_closed
+      list = @incomplete.delete(:list)
+      list.complete = true
+    elsif !@list_closed
+      list = @incomplete.delete(:list)
+      list.complete = false
     end
+    @buffers[:list] = list
   }
 
-  action finish_list {
-    #TODO: Mark @buffers[:list] as complete.
-  }
-
-  action error_list_string {
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+  action a_list_eof {
+    trace('LIST a_list_eof')
+    list = @incomplete.delete(:list)
+    string = @buffers.delete(:string)
+    unless string.nil?
+      item = list_item(string, complete: string.complete)
+      list <<= item
+    end
+    ident = @buffers.delete(:ident)
+    unless ident.nil?
+      item = list_item(ident, complete: ident.complete)
+      list <<= item
+    end
+    if @list_opened && @list_closed
+      list.complete = true
+    else
+      list.complete = false
+    end
+    @buffers[:list] = list
   }
 
-  action error_list_ident {
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+  action list_node_eof {
+    trace('LIST list_node_eof')
+    list = @incomplete.delete(:list)
+    string = @buffers.delete(:string)
+    item = list_item(string, complete: string.complete)
+    list <<= item
+    list.complete = false
+    yield list
   }
 
-  action yield_complete_list {
+  action yield_list {
+    trace('LIST yield_list')
     yield @buffers[:list]
   }
 
-  action yield_error_list {
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
-  }
+  START_LIST = '{' SP* >start_list;
+  END_LIST = '}' %stop_list;
 
-  LIST  =
-    '{' @start_list
-    SP*
-    (
-      STRING %string $err(error_list_string) |
-      IDENT  %ident  $err(error_list_ident)
-    )? $err(append_list) %append_list
+  string_item =
+    a_string
+    %add_string
+    ;
+
+  ident_item =
+    an_ident
+    %add_ident
+    ;
+
+  item =
+    string_item |
+    ident_item
+    ;
+
+  list_item_0 =
+    item
+    ;
+
+  list_item_n =
+    COMMA_DELIM
+    item
+    ;
+
+  items =
+    list_item_0
+    list_item_n*
     SP*
-    (
-      ',' @clear
-      SP*
-      (
-        STRING %string $err(error_list_string) |
-        IDENT  %ident  $err(error_list_ident)
-      ) $err(append_list) %append_list
-      SP*
-    )*
-    '}' @finish_list;
-
-  list := LIST $err(yield_error_list) %yield_complete_list NL;
+    ;
+
+  a_list =
+    START_LIST
+    items
+    END_LIST
+    %list_end
+    @eof(a_list_eof)
+    ;
+
+  list_node :=
+    START_LIST
+    items?
+    @eof(list_node_eof)
+    END_LIST?
+    @eof(list_node_eof)
+    NL?
+    %list_end
+    %yield_list
+    ;
 }%%
 =end
 # end: ragel
@@ -83,6 +138,7 @@
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -108,25 +164,29 @@ 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   = {}
+            @list_opened  = false
+            @list_closed  = false
+            data          = @content.unpack('C*')
+            p             = 0
+            pe            = data.length
+            eof           = data.length
+
+      # begin: ragel
             %% write init;
             %% write exec;
-      # end: ragel        
+      # end: ragel
           end
         end
       end

data/lib/bel_parser/parsers/common/string.rb

@@ -5,10 +5,12 @@
 
 =end
 # end: ragel
+# ('\"' | ^(0 .. 31 | 34))* ^'\\"'
 
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -34,18 +36,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, 34, 34, 34, 92, 
-	10, 10, 92, 92, 0, 
+	0, 0, 9, 34, 34, 92, 
+	34, 92, 0, 0, 0, 
 	0, 0
 ]
 
@@ -54,7 +57,7 @@ class << self
 	private :_bel_key_spans, :_bel_key_spans=
 end
 self._bel_key_spans = [
-	0, 1, 59, 1, 1, 0
+	0, 26, 59, 59, 0, 0
 ]
 
 class << self
@@ -62,7 +65,7 @@ class << self
 	private :_bel_index_offsets, :_bel_index_offsets=
 end
 self._bel_index_offsets = [
-	0, 0, 2, 62, 64, 66
+	0, 0, 27, 87, 147, 148
 ]
 
 class << self
@@ -70,15 +73,25 @@ class << self
 	private :_bel_indicies, :_bel_indicies=
 end
 self._bel_indicies = [
-	1, 0, 3, 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, 4, 2, 5, 0, 
-	4, 2, 6, 0
+	1, 1, 1, 1, 1, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 1, 
+	0, 2, 0, 4, 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, 5, 3, 7, 
+	6, 6, 6, 6, 6, 6, 6, 6, 
+	6, 6, 6, 6, 6, 6, 6, 6, 
+	6, 6, 6, 6, 6, 6, 6, 6, 
+	6, 6, 6, 6, 6, 6, 6, 6, 
+	6, 6, 6, 6, 6, 6, 6, 6, 
+	6, 6, 6, 6, 6, 6, 6, 6, 
+	6, 6, 6, 6, 6, 6, 6, 6, 
+	6, 8, 6, 6, 0, 0
 ]
 
 class << self
@@ -86,7 +99,8 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	0, 2, 2, 3, 4, 5, 0
+	0, 1, 2, 3, 5, 4, 3, 5, 
+	4
 ]
 
 class << self
@@ -94,7 +108,8 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	1, 2, 3, 3, 3, 4, 0
+	2, 0, 0, 4, 5, 4, 0, 6, 
+	0
 ]
 
 class << self
@@ -102,7 +117,7 @@ class << self
 	private :_bel_eof_actions, :_bel_eof_actions=
 end
 self._bel_eof_actions = [
-	0, 1, 1, 1, 1, 0
+	0, 1, 3, 3, 3, 0
 ]
 
 class << self
@@ -119,22 +134,27 @@ end
 self.bel_error = 0;
 
 class << self
-	attr_accessor :bel_en_string
+	attr_accessor :bel_en_string_node
 end
-self.bel_en_string = 1;
+self.bel_en_string_node = 1;
 
 
-      # end: ragel        
+      # end: ragel
           end
 
           def each
-            @buffers = {}
-            data     = @content.unpack('C*')
-            p        = 0
-            pe       = data.length
-            eof      = data.length
-
-      # begin: ragel        
+            @buffers        = {}
+            @incomplete     = {}
+            @string_opened  = false
+            @string_closed  = false
+            data            = @content.unpack('C*')
+            p_start         = 0
+            p_end           = 0
+            p               = 0
+            pe              = data.length
+            eof             = data.length
+
+      # begin: ragel
             
 begin
 	p ||= 0
@@ -179,38 +199,66 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 3 then
+	when 4 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
 	when 2 then
 		begin
 
-    @buffers[:string] = []
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
   		end
+	when 6 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 4 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING string_end')
+    completed = @string_opened && @string_closed
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: true)
+    @buffers[:string] = ast_node
   		end
 		begin
 
+    trace('STRING yield_string')
     yield @buffers[:string]
   		end
-	when 1 then
+	when 5 then
+		begin
+
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
+  		end
+		begin
+
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
+  		end
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('STRING string_end')
+    completed = @string_opened && @string_closed
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: true)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    @buffers[:string] ||= []
+    trace('STRING yield_string')
     yield @buffers[:string]
   		end
 	end
@@ -233,12 +281,37 @@ begin
 	when 1 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
+  		end
+		begin
+
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
+  		end
+	when 3 then
+		begin
+
+    trace('STRING eof_string')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
+  		end
+		begin
+
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
   		end
 		begin
 
-    @buffers[:string] ||= []
+    trace('STRING string_node_eof')
     yield @buffers[:string]
   		end
 	  end
@@ -251,7 +324,7 @@ begin
 end
 	end
 
-      # end: ragel        
+      # end: ragel
           end
         end
       end