RubyGems - node_query - Versions diffs - 1.13.9 → 1.13.11 - Mend

node_query 1.13.9 → 1.13.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +8 -0
data/Gemfile.lock +2 -2
data/lib/node_query/helper.rb +14 -9
data/lib/node_query/version.rb +1 -1
data/lib/node_query_parser.racc.rb +89 -93
data/lib/node_query_parser.y +6 -6
metadata +3 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215ae99bb6d5fddf440256e3982a06f8795ab484008dcc736679151f0b1c963a
-  data.tar.gz: 0e69083c8350bc90058d0b5d62e90046d612a4e26e59141bd7722b8657ec6f06
+  metadata.gz: d162f1ed40046054e6b68d3b89341508485ca005541c16408c632f86f205a818
+  data.tar.gz: 191962526bb18daa93b6e506181c99d211cdc3273fe861d4e6aec699720b5557
 SHA512:
-  metadata.gz: 561dff60b719e9596343e4f667939b06ffec1078b0802c1236dba472d7051672e1203d610d0e5b4685fcc936728355b69935f1fdf2d2166f85910afa7f484485
-  data.tar.gz: c08f454ba9300e0401d08cff16f269348e9913a6bb1d5b52d237cd0abe45cbb15f5b7dade4f49bdb0b24c279843f954dbf2b4d5ef200533109c14df8a00a9b35
+  metadata.gz: 6a3ed7084d7268f5e4aef354fd5b49abec8e255ca542a755992eabb705402e23eabfead3d16b37a6b451c63c5703bdf2f24da59be8bbdbbe9b623e02b44dcf9f
+  data.tar.gz: 00d10e20a2a6cbc4db6340bdc01f77a543361e689cc877fbb5923f996306c51301cd40612fbf9d6e3928954aa680a0f3055cea6d273dc7043bfaebb960e9cfed

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,13 @@
 # CHANGELOG
+## 1.13.11 (2023-08-17)
+* Do not handle if `child_node` is nil
+## 1.13.10 (2023-08-12)
+* Update `node_query_parser.y`
 ## 1.13.9 (2023-08-02)
 * Add `OPERATOR` macro

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.13.9)
+    node_query (1.13.11)
 GEM
   remote: https://rubygems.org/
@@ -67,7 +67,7 @@ GEM
     shellany (0.0.1)
     syntax_tree (6.1.1)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.6.2)
+    syntax_tree_ext (0.6.4)
       syntax_tree
     thor (1.2.1)

data/lib/node_query/helper.rb CHANGED Viewed

@@ -33,15 +33,7 @@ class NodeQuery::Helper
     # @yieldparam child [Node] child node
     def handle_recursive_child(node, &block)
       NodeQuery.adapter.get_children(node).each do |child|
-        if NodeQuery.adapter.is_node?(child)
-          block.call(child)
-          handle_recursive_child(child, &block)
-        elsif child.is_a?(Array)
-          child.each do |child_child|
-            block.call(child_child)
-            handle_recursive_child(child_child, &block)
-          end
-        end
+        handle_child(child, &block)
       end
     end
@@ -67,5 +59,18 @@ class NodeQuery::Helper
       node.to_s
     end
+    private
+    def handle_child(node, &block)
+      if NodeQuery.adapter.is_node?(node)
+        block.call(node)
+        handle_recursive_child(node, &block)
+      elsif node.is_a?(Array)
+        node.each do |child_node|
+          handle_child(child_node, &block) unless child_node.nil?
+        end
+      end
+    end
   end
 end

data/lib/node_query/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 class NodeQuery
-  VERSION = "1.13.9"
+  VERSION = "1.13.11"
 end

data/lib/node_query_parser.racc.rb CHANGED Viewed

