bel_parser 1.0.0.alpha.6 → 1.0.0.alpha.7

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

@@ -16,60 +16,60 @@
   URL_KW        = [uU][rR][lL];
 
   action annotation_keyword {
-    @buffers[:define_annotation] = define_annotation()
+    @buffers[:annotation_definition] = annotation_definition()
   }
 
   action keyword {
-    @buffers[:define_annotation] = define_annotation(
-                                     keyword(@buffers[:ident]))
+    @buffers[:annotation_definition] = annotation_definition(
+                                         keyword(@buffers[:ident]))
   }
 
   action list_keyword {
-    @buffers[:define_annotation] = @buffers[:define_annotation] << domain()
+    @buffers[:annotation_definition] = @buffers[:annotation_definition] << domain()
   }
 
   action pattern_keyword {
-    @buffers[:define_annotation] = @buffers[:define_annotation] << domain(pattern())
+    @buffers[:annotation_definition] = @buffers[:annotation_definition] << domain(pattern())
   }
 
   action url_keyword {
-    @buffers[:define_annotation] = @buffers[:define_annotation] << domain(url())
+    @buffers[:annotation_definition] = @buffers[:annotation_definition] << domain(url())
   }
 
   action pattern {
-    keyword, domain              = @buffers[:define_annotation].children
-    domain                       = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_annotation] = define_annotation(keyword, domain)
+    keyword, domain                  = @buffers[:annotation_definition].children
+    domain                           = domain(
+                                         domain.children[0] << @buffers[:string])
+    @buffers[:annotation_definition] = annotation_definition(keyword, domain)
   }
 
   action url {
-    keyword, domain              = @buffers[:define_annotation].children
-    domain                       = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_annotation] = define_annotation(keyword, domain)
+    keyword, domain                  = @buffers[:annotation_definition].children
+    domain                           = domain(
+                                         domain.children[0] << @buffers[:string])
+    @buffers[:annotation_definition] = annotation_definition(keyword, domain)
   }
 
   action list {
-    keyword, domain              = @buffers[:define_annotation].children
-    domain                       = domain(
-                                     @buffers[:list])
-    @buffers[:define_annotation] = define_annotation(keyword, domain)
+    keyword, domain                  = @buffers[:annotation_definition].children
+    domain                           = domain(
+                                         @buffers[:list])
+    @buffers[:annotation_definition] = annotation_definition(keyword, domain)
   }
 
-  action yield_define_annotation {
-    yield @buffers[:define_annotation]
+  action yield_annotation_definition {
+    yield @buffers[:annotation_definition]
   }
 
   # Define FSM
-  define_annotation :=
+  annotation_definition :=
     DEFINE_KW SP+ ANNOTATION_KW @annotation_keyword SP+
       IDENT %keyword SP+
     AS_KW SP+
       (
-        (LIST_KW    %list_keyword    SP+ LIST   %list    SP* NL @yield_define_annotation) |
-        (PATTERN_KW %pattern_keyword SP+ STRING %pattern SP* NL @yield_define_annotation) |
-        (URL_KW     %url_keyword     SP+ STRING %url     SP* NL @yield_define_annotation)
+        (LIST_KW    %list_keyword    SP+ LIST   %list    SP* NL @yield_annotation_definition) |
+        (PATTERN_KW %pattern_keyword SP+ STRING %pattern SP* NL @yield_annotation_definition) |
+        (URL_KW     %url_keyword     SP+ STRING %url     SP* NL @yield_annotation_definition)
       );
 }%%
 =end

data/lib/bel_parser/parsers/bel_script/define_namespace.rb

@@ -397,17 +397,17 @@ begin
 	when 1 then
 		begin
 
-    @buffers[:define_namespace] = define_namespace()
+    @buffers[:namespace_definition] = namespace_definition()
   		end
 	when 6 then
 		begin
 
-    @buffers[:define_namespace] = @buffers[:define_namespace] << domain(url())
+    @buffers[:namespace_definition] = @buffers[:namespace_definition] << domain(url())
   		end
 	when 12 then
 		begin
 
-    yield @buffers[:define_namespace]
+    yield @buffers[:namespace_definition]
   		end
 	when 3 then
 		begin
@@ -434,7 +434,7 @@ begin
   		end
 		begin
 
-    @buffers[:define_namespace] = @buffers[:define_namespace] << keyword(@buffers[:ident])
+    @buffers[:namespace_definition] = @buffers[:namespace_definition] << keyword(@buffers[:ident])
   		end
 	when 13 then
 		begin
@@ -474,10 +474,10 @@ begin
   		end
 		begin
 
-    keyword, domain             = @buffers[:define_namespace].children
-    domain                      = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_namespace] = define_namespace(keyword, domain)
+    keyword, domain                 = @buffers[:namespace_definition].children
+    domain                          = domain(
+                                        domain.children[0] << @buffers[:string])
+    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
   		end
 	when 15 then
 		begin
@@ -497,14 +497,14 @@ begin
   		end
 		begin
 
