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

data/lib/bel_parser/parsers/expression/{statement_simple.rb → simple_statement.rb}

@@ -869,9 +869,9 @@ class << self
 end
 self.bel_en_comment = 77;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 1;
+self.bel_en_simple_statement = 1;
 
 
 begin
@@ -1004,7 +1004,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -1188,7 +1188,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -1205,7 +1205,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -2355,9 +2355,9 @@ class << self
 end
 self.bel_en_comment = 77;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 1;
+self.bel_en_simple_statement = 1;
 
 
 begin
@@ -2490,7 +2490,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -2674,7 +2674,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -2691,7 +2691,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -3841,9 +3841,9 @@ class << self
 end
 self.bel_en_comment = 77;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 1;
+self.bel_en_simple_statement = 1;
 
 
 begin
@@ -3976,7 +3976,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -4160,7 +4160,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -4177,7 +4177,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -5327,9 +5327,9 @@ class << self
 end
 self.bel_en_comment = 77;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 1;
+self.bel_en_simple_statement = 1;
 
 
 begin
@@ -5462,7 +5462,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -5646,7 +5646,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -5663,7 +5663,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -6813,9 +6813,9 @@ class << self
 end
 self.bel_en_comment = 77;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 1;
+self.bel_en_simple_statement = 1;
 
 
 begin
@@ -6948,7 +6948,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -7132,7 +7132,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -7149,7 +7149,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -8299,9 +8299,9 @@ class << self
 end
 self.bel_en_comment = 77;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 1;
+self.bel_en_simple_statement = 1;
 
 
 begin
@@ -8434,7 +8434,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -8618,7 +8618,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -8635,7 +8635,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -8929,7 +8929,7 @@ require_relative '../nonblocking_io_wrapper'
 module BELParser
   module Parsers
     module Expression
-      module StatementSimple
+      module SimpleStatement
 
         class << self
 
@@ -9822,9 +9822,9 @@ class << self
 end
 self.bel_en_comment = 77;
 class << self
-	attr_accessor :bel_en_statement_simple
+	attr_accessor :bel_en_simple_statement
 end
-self.bel_en_statement_simple = 1;
+self.bel_en_simple_statement = 1;
 
 
       # end: ragel        
@@ -9971,7 +9971,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -10155,7 +10155,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -10172,7 +10172,7 @@ begin
 		begin
 
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -10465,7 +10465,7 @@ end
 
 if __FILE__ == $0
   $stdin.each_line do |line|
-    BELParser::Parsers::Expression::StatementSimple.parse(line) { |obj|
+    BELParser::Parsers::Expression::SimpleStatement.parse(line) { |obj|
       puts obj.inspect
     }
   end

data/lib/bel_parser/parsers/expression/{statement_simple.rl → simple_statement.rl}

@@ -19,9 +19,9 @@
     @buffers[:term_stack] = nil
   }
 