@@ -22,90 +22,90 @@ class NodeQueryParser < Racc::Parser
 ##### State transition tables begin ###
 racc_action_table = [
-     8,     7,     8,     7,     9,    37,     5,     6,     5,     6,
-    28,    10,    12,    13,    17,    18,    22,    30,    31,    32,
-    33,    34,    35,    36,     8,     7,    23,    24,    25,    37,
-     5,     6,     8,     7,    17,    38,    41,    37,     5,     6,
-   nil,    30,    31,    32,    33,    34,    35,    36,   nil,    30,
-    31,    32,    33,    34,    35,    36,     8,     7,     8,     7,
-     8,     7,     5,     6,     5,     6,     5,     6,     8,     7,
-     8,     7,   nil,   nil,     5,     6,     5,     6 ]
+     8,     7,     9,    36,     5,     6,     8,     7,    27,    10,
+     5,     6,    12,    13,    18,    29,    30,    31,    32,    33,
+    34,    35,     8,     7,    19,    36,     5,     6,    18,     8,
+     7,    38,    36,     5,     6,    23,    24,    29,    30,    31,
+    32,    33,    34,    35,    29,    30,    31,    32,    33,    34,
+    35,     8,     7,     8,     7,     5,     6,     5,     6,     8,
+     7,     8,     7,     5,     6,     5,     6,     8,     7,    25,
+    37,     5,     6,    41,    42,    44 ]
 racc_action_check = [
-    25,    25,     0,     0,     1,    25,    25,    25,     0,     0,
-    25,     2,     4,     5,     8,     9,    17,    25,    25,    25,
-    25,    25,    25,    25,    28,    28,    20,    21,    22,    28,
-    28,    28,    40,    40,    24,    28,    39,    40,    40,    40,
-   nil,    28,    28,    28,    28,    28,    28,    28,   nil,    40,
-    40,    40,    40,    40,    40,    40,     3,     3,     6,     6,
-     7,     7,     3,     3,     6,     6,     7,     7,    10,    10,
-    13,    13,   nil,   nil,    10,    10,    13,    13 ]
+    25,    25,     1,    25,    25,    25,     0,     0,    25,     2,
+     0,     0,     4,     5,     8,    25,    25,    25,    25,    25,
+    25,    25,    27,    27,     9,    27,    27,    27,    17,    40,
+    40,    27,    40,    40,    40,    18,    21,    27,    27,    27,
+    27,    27,    27,    27,    40,    40,    40,    40,    40,    40,
+    40,     3,     3,     6,     6,     3,     3,     6,     6,     7,
+     7,    10,    10,     7,     7,    10,    10,    13,    13,    23,
+    26,    13,    13,    38,    39,    42 ]
 racc_action_pointer = [
-    -1,     4,     9,    53,    -5,    -2,    55,    57,     3,    15,
-    65,   nil,   nil,    67,   nil,   nil,   nil,    10,   nil,   nil,
-    10,    15,    10,   nil,    23,    -3,   nil,   nil,    21,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
-    29,   nil,   nil ]
+     3,     2,     7,    48,    -3,     0,    50,    56,     5,    24,
+    58,   nil,   nil,    64,   nil,   nil,   nil,    19,    30,   nil,
+   nil,    22,   nil,    53,   nil,    -3,    60,    19,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    63,    62,
+    26,   nil,    65,   nil,   nil ]
 racc_action_default = [
    -28,   -28,    -2,    -4,    -6,   -28,   -28,   -28,   -10,   -28,
-   -28,    -3,    -5,   -28,    -8,    -9,   -11,   -28,    43,    -1,
-   -28,   -28,   -28,    -7,   -13,   -28,   -12,   -14,   -28,   -19,
-   -20,   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -15,   -28,
-   -18,   -16,   -17 ]
+   -28,    -3,    -5,   -28,    -8,    -9,   -11,   -13,   -28,    45,
+    -1,   -28,   -12,   -28,    -7,   -28,   -28,   -28,   -19,   -20,
+   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -14,   -28,   -28,
+   -18,   -15,   -28,   -17,   -16 ]
 racc_goto_table = [
-    14,    15,    16,    39,     1,    11,    21,    20,    27,   nil,
-   nil,   nil,   nil,   nil,    19,    42,   nil,   nil,    26,    29,
-   nil,   nil,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    29 ]
+    14,    15,    39,     1,    11,    16,    26,    21,   nil,   nil,
+   nil,   nil,   nil,    20,    22,    43,   nil,   nil,   nil,    28,
+   nil,    28,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    28 ]
 racc_goto_check = [
-     3,     3,     5,     8,     1,     2,     6,     3,     7,   nil,
-   nil,   nil,   nil,   nil,     1,     8,   nil,   nil,     5,     3,
-   nil,   nil,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     3,     3,     8,     1,     2,     5,     7,     3,   nil,   nil,
+   nil,   nil,   nil,     1,     5,     8,   nil,   nil,   nil,     3,
+   nil,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,     3 ]
 racc_goto_pointer = [
-   nil,     4,     2,    -6,   nil,    -6,   -11,   -17,   -25 ]
+   nil,     3,     1,    -6,   nil,    -3,   nil,   -19,   -25 ]
 racc_goto_default = [
-   nil,   nil,     2,     3,     4,   nil,   nil,    40,   nil ]
+   nil,   nil,     2,     3,     4,   nil,    17,    40,   nil ]
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 28, :_reduce_1,
-  1, 28, :_reduce_2,
-  2, 29, :_reduce_3,
-  1, 29, :_reduce_4,
-  2, 30, :_reduce_5,
-  1, 30, :_reduce_6,
-  4, 30, :_reduce_7,
-  2, 30, :_reduce_8,
-  2, 30, :_reduce_9,
-  1, 31, :_reduce_10,
-  2, 31, :_reduce_11,
-  4, 32, :_reduce_12,
-  3, 32, :_reduce_13,
-  3, 33, :_reduce_14,
-  4, 33, :_reduce_15,
-  5, 33, :_reduce_16,
-  2, 35, :_reduce_17,
-  1, 35, :_reduce_18,
-  1, 34, :_reduce_none,
-  1, 34, :_reduce_20,
-  1, 34, :_reduce_21,
-  1, 34, :_reduce_22,
-  1, 34, :_reduce_23,
-  1, 34, :_reduce_24,
-  1, 34, :_reduce_25,
-  1, 34, :_reduce_26,
-  1, 34, :_reduce_27 ]
+  3, 26, :_reduce_1,
+  1, 26, :_reduce_2,
+  2, 27, :_reduce_3,
+  1, 27, :_reduce_4,
+  2, 28, :_reduce_5,
+  1, 28, :_reduce_6,
+  4, 28, :_reduce_7,
+  2, 28, :_reduce_8,
+  2, 28, :_reduce_9,
+  1, 29, :_reduce_10,
+  2, 29, :_reduce_11,
+  2, 30, :_reduce_12,
+  1, 30, :_reduce_13,
+  5, 31, :_reduce_14,
+  6, 31, :_reduce_15,
+  7, 31, :_reduce_16,
+  2, 33, :_reduce_17,
+  1, 33, :_reduce_18,
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_20,
+  1, 32, :_reduce_21,
+  1, 32, :_reduce_22,
+  1, 32, :_reduce_23,
+  1, 32, :_reduce_24,
+  1, 32, :_reduce_25,
+  1, 32, :_reduce_26,
+  1, 32, :_reduce_27 ]
 racc_reduce_n = 28
