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

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

@@ -8,69 +8,156 @@
   include 'string.rl';
   include 'list.rl';
 
-  DEFINE_KW     = [dD][eE][fF][iI][nN][eE];
-  ANNOTATION_KW = [aA][nN][nN][oO][tT][aA][tT][iI][oO][nN];
-  AS_KW         = [aA][sS];
-  LIST_KW       = [lL][iI][sS][tT];
-  PATTERN_KW    = [pP][aA][tT][tT][eE][rR][nN];
-  URL_KW        = [uU][rR][lL];
-
-  action annotation_keyword {
-    @buffers[:annotation_definition] = annotation_definition()
+  action add_name {
+    trace('DEFINE_ANNOTATION add_name')
+    name = @buffers.delete(:ident)
+    @buffers[:annotation_definition_name] = name
   }
 
-  action keyword {
-    @buffers[:annotation_definition] = annotation_definition(
-                                         keyword(@buffers[:ident]))
+  action add_string_value {
+    trace('DEFINE_ANNOTATION add_string_value')
+    string_node = @buffers.delete(:string)
+    if @url_domain
+      leaf = domain(url(string_node))
+      leaf.complete = string_node.complete
+    elsif @pattern_domain
+      leaf = domain(pattern(string_node))
+      leaf.complete = string_node.complete
+    else
+      leaf = domain(string_node)
+      # defined as list, given string
+      leaf.complete = false
+    end
+    @buffers[:annotation_definition_domain] = leaf
   }
 
-  action list_keyword {
-    @buffers[:annotation_definition] = @buffers[:annotation_definition] << domain()
+  action add_list_value {
+    trace('DEFINE_ANNOTATION add_list_value')
+    list_node = @buffers.delete(:list)
+    if @url_domain
+      leaf = domain(url(list_node))
+      # defined as url, given list
+      leaf.completed = false
+    elsif @pattern_domain
+      leaf = domain(pattern(list_node))
+      # defined as url, given pattern
+      leaf.complete = false
+    else
+      leaf = domain(list_node)
+      leaf.complete = list_node.complete
+    end
+    @buffers[:annotation_definition_domain] = leaf
   }
 
-  action pattern_keyword {
-    @buffers[:annotation_definition] = @buffers[:annotation_definition] << domain(pattern())
+  action add_list_domain {
+    trace('DEFINE_ANNOTATION add_list_domain')
+    @list_domain = true
   }
 
-  action url_keyword {
-    @buffers[:annotation_definition] = @buffers[:annotation_definition] << domain(url())
+  action add_url_domain {
+    trace('DEFINE_ANNOTATION add_url_domain')
+    @url_domain = true
   }
 
-  action pattern {
-    keyword, domain                  = @buffers[:annotation_definition].children
-    domain                           = domain(
-                                         domain.children[0] << @buffers[:string])
-    @buffers[:annotation_definition] = annotation_definition(keyword, domain)
+  action add_pattern_domain {
+    trace('DEFINE_ANNOTATION add_pattern_domain')
+    @pattern_domain = true
   }
 
-  action url {
-    keyword, domain                  = @buffers[:annotation_definition].children
-    domain                           = domain(
-                                         domain.children[0] << @buffers[:string])
-    @buffers[:annotation_definition] = annotation_definition(keyword, domain)
+  action define_annotation_end {
+    trace('DEFINE_ANNOTATION define_annotation_end')
+    annotation_definition_node = annotation_definition()
+    domain = @buffers.delete(:annotation_definition_domain)
+    unless domain.nil?
+      annotation_definition_node <<= domain
+      annotation_definition_node.complete = domain.complete
+    end
+    @buffers[:annotation_definition] = annotation_definition_node
   }
 
-  action list {
-    keyword, domain                  = @buffers[:annotation_definition].children
-    domain                           = domain(
-                                         @buffers[:list])
-    @buffers[:annotation_definition] = annotation_definition(keyword, domain)
+  action yield_define_annotation {
+    trace('DEFINE_ANNOTATION yield_define_annotation')
+    yield @buffers[:annotation_definition]
   }
 
-  action yield_annotation_definition {
-    yield @buffers[:annotation_definition]
+  action define_annotation_node_eof {
+    trace('DEFINE_ANNOTATION define_annotation_node_eof')
+    annotation_definition_node = annotation_definition()
+    if @url_domain
+      domain_node = domain(url())
+    elsif @pattern_domain
+      domain_node = domain(pattern())
+    else
+      domain_node = domain()
+    end
+
+    domain_node.complete = false
+    list_node = @buffers.delete(:list)
+    unless list_node.nil?
+      domain_node <<= list_node
+      domain_node.complete = list_node.complete
+    end
+    string_node = @buffers.delete(:string)
+    unless string_node.nil?
+      domain_node <<= string_node
+      domain_node.complete = string_node.complete
+    end
+    annotation_definition_node <<= domain_node
+    annotation_definition_node.complete = domain_node.complete
+    yield annotation_definition_node
   }
 
-  # Define FSM
-  annotation_definition :=
-    DEFINE_KW SP+ ANNOTATION_KW @annotation_keyword SP+
-      IDENT %keyword SP+
-    AS_KW SP+
-      (
-        (LIST_KW    %list_keyword    SP+ LIST   %list    SP* NL @yield_annotation_definition) |
-        (PATTERN_KW %pattern_keyword SP+ STRING %pattern SP* NL @yield_annotation_definition) |
-        (URL_KW     %url_keyword     SP+ STRING %url     SP* NL @yield_annotation_definition)
-      );
+  string_value =
+    a_string
+    %add_string_value
+    ;
+
+  list_value =
+    a_list
+    %add_list_value
+    ;
+
+  value =
+    string_value |
+    list_value
+    ;
+
+  list_domain =
+    KW_LIST
+    %add_list_domain
+    ;
+
+  url_domain =
+    KW_URL
+    %add_url_domain
+    ;
+
+  pattern_domain =
+    KW_PATTERN
+    %add_pattern_domain
+    ;
+
+  domain =
+    list_domain |
+    url_domain |
+    pattern_domain
+    ;
+
+  define_annotation_node :=
+    DEFINE_ANNOTATION
+    SP+
+    an_ident
+    %add_name
+    SP+
+    KW_AS
+    SP+
+    domain
+    SP+
+    value
+    @eof(define_annotation_node_eof)
+    %define_annotation_end
+    %yield_define_annotation
+    ;
 }%%
 =end
 # end: ragel
@@ -78,6 +165,7 @@
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -103,25 +191,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 = {}
+            @incomplete = {}
+            @list_domain = false
+            @url_domain = false
+            @pattern_domain = false
             data     = @content.unpack('C*')
             p        = 0
             pe       = data.length
             eof      = data.length
 
-      # begin: ragel        
+      # begin: ragel
             %% write init;
             %% write exec;
-      # end: ragel        
+      # end: ragel
           end
         end
       end

data/lib/bel_parser/parsers/bel_script/define_namespace.rb

@@ -17,11 +17,11 @@ self._bel_trans_keys = [
 	9, 122, 9, 97, 83, 
 	115, 9, 32, 9, 117, 
 	82, 114, 76, 108, 9, 32, 
-	9, 34, 34, 92, 9, 
-	32, 9, 32, 92, 92, 
-	48, 122, 10, 122, 34, 34, 
-	34, 92, 10, 10, 92, 
-	92, 0, 0, 0, 0, 
+	9, 34, 34, 92, 34, 
+	92, 10, 10, 0, 0, 
+	48, 122, 9, 34, 34, 92, 
+	34, 92, 0, 0, 0, 
+	0, 10, 122, 0, 0, 
 	0, 0, 0
 ]
 
@@ -33,8 +33,8 @@ self._bel_key_spans = [
 	0, 33, 33, 33, 33, 33, 33, 24, 
 	102, 33, 33, 33, 33, 33, 33, 33, 
 	33, 24, 114, 114, 89, 33, 24, 109, 
-	33, 33, 24, 26, 59, 24, 24, 1, 
-	75, 113, 1, 59, 1, 1, 0, 0, 
+	33, 33, 24, 26, 59, 59, 1, 0, 
+	75, 26, 59, 59, 0, 0, 113, 0, 
 	0
 ]
 
@@ -46,9 +46,9 @@ self._bel_index_offsets = [
 	0, 0, 34, 68, 102, 136, 170, 204, 
 	229, 332, 366, 400, 434, 468, 502, 536, 
 	570, 604, 629, 744, 859, 949, 983, 1008, 
-	1118, 1152, 1186, 1211, 1238, 1298, 1323, 1348, 
-	1350, 1426, 1540, 1542, 1602, 1604, 1606, 1607, 
-	1608
+	1118, 1152, 1186, 1211, 1238, 1298, 1358, 1360, 
+	1361, 1437, 1464, 1524, 1584, 1585, 1586, 1700, 
+	1701
 ]
 
 class << self
@@ -207,57 +207,68 @@ self._bel_indicies = [
 	28, 1, 29, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 29, 1, 29, 30, 30, 30, 30, 
+	1, 29, 1, 31, 31, 31, 31, 31, 
 	30, 30, 30, 30, 30, 30, 30, 30, 
 	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 29, 30, 31, 30, 33, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	34, 32, 35, 36, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 35, 30, 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, 34, 32, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	39, 39, 39, 39, 39, 39, 39, 40, 
+	30, 30, 31, 30, 32, 30, 34, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	35, 33, 37, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 38, 36, 39, 30, 
+	36, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 1, 1, 1, 1, 1, 
+	1, 1, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 1, 1, 1, 1, 
+	40, 1, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 39, 39, 39, 39, 40, 39, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 39, 41, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 39, 39, 39, 39, 39, 39, 
-	39, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 39, 39, 39, 39, 42, 
-	39, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 39, 44, 43, 46, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	47, 45, 48, 43, 47, 45, 1, 1, 
-	1, 0
+	40, 40, 40, 40, 1, 42, 42, 42, 
+	42, 42, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 42, 41, 43, 41, 
+	45, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 46, 44, 48, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 49, 47, 
+	47, 1, 51, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 50, 50, 50, 50, 50, 50, 
+	50, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 50, 50, 50, 50, 52, 
+	50, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 50, 50, 41, 0
 ]
 
 class << self
@@ -268,10 +279,10 @@ self._bel_trans_targs = [
 	2, 0, 3, 4, 5, 6, 7, 8, 
 	9, 10, 11, 12, 13, 14, 15, 16, 
 	17, 18, 0, 19, 20, 19, 20, 21, 
-	22, 23, 24, 25, 26, 27, 0, 28, 
-	28, 29, 31, 30, 38, 30, 38, 0, 
-	33, 39, 33, 0, 35, 35, 36, 37, 
-	40
+	22, 23, 24, 25, 26, 27, 0, 27, 
+	28, 29, 30, 31, 29, 30, 31, 37, 
+	38, 0, 33, 34, 35, 40, 36, 35, 
+	40, 36, 0, 39, 38
 ]
 
 class << self
@@ -281,11 +292,11 @@ end
 self._bel_trans_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	1, 0, 2, 3, 4, 5, 0, 0, 
-	0, 0, 0, 0, 6, 0, 7, 8, 
-	9, 9, 9, 10, 11, 0, 12, 13, 
-	3, 14, 5, 15, 8, 9, 9, 9, 
-	16
+	0, 0, 2, 3, 4, 0, 0, 0, 
+	0, 0, 0, 0, 0, 5, 7, 0, 
+	0, 9, 10, 9, 0, 11, 0, 12, 
+	3, 14, 0, 0, 9, 16, 9, 0, 
+	17, 0, 19, 20, 0
 ]
 
 class << self
@@ -295,9 +306,9 @@ end
 self._bel_eof_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 2, 2, 0, 0, 0, 0, 
-	0, 0, 0, 7, 7, 7, 0, 7, 
-	13, 13, 15, 15, 15, 15, 0, 0, 
+	0, 0, 1, 1, 0, 0, 0, 0, 
+	0, 0, 0, 6, 8, 8, 7, 8, 
+	0, 13, 15, 15, 15, 0, 18, 21, 
 	0
 ]
 
@@ -308,24 +319,24 @@ self.bel_start = 1;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 38;
+self.bel_first_final = 37;
 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 = 32;
+self.bel_en_ident_node = 32;
 class << self
-	attr_accessor :bel_en_string
+	attr_accessor :bel_en_string_node
 end
-self.bel_en_string = 34;
+self.bel_en_string_node = 33;
 class << self
-	attr_accessor :bel_en_define_namespace
+	attr_accessor :bel_en_define_namespace_node
 end
-self.bel_en_define_namespace = 1;
+self.bel_en_define_namespace_node = 1;
 
 
 begin
@@ -370,141 +381,198 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 5 then
+	when 3 then
 		begin
 
-    (@buffers[:ident] ||= []) << data[p].ord
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
-	when 2 then
+	when 20 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    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 9 then
+	when 2 then
 		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 7 then
+	when 19 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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 1 then
+	when 9 then
 		begin
 
-    @buffers[:namespace_definition] = namespace_definition()
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
-	when 6 then
+	when 7 then
 		begin
 
-    @buffers[:namespace_definition] = @buffers[:namespace_definition] << domain(url())
+    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 12 then
+	when 14 then
 		begin
 
-    yield @buffers[:namespace_definition]
+    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 3 then
+	when 5 then
 		begin
 
-    @buffers[:ident] = []
+    trace('DEFINE_NAMESPACE add_url_domain')
+    @url_domain = true
   		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 14 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('DEFINE_NAMESPACE add_name')
+    name = @buffers.delete(:ident)
+    @buffers[:namespace_definition_name] = name
   		end
+	when 11 then
 		begin
 
-    yield @buffers[:ident]
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 4 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
+	when 10 then
 		begin
 
-    @buffers[:namespace_definition] = @buffers[:namespace_definition] << keyword(@buffers[:ident])
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
-	when 13 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 8 then
+	when 17 then
 		begin
 
-    @buffers[:string] = []
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
-  		end
-	when 16 then
-		begin
-
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING string_end')
+    completed = @string_opened && @string_closed
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: true)
+    @buffers[:string] = ast_node
   		end
 		begin
 
+    trace('STRING yield_string')
     yield @buffers[:string]
   		end
-	when 10 then
+	when 12 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('DEFINE_NAMESPACE add_string_value')
+    string_node = @buffers.delete(:string)
+    leaf = domain(url(string_node))
+    leaf.complete = string_node.complete
+    @buffers[:namespace_definition_domain] = leaf
   		end
 		begin
 
-    keyword, domain                 = @buffers[:namespace_definition].children
-    domain                          = domain(
-                                        domain.children[0] << @buffers[:string])
-    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
+    trace('DEFINE_NAMESPACE define_namespace_end')
+    namespace_definition_node = namespace_definition()
+
+    name = @buffers.delete(:namespace_definition_name)
+    namespace_definition_node <<= keyword(name)
+
+    domain = @buffers.delete(:namespace_definition_domain)
+    unless domain.nil?
+      namespace_definition_node <<= domain
+      namespace_definition_node.complete = domain.complete
+    end
+    @buffers[:namespace_definition] = namespace_definition_node
   		end
-	when 15 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('DEFINE_NAMESPACE yield_define_namespace')
+    yield @buffers[:namespace_definition]
   		end
+	when 16 then
 		begin
 
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    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
 
-    keyword, domain                 = @buffers[:namespace_definition].children
-    domain                          = domain(
-                                        domain.children[0] << @buffers[:string])
-    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
+    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
 
-    yield @buffers[:namespace_definition]
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
 	end
 	end
@@ -523,42 +591,146 @@ begin
 	if _goto_level <= _test_eof
 	if p == eof
 	  case _bel_eof_actions[cs]
-	when 2 then
+	when 21 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 7 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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 13 then
+	when 18 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    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
+	when 1 then
+		begin
+
+    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
+
+    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 6 then
+		begin
+
+    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
+
+    trace('DEFINE_NAMESPACE define_namespace_node_eof')
+    leaf = url()
+    string_node = @buffers.delete(:string)
+    unless string_node.nil?
+      leaf <<= string_node
+      leaf.complete = string_node.complete
+    end
+    domain_node = domain(leaf)
+    domain_node.complete = leaf.complete
+    namespace_definition_node = namespace_definition(domain_node)
+    namespace_definition_node.complete = domain_node.complete
+    yield namespace_definition_node
+  		end
+	when 13 then
+		begin
+
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
+  		end
+		begin
+
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
+  		end
+	when 8 then
+		begin
+
+    trace('STRING eof_string')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
+  		end
+		begin
+
+    trace('STRING 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
+
+    trace('DEFINE_NAMESPACE define_namespace_node_eof')
+    leaf = url()
+    string_node = @buffers.delete(:string)
+    unless string_node.nil?
+      leaf <<= string_node
+      leaf.complete = string_node.complete
+    end
+    domain_node = domain(leaf)
+    domain_node.complete = leaf.complete
+    namespace_definition_node = namespace_definition(domain_node)
+    namespace_definition_node.complete = domain_node.complete
+    yield namespace_definition_node
+  		end
 	when 15 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('STRING eof_string')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
+  		end
+		begin
+
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
   		end
 		begin
 
-    @buffers[:string] ||= []
+    trace('STRING string_node_eof')
     yield @buffers[:string]
   		end
 	  end
@@ -586,11 +758,11 @@ self._bel_trans_keys = [
 	9, 122, 9, 97, 83, 
 	115, 9, 32, 9, 117, 
 	82, 114, 76, 108, 9, 32, 
-	9, 34, 34, 92, 9, 
-	32, 9, 32, 92, 92, 
-	48, 122, 10, 122, 34, 34, 
-	34, 92, 10, 10, 92, 
-	92, 0, 0, 0, 0, 
+	9, 34, 34, 92, 34, 
+	92, 10, 10, 0, 0, 
+	48, 122, 9, 34, 34, 92, 
+	34, 92, 0, 0, 0, 
+	0, 10, 122, 0, 0, 
 	0, 0, 0
 ]
 
@@ -602,8 +774,8 @@ self._bel_key_spans = [
 	0, 33, 33, 33, 33, 33, 33, 24, 
 	102, 33, 33, 33, 33, 33, 33, 33, 
 	33, 24, 114, 114, 89, 33, 24, 109, 
-	33, 33, 24, 26, 59, 24, 24, 1, 
-	75, 113, 1, 59, 1, 1, 0, 0, 
+	33, 33, 24, 26, 59, 59, 1, 0, 
+	75, 26, 59, 59, 0, 0, 113, 0, 
 	0
 ]
 
@@ -615,9 +787,9 @@ self._bel_index_offsets = [
 	0, 0, 34, 68, 102, 136, 170, 204, 
 	229, 332, 366, 400, 434, 468, 502, 536, 
 	570, 604, 629, 744, 859, 949, 983, 1008, 
-	1118, 1152, 1186, 1211, 1238, 1298, 1323, 1348, 
-	1350, 1426, 1540, 1542, 1602, 1604, 1606, 1607, 
-	1608
+	1118, 1152, 1186, 1211, 1238, 1298, 1358, 1360, 
+	1361, 1437, 1464, 1524, 1584, 1585, 1586, 1700, 
+	1701
 ]
 
 class << self
@@ -776,57 +948,68 @@ self._bel_indicies = [
 	28, 1, 29, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 29, 1, 29, 30, 30, 30, 30, 
+	1, 29, 1, 31, 31, 31, 31, 31, 
 	30, 30, 30, 30, 30, 30, 30, 30, 
 	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 29, 30, 31, 30, 33, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	34, 32, 35, 36, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 35, 30, 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, 34, 32, 40, 40, 
+	30, 30, 31, 30, 32, 30, 34, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	35, 33, 37, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 38, 36, 39, 30, 
+	36, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 1, 1, 1, 1, 1, 
+	1, 1, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
-	39, 39, 39, 39, 39, 39, 39, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 1, 1, 1, 1, 
+	40, 1, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 39, 39, 39, 39, 40, 39, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 39, 41, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 39, 39, 39, 39, 39, 39, 
-	39, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 39, 39, 39, 39, 42, 
-	39, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 39, 44, 43, 46, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	47, 45, 48, 43, 47, 45, 1, 1, 
-	1, 0
+	40, 40, 40, 40, 1, 42, 42, 42, 
+	42, 42, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 42, 41, 43, 41, 
+	45, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 46, 44, 48, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 49, 47, 
+	47, 1, 51, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 50, 50, 50, 50, 50, 50, 
+	50, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 50, 50, 50, 50, 52, 
+	50, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 50, 50, 41, 0
 ]
 
 class << self
@@ -837,10 +1020,10 @@ self._bel_trans_targs = [
 	2, 0, 3, 4, 5, 6, 7, 8, 
 	9, 10, 11, 12, 13, 14, 15, 16, 
 	17, 18, 0, 19, 20, 19, 20, 21, 
-	22, 23, 24, 25, 26, 27, 0, 28, 
-	28, 29, 31, 30, 38, 30, 38, 0, 
-	33, 39, 33, 0, 35, 35, 36, 37, 
-	40
+	22, 23, 24, 25, 26, 27, 0, 27, 
+	28, 29, 30, 31, 29, 30, 31, 37, 
+	38, 0, 33, 34, 35, 40, 36, 35, 
+	40, 36, 0, 39, 38
 ]
 
 class << self
@@ -850,11 +1033,11 @@ end
 self._bel_trans_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	1, 0, 2, 3, 4, 5, 0, 0, 
-	0, 0, 0, 0, 6, 0, 7, 8, 
-	9, 9, 9, 10, 11, 0, 12, 13, 
-	3, 14, 5, 15, 8, 9, 9, 9, 
-	16
+	0, 0, 2, 3, 4, 0, 0, 0, 
+	0, 0, 0, 0, 0, 5, 7, 0, 
+	0, 9, 10, 9, 0, 11, 0, 12, 
+	3, 14, 0, 0, 9, 16, 9, 0, 
+	17, 0, 19, 20, 0
 ]
 
 class << self
@@ -864,9 +1047,9 @@ end
 self._bel_eof_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 2, 2, 0, 0, 0, 0, 
-	0, 0, 0, 7, 7, 7, 0, 7, 
-	13, 13, 15, 15, 15, 15, 0, 0, 
+	0, 0, 1, 1, 0, 0, 0, 0, 
+	0, 0, 0, 6, 8, 8, 7, 8, 
+	0, 13, 15, 15, 15, 0, 18, 21, 
 	0
 ]
 
@@ -877,24 +1060,24 @@ self.bel_start = 1;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 38;
+self.bel_first_final = 37;
 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 = 32;
+self.bel_en_ident_node = 32;
 class << self
-	attr_accessor :bel_en_string
+	attr_accessor :bel_en_string_node
 end
-self.bel_en_string = 34;
+self.bel_en_string_node = 33;
 class << self
-	attr_accessor :bel_en_define_namespace
+	attr_accessor :bel_en_define_namespace_node
 end
-self.bel_en_define_namespace = 1;
+self.bel_en_define_namespace_node = 1;
 
 
 begin
@@ -939,141 +1122,198 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 5 then
-		begin
-
-    (@buffers[:ident] ||= []) << data[p].ord
-  		end
-	when 2 then
+	when 3 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
-	when 9 then
+	when 20 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 7 then
+	when 2 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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 1 then
+	when 19 then
 		begin
 
-    @buffers[:namespace_definition] = namespace_definition()
+    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 6 then
+	when 9 then
 		begin
 
-    @buffers[:namespace_definition] = @buffers[:namespace_definition] << domain(url())
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
-	when 12 then
+	when 7 then
 		begin
 
-    yield @buffers[:namespace_definition]
+    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 3 then
+	when 14 then
 		begin
 
-    @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
+	when 5 then
 		begin
 
-    (@buffers[:ident] ||= []) << data[p].ord
+    trace('DEFINE_NAMESPACE add_url_domain')
+    @url_domain = true
   		end
-	when 14 then
+	when 4 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('DEFINE_NAMESPACE add_name')
+    name = @buffers.delete(:ident)
+    @buffers[:namespace_definition_name] = name
   		end
-	when 4 then
+	when 11 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    @buffers[:namespace_definition] = @buffers[:namespace_definition] << keyword(@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 13 then
+	when 10 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
 		begin
 
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 8 then
 		begin
 
-    @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 17 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 16 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING string_end')
+    completed = @string_opened && @string_closed
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: true)
+    @buffers[:string] = ast_node
   		end
 		begin
 
+    trace('STRING yield_string')
     yield @buffers[:string]
   		end
-	when 10 then
+	when 12 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('DEFINE_NAMESPACE add_string_value')
+    string_node = @buffers.delete(:string)
+    leaf = domain(url(string_node))
+    leaf.complete = string_node.complete
+    @buffers[:namespace_definition_domain] = leaf
   		end
 		begin
 
-    keyword, domain                 = @buffers[:namespace_definition].children
-    domain                          = domain(
-                                        domain.children[0] << @buffers[:string])
-    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
+    trace('DEFINE_NAMESPACE define_namespace_end')
+    namespace_definition_node = namespace_definition()
+
+    name = @buffers.delete(:namespace_definition_name)
+    namespace_definition_node <<= keyword(name)
+
+    domain = @buffers.delete(:namespace_definition_domain)
+    unless domain.nil?
+      namespace_definition_node <<= domain
+      namespace_definition_node.complete = domain.complete
+    end
+    @buffers[:namespace_definition] = namespace_definition_node
   		end
-	when 15 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('DEFINE_NAMESPACE yield_define_namespace')
+    yield @buffers[:namespace_definition]
   		end
+	when 16 then
 		begin
 
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    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
 
-    keyword, domain                 = @buffers[:namespace_definition].children
-    domain                          = domain(
-                                        domain.children[0] << @buffers[:string])
-    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
+    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
 
-    yield @buffers[:namespace_definition]
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
 	end
 	end
@@ -1092,42 +1332,146 @@ begin
 	if _goto_level <= _test_eof
 	if p == eof
 	  case _bel_eof_actions[cs]
-	when 2 then
+	when 21 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 7 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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 13 then
+	when 18 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    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
+	when 1 then
+		begin
+
+    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
+
+    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 6 then
+		begin
+
+    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
+
+    trace('DEFINE_NAMESPACE define_namespace_node_eof')
+    leaf = url()
+    string_node = @buffers.delete(:string)
+    unless string_node.nil?
+      leaf <<= string_node
+      leaf.complete = string_node.complete
+    end
+    domain_node = domain(leaf)
+    domain_node.complete = leaf.complete
+    namespace_definition_node = namespace_definition(domain_node)
+    namespace_definition_node.complete = domain_node.complete
+    yield namespace_definition_node
+  		end
+	when 13 then
+		begin
+
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
+  		end
+		begin
+
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
+  		end
+	when 8 then
+		begin
+
+    trace('STRING eof_string')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
+  		end
+		begin
+
+    trace('STRING 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
+
+    trace('DEFINE_NAMESPACE define_namespace_node_eof')
+    leaf = url()
+    string_node = @buffers.delete(:string)
+    unless string_node.nil?
+      leaf <<= string_node
+      leaf.complete = string_node.complete
+    end
+    domain_node = domain(leaf)
+    domain_node.complete = leaf.complete
+    namespace_definition_node = namespace_definition(domain_node)
+    namespace_definition_node.complete = domain_node.complete
+    yield namespace_definition_node
+  		end
 	when 15 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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[:string] ||= []
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
+  		end
+		begin
+
+    trace('STRING string_node_eof')
     yield @buffers[:string]
   		end
 	  end
@@ -1147,6 +1491,7 @@ end
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -1172,10 +1517,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
@@ -1192,11 +1538,11 @@ self._bel_trans_keys = [
 	9, 122, 9, 97, 83, 
 	115, 9, 32, 9, 117, 
 	82, 114, 76, 108, 9, 32, 
-	9, 34, 34, 92, 9, 
-	32, 9, 32, 92, 92, 
-	48, 122, 10, 122, 34, 34, 
-	34, 92, 10, 10, 92, 
-	92, 0, 0, 0, 0, 
+	9, 34, 34, 92, 34, 
+	92, 10, 10, 0, 0, 
+	48, 122, 9, 34, 34, 92, 
+	34, 92, 0, 0, 0, 
+	0, 10, 122, 0, 0, 
 	0, 0, 0
 ]
 
@@ -1208,8 +1554,8 @@ self._bel_key_spans = [
 	0, 33, 33, 33, 33, 33, 33, 24, 
 	102, 33, 33, 33, 33, 33, 33, 33, 
 	33, 24, 114, 114, 89, 33, 24, 109, 
-	33, 33, 24, 26, 59, 24, 24, 1, 
-	75, 113, 1, 59, 1, 1, 0, 0, 
+	33, 33, 24, 26, 59, 59, 1, 0, 
+	75, 26, 59, 59, 0, 0, 113, 0, 
 	0
 ]
 
@@ -1221,9 +1567,9 @@ self._bel_index_offsets = [
 	0, 0, 34, 68, 102, 136, 170, 204, 
 	229, 332, 366, 400, 434, 468, 502, 536, 
 	570, 604, 629, 744, 859, 949, 983, 1008, 
-	1118, 1152, 1186, 1211, 1238, 1298, 1323, 1348, 
-	1350, 1426, 1540, 1542, 1602, 1604, 1606, 1607, 
-	1608
+	1118, 1152, 1186, 1211, 1238, 1298, 1358, 1360, 
+	1361, 1437, 1464, 1524, 1584, 1585, 1586, 1700, 
+	1701
 ]
 
 class << self
@@ -1382,57 +1728,68 @@ self._bel_indicies = [
 	28, 1, 29, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 29, 1, 29, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 30, 29, 30, 31, 30, 33, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 
-	34, 32, 35, 36, 30, 30, 30, 30, 
+	1, 29, 1, 31, 31, 31, 31, 31, 
 	30, 30, 30, 30, 30, 30, 30, 30, 
 	30, 30, 30, 30, 30, 30, 30, 30, 
-	30, 35, 30, 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, 34, 32, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	39, 39, 39, 39, 39, 39, 39, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
+	30, 30, 31, 30, 32, 30, 34, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	33, 33, 33, 33, 33, 33, 33, 33, 
+	35, 33, 37, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 36, 36, 36, 36, 
+	36, 36, 36, 36, 38, 36, 39, 30, 
+	36, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 1, 1, 1, 1, 1, 
+	1, 1, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 39, 39, 39, 39, 40, 39, 40, 
+	40, 40, 40, 40, 1, 1, 1, 1, 
+	40, 1, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
 	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 40, 40, 40, 40, 40, 40, 40, 
-	40, 39, 41, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 39, 39, 39, 39, 39, 39, 
-	39, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 39, 39, 39, 39, 42, 
-	39, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 42, 42, 39, 44, 43, 46, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	45, 45, 45, 45, 45, 45, 45, 45, 
-	47, 45, 48, 43, 47, 45, 1, 1, 
-	1, 0
+	40, 40, 40, 40, 1, 42, 42, 42, 
+	42, 42, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 42, 41, 43, 41, 
+	45, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 44, 
+	44, 44, 46, 44, 48, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 49, 47, 
+	47, 1, 51, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 50, 50, 50, 50, 50, 50, 
+	50, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 50, 50, 50, 50, 52, 
+	50, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 52, 52, 52, 52, 52, 
+	52, 52, 52, 50, 50, 41, 0
 ]
 
 class << self
@@ -1443,10 +1800,10 @@ self._bel_trans_targs = [
 	2, 0, 3, 4, 5, 6, 7, 8, 
 	9, 10, 11, 12, 13, 14, 15, 16, 
 	17, 18, 0, 19, 20, 19, 20, 21, 
-	22, 23, 24, 25, 26, 27, 0, 28, 
-	28, 29, 31, 30, 38, 30, 38, 0, 
-	33, 39, 33, 0, 35, 35, 36, 37, 
-	40
+	22, 23, 24, 25, 26, 27, 0, 27, 
+	28, 29, 30, 31, 29, 30, 31, 37, 
+	38, 0, 33, 34, 35, 40, 36, 35, 
+	40, 36, 0, 39, 38
 ]
 
 class << self
@@ -1456,11 +1813,11 @@ end
 self._bel_trans_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	1, 0, 2, 3, 4, 5, 0, 0, 
-	0, 0, 0, 0, 6, 0, 7, 8, 
-	9, 9, 9, 10, 11, 0, 12, 13, 
-	3, 14, 5, 15, 8, 9, 9, 9, 
-	16
+	0, 0, 2, 3, 4, 0, 0, 0, 
+	0, 0, 0, 0, 0, 5, 7, 0, 
+	0, 9, 10, 9, 0, 11, 0, 12, 
+	3, 14, 0, 0, 9, 16, 9, 0, 
+	17, 0, 19, 20, 0
 ]
 
 class << self
@@ -1470,9 +1827,9 @@ end
 self._bel_eof_actions = [
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 2, 2, 0, 0, 0, 0, 
-	0, 0, 0, 7, 7, 7, 0, 7, 
-	13, 13, 15, 15, 15, 15, 0, 0, 
+	0, 0, 1, 1, 0, 0, 0, 0, 
+	0, 0, 0, 6, 8, 8, 7, 8, 
+	0, 13, 15, 15, 15, 0, 18, 21, 
 	0
 ]
 
@@ -1483,38 +1840,39 @@ self.bel_start = 1;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 38;
+self.bel_first_final = 37;
 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 = 32;
+self.bel_en_ident_node = 32;
 class << self
-	attr_accessor :bel_en_string
+	attr_accessor :bel_en_string_node
 end
-self.bel_en_string = 34;
+self.bel_en_string_node = 33;
 class << self
-	attr_accessor :bel_en_define_namespace
+	attr_accessor :bel_en_define_namespace_node
 end
-self.bel_en_define_namespace = 1;
+self.bel_en_define_namespace_node = 1;
 
 
-      # end: ragel        
+      # end: ragel
           end
 
           def each
-            @buffers = {}
-            stack    = []
-            data     = @content.unpack('C*')
-            p        = 0
-            pe       = data.length
-            eof      = data.length
-
-      # begin: ragel        
+            @buffers =    {}
+            @incomplete = {}
+            stack       = []
+            data        = @content.unpack('C*')
+            p           = 0
+            pe          = data.length
+            eof         = data.length
+
+      # begin: ragel
             
 begin
 	p ||= 0
@@ -1559,141 +1917,198 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 5 then
-		begin
-
-    (@buffers[:ident] ||= []) << data[p].ord
-  		end
-	when 2 then
+	when 3 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('IDENTIFIER start_identifier')
+    @identifier_started = true
+    id_start = p;
   		end
-	when 9 then
+	when 20 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 7 then
+	when 2 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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 1 then
+	when 19 then
 		begin
 
-    @buffers[:namespace_definition] = namespace_definition()
+    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 6 then
+	when 9 then
 		begin
 
-    @buffers[:namespace_definition] = @buffers[:namespace_definition] << domain(url())
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
-	when 12 then
+	when 7 then
 		begin
 
-    yield @buffers[:namespace_definition]
+    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 3 then
+	when 14 then
 		begin
 
-    @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
+	when 5 then
 		begin
 
-    (@buffers[:ident] ||= []) << data[p].ord
+    trace('DEFINE_NAMESPACE add_url_domain')
+    @url_domain = true
   		end
-	when 14 then
+	when 4 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('DEFINE_NAMESPACE add_name')
+    name = @buffers.delete(:ident)
+    @buffers[:namespace_definition_name] = name
   		end
-	when 4 then
+	when 11 then
 		begin
 
-    @buffers[:ident] = identifier(utf8_string(@buffers[:ident]))
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
 		begin
 
-    @buffers[:namespace_definition] = @buffers[:namespace_definition] << keyword(@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 13 then
+	when 10 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    trace('STRING start_string')
+    @string_opened = true
+    p_start = p
   		end
 		begin
 
-    @buffers[:ident] ||= []
-    yield @buffers[:ident]
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 8 then
 		begin
 
-    @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 17 then
 		begin
 
-    (@buffers[:string] ||= []) << data[p].ord
+    trace('STRING stop_string')
+    @string_closed = true
+    p_end = p
   		end
-	when 16 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('STRING string_end')
+    completed = @string_opened && @string_closed
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: true)
+    @buffers[:string] = ast_node
   		end
 		begin
 
+    trace('STRING yield_string')
     yield @buffers[:string]
   		end
-	when 10 then
+	when 12 then
 		begin
 
-    @buffers[:string] = string(utf8_string(@buffers[:string]))
+    trace('DEFINE_NAMESPACE add_string_value')
+    string_node = @buffers.delete(:string)
+    leaf = domain(url(string_node))
+    leaf.complete = string_node.complete
+    @buffers[:namespace_definition_domain] = leaf
   		end
 		begin
 
-    keyword, domain                 = @buffers[:namespace_definition].children
-    domain                          = domain(
-                                        domain.children[0] << @buffers[:string])
-    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
+    trace('DEFINE_NAMESPACE define_namespace_end')
+    namespace_definition_node = namespace_definition()
+
+    name = @buffers.delete(:namespace_definition_name)
+    namespace_definition_node <<= keyword(name)
+
+    domain = @buffers.delete(:namespace_definition_domain)
+    unless domain.nil?
+      namespace_definition_node <<= domain
+      namespace_definition_node.complete = domain.complete
+    end
+    @buffers[:namespace_definition] = namespace_definition_node
   		end
-	when 15 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('DEFINE_NAMESPACE yield_define_namespace')
+    yield @buffers[:namespace_definition]
   		end
+	when 16 then
 		begin
 
-    @buffers[:string] ||= []
-    yield @buffers[:string]
+    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
 
-    keyword, domain                 = @buffers[:namespace_definition].children
-    domain                          = domain(
-                                        domain.children[0] << @buffers[:string])
-    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
+    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
 
-    yield @buffers[:namespace_definition]
+    trace('STRING yield_string')
+    yield @buffers[:string]
   		end
 	end
 	end
@@ -1712,42 +2127,146 @@ begin
 	if _goto_level <= _test_eof
 	if p == eof
 	  case _bel_eof_actions[cs]
-	when 2 then
+	when 21 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 7 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    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 13 then
+	when 18 then
 		begin
 
-    unless @buffers[:ident].is_a?(::AST::Node)
-      @buffers[:ident] ||= []
-      @buffers[:ident]   = identifier(utf8_string(@buffers[:ident]).sub(/\n$/, ''))
-    end
+    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
+	when 1 then
+		begin
+
+    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
+
+    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 6 then
+		begin
+
+    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
+
+    trace('DEFINE_NAMESPACE define_namespace_node_eof')
+    leaf = url()
+    string_node = @buffers.delete(:string)
+    unless string_node.nil?
+      leaf <<= string_node
+      leaf.complete = string_node.complete
+    end
+    domain_node = domain(leaf)
+    domain_node.complete = leaf.complete
+    namespace_definition_node = namespace_definition(domain_node)
+    namespace_definition_node.complete = domain_node.complete
+    yield namespace_definition_node
+  		end
+	when 13 then
+		begin
+
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
+  		end
+		begin
+
+    trace('STRING string_node_eof')
+    yield @buffers[:string]
+  		end
+	when 8 then
+		begin
+
+    trace('STRING eof_string')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
+  		end
+		begin
+
+    trace('STRING 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
+
+    trace('DEFINE_NAMESPACE define_namespace_node_eof')
+    leaf = url()
+    string_node = @buffers.delete(:string)
+    unless string_node.nil?
+      leaf <<= string_node
+      leaf.complete = string_node.complete
+    end
+    domain_node = domain(leaf)
+    domain_node.complete = leaf.complete
+    namespace_definition_node = namespace_definition(domain_node)
+    namespace_definition_node.complete = domain_node.complete
+    yield namespace_definition_node
+  		end
 	when 15 then
 		begin
 
-    @buffers[:string] ||= []
-    @buffers[:string] = string(utf8_string(@buffers[:string]).sub(/\n$/, ''))
+    trace('STRING eof_string')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    @buffers[:string] = ast_node
+  		end
+		begin
+
+    trace('STRING string_node_err')
+    p_end = p
+    chars = data[p_start...p_end]
+    ast_node = string(utf8_string(chars), complete: false)
+    yield ast_node
   		end
 		begin
 
-    @buffers[:string] ||= []
+    trace('STRING string_node_eof')
     yield @buffers[:string]
   		end
 	  end
@@ -1760,7 +2279,7 @@ begin
 end
 	end
 
-      # end: ragel        
+      # end: ragel
           end
         end
       end