bel_parser 1.0.0.alpha.38-java → 1.0.0.alpha.39-java

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