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

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

@@ -6,25 +6,50 @@
   include 'common.rl';
   include 'identifier.rl';
 
-  UNSET  = [uU][nN][sS][eE][tT];
-
-  action unset_keyword {
-    @buffers[:unset] = unset()
+  action add_name {
+    trace('UNSET add_name')
+    key = @buffers.delete(:ident)
+    @buffers[:unset_name] = key
   }
 
-  action name  {
-    @buffers[:unset] = @buffers[:unset] << name(@buffers[:ident])
+  action unset_end {
+    trace('UNSET unset_end')
+    name = @buffers.delete(:unset_name)
+    unless name.nil?
+      unset_node = unset(name, complete: name.complete)
+    else
+      unset_node = unset(complete: false)
+    end
+    @buffers[:unset] = unset_node
   }
 
-  action yield_set {
+  action yield_unset {
+    trace('UNSET yield_unset')
     yield @buffers[:unset]
   }
 
-  unset :=
-    UNSET %unset_keyword
+  action set_node_eof {
+    trace('UNSET set_node_eof')
+  }
+
+  an_unset =
+    KW_UNSET
     SP+
-    IDENT %name
-    NL @yield_set;
+    an_ident
+    %add_name
+    @eof(set_node_eof)
+    %unset_end
+    ;
+
+  unset_ast_node :=
+    KW_UNSET
+    SP+?
+    an_ident?
+    %add_name
+    @eof(set_node_eof)
+    %unset_end
+    %yield_unset
+    ;
 }%%
 =end
 # end: ragel
@@ -32,6 +57,7 @@
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -57,25 +83,27 @@ module BELParser
           include Enumerable
           include BELParser::Parsers::Buffer
           include BELParser::Parsers::AST::Sexp
+          include BELParser::Parsers::Tracer
 
           def initialize(content)
             @content = content
-      # begin: ragel        
+      # begin: ragel
             %% write data;
-      # end: ragel        
+      # end: ragel
           end
 
           def each
-            @buffers = {}
-            data     = @content.unpack('C*')
-            p        = 0
-            pe       = data.length
-            eof      = data.length
-
-      # begin: ragel        
+            @buffers    = {}
+            @incomplete = {}
+            data        = @content.unpack('C*')
+            p           = 0
+            pe          = data.length
+            eof         = data.length
+
+      # begin: ragel
             %% write init;
             %% write exec;
-      # end: ragel        
+      # end: ragel
           end
         end
       end

data/lib/bel_parser/parsers/common.rb

@@ -3,3 +3,4 @@ require_relative 'common/comment_line'
 require_relative 'common/identifier'
 require_relative 'common/string'
 require_relative 'common/list'
+require_relative 'common/function'

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

@@ -37,7 +37,7 @@ module BELParser
 
           def initialize(content)
             @content = content
-      # begin: ragel        
+      # begin: ragel
             
 class << self
 	attr_accessor :_bel_trans_keys
@@ -98,28 +98,29 @@ self.bel_start = 1;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 2;
+self.bel_first_final = 1;
 class << self
 	attr_accessor :bel_error
 end
 self.bel_error = 0;
 
 class << self
-	attr_accessor :bel_en_blank
+	attr_accessor :bel_en_bl_ast
 end
-self.bel_en_blank = 1;
+self.bel_en_bl_ast = 1;
 
 
-      # end: ragel        
+      # end: ragel
           end
 
           def each
-            @buffers = {}
-            data     = @content.unpack('C*')
-            p        = 0
-            pe       = data.length
+            @buffers    = {}
+            @incomplete = {}
+            data        = @content.unpack('C*')
+            p           = 0
+            pe          = data.length
 
-      # begin: ragel        
+      # begin: ragel
             
 begin
 	p ||= 0
@@ -191,7 +192,7 @@ begin
 end
 	end
 
-      # end: ragel        
+      # end: ragel
           end
         end
       end

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

@@ -5,13 +5,12 @@
 
   include 'common.rl';
 
-  action yield_blank_line {
+  action blank_line_yield {
     yield blank_line
   }
 
-  BLANK  = SP*;
-
-  blank := BLANK %yield_blank_line NL;
+  blank = SP*;
+  bl_ast := blank NL? @blank_line_yield;
 }%%
 =end
 # end: ragel
@@ -47,21 +46,22 @@ module BELParser
 
           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
+            @buffers    = {}
+            @incomplete = {}
+            data        = @content.unpack('C*')
+            p           = 0
+            pe          = data.length
 
-      # begin: ragel        
+      # begin: ragel
             %% write init;
             %% write exec;
-      # end: ragel        
+      # end: ragel
           end
         end
       end

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

@@ -37,15 +37,16 @@ module BELParser
 
           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, 9, 35, 10, 10, 
-	10, 10, 0, 0, 0
+	0, 0, 9, 35, 9, 35, 
+	9, 32, 10, 10, 0, 
+	0, 0
 ]
 
 class << self
@@ -53,7 +54,7 @@ class << self
 	private :_bel_key_spans, :_bel_key_spans=
 end
 self._bel_key_spans = [
-	0, 27, 1, 1, 0
+	0, 27, 27, 24, 1, 0
 ]
 
 class << self
@@ -61,7 +62,7 @@ class << self
 	private :_bel_index_offsets, :_bel_index_offsets=
 end
 self._bel_index_offsets = [
-	0, 0, 28, 30, 32
+	0, 0, 28, 56, 81, 83
 ]
 
 class << self
@@ -72,8 +73,14 @@ self._bel_indicies = [
 	0, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 0, 
-	1, 1, 2, 1, 4, 3, 6, 5, 
-	1, 0
+	1, 1, 2, 1, 0, 3, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 0, 1, 1, 2, 1, 
+	5, 6, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 4, 4, 4, 
+	4, 4, 4, 4, 4, 4, 4, 5, 
+	4, 3, 7, 1, 0
 ]
 
 class << self
@@ -81,7 +88,7 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	1, 0, 2, 3, 4, 3, 4
+	1, 0, 3, 5, 4, 3, 5, 4
 ]
 
 class << self