-    keyword, domain             = @buffers[:define_namespace].children
-    domain                      = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_namespace] = define_namespace(keyword, domain)
+    keyword, domain                 = @buffers[:namespace_definition].children
+    domain                          = domain(
+                                        domain.children[0] << @buffers[:string])
+    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
   		end
 		begin
 
-    yield @buffers[:define_namespace]
+    yield @buffers[:namespace_definition]
   		end
 	end
 	end
@@ -966,17 +966,17 @@ begin
 	when 1 then
 		begin
 
-    @buffers[:define_namespace] = define_namespace()
+    @buffers[:namespace_definition] = namespace_definition()
   		end
 	when 6 then
 		begin
 
-    @buffers[:define_namespace] = @buffers[:define_namespace] << domain(url())
+    @buffers[:namespace_definition] = @buffers[:namespace_definition] << domain(url())
   		end
 	when 12 then
 		begin
 
-    yield @buffers[:define_namespace]
+    yield @buffers[:namespace_definition]
   		end
 	when 3 then
 		begin
@@ -1003,7 +1003,7 @@ begin
   		end
 		begin
 
-    @buffers[:define_namespace] = @buffers[:define_namespace] << keyword(@buffers[:ident])
+    @buffers[:namespace_definition] = @buffers[:namespace_definition] << keyword(@buffers[:ident])
   		end
 	when 13 then
 		begin
@@ -1043,10 +1043,10 @@ begin
   		end
 		begin
 
-    keyword, domain             = @buffers[:define_namespace].children
-    domain                      = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_namespace] = define_namespace(keyword, domain)
+    keyword, domain                 = @buffers[:namespace_definition].children
+    domain                          = domain(
+                                        domain.children[0] << @buffers[:string])
+    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
   		end
 	when 15 then
 		begin
@@ -1066,14 +1066,14 @@ begin
   		end
 		begin
 
-    keyword, domain             = @buffers[:define_namespace].children
-    domain                      = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_namespace] = define_namespace(keyword, domain)
+    keyword, domain                 = @buffers[:namespace_definition].children
+    domain                          = domain(
+                                        domain.children[0] << @buffers[:string])
+    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
   		end
 		begin
 
-    yield @buffers[:define_namespace]
+    yield @buffers[:namespace_definition]
   		end
 	end
 	end
@@ -1586,17 +1586,17 @@ begin
 	when 1 then
 		begin
 
-    @buffers[:define_namespace] = define_namespace()
+    @buffers[:namespace_definition] = namespace_definition()
   		end
 	when 6 then
 		begin
 
-    @buffers[:define_namespace] = @buffers[:define_namespace] << domain(url())
+    @buffers[:namespace_definition] = @buffers[:namespace_definition] << domain(url())
   		end
 	when 12 then
 		begin
 
-    yield @buffers[:define_namespace]
+    yield @buffers[:namespace_definition]
   		end
 	when 3 then
 		begin
@@ -1623,7 +1623,7 @@ begin
   		end
 		begin
 
-    @buffers[:define_namespace] = @buffers[:define_namespace] << keyword(@buffers[:ident])
+    @buffers[:namespace_definition] = @buffers[:namespace_definition] << keyword(@buffers[:ident])
   		end
 	when 13 then
 		begin
@@ -1663,10 +1663,10 @@ begin
   		end
 		begin
 
-    keyword, domain             = @buffers[:define_namespace].children
-    domain                      = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_namespace] = define_namespace(keyword, domain)
+    keyword, domain                 = @buffers[:namespace_definition].children
+    domain                          = domain(
+                                        domain.children[0] << @buffers[:string])
+    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
   		end
 	when 15 then
 		begin
@@ -1686,14 +1686,14 @@ begin
   		end
 		begin
 
-    keyword, domain             = @buffers[:define_namespace].children
-    domain                      = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_namespace] = define_namespace(keyword, domain)
+    keyword, domain                 = @buffers[:namespace_definition].children
+    domain                          = domain(
+                                        domain.children[0] << @buffers[:string])
+    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
   		end
 		begin
 
-    yield @buffers[:define_namespace]
+    yield @buffers[:namespace_definition]
   		end
 	end
 	end

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

@@ -13,26 +13,26 @@
   URL_KW        = [uU][rR][lL];
 
   action namespace_keyword {
-    @buffers[:define_namespace] = define_namespace()
+    @buffers[:namespace_definition] = namespace_definition()
   }
 
   action keyword {
-    @buffers[:define_namespace] = @buffers[:define_namespace] << keyword(@buffers[:ident])
+    @buffers[:namespace_definition] = @buffers[:namespace_definition] << keyword(@buffers[:ident])
   }
 
   action url_keyword {
-    @buffers[:define_namespace] = @buffers[:define_namespace] << domain(url())
+    @buffers[:namespace_definition] = @buffers[:namespace_definition] << domain(url())
   }
 
   action string {
-    keyword, domain             = @buffers[:define_namespace].children
-    domain                      = domain(
-                                     domain.children[0] << @buffers[:string])
-    @buffers[:define_namespace] = define_namespace(keyword, domain)
+    keyword, domain                 = @buffers[:namespace_definition].children
+    domain                          = domain(
+                                        domain.children[0] << @buffers[:string])
+    @buffers[:namespace_definition] = namespace_definition(keyword, domain)
   }
 
