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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8054ff03d78df3934f61db423d11059802405f5
-  data.tar.gz: 456a92fc5131cf4a59c53bf18771383db86a8fe4
+  metadata.gz: b7551ea8874262a96c2623bccbc0b78873f9d1f3
+  data.tar.gz: bd52f9cd988e9eb57fcea386da40ec33b71f7b32
 SHA512:
-  metadata.gz: 887008830f084cf37e994e15a79ae991a4a6d268f319d673f9234f6d498a0171c9d1b65ea1d315891f59de7c5775e50ae9ecad208cf96e5b095b4f6c5a5686ee
-  data.tar.gz: f3a7824168869bce31ce8c1f2f834cfe64c8335e231acb059691100075826405b77c8013f361e7f665c528bef59efc79be0ec4419891b0afa2f4387aecc25ba4
+  metadata.gz: 7d348dbd7674466b52d19a357b1561b9e02e6a7748931da8e0a32cee14c0b58fcdf11df308dce3e5f47360f1f15d079c07e967f3739a8098ed2384387675b64e
+  data.tar.gz: c288f3d3f77eae55d791ce8f272990a3c67b753a3fb7a77a0518cd6048974af9602a21ee01f20d0da79d5a02f85f0bf68f7d9b50b7e1d63a39d070ff93dca88f

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.38
+1.0.0.alpha.39

data/lib/bel_parser/ast_filter.rb

@@ -5,7 +5,7 @@ module BELParser
   class ASTFilter
     def initialize(ast_enum, *types)
       @ast_enum = ast_enum
-      @types    = types
+      @types    = Hash[types.map { |t| [t, true] }]
     end
 
     def each(enum = @ast_enum)
@@ -21,7 +21,11 @@ module BELParser
 
     def filter(ast_enum)
       ast_enum.select do |node|
-        @types.include?(node.type)
+        if node.nil?
+          @types[nil]
+        else
+          @types[node.type]
+        end
       end
     end
   end

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

@@ -148,6 +148,53 @@ module BELParser
           updated(@children + [element])
         end
 
+        # Get the child at the specified _index_.
+        #
+        # @param [Fixnum] index the index to get
+        # @return [Node, nil] the child of this node at the indicated index
+        #         or nil if not present
+        def child(index)
+          @children[index]
+        end
+
+        # Get the child at index 0.
+        # @see #child
+        def first_child
+          child 0
+        end
+
+        # Get the child at index 1.
+        # @see #child
+        def second_child
+          child 1
+        end
+
+        # Get the child at index 2.
+        # @see #child
+        def third_child
+          child 2
+        end
+
+        # Get the child at index 3.
+        # @see #child
+        def fourth_child
+          child 3
+        end
+
+        # Get the number of children.
+        #
+        # @return [Fixnum] the number of children
+        def num_children
+          @children.size
+        end
+
+        # Get whether this node has children.
+        #
+        # @return [true, false]
+        def children?
+          !@children.empty?
+        end
+
         alias << append
       end
 
@@ -803,8 +850,12 @@ module BELParser
         end
 
         # Get what is being unset.
+        #
+        # @return [String, nil] what is being unset
         def name
-          children[0]
+          return nil unless children?
+          return nil unless first_child.children?
+          first_child.first_child
         end
       end
 
@@ -862,124 +913,128 @@ module BELParser
       #
       # @see https://en.wikipedia.org/wiki/S-expression S-expression
       module Sexp
-        def nested_statement(*children)
-          NestedStatement.new(children)
+        def nested_statement(*children, **props)
+          NestedStatement.new(children, props)
         end
 
-        def simple_statement(*children)
-          SimpleStatement.new(children)
+        def simple_statement(*children, **props)
+          SimpleStatement.new(children, props)
         end
 
-        def observed_term(*children)
-          ObservedTerm.new(children)
+        def observed_term(*children, **props)
+          ObservedTerm.new(children, props)
         end
 
-        def statement(*children)
-          Statement.new(children)
+        def statement(*children, **props)
+          Statement.new(children, props)
         end
 
-        def subject(*children)
-          Subject.new(children)
+        def subject(*children, **props)
+          Subject.new(children, props)
         end
 
-        def object(*children)
-          Object.new(children)
+        def object(*children, **props)
+          Object.new(children, props)
         end
 
-        def relationship(*children)
-          Relationship.new(children)
+        def relationship(*children, **props)
+          Relationship.new(children, props)
         end
 
-        def term(*children)
-          Term.new(children)
+        def term(*children, **props)
+          Term.new(children, props)
         end
 
-        def function(*children)
-          Function.new(children)
+        def function(*children, **props)
+          Function.new(children, props)
         end
 
-        def argument(*children)
-          Argument.new(children)
+        def argument(*children, **props)
+          Argument.new(children, props)
         end
 
-        def parameter(*children)
-          Parameter.new(children)
+        def parameter(*children, **props)
+          Parameter.new(children, props)
         end
 
-        def prefix(*children)
-          Prefix.new(children)
+        def prefix(*children, **props)
+          Prefix.new(children, props)
         end
 
-        def name(*children)
-          Name.new(children)
+        def name(*children, **props)
+          Name.new(children, props)
         end
 
-        def value(*children)
-          Value.new(children)
+        def value(*children, **props)
+          Value.new(children, props)
         end
 
-        def identifier(*children)
-          Identifier.new(children)
+        def identifier(*children, **props)
+          Identifier.new(children, props)
         end
 
-        def string(*children)
-          String.new(children)
+        def string(*children, **props)
+          String.new(children, props)
         end
 
-        def list(*children)
-          List.new(children)
+        def list(*children, **props)
+          List.new(children, props)
         end
 
-        def list_item(*children)
-          ListItem.new(children)
+        def list_item(*children, **props)
+          ListItem.new(children, props)
         end
 
-        def comment(*children)
-          Comment.new(children)
+        def comment(*children, **props)
+          Comment.new(children, props)
         end
 
-        def comment_line(*children)
-          CommentLine.new(children)
+        def comment_line(*children, **props)
+          CommentLine.new(children, props)
         end
 
         def blank_line
-          BlankLine.new
+          BlankLine.new([], complete: true)
         end
 
-        def set(*children)
-          Set.new(children)
+        def set(*children, **props)
+          Set.new(children, props)
         end
 
         def unset(*children)
           Unset.new(children)
         end
 
-        def document_property(*children)
-          DocumentProperty.new(children)
+        def document_property(*children, **props)
+          DocumentProperty.new(children, props)
+        end
+
+        def annotation_definition(*children, **props)
+          AnnotationDefinition.new(children, props)
         end
 
-        def annotation_definition(*children)
-          AnnotationDefinition.new(children)
+        def namespace_definition(*children, **props)
+          NamespaceDefinition.new(children, props)
         end
 
-        def namespace_definition(*children)
-          NamespaceDefinition.new(children)
+        def keyword(*children, **props)
+          Keyword.new(children, props)
         end
 
-        def keyword(*children)
-          Keyword.new(children)
+        def domain(*children, **props)
+          Domain.new(children, props)
         end
 
-        def domain(*children)
-          Domain.new(children)
+        def url(*children, **props)
+          Url.new(children, props)
         end
 
-        def url(*children)
-          Url.new(children)
+        def pattern(*children, **props)
+          Pattern.new(children, props)
         end
 
-        def pattern(*children)
-          Pattern.new(children)
+        def unset(*children, **props)
+          Unset.new(children, props)
         end
       end
     end