@@ -89,38 +96,49 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	0, 0, 0, 1, 2, 3, 4
+	0, 0, 0, 1, 3, 3, 4, 5
+]
+
+class << self
+	attr_accessor :_bel_eof_actions
+	private :_bel_eof_actions, :_bel_eof_actions=
+end
+self._bel_eof_actions = [
+	0, 0, 0, 2, 0, 0
 ]
 
 class << self
 	attr_accessor :bel_start
 end
-self.bel_start = 1;
+self.bel_start = 2;
 class << self
 	attr_accessor :bel_first_final
 end
-self.bel_first_final = 4;
+self.bel_first_final = 2;
 class << self
 	attr_accessor :bel_error
 end
 self.bel_error = 0;
 
 class << self
-	attr_accessor :bel_en_comment_line
+	attr_accessor :bel_en_main
 end
-self.bel_en_comment_line = 1;
+self.bel_en_main = 2;
 
 
-      # end: ragel        
+      # end: ragel
           end
 
           def each
-            @buffers = {}
-            data     = @content.unpack('C*')
-            p        = 0
-            pe       = data.length
-
-      # begin: ragel        
+            @buffers    = {}
+            @started    = false
+            @incomplete = {}
+            data        = @content.unpack('C*')
+            p           = 0
+            pe          = data.length
+            eof         = data.length
+
+      # begin: ragel
             
 begin
 	p ||= 0
@@ -165,43 +183,39 @@ begin
 	cs = _bel_trans_targs[_trans]
 	if _bel_trans_actions[_trans] != 0
 	case _bel_trans_actions[_trans]
-	when 3 then
+	when 5 then
 		begin
 
-    @buffers[:comment_line] << data[p].ord
+    @incomplete[:comment_line] << data[p].ord
   		end
 	when 1 then
 		begin
 
-    @buffers[:comment_line] = []
-  		end
-		begin
-
-    @buffers[:comment_line] << data[p].ord
-  		end
-	when 4 then
-		begin
-
-    @buffers[:comment_line] = comment_line(
-                                utf8_string(@buffers[:comment_line]))
+    cl = @incomplete.delete(:comment_line) || []
+    completed = @started
+    yield comment_line(utf8_string(cl), complete: completed)
   		end
+	when 3 then
 		begin
 
-    yield @buffers[:comment_line]
+    @incomplete[:comment_line] = []
+    @started = true
   		end
-	when 2 then
 		begin
 
-    @buffers[:comment_line] = []
+    @incomplete[:comment_line] << data[p].ord
   		end
+	when 4 then
 		begin
 
-    @buffers[:comment_line] = comment_line(
-                                utf8_string(@buffers[:comment_line]))
+    @incomplete[:comment_line] = []
+    @started = true
   		end
 		begin
 
-    yield @buffers[:comment_line]
+    cl = @incomplete.delete(:comment_line) || []
+    completed = @started
+    yield comment_line(utf8_string(cl), complete: completed)
   		end
 	end
 	end
@@ -218,6 +232,17 @@ begin
 	end
 	end
 	if _goto_level <= _test_eof
+	if p == eof
+	  case _bel_eof_actions[cs]
+	when 2 then
+		begin
+
+    @incomplete[:comment_line] = []
+    @started = true
+  		end
+	  end
+	end
+
 	end
 	if _goto_level <= _out
 		break
@@ -225,7 +250,7 @@ begin
 end
 	end
 
-      # end: ragel        
+      # end: ragel
           end
         end
       end

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

@@ -5,29 +5,26 @@
 
   include 'common.rl';
 
-  action start_comment_line {
-    @buffers[:comment_line] = []
+  action comment_line_start {
+    @incomplete[:comment_line] = []
+    @started = true
   }
 
-  action append_comment_line {
-    @buffers[:comment_line] << fc
+  action comment_line_more {
+    @incomplete[:comment_line] << fc
   }
 
-  action finish_comment_line {
-    @buffers[:comment_line] = comment_line(
-                                utf8_string(@buffers[:comment_line]))
+  action comment_line_yield {
+    cl = @incomplete.delete(:comment_line) || []
+    completed = @started
+    yield comment_line(utf8_string(cl), complete: completed)
   }
 
-  action yield_comment_line {
-    yield @buffers[:comment_line]
-  }
-
-  COMMENT_LINE  =
-    SP*
-    NUMBER_SIGN
-    (any - NL)* >start_comment_line $append_comment_line %finish_comment_line;
-
-  comment_line := COMMENT_LINE %yield_comment_line NL;
+  comment_start = SP* NUMBER_SIGN SP*;
+  comment = comment_start (any - NL)*
+            >comment_line_start
+            $comment_line_more;
+  main := comment? NL? @comment_line_yield;
 }%%
 =end
 # end: ragel
@@ -63,21 +60,24 @@ module BELParser
 
           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
-
-      # begin: ragel        
+            @buffers    = {}
+            @started    = false
+            @incomplete = {}
+            data        = @content.unpack('C*')
+            p           = 0
+            pe          = data.length
+            eof         = data.length
+
+      # begin: ragel
             %% write init;
             %% write exec;
-      # end: ragel        
+      # end: ragel
           end
         end
       end