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

data/lib/bel_parser/parsers/common/identifier.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,10 +35,11 @@ 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
@@ -69,30 +71,30 @@ class << self
 	private :_bel_indicies, :_bel_indicies=
 end
 self._bel_indicies = [
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 0, 0, 0, 0, 0, 0, 
-	0, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 0, 0, 0, 0, 1, 
-	0, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 0, 2, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 1, 1, 1, 1, 1, 1, 
+	1, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 1, 1, 1, 1, 0, 
+	1, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 3, 3, 3, 3, 3, 3, 
-	3, 3, 3, 3, 0, 0, 0, 0, 
-	0, 0, 0, 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, 0, 0, 0, 
-	0, 3, 0, 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, 0, 4, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 1, 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, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 2, 2, 2, 2, 
+	2, 2, 2, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 2, 2, 2, 
+	2, 4, 2, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 2, 2, 0
 ]
 
 class << self
@@ -100,7 +102,7 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	0, 2, 3, 2, 0
+	2, 0, 0, 3, 2
 ]
 
 class << self
@@ -108,7 +110,7 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	1, 2, 3, 4, 0
+	1, 0, 3, 4, 0
 ]
 
 class << self
@@ -116,7 +118,7 @@ class << self
 	private :_bel_eof_actions, :_bel_eof_actions=
 end
 self._bel_eof_actions = [
-	0, 1, 1, 0
+	0, 0, 2, 5
 ]
 
 class << self
@@ -126,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_ident
+	attr_accessor :bel_en_ident_node
 end
-self.bel_en_ident = 1;
+self.bel_en_ident_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 = {}
+            data        = @content.unpack('C*')
+            p           = 0
+            id_start    = 0
+            id_end      = 0
+            pe          = data.length
+            eof         = data.length
+
+            identifier_started = false
+      # begin: ragel
             
 begin
 	p ||= 0
@@ -193,41 +199,31 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 4 then
-		begin
-
-    (@buffers[:ident] ||= []) << data[p].ord
-  		end
-	when 2 then
+	when 1 then
 		begin
 
-    @buffers[:ident] = []
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
+	when 4 then
 		begin
 
