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

data/lib/bel_parser/parsers/expression/nested_statement.rl

@@ -6,50 +6,76 @@
   include 'simple_statement.rl';
 
   action statement_init {
+    trace('NESTED_STATEMENT statement_init')
     @buffers[:statement_stack] = [ statement() ]
   }
 
   action inner_statement_init {
+    trace('NESTED_STATEMENT inner_statement_init')
     @buffers[:statement_stack] << statement()
   }
 
   action ast_subject {
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:subject]
+    trace('NESTED_STATEMENT ast_subject')
+    subject_node = @buffers[:subject]
+    stmt = @buffers[:statement_stack][-1] << subject_node
+    @buffers[:statement_stack][-1] = stmt
   }
 
   action ast_relationship {
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:relationship]
+    trace('NESTED_STATEMENT ast_relationship')
+    rel_node = @buffers[:relationship]
+    stmt = @buffers[:statement_stack][-1] << rel_node
+    @buffers[:statement_stack][-1] = stmt
   }
 
   action ast_object {
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << @buffers[:object]
+    trace('NESTED_STATEMENT ast_object')
+    object_node = object(@buffers[:object])
+    stmt = @buffers[:statement_stack][-1] << object_node
+    @buffers[:statement_stack][-1] = stmt
   }
 
   action statement_object_statement {
+    trace('NESTED_STATEMENT statement_object_statement')
     @buffers[:object] = @buffers[:statement_stack][-1]
   }
 
   action call_nested_statement {
+    trace('NESTED_STATEMENT call_nested_statement')
     fcall inner_statement;
   }
 
   action fret {
+    trace('NESTED_STATEMENT fret')
     inner_statement = @buffers[:statement_stack].pop
     @buffers[:object] = inner_statement
-    @buffers[:statement_stack][-1] = @buffers[:statement_stack][-1] << object(inner_statement)
+    obj_node = object(inner_statement)
+    stmt = @buffers[:statement_stack][-1] << obj_node
+    @buffers[:statement_stack][-1] = stmt
+    nested_stmt = nested_statement(stmt)
+    nested_stmt.complete = true
+    @buffers[:nested_statement] = nested_stmt
     fret;
   }
 
+  action nested_statement_comment {
+    trace('NESTED_STATEMENT nested_statement_comment')
+    comment = @buffers[:comment]
+    @buffers[:nested_statement] =
+      nested_statement(
+        @buffers[:nested_statement].statement << comment)
+  }
+
   action yield_nested_statement {
-    comment   = @buffers[:comment] ||= comment(nil)
-    statement = @buffers[:statement_stack][-1] << comment
-    yield nested_statement(statement)
+    trace('NESTED_STATEMENT yield_nested_statement')
+    yield @buffers[:nested_statement]
   }
 
   inner_statement :=
     outer_term >inner_statement_init %statement_subject %ast_subject
     SP+
-    RELATIONSHIP %ast_relationship
+    relationship %relationship_end %ast_relationship
     SP+
     (
       outer_term @statement_object @ast_object |
@@ -59,18 +85,19 @@
   outer_statement =
     outer_term >statement_init %statement_subject %ast_subject
     SP+
-    RELATIONSHIP %ast_relationship
+    relationship %relationship_end %ast_relationship
     SP+
     '(' @call_nested_statement
     ')'
     # ')' @ast_object
     ;
 
+
   nested_statement :=
     outer_statement
     SP*
-    COMMENT? %yield_nested_statement
-    NL;
+    comment? %nested_statement_comment %yield_nested_statement
+    NL?;
 }%%
 =end
 # end: ragel
@@ -78,6 +105,7 @@
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -103,27 +131,29 @@ module BELParser
           include Enumerable
           include BELParser::Parsers::Buffer
           include BELParser::Parsers::AST::Sexp
+          include BELParser::Parsers::Tracer
 
           def initialize(content)
             @content = content
-      # begin: ragel        
+      # begin: ragel
             %% write data;
-      # end: ragel        
+      # end: ragel
           end
 
           def each
-            @buffers = {}
-            eof      = :ignored
-            stack    = []
-            data     = @content.unpack('C*')
-            p        = 0
-            pe       = data.length
-            eof      = data.length
-
-      # begin: ragel        
+            @buffers    = {}
+            @incomplete = {}
+            eof         = :ignored
+            stack       = []
+            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