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

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

@@ -8,39 +8,53 @@
   include 'comment.rl';
 
   action statement_subject {
+    trace('SIMPLE_STATEMENT statement_subject')
     @buffers[:subject]    = subject(
                               @buffers[:term_stack][-1])
     @buffers[:term_stack] = nil
   }
 
   action statement_object {
-    @buffers[:object]     = object(
-                              @buffers[:term_stack][-1])
+    trace('SIMPLE_STATEMENT statement_object')
+    term = @buffers[:term_stack][-1]
+    @buffers[:object] = object(term)
     @buffers[:term_stack] = nil
+    sub = @buffers[:subject]
+    rel = @buffers[:relationship]
+    obj = @buffers[:object]
+    stmt = statement(sub, rel, obj)
+    simple_stmt = simple_statement(stmt)
+    simple_stmt.complete = true
+    @buffers[:simple_statement] = simple_stmt
+  }
+
+  action simple_statement_comment {
+    trace('SIMPLE_STATEMENT simple_statement_comment')
+    comment = @buffers[:comment]
+    @buffers[:simple_statement] =
+      simple_statement(
+        @buffers[:simple_statement].statement << comment)
   }
 
   action yield_simple_statement {
-    @buffers[:comment] ||= comment(nil)
-    yield simple_statement(
-            statement(
-              @buffers[:subject],
-              @buffers[:relationship],
-              @buffers[:object],
-              @buffers[:comment]))
+    trace('YIELD_SIMPLE_STATEMENT')
+    simple_stmt = @buffers.delete(:simple_statement)
+    yield simple_stmt
   }
 
   STATEMENT_SIMPLE =
     outer_term %statement_subject
     SP+
-    RELATIONSHIP
+    relationship %relationship_end
     SP+
-    outer_term %statement_object;
+    outer_term
+    %statement_object;
 
   simple_statement :=
     STATEMENT_SIMPLE
     SP*
-    COMMENT? %yield_simple_statement
-    NL;
+    comment? %simple_statement_comment %yield_simple_statement
+    NL?;
 }%%
 =end
 # end: ragel
@@ -48,6 +62,7 @@
 require_relative '../ast/node'
 require_relative '../mixin/buffer'
 require_relative '../nonblocking_io_wrapper'
+require_relative '../tracer'
 
 module BELParser
   module Parsers
@@ -73,26 +88,28 @@ 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 = {}
-            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
             %% write init;
             %% write exec;
-      # end: ragel        
+      # end: ragel
           end
         end
       end