bel_parser 1.0.0.alpha.5 → 1.0.0.alpha.6

data/lib/bel_parser/parsers/expression/{statement_nested.rb → nested_statement.rb}

@@ -1379,17 +1379,17 @@ class << self
 end
 self.bel_en_comment = 65;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 69;
+self.bel_en_simple_statement = 69;
 class << self
 	attr_accessor :bel_en_inner_statement
 end
 self.bel_en_inner_statement = 103;
 class << self
-	attr_accessor :bel_en_statement_nested
+	attr_accessor :bel_en_nested_statement
 end
-self.bel_en_statement_nested = 1;
+self.bel_en_nested_statement = 1;
 
 
 begin
@@ -1522,7 +1522,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -1747,7 +1747,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -1785,7 +1785,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -3595,17 +3595,17 @@ class << self
 end
 self.bel_en_comment = 65;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 69;
+self.bel_en_simple_statement = 69;
 class << self
 	attr_accessor :bel_en_inner_statement
 end
 self.bel_en_inner_statement = 103;
 class << self
-	attr_accessor :bel_en_statement_nested
+	attr_accessor :bel_en_nested_statement
 end
-self.bel_en_statement_nested = 1;
+self.bel_en_nested_statement = 1;
 
 
 begin
@@ -3738,7 +3738,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -3963,7 +3963,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -4001,7 +4001,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -5811,17 +5811,17 @@ class << self
 end
 self.bel_en_comment = 65;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 69;
+self.bel_en_simple_statement = 69;
 class << self
 	attr_accessor :bel_en_inner_statement
 end
 self.bel_en_inner_statement = 103;
 class << self
-	attr_accessor :bel_en_statement_nested
+	attr_accessor :bel_en_nested_statement
 end
-self.bel_en_statement_nested = 1;
+self.bel_en_nested_statement = 1;
 
 
 begin
@@ -5954,7 +5954,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -6179,7 +6179,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -6217,7 +6217,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -8027,17 +8027,17 @@ class << self
 end
 self.bel_en_comment = 65;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 69;
+self.bel_en_simple_statement = 69;
 class << self
 	attr_accessor :bel_en_inner_statement
 end
 self.bel_en_inner_statement = 103;
 class << self
-	attr_accessor :bel_en_statement_nested
+	attr_accessor :bel_en_nested_statement
 end
-self.bel_en_statement_nested = 1;
+self.bel_en_nested_statement = 1;
 
 
 begin
@@ -8170,7 +8170,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -8395,7 +8395,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -8433,7 +8433,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -10243,17 +10243,17 @@ class << self
 end
 self.bel_en_comment = 65;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 69;
+self.bel_en_simple_statement = 69;
 class << self
 	attr_accessor :bel_en_inner_statement
 end
 self.bel_en_inner_statement = 103;
 class << self
-	attr_accessor :bel_en_statement_nested
+	attr_accessor :bel_en_nested_statement
 end
-self.bel_en_statement_nested = 1;
+self.bel_en_nested_statement = 1;
 
 
 begin
@@ -10386,7 +10386,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -10611,7 +10611,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -10649,7 +10649,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -12459,17 +12459,17 @@ class << self
 end
 self.bel_en_comment = 65;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 69;
+self.bel_en_simple_statement = 69;
 class << self
 	attr_accessor :bel_en_inner_statement
 end
 self.bel_en_inner_statement = 103;
 class << self
-	attr_accessor :bel_en_statement_nested
+	attr_accessor :bel_en_nested_statement
 end
-self.bel_en_statement_nested = 1;
+self.bel_en_nested_statement = 1;
 
 
 begin
@@ -12602,7 +12602,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -12827,7 +12827,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -12865,7 +12865,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -14675,17 +14675,17 @@ class << self
 end
 self.bel_en_comment = 65;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 69;
+self.bel_en_simple_statement = 69;
 class << self
 	attr_accessor :bel_en_inner_statement
 end
 self.bel_en_inner_statement = 103;
 class << self
-	attr_accessor :bel_en_statement_nested
+	attr_accessor :bel_en_nested_statement
 end
-self.bel_en_statement_nested = 1;
+self.bel_en_nested_statement = 1;
 
 
 begin
@@ -14818,7 +14818,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -15043,7 +15043,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -15081,7 +15081,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -15525,7 +15525,7 @@ require_relative '../nonblocking_io_wrapper'
 module BELParser
   module Parsers
     module Expression
-      module StatementNested
+      module NestedStatement
 
         class << self
 
@@ -16928,17 +16928,17 @@ class << self
 end
 self.bel_en_comment = 65;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 69;
+self.bel_en_simple_statement = 69;
 class << self
 	attr_accessor :bel_en_inner_statement
 end
 self.bel_en_inner_statement = 103;
 class << self
-	attr_accessor :bel_en_statement_nested
+	attr_accessor :bel_en_nested_statement
 end
-self.bel_en_statement_nested = 1;
+self.bel_en_nested_statement = 1;
 
 
       # end: ragel        
@@ -17086,7 +17086,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -17311,7 +17311,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -17349,7 +17349,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -17792,7 +17792,7 @@ end
 
 if __FILE__ == $0
   $stdin.each_line do |line|