-    (@buffers[:ident] ||= []) << data[p].ord
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 	when 3 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
-  		end
-		begin
-
-    yield @buffers[:ident]
-  		end
-	when 1 then
-		begin
-
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
-  		end
-		begin
-
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
+    trace('IDENTIFIER ident_node_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    yield ast_node
   		end
 	end
 	end
@@ -246,17 +242,25 @@ begin
 	if _goto_level <= _test_eof
 	if p == eof
 	  case _bel_eof_actions[cs]
-	when 1 then
+	when 5 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('IDENTIFIER yield_identifier')
+    yield @buffers[:ident]
+  		end
+	when 2 then
+		begin
+
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    @buffers[:ident] ||= []
+    trace('IDENTIFIER yield_identifier')
     yield @buffers[:ident]
   		end
 	  end
@@ -269,7 +273,7 @@ begin
 end
 	end
 
-      # end: ragel        
+      # end: ragel
           end
         end
       end

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

@@ -5,37 +5,75 @@
 
   include 'common.rl';
 
-  action start_ident {
-    @buffers[:ident] = []
+  action start_identifier {
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   }
 
-  action append_ident {
-    (@buffers[:ident] ||= []) << fc
+  action end_identifier {
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   }
 
-  action finish_ident {
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+  action an_ident_err {
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   }
 
-  action yield_complete_ident {
-    yield @buffers[:ident]
-  }
-
-  action error_ident {
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+  action ident_node_err {
+    trace('IDENTIFIER ident_node_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    yield ast_node
   }
 
-  action yield_error_ident {
-    @buffers[:ident] ||= []
+  action yield_identifier {
+    trace('IDENTIFIER yield_identifier')
     yield @buffers[:ident]
   }
 
-  IDENT = [a-zA-Z0-9_]+ >start_ident $append_ident %finish_ident $err(error_ident);
+  action an_ident_eof {
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
+    end
+  }
 
-  ident := IDENT $err(yield_error_ident) %yield_complete_ident NL;
+  ident =
+    ID_CHARS
+    >start_identifier
+    %end_identifier
+    ;
+
+  maybe_ident =
+    ident?
+    ;
+
+  an_ident =
+    ident
+    $eof(an_ident_eof)
+    $err(an_ident_err)
+    ;
+
+  ident_node :=
+    ident
+    NL?
+    $err(ident_node_err)
+    %yield_identifier
+    ;
 }%%
 =end
 # end: ragel
@@ -43,6 +81,7 @@
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -68,25 +107,30 @@ 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
+            id_start    = 0
+            id_end      = 0
+            pe          = data.length
+            eof         = data.length
+
+            identifier_started = false
+      # begin: ragel
             %% write init;
             %% write exec;
-      # end: ragel        
+      # end: ragel
           end
         end
       end

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

@@ -7,14 +7,15 @@ class << self
 	private :_bel_trans_keys, :_bel_trans_keys=
 end
 self._bel_trans_keys = [
-	0, 0, 123, 123, 9, 125, 
-	34, 92, 9, 125, 9, 
-	125, 9, 122, 9, 125, 
-	10, 10, 92, 92, 48, 122, 
-	10, 122, 34, 34, 34, 
-	92, 10, 10, 92, 92, 
-	0, 0, 0, 0, 0, 0, 
-	0
+	0, 0, 123, 123, 9, 34, 
+	34, 92, 34, 92, 9, 
+	122, 0, 0, 48, 122, 
+	9, 34, 34, 92, 34, 92, 
+	0, 0, 9, 125, 9, 
+	125, 9, 34, 9, 125, 
+	9, 125, 0, 0, 9, 125, 
+	10, 10, 10, 122, 0, 
+	0, 0, 0, 0
 ]
 
 class << self
@@ -22,9 +23,9 @@ class << self
 	private :_bel_key_spans, :_bel_key_spans=
 end
 self._bel_key_spans = [
-	0, 1, 117, 59, 117, 117, 114, 117, 
-	1, 1, 75, 113, 1, 59, 1, 1, 
-	0, 0, 0
+	0, 1, 26, 59, 59, 114, 0, 75, 
+	26, 59, 59, 0, 117, 117, 26, 117, 
+	117, 0, 117, 1, 113, 0, 0
 ]
 
 class << self
@@ -32,9 +33,9 @@ class << self
 	private :_bel_index_offsets, :_bel_index_offsets=
 end
 self._bel_index_offsets = [
-	0, 0, 2, 120, 180, 298, 416, 531, 
-	649, 651, 653, 729, 843, 845, 905, 907, 
-	909, 910, 911
+	0, 0, 2, 29, 89, 149, 264, 265, 
+	341, 368, 428, 488, 489, 607, 725, 752, 
+	870, 988, 989, 1107, 1109, 1223, 1224
 ]
 
 class << self
@@ -42,121 +43,160 @@ class << self
 	private :_bel_indicies, :_bel_indicies=
 end
 self._bel_indicies = [
-	1, 0, 3, 2, 2, 2, 2, 2, 
+	0, 1, 3, 3, 3, 3, 3, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 3, 2, 4, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 5, 2, 2, 
-	2, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 2, 2, 2, 2, 2, 
-	2, 2, 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, 2, 2, 2, 2, 
-	6, 2, 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, 2, 2, 7, 2, 
-	9, 8, 8, 8, 8, 8, 8, 8, 
+	2, 3, 2, 4, 2, 6, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 7, 
+	5, 9, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
-	8, 8, 10, 8, 12, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 12, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 13, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
+	8, 8, 8, 10, 8, 12, 3, 3, 
+	3, 3, 11, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 12, 11, 4, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 11, 11, 
+	11, 11, 11, 11, 11, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 11, 
+	11, 11, 11, 13, 11, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 11, 
+	8, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 1, 1, 1, 1, 1, 
+	1, 1, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 1, 1, 1, 1, 
+	14, 1, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 1, 16, 16, 16, 
+	16, 16, 15, 15, 15, 15, 15, 15, 
+	15, 15, 15, 15, 15, 15, 15, 15, 
+	15, 15, 15, 15, 16, 15, 17, 15, 
+	19, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 20, 18, 22, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 23, 21, 
+	21, 24, 25, 26, 26, 26, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	24, 11, 27, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	14, 11, 15, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 15, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 16, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 17, 0, 
-	18, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 18, 
-	2, 4, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 2, 2, 2, 2, 2, 2, 2, 
-	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, 2, 2, 2, 2, 6, 2, 
-	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, 2, 20, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 20, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 21, 19, 
-	19, 19, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 19, 19, 19, 19, 
-	19, 19, 19, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 19, 19, 19, 
-	19, 22, 19, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 19, 19, 23, 
-	19, 24, 0, 10, 8, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 25, 
-	25, 25, 25, 25, 25, 25, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	25, 25, 25, 25, 26, 25, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	25, 27, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 25, 25, 25, 25, 25, 25, 25, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 11, 11, 11, 11, 11, 11, 
+	11, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 25, 25, 25, 25, 28, 25, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 11, 11, 11, 11, 28, 
+	11, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 25, 30, 29, 32, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 33, 
-	31, 34, 29, 33, 31, 35, 35, 35, 
-	0
+	28, 28, 28, 11, 11, 29, 11, 30, 
+	31, 3, 3, 3, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 30, 11, 
+	4, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	11, 11, 11, 11, 11, 11, 11, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 11, 11, 11, 11, 13, 11, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 11, 11, 32, 11, 3, 3, 3, 
+	3, 3, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 3, 2, 4, 2, 
+	33, 34, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 33, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 35, 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, 36, 2, 37, 38, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 37, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 12, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 32, 1, 1, 40, 41, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 40, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	42, 39, 39, 39, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 39, 39, 
+	39, 39, 39, 39, 39, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 39, 
+	39, 39, 39, 43, 39, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 39, 
+	39, 44, 39, 45, 1, 47, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 46, 46, 46, 
+	46, 46, 46, 46, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 46, 46, 
+	46, 46, 48, 46, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 46, 46, 
+	15, 0
 ]
 
 class << self
@@ -164,11 +204,13 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	0, 2, 0, 2, 3, 6, 7, 8, 
-	3, 4, 9, 0, 5, 6, 8, 5, 
-	6, 8, 6, 0, 5, 6, 7, 8, 
-	16, 0, 11, 17, 11, 0, 13, 13, 
-	14, 15, 18, 0
+	12, 0, 0, 2, 3, 4, 15, 6, 
+	4, 15, 6, 0, 5, 18, 20, 0, 
+	8, 9, 10, 22, 11, 10, 22, 11, 
+	13, 14, 2, 3, 18, 19, 13, 14, 
+	19, 16, 17, 5, 19, 16, 17, 0, 
+	16, 17, 5, 18, 19, 17, 0, 21, 
+	20
 ]
 
 class << self
@@ -176,11 +218,13 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	1, 2, 3, 4, 5, 6, 7, 8, 
-	10, 10, 10, 9, 11, 12, 13, 0, 
-	14, 15, 0, 16, 17, 18, 19, 20, 
-	21, 22, 7, 23, 19, 24, 5, 10, 
-	10, 10, 25, 0
+	0, 0, 2, 0, 0, 4, 5, 4, 
+	0, 6, 0, 8, 0, 9, 9, 11, 
+	0, 0, 4, 13, 4, 0, 14, 0, 
+	16, 16, 16, 16, 17, 16, 0, 0, 
+	0, 21, 21, 21, 21, 0, 0, 24, 
+	25, 25, 25, 0, 25, 27, 29, 30, 
+	0
 ]
 
 class << self
@@ -188,9 +232,9 @@ class << self
 	private :_bel_eof_actions, :_bel_eof_actions=
 end
 self._bel_eof_actions = [
-	0, 1, 3, 9, 9, 1, 3, 16, 
-	1, 9, 22, 22, 24, 24, 24, 24, 
-	0, 0, 0
+	0, 0, 1, 3, 3, 7, 3, 0, 
+	10, 12, 12, 12, 15, 18, 19, 20, 
+	22, 22, 23, 26, 28, 31, 0
 ]
 
 class << self
@@ -200,24 +244,24 @@ self.bel_start = 1;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 16;
+self.bel_first_final = 12;
 class << self
 	attr_accessor :bel_error
 end
 self.bel_error = 0;
 
 class << self
-	attr_accessor :bel_en_ident
+	attr_accessor :bel_en_ident_node
 end
-self.bel_en_ident = 10;
+self.bel_en_ident_node = 7;
 class << self
-	attr_accessor :bel_en_string
+	attr_accessor :bel_en_string_node
 end
-self.bel_en_string = 12;
+self.bel_en_string_node = 8;
 class << self
-	attr_accessor :bel_en_list
+	attr_accessor :bel_en_list_node
 end
-self.bel_en_list = 1;
+self.bel_en_list_node = 1;
 
 
 begin
@@ -262,506 +306,585 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 19 then
+	when 9 then
 		begin
 
-    (@buffers[:ident] ||= []) << data[p].ord
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
-	when 10 then
+	when 30 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
-	when 14 then
+	when 24 then
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
-	when 2 then
+	when 29 then
 		begin
 
-    @buffers[:list] = list()
+    trace('IDENTIFIER ident_node_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    yield ast_node
   		end
 	when 4 then
 		begin
 
-    # 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
-    end
-  		end
-	when 15 then
-		begin
-
-    #TODO: Mark @buffers[:list] as complete.
-  		end
-	when 21 then
-		begin
-
-    yield @buffers[:list]
-  		end
-	when 1 then
-		begin
-
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
-  		end
-	when 7 then
-		begin
-
-    @buffers[:ident] = []
-  		end
-		begin
-
-    (@buffers[:ident] ||= []) << data[p].ord
-  		end
-	when 23 then
-		begin
-
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
+	when 2 then
 		begin
 
-    yield @buffers[:ident]
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
-	when 22 then
+	when 11 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    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 16 then
 		begin
 
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
-	when 5 then
+	when 27 then
 		begin
 
-    @buffers[:string] = []
+    trace('LIST stop_list')
+    @list_closed = true
   		end
+	when 21 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('LIST add_string')
+    string = @buffers.delete(:string)
+    item = list_item(string, complete: string.complete)
+    @incomplete[:list] <<= item
   		end
 	when 25 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
-  		end
-		begin
-
-    yield @buffers[:string]
-  		end
-	when 24 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    trace('LIST add_ident')
+    ident = @buffers.delete(:ident)
+    item = list_item(ident, complete: ident.complete)
+    @incomplete[:list] <<= item
   		end
 	when 6 then
 		begin
 
-    # 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
-    end
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    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
 	when 8 then
 		begin
 
-    # 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
-    end
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    #TODO: Mark @buffers[:list] as complete.
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
 	when 17 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
+	when 5 then
 		begin
 
-    # 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
-    end
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
-	when 11 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    @buffers[:list_arg] = list_item(@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
+	when 14 then
 		begin
 
-    # 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
-    end
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 18 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    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[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
+	when 13 then
 		begin
 
-    # 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
-    end
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 20 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    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[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
+	end
+	end
+	end
+	if _goto_level <= _again
+	if cs == 0
+		_goto_level = _out
+		next
+	end
+	p += 1
+	if p != pe
+		_goto_level = _resume
+		next
+	end
+	end
+	if _goto_level <= _test_eof
+	if p == eof
+	  case _bel_eof_actions[cs]
+	when 31 then
 		begin
 
-    # 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
-    end
+    trace('IDENTIFIER yield_identifier')
+    yield @buffers[:ident]
   		end
+	when 28 then
 		begin
 
-    #TODO: Mark @buffers[:list] as complete.
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
-	when 16 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('IDENTIFIER yield_identifier')
+    yield @buffers[:ident]
   		end
+	when 1 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    # 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
-    end
+    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
   		end
+	when 10 then
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    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 12 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
   		end
+	when 22 then
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    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
   		end
 		begin
 
-    # 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
-    end
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 3 then
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    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
-	when 13 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    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
   		end
+	when 12 then
 		begin
 
-    # 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
-    end
+    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
 
-    #TODO: Mark @buffers[:list] as complete.
+    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 9 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
   		end
+	when 26 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('LIST stop_list')
+    @list_closed = true
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
-	when 3 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
-  		end
+	when 20 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('LIST add_string')
+    string = @buffers.delete(:string)
+    item = list_item(string, complete: string.complete)
+    @incomplete[:list] <<= item
   		end
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    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
   		end
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 19 then
 		begin
 
-    # 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
-    end
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    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
   		end
-	end
-	end
-	end
-	if _goto_level <= _again
-	if cs == 0
-		_goto_level = _out
-		next
-	end
-	p += 1
-	if p != pe
-		_goto_level = _resume
-		next
-	end
-	end
-	if _goto_level <= _test_eof
-	if p == eof
-	  case _bel_eof_actions[cs]
-	when 1 then
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
-	when 22 then
+	when 18 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
-  		end
-	when 24 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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
   		end
 		begin
 
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    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
   		end
-	when 16 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 7 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    # 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
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
-	when 9 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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
   		end
+	when 15 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
 		begin
 
-    # 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
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    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
   		end
-	when 3 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 23 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('LIST add_ident')
+    ident = @buffers.delete(:ident)
+    item = list_item(ident, complete: ident.complete)
+    @incomplete[:list] <<= item
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
 	  end
@@ -779,14 +902,15 @@ class << self
 	private :_bel_trans_keys, :_bel_trans_keys=
 end
 self._bel_trans_keys = [
-	0, 0, 123, 123, 9, 125, 
-	34, 92, 9, 125, 9, 
-	125, 9, 122, 9, 125, 
-	10, 10, 92, 92, 48, 122, 
-	10, 122, 34, 34, 34, 
-	92, 10, 10, 92, 92, 
-	0, 0, 0, 0, 0, 0, 
-	0
+	0, 0, 123, 123, 9, 34, 
+	34, 92, 34, 92, 9, 
+	122, 0, 0, 48, 122, 
+	9, 34, 34, 92, 34, 92, 
+	0, 0, 9, 125, 9, 
+	125, 9, 34, 9, 125, 
+	9, 125, 0, 0, 9, 125, 
+	10, 10, 10, 122, 0, 
+	0, 0, 0, 0
 ]
 
 class << self
@@ -794,9 +918,9 @@ class << self
 	private :_bel_key_spans, :_bel_key_spans=
 end
 self._bel_key_spans = [
-	0, 1, 117, 59, 117, 117, 114, 117, 
-	1, 1, 75, 113, 1, 59, 1, 1, 
-	0, 0, 0
+	0, 1, 26, 59, 59, 114, 0, 75, 
+	26, 59, 59, 0, 117, 117, 26, 117, 
+	117, 0, 117, 1, 113, 0, 0
 ]
 
 class << self
@@ -804,9 +928,9 @@ class << self
 	private :_bel_index_offsets, :_bel_index_offsets=
 end
 self._bel_index_offsets = [
-	0, 0, 2, 120, 180, 298, 416, 531, 
-	649, 651, 653, 729, 843, 845, 905, 907, 
-	909, 910, 911
+	0, 0, 2, 29, 89, 149, 264, 265, 
+	341, 368, 428, 488, 489, 607, 725, 752, 
+	870, 988, 989, 1107, 1109, 1223, 1224
 ]
 
 class << self
@@ -814,121 +938,160 @@ class << self
 	private :_bel_indicies, :_bel_indicies=
 end
 self._bel_indicies = [
-	1, 0, 3, 2, 2, 2, 2, 2, 
+	0, 1, 3, 3, 3, 3, 3, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 3, 2, 4, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 5, 2, 2, 
-	2, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 2, 2, 2, 2, 2, 
-	2, 2, 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, 2, 2, 2, 2, 
-	6, 2, 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, 2, 2, 7, 2, 
-	9, 8, 8, 8, 8, 8, 8, 8, 
+	2, 3, 2, 4, 2, 6, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 7, 
+	5, 9, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
-	8, 8, 10, 8, 12, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 12, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 13, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
+	8, 8, 8, 10, 8, 12, 3, 3, 
+	3, 3, 11, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 12, 11, 4, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 11, 11, 
+	11, 11, 11, 11, 11, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 11, 
+	11, 11, 11, 13, 11, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 11, 
+	8, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 1, 1, 1, 1, 1, 
+	1, 1, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 1, 1, 1, 1, 
+	14, 1, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 1, 16, 16, 16, 
+	16, 16, 15, 15, 15, 15, 15, 15, 
+	15, 15, 15, 15, 15, 15, 15, 15, 
+	15, 15, 15, 15, 16, 15, 17, 15, 
+	19, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 20, 18, 22, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 23, 21, 
+	21, 24, 25, 26, 26, 26, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	24, 11, 27, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	14, 11, 15, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 15, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 16, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 17, 0, 
-	18, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 18, 
-	2, 4, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 2, 2, 2, 2, 2, 2, 2, 
-	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, 2, 2, 2, 2, 6, 2, 
-	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, 2, 20, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 20, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 21, 19, 
-	19, 19, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 19, 19, 19, 19, 
-	19, 19, 19, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 19, 19, 19, 
-	19, 22, 19, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 19, 19, 23, 
-	19, 24, 0, 10, 8, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 25, 
-	25, 25, 25, 25, 25, 25, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	25, 25, 25, 25, 26, 25, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	25, 27, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 25, 25, 25, 25, 25, 25, 25, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 11, 11, 11, 11, 11, 11, 
+	11, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 25, 25, 25, 25, 28, 25, 
+	28, 28, 28, 11, 11, 11, 11, 28, 
+	11, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 25, 30, 29, 32, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 33, 
-	31, 34, 29, 33, 31, 35, 35, 35, 
-	0
+	28, 28, 28, 11, 11, 29, 11, 30, 
+	31, 3, 3, 3, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 30, 11, 
+	4, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	11, 11, 11, 11, 11, 11, 11, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 11, 11, 11, 11, 13, 11, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 11, 11, 32, 11, 3, 3, 3, 
+	3, 3, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 3, 2, 4, 2, 
+	33, 34, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 33, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 35, 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, 36, 2, 37, 38, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 37, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 12, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 32, 1, 1, 40, 41, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 40, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	42, 39, 39, 39, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 39, 39, 
+	39, 39, 39, 39, 39, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 39, 
+	39, 39, 39, 43, 39, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 39, 
+	39, 44, 39, 45, 1, 47, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 46, 46, 46, 
+	46, 46, 46, 46, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 46, 46, 
+	46, 46, 48, 46, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 46, 46, 
+	15, 0
 ]
 
 class << self
@@ -936,11 +1099,13 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	0, 2, 0, 2, 3, 6, 7, 8, 
-	3, 4, 9, 0, 5, 6, 8, 5, 
-	6, 8, 6, 0, 5, 6, 7, 8, 
-	16, 0, 11, 17, 11, 0, 13, 13, 
-	14, 15, 18, 0
+	12, 0, 0, 2, 3, 4, 15, 6, 
+	4, 15, 6, 0, 5, 18, 20, 0, 
+	8, 9, 10, 22, 11, 10, 22, 11, 
+	13, 14, 2, 3, 18, 19, 13, 14, 
+	19, 16, 17, 5, 19, 16, 17, 0, 
+	16, 17, 5, 18, 19, 17, 0, 21, 
+	20
 ]
 
 class << self
@@ -948,11 +1113,13 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	1, 2, 3, 4, 5, 6, 7, 8, 
-	10, 10, 10, 9, 11, 12, 13, 0, 
-	14, 15, 0, 16, 17, 18, 19, 20, 
-	21, 22, 7, 23, 19, 24, 5, 10, 
-	10, 10, 25, 0
+	0, 0, 2, 0, 0, 4, 5, 4, 
+	0, 6, 0, 8, 0, 9, 9, 11, 
+	0, 0, 4, 13, 4, 0, 14, 0, 
+	16, 16, 16, 16, 17, 16, 0, 0, 
+	0, 21, 21, 21, 21, 0, 0, 24, 
+	25, 25, 25, 0, 25, 27, 29, 30, 
+	0
 ]
 
 class << self
@@ -960,9 +1127,9 @@ class << self
 	private :_bel_eof_actions, :_bel_eof_actions=
 end
 self._bel_eof_actions = [
-	0, 1, 3, 9, 9, 1, 3, 16, 
-	1, 9, 22, 22, 24, 24, 24, 24, 
-	0, 0, 0
+	0, 0, 1, 3, 3, 7, 3, 0, 
+	10, 12, 12, 12, 15, 18, 19, 20, 
+	22, 22, 23, 26, 28, 31, 0
 ]
 
 class << self
@@ -972,24 +1139,24 @@ self.bel_start = 1;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 16;
+self.bel_first_final = 12;
 class << self
 	attr_accessor :bel_error
 end
 self.bel_error = 0;
 
 class << self
-	attr_accessor :bel_en_ident
+	attr_accessor :bel_en_ident_node
 end
-self.bel_en_ident = 10;
+self.bel_en_ident_node = 7;
 class << self
-	attr_accessor :bel_en_string
+	attr_accessor :bel_en_string_node
 end
-self.bel_en_string = 12;
+self.bel_en_string_node = 8;
 class << self
-	attr_accessor :bel_en_list
+	attr_accessor :bel_en_list_node
 end
-self.bel_en_list = 1;
+self.bel_en_list_node = 1;
 
 
 begin
@@ -1034,506 +1201,585 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 19 then
+	when 9 then
 		begin
 
-    (@buffers[:ident] ||= []) << data[p].ord
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
-	when 10 then
+	when 30 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
-	when 14 then
+	when 24 then
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
-	when 2 then
+	when 29 then
 		begin
 
-    @buffers[:list] = list()
+    trace('IDENTIFIER ident_node_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    yield ast_node
   		end
 	when 4 then
 		begin
 
-    # 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
-    end
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
-	when 15 then
+	when 2 then
 		begin
 
-    #TODO: Mark @buffers[:list] as complete.
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
-	when 21 then
+	when 11 then
 		begin
 
-    yield @buffers[:list]
+    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 1 then
+	when 16 then
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
-	when 7 then
+	when 27 then
 		begin
 
-    @buffers[:ident] = []
+    trace('LIST stop_list')
+    @list_closed = true
   		end
+	when 21 then
 		begin
 
-    (@buffers[:ident] ||= []) << data[p].ord
+    trace('LIST add_string')
+    string = @buffers.delete(:string)
+    item = list_item(string, complete: string.complete)
+    @incomplete[:list] <<= item
   		end
-	when 23 then
+	when 25 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    yield @buffers[:ident]
+    trace('LIST add_ident')
+    ident = @buffers.delete(:ident)
+    item = list_item(ident, complete: ident.complete)
+    @incomplete[:list] <<= item
   		end
-	when 22 then
+	when 6 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
+    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
-	when 5 then
+	when 8 then
 		begin
 
-    @buffers[:string] = []
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
-	when 25 then
+	when 17 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
 		begin
 
-    yield @buffers[:string]
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
-	when 24 then
+	when 5 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
 		begin
 
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 6 then
 		begin
 
-    # 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
-    end
+    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
+	when 14 then
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 8 then
 		begin
 
-    # 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
-    end
+    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
 
-    #TODO: Mark @buffers[:list] as complete.
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
-	when 17 then
+	when 13 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    # 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
-    end
+    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
-	when 11 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
-  		end
-		begin
-
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
+	end
+	end
+	end
+	if _goto_level <= _again
+	if cs == 0
+		_goto_level = _out
+		next
+	end
+	p += 1
+	if p != pe
+		_goto_level = _resume
+		next
+	end
+	end
+	if _goto_level <= _test_eof
+	if p == eof
+	  case _bel_eof_actions[cs]
+	when 31 then
 		begin
 
-    # 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
-    end
+    trace('IDENTIFIER yield_identifier')
+    yield @buffers[:ident]
   		end
-	when 18 then
+	when 28 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('IDENTIFIER yield_identifier')
+    yield @buffers[:ident]
   		end
+	when 1 then
 		begin
 
-    # 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
-    end
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    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
   		end
-	when 20 then
+	when 10 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    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[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
   		end
+	when 22 then
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    #TODO: Mark @buffers[:list] as complete.
-  		end
-	when 16 then
-		begin
-
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 3 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    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
 
-    # 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
-    end
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    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
   		end
 	when 12 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
-  		end
-		begin
-
-    @buffers[:list_arg] = list_item(@buffers[:string])
-  		end
-		begin
-
-    # 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
-    end
+    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
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    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 13 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
   		end
+	when 26 then
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('LIST stop_list')
+    @list_closed = true
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    #TODO: Mark @buffers[:list] as complete.
-  		end
-	when 9 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 20 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('LIST add_string')
+    string = @buffers.delete(:string)
+    item = list_item(string, complete: string.complete)
+    @incomplete[:list] <<= item
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
-	when 3 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
-  		end
+	when 19 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    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
   		end
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    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
   		end
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 18 then
 		begin
 
-    # 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
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    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
   		end
-	end
-	end
-	end
-	if _goto_level <= _again
-	if cs == 0
-		_goto_level = _out
-		next
-	end
-	p += 1
-	if p != pe
-		_goto_level = _resume
-		next
-	end
-	end
-	if _goto_level <= _test_eof
-	if p == eof
-	  case _bel_eof_actions[cs]
-	when 1 then
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
-  		end
-	when 22 then
-		begin
-
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    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
   		end
 		begin
 
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
-  		end
-	when 24 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 7 then
 		begin
 
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
-	when 16 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
-  		end
-		begin
-
-    # 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
-    end
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    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
   		end
-	when 9 then
+	when 15 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
+    end
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
-	when 3 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
-  		end
+	when 23 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('LIST add_ident')
+    ident = @buffers.delete(:ident)
+    item = list_item(ident, complete: ident.complete)
+    @incomplete[:list] <<= item
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
 	  end
@@ -1553,6 +1799,7 @@ end
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -1578,24 +1825,26 @@ 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, 123, 123, 9, 125, 
-	34, 92, 9, 125, 9, 
-	125, 9, 122, 9, 125, 
-	10, 10, 92, 92, 48, 122, 
-	10, 122, 34, 34, 34, 
-	92, 10, 10, 92, 92, 
-	0, 0, 0, 0, 0, 0, 
-	0
+	0, 0, 123, 123, 9, 34, 
+	34, 92, 34, 92, 9, 
+	122, 0, 0, 48, 122, 
+	9, 34, 34, 92, 34, 92, 
+	0, 0, 9, 125, 9, 
+	125, 9, 34, 9, 125, 
+	9, 125, 0, 0, 9, 125, 
+	10, 10, 10, 122, 0, 
+	0, 0, 0, 0
 ]
 
 class << self
@@ -1603,9 +1852,9 @@ class << self
 	private :_bel_key_spans, :_bel_key_spans=
 end
 self._bel_key_spans = [
-	0, 1, 117, 59, 117, 117, 114, 117, 
-	1, 1, 75, 113, 1, 59, 1, 1, 
-	0, 0, 0
+	0, 1, 26, 59, 59, 114, 0, 75, 
+	26, 59, 59, 0, 117, 117, 26, 117, 
+	117, 0, 117, 1, 113, 0, 0
 ]
 
 class << self
@@ -1613,9 +1862,9 @@ class << self
 	private :_bel_index_offsets, :_bel_index_offsets=
 end
 self._bel_index_offsets = [
-	0, 0, 2, 120, 180, 298, 416, 531, 
-	649, 651, 653, 729, 843, 845, 905, 907, 
-	909, 910, 911
+	0, 0, 2, 29, 89, 149, 264, 265, 
+	341, 368, 428, 488, 489, 607, 725, 752, 
+	870, 988, 989, 1107, 1109, 1223, 1224
 ]
 
 class << self
@@ -1623,121 +1872,160 @@ class << self
 	private :_bel_indicies, :_bel_indicies=
 end
 self._bel_indicies = [
-	1, 0, 3, 2, 2, 2, 2, 2, 
+	0, 1, 3, 3, 3, 3, 3, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
 	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 3, 2, 4, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 5, 2, 2, 
-	2, 6, 6, 6, 6, 6, 6, 6, 
-	6, 6, 6, 2, 2, 2, 2, 2, 
-	2, 2, 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, 2, 2, 2, 2, 
-	6, 2, 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, 2, 2, 7, 2, 
-	9, 8, 8, 8, 8, 8, 8, 8, 
+	2, 3, 2, 4, 2, 6, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 5, 5, 5, 7, 
+	5, 9, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
 	8, 8, 8, 8, 8, 8, 8, 8, 
-	8, 8, 10, 8, 12, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 12, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 13, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
+	8, 8, 8, 10, 8, 12, 3, 3, 
+	3, 3, 11, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 12, 11, 4, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 11, 11, 
+	11, 11, 11, 11, 11, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 11, 
+	11, 11, 11, 13, 11, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 11, 
+	8, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 1, 1, 1, 1, 1, 
+	1, 1, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 1, 1, 1, 1, 
+	14, 1, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
+	14, 14, 14, 14, 1, 16, 16, 16, 
+	16, 16, 15, 15, 15, 15, 15, 15, 
+	15, 15, 15, 15, 15, 15, 15, 15, 
+	15, 15, 15, 15, 16, 15, 17, 15, 
+	19, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 18, 18, 18, 18, 18, 
+	18, 18, 20, 18, 22, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 21, 21, 
+	21, 21, 21, 21, 21, 21, 23, 21, 
+	21, 24, 25, 26, 26, 26, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
+	24, 11, 27, 11, 11, 11, 11, 11, 
 	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	11, 11, 11, 11, 11, 11, 11, 11, 
-	14, 11, 15, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 15, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 16, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 17, 0, 
-	18, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 18, 
-	2, 4, 2, 2, 2, 2, 2, 2, 
-	2, 2, 2, 2, 2, 2, 2, 6, 
-	6, 6, 6, 6, 6, 6, 6, 6, 
-	6, 2, 2, 2, 2, 2, 2, 2, 
-	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, 2, 2, 2, 2, 6, 2, 
-	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, 2, 20, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 20, 19, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 21, 19, 
-	19, 19, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 19, 19, 19, 19, 
-	19, 19, 19, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 19, 19, 19, 
-	19, 22, 19, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 19, 19, 23, 
-	19, 24, 0, 10, 8, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 25, 
-	25, 25, 25, 25, 25, 25, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	25, 25, 25, 25, 26, 25, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	26, 26, 26, 26, 26, 26, 26, 26, 
-	25, 27, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 25, 
-	25, 25, 25, 25, 25, 25, 25, 28, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 25, 25, 25, 25, 25, 25, 25, 
-	28, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 11, 11, 11, 11, 11, 11, 
+	11, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 25, 25, 25, 25, 28, 25, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
+	28, 28, 28, 11, 11, 11, 11, 28, 
+	11, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
 	28, 28, 28, 28, 28, 28, 28, 28, 
-	28, 28, 25, 30, 29, 32, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 31, 
-	31, 31, 31, 31, 31, 31, 31, 33, 
-	31, 34, 29, 33, 31, 35, 35, 35, 
-	0
+	28, 28, 28, 11, 11, 29, 11, 30, 
+	31, 3, 3, 3, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 30, 11, 
+	4, 11, 11, 11, 11, 11, 11, 11, 
+	11, 11, 11, 11, 11, 11, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	11, 11, 11, 11, 11, 11, 11, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 11, 11, 11, 11, 13, 11, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 13, 13, 13, 13, 13, 13, 13, 
+	13, 11, 11, 32, 11, 3, 3, 3, 
+	3, 3, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 3, 2, 4, 2, 
+	33, 34, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 2, 2, 2, 2, 33, 
+	2, 2, 2, 2, 2, 2, 2, 2, 
+	2, 2, 2, 35, 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, 36, 2, 37, 38, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 37, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 12, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 32, 1, 1, 40, 41, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 40, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	42, 39, 39, 39, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 39, 39, 
+	39, 39, 39, 39, 39, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 39, 
+	39, 39, 39, 43, 39, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 43, 
+	43, 43, 43, 43, 43, 43, 43, 39, 
+	39, 44, 39, 45, 1, 47, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 46, 46, 46, 46, 46, 
+	46, 46, 46, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 46, 46, 46, 
+	46, 46, 46, 46, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 46, 46, 
+	46, 46, 48, 46, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 48, 48, 
+	48, 48, 48, 48, 48, 48, 46, 46, 
+	15, 0
 ]
 
 class << self
@@ -1745,11 +2033,13 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	0, 2, 0, 2, 3, 6, 7, 8, 
-	3, 4, 9, 0, 5, 6, 8, 5, 
-	6, 8, 6, 0, 5, 6, 7, 8, 
-	16, 0, 11, 17, 11, 0, 13, 13, 
-	14, 15, 18, 0
+	12, 0, 0, 2, 3, 4, 15, 6, 
+	4, 15, 6, 0, 5, 18, 20, 0, 
+	8, 9, 10, 22, 11, 10, 22, 11, 
+	13, 14, 2, 3, 18, 19, 13, 14, 
+	19, 16, 17, 5, 19, 16, 17, 0, 
+	16, 17, 5, 18, 19, 17, 0, 21, 
+	20
 ]
 
 class << self
@@ -1757,11 +2047,13 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	1, 2, 3, 4, 5, 6, 7, 8, 
-	10, 10, 10, 9, 11, 12, 13, 0, 
-	14, 15, 0, 16, 17, 18, 19, 20, 
-	21, 22, 7, 23, 19, 24, 5, 10, 
-	10, 10, 25, 0
+	0, 0, 2, 0, 0, 4, 5, 4, 
+	0, 6, 0, 8, 0, 9, 9, 11, 
+	0, 0, 4, 13, 4, 0, 14, 0, 
+	16, 16, 16, 16, 17, 16, 0, 0, 
+	0, 21, 21, 21, 21, 0, 0, 24, 
+	25, 25, 25, 0, 25, 27, 29, 30, 
+	0
 ]
 
 class << self
@@ -1769,9 +2061,9 @@ class << self
 	private :_bel_eof_actions, :_bel_eof_actions=
 end
 self._bel_eof_actions = [
-	0, 1, 3, 9, 9, 1, 3, 16, 
-	1, 9, 22, 22, 24, 24, 24, 24, 
-	0, 0, 0
+	0, 0, 1, 3, 3, 7, 3, 0, 
+	10, 12, 12, 12, 15, 18, 19, 20, 
+	22, 22, 23, 26, 28, 31, 0
 ]
 
 class << self
@@ -1781,37 +2073,40 @@ self.bel_start = 1;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 16;
+self.bel_first_final = 12;
 class << self
 	attr_accessor :bel_error
 end
 self.bel_error = 0;
 
 class << self
-	attr_accessor :bel_en_ident
+	attr_accessor :bel_en_ident_node
 end
-self.bel_en_ident = 10;
+self.bel_en_ident_node = 7;
 class << self
-	attr_accessor :bel_en_string
+	attr_accessor :bel_en_string_node
 end
-self.bel_en_string = 12;
+self.bel_en_string_node = 8;
 class << self
-	attr_accessor :bel_en_list
+	attr_accessor :bel_en_list_node
 end
-self.bel_en_list = 1;
+self.bel_en_list_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   = {}
+            @list_opened  = false
+            @list_closed  = false
+            data          = @content.unpack('C*')
+            p             = 0
+            pe            = data.length
+            eof           = data.length
+
+      # begin: ragel
             
 begin
 	p ||= 0
@@ -1856,506 +2151,585 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 19 then
+	when 9 then
 		begin
 
-    (@buffers[:ident] ||= []) << data[p].ord
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
-	when 10 then
+	when 30 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
-	when 14 then
+	when 24 then
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
-	when 2 then
+	when 29 then
 		begin
 
-    @buffers[:list] = list()
+    trace('IDENTIFIER ident_node_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    yield ast_node
   		end
 	when 4 then
 		begin
 
-    # 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
-    end
-  		end
-	when 15 then
-		begin
-
-    #TODO: Mark @buffers[:list] as complete.
-  		end
-	when 21 then
-		begin
-
-    yield @buffers[:list]
-  		end
-	when 1 then
-		begin
-
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
-  		end
-	when 7 then
-		begin
-
-    @buffers[:ident] = []
-  		end
-		begin
-
-    (@buffers[:ident] ||= []) << data[p].ord
-  		end
-	when 23 then
-		begin
-
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
+	when 2 then
 		begin
 
-    yield @buffers[:ident]
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
-	when 22 then
+	when 11 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    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 16 then
 		begin
 
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
-	when 5 then
+	when 27 then
 		begin
 
-    @buffers[:string] = []
+    trace('LIST stop_list')
+    @list_closed = true
   		end
+	when 21 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('LIST add_string')
+    string = @buffers.delete(:string)
+    item = list_item(string, complete: string.complete)
+    @incomplete[:list] <<= item
   		end
 	when 25 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    yield @buffers[:string]
-  		end
-	when 24 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
-  		end
-		begin
-
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    trace('LIST add_ident')
+    ident = @buffers.delete(:ident)
+    item = list_item(ident, complete: ident.complete)
+    @incomplete[:list] <<= item
   		end
 	when 6 then
 		begin
 
-    # 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
-    end
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    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
 	when 8 then
 		begin
 
-    # 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
-    end
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    #TODO: Mark @buffers[:list] as complete.
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
 	when 17 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
+	when 5 then
 		begin
 
-    # 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
-    end
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
-	when 11 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    @buffers[:list_arg] = list_item(@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
+	when 14 then
 		begin
 
-    # 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
-    end
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 18 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    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[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
+	when 13 then
 		begin
 
-    # 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
-    end
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 20 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    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[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
+	end
+	end
+	end
+	if _goto_level <= _again
+	if cs == 0
+		_goto_level = _out
+		next
+	end
+	p += 1
+	if p != pe
+		_goto_level = _resume
+		next
+	end
+	end
+	if _goto_level <= _test_eof
+	if p == eof
+	  case _bel_eof_actions[cs]
+	when 31 then
 		begin
 
-    # 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
-    end
+    trace('IDENTIFIER yield_identifier')
+    yield @buffers[:ident]
   		end
+	when 28 then
 		begin
 
-    #TODO: Mark @buffers[:list] as complete.
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
-	when 16 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('IDENTIFIER yield_identifier')
+    yield @buffers[:ident]
   		end
+	when 1 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    # 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
-    end
+    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
   		end
+	when 10 then
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    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 12 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
   		end
+	when 22 then
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    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
   		end
 		begin
 
-    # 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
-    end
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 3 then
 		begin
 
-    @buffers.delete(:string)
-    @buffers.delete(:ident)
+    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
-	when 13 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    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
   		end
+	when 12 then
 		begin
 
-    # 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
-    end
+    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
 
-    #TODO: Mark @buffers[:list] as complete.
+    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 9 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
   		end
+	when 26 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('LIST stop_list')
+    @list_closed = true
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
-	when 3 then
+	when 20 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('LIST add_string')
+    string = @buffers.delete(:string)
+    item = list_item(string, complete: string.complete)
+    @incomplete[:list] <<= item
   		end
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    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
   		end
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 19 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    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
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
-	end
-	end
-	end
-	if _goto_level <= _again
-	if cs == 0
-		_goto_level = _out
-		next
-	end
-	p += 1
-	if p != pe
-		_goto_level = _resume
-		next
-	end
-	end
-	if _goto_level <= _test_eof
-	if p == eof
-	  case _bel_eof_actions[cs]
-	when 1 then
-		begin
-
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
-  		end
-	when 22 then
+	when 18 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
-  		end
-	when 24 then
-		begin
-
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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
   		end
 		begin
 
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    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
   		end
-	when 16 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 7 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('STRING a_string_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
   		end
 		begin
 
-    # 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
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    trace('IDENTIFIER an_ident_err')
+    id_end = p
+    chars = data[id_start...id_end]
+    ast_node = identifier(utf8_string(chars), complete: false)
+    @buffers[:ident] = ast_node
   		end
-	when 9 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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
   		end
+	when 15 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('LIST start_list')
+    @list_opened = true
+    @incomplete[:list] = list()
   		end
 		begin
 
-    # 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
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    @buffers[:list] ||= list()
-    yield @buffers[:list]
+    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
   		end
-	when 3 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('LIST yield_list')
+    yield @buffers[:list]
   		end
+	when 23 then
 		begin
 
-    #TODO: Mark @buffers[:list_arg] string as error.
-    @buffers[:list_arg] = list_item(@buffers[:string])
+    trace('IDENTIFIER end_identifier')
+    id_end = p
+    chars = data[id_start...id_end]
+    completed = !chars.empty?
+    ast_node = identifier(utf8_string(chars), complete: completed)
+    @buffers[:ident] = ast_node
   		end
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
+    trace('IDENTIFIER an_ident_eof')
+    if @identifier_started
+      id_end = p
+      chars = data[id_start...id_end]
+      completed = !chars.empty?
+      ast_node = identifier(utf8_string(chars), complete: completed)
+      @buffers[:ident] = ast_node
     end
   		end
 		begin
 
-    #TODO: Mark @buffers[:list_arg] identifier as error.
-    @buffers[:list_arg] = list_item(@buffers[:ident])
+    trace('LIST add_ident')
+    ident = @buffers.delete(:ident)
+    item = list_item(ident, complete: ident.complete)
+    @incomplete[:list] <<= item
   		end
 		begin
 
-    # 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
+    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
   		end
 		begin
 
-    @buffers[:list] ||= list()
+    trace('LIST yield_list')
     yield @buffers[:list]
   		end
 	  end
@@ -2368,7 +2742,7 @@ begin
 end
 	end
 
-      # end: ragel        
+      # end: ragel
           end
         end
       end