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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31d99776d9e14c8680ec557fcc2e9e94136b90dc
-  data.tar.gz: 0764321e9c0d762d5a4186301f62c4f21b56431c
+  metadata.gz: a34f2b2fcde4d9804cccccca0a470bce0d266956
+  data.tar.gz: c3443d26fb7a34c8a65b5ca7275bb77cda43557f
 SHA512:
-  metadata.gz: 4d8915205e38ae41098e1c4468b7a54b7d07f23b20f6667d8ab17fbbd7371504402e369122d3e6a91d3adb1148d824578732328f457531956b729402b5401d1f
-  data.tar.gz: 528a2bad2581e21df25812804b56d7c366d23f1ee18524767aac5cf8e518b4d1d58952c75763e7893d760b66809b3e15d0d92b0091dda4b6a56bf6d28ebf1146
+  metadata.gz: 224d93b78ef97b22a0105ffe03188e20fad89096922c806a2a474d043ba6effe33889ba7162d7aa310bdf34a57355cbb81776099c00c037a9a4d3b62570d45e2
+  data.tar.gz: 907a17075b1053f6f515e434061d51a49f23167bc5f37bd475124b8f4a6f6ba6cc9364b498ddf428f2172c92ab0aae41b2693657331b1d6cdd9806c2448b9110

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.6
+1.0.0.alpha.7

data/lib/bel_parser/ast_filter.rb

@@ -25,3 +25,16 @@ module BELParser
     end
   end
 end
+
+if __FILE__ == $PROGRAM_NAME
+  require_relative 'ast_generator'
+
+  types = ARGV.map(&:to_sym)
+  ast   = BELParser::ASTGenerator.new.each($stdin)
+  BELParser::ASTFilter.new(*types).each(ast) do |(line_number, line, results)|
+    puts "#{line_number}: #{line}"
+    results.each do |ast|
+      puts ast.to_s(1)
+    end
+  end
+end

data/lib/bel_parser/expression/parser.rb

@@ -34,10 +34,9 @@ module BELParser
 end
 
 if __FILE__ == $PROGRAM_NAME
-  BELParser::Expression::Parser.new.each($stdin) do |line_result|
-    line_number, line, ast_results = line_result
+  BELParser::Expression::Parser.new.each($stdin) do |(line_number, line, res)|
     puts "#{line_number}: #{line}"
-    ast_results.each do |ast|
+    res.each do |ast|
       puts ast.to_s(1)
     end
   end

data/lib/bel_parser/expression/validator.rb

@@ -46,10 +46,8 @@ if __FILE__ == $PROGRAM_NAME
     USAGE
     exit 1
   end
-  namespaces = Hash[ARGV[1..-1].map { |ns| ns.split('=') }]
-  BELParser::Expression::Validator.new(ARGV.first, namespaces).each($stdin) do |res|
-    res.each do |res|
-      puts res.each_line.map { |l| "  #{l}" }.join
-    end
+  ns = Hash[ARGV[1..-1].map { |ns| ns.split('=') }]
+  BELParser::Expression::Validator.new(ARGV.first, ns).each($stdin) do |res|
+    puts res.map { |r| "#{r}\n" }.join.each_line.map { |l| "  #{l}" }.join
   end
 end

data/lib/bel_parser/parser.rb

@@ -24,8 +24,8 @@ module BELParser
       :observed_term,
       :simple_statement,
       :nested_statement,
-      :define_annotation,
-      :define_namespace,
+      :annotation_definition,
+      :namespace_definition,
       :set,
       :unset
     )
@@ -44,10 +44,9 @@ module BELParser
 end
 
 if __FILE__ == $PROGRAM_NAME
-  BELParser::Parser.new.each($stdin) do |line_result|
-    line_number, line, ast_results = line_result
+  BELParser::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

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

@@ -250,7 +250,97 @@ module BELParser
 
         # Get the namespace definition's keyword.
         def keyword
-          # TODO: access children for content
+          children[0]
+        end
+
+        # Get the namespace definition's domain.
+        def domain
+          children[1]
+        end
+      end
+
+      # AST node representing a keyword (e.g. definitions).
+      class Keyword < Node
+        # AST node type
+        @ast_type = :keyword
+        # Keywords have semantic meaning
+        @has_semantics = true
+
+        # New Keyword AST node.
+        #
+        # @see Node#initialize Node class for basic properties
+        def initialize(children = [], properties = {})
+          super(Keyword.ast_type, children, properties)
+        end
+
+        # Get the keyword's identifier.
+        def identifier
+          children[0]
+        end
+      end
+
+      # AST node representing a domain (e.g. Url, Uri, List, Pattern).
+      class Domain < Node
+        # AST node type
+        @ast_type = :domain
+        # Domains have semantic meaning
+        @has_semantics = true
+
+        # New Domain AST node.
+        #
+        # @see Node#initialize Node class for basic properties
+        def initialize(children = [], properties = {})
+          super(Domain.ast_type, children, properties)
+        end
+
+        # Determine if this is a URL domain.
+        def has_url?
+          children[0] && children[0].is_a?(Url)
+        end
+
+        # Get the domain's Url.
+        def url
+          has_url? ? children[0] : nil
+        end
+      end
+
+      # AST node representing a URL.
+      class Url < Node
+        # AST node type
+        @ast_type = :url
+        # Urls have semantic meaning
+        @has_semantics = true
+
+        # New Url AST node.
+        #
+        # @see Node#initialize Node class for basic properties
+        def initialize(children = [], properties = {})
+          super(Url.ast_type, children, properties)
+        end
+
+        # Get the url's string.
+        def string
+          children[0]
+        end
+      end
+
+      # AST node representing a Pattern.
+      class Pattern < Node
+        # AST node type
+        @ast_type = :pattern
+        # Patterns have semantic meaning
+        @has_semantics = true
+
+        # New Pattern AST node.
+        #
+        # @see Node#initialize Node class for basic properties
+        def initialize(children = [], properties = {})
+          super(Pattern.ast_type, children, properties)
+        end
+
+        # Get the pattern's string.
+        def string
+          children[0]
         end
       end
 
@@ -289,6 +379,21 @@ module BELParser
         end
       end
 
+      # AST node representing a list item.
+      class ListItem < Node
+        # AST node type
+        @ast_type = :list_item
+        # List items have semantics (content is meaningful)
+        @has_semantics = true
+
+        # New ListItem AST node.
+        #
+        # @see Node#initialize Node class for basic properties
+        def initialize(children = [], properties = {})
+          super(ListItem.ast_type, children, properties)
+        end
+      end
+
       # AST node representing an argument.
       class Argument < Node
         # AST node type
@@ -750,6 +855,10 @@ module BELParser
           List.new(children)
         end
 
+        def list_item(*children)
+          ListItem.new(children)
+        end
+
         def comment(*children)
           Comment.new(children)
         end
@@ -758,6 +867,10 @@ module BELParser
           CommentLine.new(children)
         end
 
+        def blank_line
+          BlankLine.new
+        end
+
         def annotation_definition(*children)
           AnnotationDefinition.new(children)
         end
@@ -765,6 +878,22 @@ module BELParser
         def namespace_definition(*children)
           NamespaceDefinition.new(children)
         end
+
+        def keyword(*children)
+          Keyword.new(children)
+        end
+
+        def domain(*children)
+          Domain.new(children)
+        end
+
+        def url(*children)
+          Url.new(children)
+        end
+
+        def pattern(*children)
+          Pattern.new(children)
+        end
       end
     end
   end