-    BELParser::Parsers::Expression::StatementNested.parse(line) { |obj|
+    BELParser::Parsers::Expression::NestedStatement.parse(line) { |obj|
       puts obj.inspect
     }
   end

data/lib/bel_parser/parsers/expression/{statement_nested.rl → nested_statement.rl}

@@ -3,7 +3,7 @@
 %%{
   machine bel;
 
-  include 'statement_simple.rl';
+  include 'simple_statement.rl';
 
   action statement_init {
     @buffers[:statement_stack] = [ statement() ]
@@ -40,7 +40,7 @@
     fret;
   }
 
-  action yield_statement_nested {
+  action yield_nested_statement {
     yield nested_statement(@buffers[:statement_stack][-1])
   }
 
@@ -64,10 +64,10 @@
     # ')' @ast_object
     ;
 
-  statement_nested :=
+  nested_statement :=
     outer_statement
     SP*
-    COMMENT? %yield_statement_nested
+    COMMENT? %yield_nested_statement
     NL;
 }%%
 =end
@@ -80,7 +80,7 @@ require_relative '../nonblocking_io_wrapper'
 module BELParser
   module Parsers
     module Expression
-      module StatementNested
+      module NestedStatement
 
         class << self
 
@@ -131,7 +131,7 @@ end
 
 if __FILE__ == $0
   $stdin.each_line do |line|
-    BELParser::Parsers::Expression::StatementNested.parse(line) { |obj|
+    BELParser::Parsers::Expression::NestedStatement.parse(line) { |obj|
       puts obj.inspect
     }
   end

data/lib/bel_parser/parsers/expression/{statement_observed_term.rb → observed_term.rb}

@@ -647,9 +647,9 @@ class << self
 end
 self.bel_en_comment = 58;
 class << self
-	attr_accessor :bel_en_statement_observed_term
+	attr_accessor :bel_en_observed_term
 end
-self.bel_en_statement_observed_term = 1;
+self.bel_en_observed_term = 1;
 
 
 begin
@@ -1850,9 +1850,9 @@ class << self
 end
 self.bel_en_comment = 58;
 class << self
-	attr_accessor :bel_en_statement_observed_term
+	attr_accessor :bel_en_observed_term
 end
-self.bel_en_statement_observed_term = 1;
+self.bel_en_observed_term = 1;
 
 
 begin
@@ -3053,9 +3053,9 @@ class << self
 end
 self.bel_en_comment = 58;
 class << self
-	attr_accessor :bel_en_statement_observed_term
+	attr_accessor :bel_en_observed_term
 end
-self.bel_en_statement_observed_term = 1;
+self.bel_en_observed_term = 1;
 
 
 begin
@@ -4256,9 +4256,9 @@ class << self
 end
 self.bel_en_comment = 58;
 class << self
-	attr_accessor :bel_en_statement_observed_term
+	attr_accessor :bel_en_observed_term
 end
-self.bel_en_statement_observed_term = 1;
+self.bel_en_observed_term = 1;
 
 
 begin
@@ -5459,9 +5459,9 @@ class << self
 end
 self.bel_en_comment = 58;
 class << self
-	attr_accessor :bel_en_statement_observed_term
+	attr_accessor :bel_en_observed_term
 end
-self.bel_en_statement_observed_term = 1;
+self.bel_en_observed_term = 1;
 
 
 begin
@@ -6028,7 +6028,7 @@ require_relative '../nonblocking_io_wrapper'
 module BELParser
   module Parsers
     module Expression
-      module StatementObservedTerm
+      module ObservedTerm
 
         class << self
 
@@ -6699,9 +6699,9 @@ class << self
 end
 self.bel_en_comment = 58;
 class << self
-	attr_accessor :bel_en_statement_observed_term
+	attr_accessor :bel_en_observed_term
 end
-self.bel_en_statement_observed_term = 1;
+self.bel_en_observed_term = 1;
 
 
       # end: ragel        
@@ -7281,7 +7281,7 @@ end
 
 if __FILE__ == $0
   $stdin.each_line do |line|
-    BELParser::Parsers::Expression::StatementObservedTerm.parse(line) { |obj|
+    BELParser::Parsers::Expression::ObservedTerm.parse(line) { |obj|
       puts obj.inspect
     }
   end

data/lib/bel_parser/parsers/expression/{statement_observed_term.rl → observed_term.rl}

@@ -6,7 +6,7 @@
   include 'term.rl';
   include 'comment.rl';
 
-  action yield_statement_observed_term {
+  action yield_observed_term {
     @buffers[:comment] ||= comment(nil)
     yield observed_term(
             statement(
@@ -16,10 +16,10 @@
               @buffers[:comment]))
   }
 
-  statement_observed_term :=
+  observed_term :=
     outer_term 
     SP*
-    COMMENT? %yield_statement_observed_term
+    COMMENT? %yield_observed_term
     NL;
 }%%
 =end
@@ -32,7 +32,7 @@ require_relative '../nonblocking_io_wrapper'
 module BELParser
   module Parsers
     module Expression
-      module StatementObservedTerm
+      module ObservedTerm
 
         class << self
 
@@ -82,7 +82,7 @@ end
 
 if __FILE__ == $0
   $stdin.each_line do |line|
-    BELParser::Parsers::Expression::StatementObservedTerm.parse(line) { |obj|
+    BELParser::Parsers::Expression::ObservedTerm.parse(line) { |obj|
       puts obj.inspect
     }
   end