-  action yield_statement_simple {
+  action yield_simple_statement {
     @buffers[:comment] ||= comment(nil)
-    yield statement_simple(
+    yield simple_statement(
             statement(
               @buffers[:subject],
               @buffers[:relationship],
@@ -36,10 +36,10 @@
     SP+
     outer_term %statement_object;
 
-  statement_simple :=
+  simple_statement :=
     STATEMENT_SIMPLE
     SP*
-    COMMENT? %yield_statement_simple
+    COMMENT? %yield_simple_statement
     NL;
 }%%
 =end
@@ -52,7 +52,7 @@ require_relative '../nonblocking_io_wrapper'
 module BELParser
   module Parsers
     module Expression
-      module StatementSimple
+      module SimpleStatement
 
         class << self
 
@@ -102,7 +102,7 @@ end
 
 if __FILE__ == $0
   $stdin.each_line do |line|
-    BELParser::Parsers::Expression::StatementSimple.parse(line) { |obj|
+    BELParser::Parsers::Expression::SimpleStatement.parse(line) { |obj|
       puts obj.inspect
     }
   end

data/lib/bel_parser/parsers/expression.rb

@@ -2,6 +2,6 @@ require_relative 'expression/parameter'
 require_relative 'expression/term'
 require_relative 'expression/relationship'
 require_relative 'expression/comment'
-require_relative 'expression/statement_observed_term'
-require_relative 'expression/statement_simple'
-require_relative 'expression/statement_nested'
+require_relative 'expression/observed_term'
+require_relative 'expression/simple_statement'
+require_relative 'expression/nested_statement'

data/lib/bel_parser/parsers/line_parser.rb

@@ -18,9 +18,9 @@ module LINE
     BELParser::Parsers::Expression::Term,
     BELParser::Parsers::Expression::Relationship,
     BELParser::Parsers::Expression::Comment,
-    BELParser::Parsers::Expression::StatementObservedTerm,
-    BELParser::Parsers::Expression::StatementSimple,
-    BELParser::Parsers::Expression::StatementNested,
+    BELParser::Parsers::Expression::ObservedTerm,
+    BELParser::Parsers::Expression::SimpleStatement,
+    BELParser::Parsers::Expression::NestedStatement,
     BELParser::Parsers::BELScript::DefineAnnotation,
     BELParser::Parsers::BELScript::DefineNamespace,
     BELParser::Parsers::BELScript::Set,

data/lib/bel_parser/script/parser.rb

@@ -13,7 +13,7 @@ module BELParser
       include BELParser::Parsers::BELScript
 
       FILTER = BELParser::ASTFilter.new(
-        :statement_simple,
+        :simple_statement,
         :observed_term,
         :nested_statement,
         :define_annotation,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.5
+  version: 1.0.0.alpha.6
 platform: ruby
 authors:
 - Anthony Bargnesi
@@ -29,7 +29,7 @@ files:
 - lib/bel_parser/ast_generator.rb
 - lib/bel_parser/ast_validator.rb
 - lib/bel_parser/expression/parser.rb
-- lib/bel_parser/expression/term_validator.rb
+- lib/bel_parser/expression/validator.rb
 - lib/bel_parser/language.rb
 - lib/bel_parser/language/expression_validator.rb
 - lib/bel_parser/language/function.rb
@@ -46,6 +46,7 @@ files:
 - lib/bel_parser/language/specification.rb
 - lib/bel_parser/language/syntax.rb
 - lib/bel_parser/language/syntax/invalid_function.rb
+- lib/bel_parser/language/syntax/invalid_relationship.rb
 - lib/bel_parser/language/syntax/undefined_namespace.rb
 - lib/bel_parser/language/syntax_error.rb
 - lib/bel_parser/language/syntax_function.rb
@@ -247,16 +248,16 @@ files:
 - lib/bel_parser/parsers/expression.rb
 - lib/bel_parser/parsers/expression/comment.rb
 - lib/bel_parser/parsers/expression/comment.rl
+- lib/bel_parser/parsers/expression/nested_statement.rb
+- lib/bel_parser/parsers/expression/nested_statement.rl
+- lib/bel_parser/parsers/expression/observed_term.rb
+- lib/bel_parser/parsers/expression/observed_term.rl
 - lib/bel_parser/parsers/expression/parameter.rb
 - lib/bel_parser/parsers/expression/parameter.rl
 - lib/bel_parser/parsers/expression/relationship.rb
 - lib/bel_parser/parsers/expression/relationship.rl
-- lib/bel_parser/parsers/expression/statement_nested.rb
-- lib/bel_parser/parsers/expression/statement_nested.rl
-- lib/bel_parser/parsers/expression/statement_observed_term.rb
-- lib/bel_parser/parsers/expression/statement_observed_term.rl
-- lib/bel_parser/parsers/expression/statement_simple.rb
-- lib/bel_parser/parsers/expression/statement_simple.rl
+- lib/bel_parser/parsers/expression/simple_statement.rb
+- lib/bel_parser/parsers/expression/simple_statement.rl
 - lib/bel_parser/parsers/expression/term.rb
 - lib/bel_parser/parsers/expression/term.rl
 - lib/bel_parser/parsers/line_parser.rb