-racc_shift_n = 43
+racc_shift_n = 45
 racc_token_table = {
   false => 0,
@@ -113,30 +113,28 @@ racc_token_table = {
   :tCOMMA => 2,
   :tNODE_TYPE => 3,
   :tGOTO_SCOPE => 4,
-  :tATTRIBUTE => 5,
-  :tKEY => 6,
-  :tIDENTIFIER => 7,
-  :tIDENTIFIER_VALUE => 8,
-  :tPSEUDO_CLASS => 9,
-  :tRELATIONSHIP => 10,
-  :tOPEN_ATTRIBUTE => 11,
-  :tCLOSE_ATTRIBUTE => 12,
-  :tOPEN_ARRAY => 13,
-  :tCLOSE_ARRAY => 14,
-  :tOPEN_SELECTOR => 15,
-  :tCLOSE_SELECTOR => 16,
-  :tPOSITION => 17,
-  :tOPERATOR => 18,
-  :tARRAY_VALUE => 19,
-  :tBOOLEAN => 20,
-  :tFLOAT => 21,
-  :tINTEGER => 22,
-  :tNIL => 23,
-  :tREGEXP => 24,
-  :tSTRING => 25,
-  :tSYMBOL => 26 }
-racc_nt_base = 27
+  :tKEY => 5,
+  :tIDENTIFIER_VALUE => 6,
+  :tPSEUDO_CLASS => 7,
+  :tRELATIONSHIP => 8,
+  :tOPEN_ATTRIBUTE => 9,
+  :tCLOSE_ATTRIBUTE => 10,
+  :tOPEN_ARRAY => 11,
+  :tCLOSE_ARRAY => 12,
+  :tOPEN_SELECTOR => 13,
+  :tCLOSE_SELECTOR => 14,
+  :tPOSITION => 15,
+  :tOPERATOR => 16,
+  :tARRAY_VALUE => 17,
+  :tBOOLEAN => 18,
+  :tFLOAT => 19,
+  :tINTEGER => 20,
+  :tNIL => 21,
+  :tREGEXP => 22,
+  :tSTRING => 23,
+  :tSYMBOL => 24 }
+racc_nt_base = 25
 racc_use_result_var = false