-  action yield_define_namespace {
-    yield @buffers[:define_namespace]
+  action yield_namespace_definition {
+    yield @buffers[:namespace_definition]
   }
 
   # Define FSM
@@ -49,7 +49,7 @@
     SP+
     STRING %string
     SP*
-    NL @yield_define_namespace;
+    NL @yield_namespace_definition;
 }%%
 =end
 # end: ragel

data/lib/bel_parser/script/parser.rb

@@ -16,8 +16,8 @@ module BELParser
         :simple_statement,
         :observed_term,
         :nested_statement,
-        :define_annotation,
-        :define_namespace,
+        :annotation_definition,
+        :namespace_definition,
         :set,
         :unset,
         :blank_line,
@@ -39,10 +39,9 @@ module BELParser
 end
 
 if __FILE__ == $PROGRAM_NAME
-  BELParser::Script::Parser.new.each($stdin) do |line_result|
-    line_number, line, ast_results = line_result
+  BELParser::Script::Parser.new.each($stdin) do |(line_number, line, results)|
     puts "#{line_number}: #{line}"
-    ast_results.each do |ast|
+    results.each do |ast|
       puts ast.to_s(1)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.6
+  version: 1.0.0.alpha.7
 platform: ruby
 authors:
 - Anthony Bargnesi
@@ -27,7 +27,6 @@ files:
 - lib/bel_parser.rb
 - lib/bel_parser/ast_filter.rb
 - lib/bel_parser/ast_generator.rb
-- lib/bel_parser/ast_validator.rb
 - lib/bel_parser/expression/parser.rb
 - lib/bel_parser/expression/validator.rb
 - lib/bel_parser/language.rb
@@ -219,10 +218,8 @@ files:
 - lib/bel_parser/mixin/line_continuator.rb
 - lib/bel_parser/mixin/line_mapping.rb
 - lib/bel_parser/parser.rb
-- lib/bel_parser/parsers/ast/mapped_traversal.rb
 - lib/bel_parser/parsers/ast/node.rb
 - lib/bel_parser/parsers/ast/sexp.rb
-- lib/bel_parser/parsers/ast/traversal.rb
 - lib/bel_parser/parsers/bel_script.rb
 - lib/bel_parser/parsers/bel_script/define_annotation.rb
 - lib/bel_parser/parsers/bel_script/define_annotation.rl

data/lib/bel_parser/ast_validator.rb

@@ -1,40 +0,0 @@
-require_relative 'ast_generator'
-require_relative 'parsers/ast/node'
-require_relative 'parsers/ast/sexp'
-require_relative 'parsers/ast/mapped_traversal'
-
-module BELParser
-  # ASTValidator applies observers to an AST traversal.
-  class ASTValidator
-    def initialize(observers: [])
-      @observers = observers
-    end
-
-    def each(ast_source, &block)
-      if block_given?
-        traversal = observable_traversal
-        ast_source.each do |(line_number, line, ast_results)|
-          traverse(traversal, line_number, line, ast_results, &block)
-        end
-      else
-        enum_for(:each, ast_source)
-      end
-    end
-
-    def traverse(traversal, line_number, line, ast_results)
-      ast_results.each do |ast|
-        traversal.traverse(ast) do |node, results|
-          yield([line_number, line, node, (results && results.compact)])
-        end
-      end
-    end
-
-    def observable_traversal
-      traversal = BELParser::Parsers::AST::MappedTraversal.new
-      @observers.each do |observer|
-        traversal.add_observer(observer)
-      end
-      traversal
-    end
-  end
-end

data/lib/bel_parser/parsers/ast/mapped_traversal.rb

@@ -1,36 +0,0 @@
-require 'observer'
-
-module BELParser
-  module Parsers
-    module AST
-      # Traversal provides an observable walk that maps over the
-      # {BELParser::Parsers::AST::Node AST node} and returns the results.
-      # Alternatively, see {BELParser::Parsers::AST::Traversal}.
-      class MappedTraversal
-        include Observable
-
-        def traverse(ast)
-          if block_given?
-            ast.traverse do |node|
-              changed
-              yield(node, notify_observers(node))
-            end
-          else
-            enum_for(:traverse, ast)
-          end
-        end
-
-        def notify_observers(*args)
-          if defined? @observer_state && @observer_state
-            @observer_state = false
-            if defined? @observer_peers
-              @observer_peers.map do |k, v|
-                k.send v, *args
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/bel_parser/parsers/ast/traversal.rb

@@ -1,21 +0,0 @@
-require 'observer'
-
-module BELParser
-  module Parsers
-    module AST
-      # Traversal provides an observable walk over an
-      # {BELParser::Parsers::AST::Node AST node}. A result is not conveyed from the
-      # walk (alternatively, see {BELParser::Parsers::AST::MappedTraversal}).
-      class Traversal
-        include Observable
-
-        def traverse(ast)
-          ast.traverse do |node|
-            changed
-            notify_observers(node)
-          end
-        end
-      end
-    end
-  end
-end