@@ -162,9 +160,7 @@ Racc_token_to_s_table = [
   "tCOMMA",
   "tNODE_TYPE",
   "tGOTO_SCOPE",
-  "tATTRIBUTE",
   "tKEY",
-  "tIDENTIFIER",
   "tIDENTIFIER_VALUE",
   "tPSEUDO_CLASS",
   "tRELATIONSHIP",
@@ -245,23 +241,23 @@ def _reduce_11(val, _values)
 end
 def _reduce_12(val, _values)
- NodeQuery::Compiler::AttributeList.new(attribute: val[1], rest: val[3])
+ NodeQuery::Compiler::AttributeList.new(attribute: val[0], rest: val[1])
 end
 def _reduce_13(val, _values)
- NodeQuery::Compiler::AttributeList.new(attribute: val[1])
+ NodeQuery::Compiler::AttributeList.new(attribute: val[0])
 end
 def _reduce_14(val, _values)
- NodeQuery::Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1])
+ NodeQuery::Compiler::Attribute.new(key: val[1], value: val[3], operator: val[2])
 end
 def _reduce_15(val, _values)
- NodeQuery::Compiler::Attribute.new(key: val[0], value: NodeQuery::Compiler::ArrayValue.new, operator: val[1])
+ NodeQuery::Compiler::Attribute.new(key: val[1], value: NodeQuery::Compiler::ArrayValue.new, operator: val[2])
 end
 def _reduce_16(val, _values)
- NodeQuery::Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1])
+ NodeQuery::Compiler::Attribute.new(key: val[1], value: val[4], operator: val[2])
 end
 def _reduce_17(val, _values)

data/lib/node_query_parser.y CHANGED Viewed

@@ -1,6 +1,6 @@
 class NodeQueryParser
 options no_result_var
-token tCOMMA tNODE_TYPE tGOTO_SCOPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tPSEUDO_CLASS tRELATIONSHIP
+token tCOMMA tNODE_TYPE tGOTO_SCOPE tKEY tIDENTIFIER_VALUE tPSEUDO_CLASS tRELATIONSHIP
       tOPEN_ATTRIBUTE tCLOSE_ATTRIBUTE tOPEN_ARRAY tCLOSE_ARRAY tOPEN_SELECTOR tCLOSE_SELECTOR tPOSITION
       tOPERATOR tARRAY_VALUE tBOOLEAN tFLOAT tINTEGER tNIL tREGEXP tSTRING tSYMBOL
 rule
@@ -24,13 +24,13 @@ rule
     | tNODE_TYPE attribute_list { NodeQuery::Compiler::BasicSelector.new(node_type: val[0], attribute_list: val[1]) }
   attribute_list
-    : tOPEN_ATTRIBUTE attribute tCLOSE_ATTRIBUTE attribute_list { NodeQuery::Compiler::AttributeList.new(attribute: val[1], rest: val[3]) }
-    | tOPEN_ATTRIBUTE attribute tCLOSE_ATTRIBUTE { NodeQuery::Compiler::AttributeList.new(attribute: val[1]) }
+    : attribute attribute_list { NodeQuery::Compiler::AttributeList.new(attribute: val[0], rest: val[1]) }
+    | attribute { NodeQuery::Compiler::AttributeList.new(attribute: val[0]) }
   attribute
-    : tKEY tOPERATOR value { NodeQuery::Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1]) }
-    | tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY { NodeQuery::Compiler::Attribute.new(key: val[0], value: NodeQuery::Compiler::ArrayValue.new, operator: val[1]) }
-    | tKEY tOPERATOR tOPEN_ARRAY array_value tCLOSE_ARRAY { NodeQuery::Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1]) }
+    : tOPEN_ATTRIBUTE tKEY tOPERATOR value tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: val[3], operator: val[2]) }
+    | tOPEN_ATTRIBUTE tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: NodeQuery::Compiler::ArrayValue.new, operator: val[2]) }
+    | tOPEN_ATTRIBUTE tKEY tOPERATOR tOPEN_ARRAY array_value tCLOSE_ARRAY tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: val[4], operator: val[2]) }
   array_value
     : value array_value { NodeQuery::Compiler::ArrayValue.new(value: val[0], rest: val[1]) }

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.13.9
+  version: 1.13.11
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies: []
 description: ast node query language
 email:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: ast node query language