RubyGems - synvert-core - Versions diffs - 1.2.0 → 1.2.1 - Mend

synvert-core 1.2.0 → 1.2.1

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 (10) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +5 -0
data/lib/synvert/core/node_ext.rb +14 -2
data/lib/synvert/core/node_query/parser.racc.rb +141 -149
data/lib/synvert/core/node_query/parser.y +0 -2
data/lib/synvert/core/node_query.rb +7 -7
data/lib/synvert/core/version.rb +1 -1
data/spec/synvert/core/node_ext_spec.rb +7 -5
data/spec/synvert/core/node_query/parser_spec.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5bf36b2f9e986dd2baf0bbddf53f4671a3bf98af0db830c270960eb583b47ce
-  data.tar.gz: 7e8693858d73d11c09652076ee03d49fe69662386caff67cbd0a3cc37e47d0a2
+  metadata.gz: 3c530d34ca0e2db5d9a295cb0cb48c375d13760f09290624805d742328a49103
+  data.tar.gz: 87cc4ef7ab9116bac2cbed78b9f71ab8d4ffa30281554d10319527a9aab94573
 SHA512:
-  metadata.gz: ad0eb6125d82241c60f7f0e229b9735f7c253280f1e56d586dfd24e8afb9c25b2cf574ca9c21e252c485f529b1bdf5f6b26c2b59805781cdefd3bc07a76072d8
-  data.tar.gz: 37bd754087a17d55577a10338fef9da3c60733d8634e9c394666a826fe205dc7f895121570f1e9cca4e7e1284f0b3b11c16e532e197afe2cd0ce61424c5d1557
+  metadata.gz: 1b864e1e350d3467fe12d2c5e26a5c5a0b685752e21802e3773edfbbb8fca8f7dec60fb545475a630a3f00c09359c66859b228cf7cb3d19aa6bf044df4848408
+  data.tar.gz: c8c5641b85080f03307fed835c05132488d140bb19b694c2b5b0958cb3d6377785ef1447c8b7fec59e7529f2ec610f6c78d72357b60f5fe4285d43d5071750fb

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,10 @@
 # CHANGELOG
+## 1.2.1 (2022-05-01)
+* Selector always after a node type in NQL
+* Define `pairs` method for `hash` ndoe
 ## 1.2.0 (2022-04-29)
 * Remove comma in NQL array value

data/lib/synvert/core/node_ext.rb CHANGED Viewed

@@ -93,9 +93,21 @@ module Parser::AST
     end
     # Dyamically defined method
-    # caller, key, left_value, message, name, parent_class, parent_const, receivr, rgith_value and value.
+    # caller, key, left_value, message, name, pairs, parent_class, parent_const, receivr, rgith_value and value.
     # based on const TYPE_CHILDREN.
-    %i[caller key left_value message name parent_class parent_const receiver right_value value].each do |method_name|
+    %i[
+      caller
+      key
+      left_value
+      message
+      name
+      pairs
+      parent_class
+      parent_const
+      receiver
+      right_value
+      value
+    ].each do |method_name|
       define_method(method_name) do
         index = TYPE_CHILDREN[type]&.index(method_name)
         return children[index] if index

data/lib/synvert/core/node_query/parser.racc.rb CHANGED Viewed

@@ -25,116 +25,118 @@ module Synvert
 ##### State transition tables begin ###
 racc_action_table = [
-     8,    19,    11,    15,    53,    16,    10,     8,    20,    22,
-    10,    53,    45,    23,    43,    24,     8,    10,    26,    45,
-    53,    27,    40,    10,    63,    64,    10,    68,    45,    75,
-    77,    78,    79,    46,    47,    48,    49,    50,    51,    52,
-    46,    47,    48,    49,    50,    51,    52,    80,   nil,    46,
-    47,    48,    49,    50,    51,    52,     8,   nil,   nil,   nil,
-    53,   nil,   nil,     8,   nil,   nil,    10,    53,    45,   nil,
-     8,   nil,   nil,    10,    53,    45,   nil,   nil,   nil,   nil,
-    10,   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,    46,
-    47,    48,    49,    50,    51,    52,    46,    47,    48,    49,
-    50,    51,    52,    46,    47,    48,    49,    50,    51,    52,
-     8,   nil,   nil,   nil,    53,   nil,   nil,     8,   nil,   nil,
-    10,    53,    45,   nil,     8,   nil,   nil,    10,    53,    45,
-   nil,    61,   nil,   nil,    10,   nil,    45,   nil,   nil,   nil,
-   nil,   nil,   nil,    46,    47,    48,    49,    50,    51,    52,
-    46,    47,    48,    49,    50,    51,    52,    46,    47,    48,
-    49,    50,    51,    52,     8,   nil,   nil,   nil,    53,   nil,
-   nil,     8,   nil,   nil,    10,    53,    45,   nil,     8,    65,
-   nil,    10,    53,    45,   nil,   nil,    69,   nil,    10,   nil,
-    45,   nil,   nil,    71,   nil,   nil,   nil,    46,    47,    48,
-    49,    50,    51,    52,    46,    47,    48,    49,    50,    51,
-    52,    46,    47,    48,    49,    50,    51,    52,     8,   nil,
-   nil,   nil,    53,   nil,   nil,     8,   nil,   nil,    10,    53,
-    45,   nil,     8,    73,   nil,    10,   nil,    45,     6,     2,
-     3,     4,    10,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     5,    46,    47,    48,    49,    50,    51,    52,    46,    47,
-    48,    49,    50,    51,    52,     8,   nil,   nil,   nil,   nil,
-     8,     6,     2,     3,     4,    10,     6,     2,     3,     4,
-    10,   nil,   nil,     5,     8,   nil,   nil,   nil,     5,     8,
-     6,     2,     3,     4,    10,     6,     2,     3,     4,    10,
-   nil,   nil,     5,     8,   nil,   nil,   nil,     5,     8,     6,
-     2,     3,     4,    10,     6,     2,     3,     4,    10,   nil,
-   nil,     5,   nil,   nil,   nil,   nil,     5,    35,    28,    30,
-    29,    32,    31,    34,    33,    38,    37,    36 ]
+     8,    17,     9,    13,    51,    14,    18,     8,    19,    20,
+    22,    51,    43,    24,    41,    26,     8,    27,    18,    43,
+    51,    61,    62,    66,    73,    75,    76,    77,    43,    78,
+   nil,   nil,   nil,    44,    45,    46,    47,    48,    49,    50,
+    44,    45,    46,    47,    48,    49,    50,   nil,   nil,    44,
+    45,    46,    47,    48,    49,    50,     8,   nil,   nil,   nil,
+    51,   nil,   nil,     8,   nil,   nil,   nil,    51,    43,   nil,
+     8,   nil,   nil,   nil,    51,    43,   nil,   nil,   nil,   nil,
+   nil,   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,    44,
+    45,    46,    47,    48,    49,    50,    44,    45,    46,    47,
+    48,    49,    50,    44,    45,    46,    47,    48,    49,    50,
+     8,   nil,   nil,   nil,    51,   nil,   nil,     8,   nil,   nil,
+   nil,    51,    43,   nil,     8,   nil,   nil,   nil,    51,    43,
+   nil,    59,   nil,   nil,   nil,   nil,    43,   nil,   nil,   nil,
+   nil,   nil,   nil,    44,    45,    46,    47,    48,    49,    50,
+    44,    45,    46,    47,    48,    49,    50,    44,    45,    46,
+    47,    48,    49,    50,     8,   nil,   nil,   nil,    51,   nil,
+   nil,     8,   nil,   nil,   nil,    51,    43,   nil,     8,    63,
+   nil,   nil,    51,    43,   nil,   nil,    67,   nil,   nil,   nil,
+    43,   nil,   nil,    69,   nil,   nil,   nil,    44,    45,    46,
+    47,    48,    49,    50,    44,    45,    46,    47,    48,    49,
+    50,    44,    45,    46,    47,    48,    49,    50,     8,   nil,
+   nil,   nil,    51,   nil,   nil,     8,   nil,   nil,   nil,    51,
+    43,   nil,     8,    71,   nil,   nil,   nil,    43,     6,     2,
+     3,     4,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     5,    44,    45,    46,    47,    48,    49,    50,    44,    45,
+    46,    47,    48,    49,    50,     8,   nil,   nil,   nil,     8,
+   nil,     6,     2,     3,     4,     6,     2,     3,     4,   nil,
+   nil,   nil,     8,     5,   nil,   nil,     8,     5,     6,     2,
+     3,     4,     6,     2,     3,     4,   nil,   nil,   nil,     8,
+     5,   nil,   nil,     8,     5,     6,     2,     3,     4,     6,
+     2,     3,     4,   nil,   nil,   nil,   nil,     5,   nil,   nil,
+   nil,     5,    35,    28,    30,    29,    32,    31,    34,    33,
+    38,    37,    36 ]
 racc_action_check = [
-    28,     8,     1,     5,    28,     6,     8,    29,     9,    10,
-    28,    29,    28,    11,    28,    15,    30,    29,    18,    29,
-    30,    21,    25,    27,    37,    38,    30,    45,    30,    66,
-    68,    70,    72,    28,    28,    28,    28,    28,    28,    28,
-    29,    29,    29,    29,    29,    29,    29,    74,   nil,    30,
+    28,     8,     1,     5,    28,     6,     8,    29,     9,    13,
+    16,    29,    28,    18,    28,    21,    30,    23,    27,    29,
+    30,    37,    38,    43,    64,    66,    68,    70,    30,    72,
+   nil,   nil,   nil,    28,    28,    28,    28,    28,    28,    28,
+    29,    29,    29,    29,    29,    29,    29,   nil,   nil,    30,
     30,    30,    30,    30,    30,    30,    31,   nil,   nil,   nil,
-    31,   nil,   nil,    32,   nil,   nil,    31,    32,    31,   nil,
-    33,   nil,   nil,    32,    33,    32,   nil,   nil,   nil,   nil,
-    33,   nil,    33,   nil,   nil,   nil,   nil,   nil,   nil,    31,
+    31,   nil,   nil,    32,   nil,   nil,   nil,    32,    31,   nil,
+    33,   nil,   nil,   nil,    33,    32,   nil,   nil,   nil,   nil,
+   nil,   nil,    33,   nil,   nil,   nil,   nil,   nil,   nil,    31,
     31,    31,    31,    31,    31,    31,    32,    32,    32,    32,
     32,    32,    32,    33,    33,    33,    33,    33,    33,    33,
     34,   nil,   nil,   nil,    34,   nil,   nil,    35,   nil,   nil,
-    34,    35,    34,   nil,    36,   nil,   nil,    35,    36,    35,
-   nil,    35,   nil,   nil,    36,   nil,    36,   nil,   nil,   nil,
+   nil,    35,    34,   nil,    36,   nil,   nil,   nil,    36,    35,
+   nil,    35,   nil,   nil,   nil,   nil,    36,   nil,   nil,   nil,
    nil,   nil,   nil,    34,    34,    34,    34,    34,    34,    34,
     35,    35,    35,    35,    35,    35,    35,    36,    36,    36,
-    36,    36,    36,    36,    43,   nil,   nil,   nil,    43,   nil,
-   nil,    61,   nil,   nil,    43,    61,    43,   nil,    63,    43,
-   nil,    61,    63,    61,   nil,   nil,    61,   nil,    63,   nil,
-    63,   nil,   nil,    63,   nil,   nil,   nil,    43,    43,    43,
-    43,    43,    43,    43,    61,    61,    61,    61,    61,    61,
-    61,    63,    63,    63,    63,    63,    63,    63,    64,   nil,
-   nil,   nil,    64,   nil,   nil,    67,   nil,   nil,    64,    67,
-    64,   nil,     0,    64,   nil,    67,   nil,    67,     0,     0,
-     0,     0,     0,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     0,    64,    64,    64,    64,    64,    64,    64,    67,    67,
-    67,    67,    67,    67,    67,     2,   nil,   nil,   nil,   nil,
-     3,     2,     2,     2,     2,     2,     3,     3,     3,     3,
-     3,   nil,   nil,     2,     4,   nil,   nil,   nil,     3,     7,
-     4,     4,     4,     4,     4,     7,     7,     7,     7,     7,
-   nil,   nil,     4,    16,   nil,   nil,   nil,     7,    24,    16,
-    16,    16,    16,    16,    24,    24,    24,    24,    24,   nil,
-   nil,    16,   nil,   nil,   nil,   nil,    24,    22,    22,    22,
-    22,    22,    22,    22,    22,    22,    22,    22 ]
+    36,    36,    36,    36,    41,   nil,   nil,   nil,    41,   nil,
+   nil,    59,   nil,   nil,   nil,    59,    41,   nil,    61,    41,
+   nil,   nil,    61,    59,   nil,   nil,    59,   nil,   nil,   nil,
+    61,   nil,   nil,    61,   nil,   nil,   nil,    41,    41,    41,
+    41,    41,    41,    41,    59,    59,    59,    59,    59,    59,
+    59,    61,    61,    61,    61,    61,    61,    61,    62,   nil,
+   nil,   nil,    62,   nil,   nil,    65,   nil,   nil,   nil,    65,
+    62,   nil,     0,    62,   nil,   nil,   nil,    65,     0,     0,
+     0,     0,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     0,    62,    62,    62,    62,    62,    62,    62,    65,    65,
+    65,    65,    65,    65,    65,     2,   nil,   nil,   nil,     3,
+   nil,     2,     2,     2,     2,     3,     3,     3,     3,   nil,
+   nil,   nil,     4,     2,   nil,   nil,     7,     3,     4,     4,
+     4,     4,     7,     7,     7,     7,   nil,   nil,   nil,    14,
+     4,   nil,   nil,    20,     7,    14,    14,    14,    14,    20,
+    20,    20,    20,   nil,   nil,   nil,   nil,    14,   nil,   nil,
+   nil,    20,    24,    24,    24,    24,    24,    24,    24,    24,
+    24,    24,    24 ]
 racc_action_pointer = [
-   230,     2,   263,   268,   282,    -2,   -13,   287,    -6,     1,
-     5,    13,   nil,   nil,   nil,    -6,   301,   nil,    11,   nil,
-   nil,     8,   305,   nil,   306,     3,   nil,    11,    -2,     5,
-    14,    54,    61,    68,   108,   115,   122,     8,     9,   nil,
-   nil,   nil,   nil,   162,   nil,    -7,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   169,   nil,   176,   216,   nil,    12,   223,    15,   nil,
-    14,   nil,    15,   nil,    30,   nil,   nil,   nil,   nil,   nil,
-   nil ]
+   230,     2,   263,   267,   280,    -2,   -13,   284,    -6,     8,
+   nil,   nil,   nil,   -12,   297,   nil,     3,   nil,     9,   nil,
+   301,    -4,   nil,     4,   300,   nil,   nil,     6,    -2,     5,
+    14,    54,    61,    68,   108,   115,   122,     5,     6,   nil,
+   nil,   162,   nil,   -11,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   169,
+   nil,   176,   216,   nil,     7,   223,    10,   nil,     9,   nil,
+    10,   nil,    12,   nil,   nil,   nil,   nil,   nil,   nil ]
 racc_action_default = [
-   -45,   -45,   -45,   -45,   -45,   -45,   -45,    -7,   -12,   -13,
-   -45,   -45,    -1,    -2,    -3,   -45,   -45,    -6,   -11,    -9,
-   -10,   -45,   -45,    81,   -45,   -45,    -8,   -15,   -45,   -45,
-   -45,   -45,   -45,   -45,   -45,   -45,   -45,   -45,   -45,    -4,
-    -5,   -14,   -16,   -45,   -35,   -45,   -37,   -38,   -39,   -40,
-   -41,   -42,   -43,   -44,   -17,   -18,   -19,   -20,   -21,   -22,
-   -23,   -45,   -24,   -45,   -45,   -25,   -45,   -34,   -45,   -26,
-   -45,   -27,   -45,   -28,   -45,   -29,   -33,   -36,   -30,   -31,
-   -32 ]
+   -43,   -43,   -43,   -43,   -43,   -43,   -43,    -7,   -11,   -43,
+    -1,    -2,    -3,   -43,   -43,    -6,   -10,    -9,   -43,    79,
+   -43,   -43,    -8,   -43,   -43,    -4,    -5,   -13,   -43,   -43,
+   -43,   -43,   -43,   -43,   -43,   -43,   -43,   -43,   -43,   -12,
+   -14,   -43,   -33,   -43,   -35,   -36,   -37,   -38,   -39,   -40,
+   -41,   -42,   -15,   -16,   -17,   -18,   -19,   -20,   -21,   -43,
+   -22,   -43,   -43,   -23,   -43,   -32,   -43,   -24,   -43,   -25,
+   -43,   -26,   -43,   -27,   -31,   -34,   -28,   -29,   -30 ]
 racc_goto_table = [
-     1,    18,    12,    13,    14,    66,     7,    17,     7,     7,
-     7,    21,   nil,     7,   nil,   nil,    25,   nil,   nil,   nil,
-    41,   nil,     7,    70,    39,    72,    74,   nil,   nil,    76,
-     7,    42,    54,    55,    56,    57,    58,    59,    60,    62 ]
+    64,    23,     1,   nil,    10,    11,    12,   nil,   nil,    15,
+    16,   nil,   nil,   nil,   nil,   nil,    21,   nil,    68,   nil,
+    70,    72,    25,     7,    74,     7,     7,     7,   nil,    39,
+     7,   nil,   nil,   nil,   nil,   nil,   nil,     7,   nil,   nil,
+   nil,   nil,   nil,     7,    40,    52,    53,    54,    55,    56,
+    57,    58,    60 ]
 racc_goto_check = [
-     1,     3,     1,     1,     1,     6,     2,     1,     2,     2,
-     2,     4,   nil,     2,   nil,   nil,     1,   nil,   nil,   nil,
-     3,   nil,     2,     6,     1,     6,     6,   nil,   nil,     6,
-     2,     5,     5,     5,     5,     5,     5,     5,     5,     5 ]
+     6,     4,     1,   nil,     1,     1,     1,   nil,   nil,     1,
+     3,   nil,   nil,   nil,   nil,   nil,     1,   nil,     6,   nil,
+     6,     6,     1,     2,     6,     2,     2,     2,   nil,     3,
+     2,   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,
+   nil,   nil,   nil,     2,     5,     5,     5,     5,     5,     5,
+     5,     5,     5 ]
 racc_goto_pointer = [
-   nil,     0,     6,    -7,     1,     3,   -38 ]
+   nil,     2,    23,     2,   -17,    16,   -41 ]
 racc_goto_default = [
-   nil,   nil,    44,     9,   nil,    67,   nil ]
+   nil,   nil,    42,   nil,   nil,    65,   nil ]
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -148,11 +150,11 @@ racc_reduce_table = [
   3, 44, :_reduce_8,
   2, 44, :_reduce_9,
   2, 44, :_reduce_10,
-  2, 44, :_reduce_11,
-  1, 44, :_reduce_12,
-  1, 44, :_reduce_13,
-  4, 45, :_reduce_14,
-  3, 45, :_reduce_15,
+  1, 44, :_reduce_11,
+  4, 45, :_reduce_12,
+  3, 45, :_reduce_13,
+  3, 46, :_reduce_14,
+  3, 46, :_reduce_15,
   3, 46, :_reduce_16,
   3, 46, :_reduce_17,
   3, 46, :_reduce_18,
@@ -160,32 +162,30 @@ racc_reduce_table = [
   3, 46, :_reduce_20,
   3, 46, :_reduce_21,
   3, 46, :_reduce_22,
-  3, 46, :_reduce_23,
-  3, 46, :_reduce_24,
+  4, 46, :_reduce_23,
+  4, 46, :_reduce_24,
   4, 46, :_reduce_25,
   4, 46, :_reduce_26,
-  4, 46, :_reduce_27,
-  4, 46, :_reduce_28,
+  5, 46, :_reduce_27,
+  5, 46, :_reduce_28,
   5, 46, :_reduce_29,
   5, 46, :_reduce_30,
-  5, 46, :_reduce_31,
-  5, 46, :_reduce_32,
-  2, 48, :_reduce_33,
-  1, 48, :_reduce_34,
+  2, 48, :_reduce_31,
+  1, 48, :_reduce_32,
   1, 47, :_reduce_none,
-  3, 47, :_reduce_36,
+  3, 47, :_reduce_34,
+  1, 47, :_reduce_35,
+  1, 47, :_reduce_36,
   1, 47, :_reduce_37,
   1, 47, :_reduce_38,
   1, 47, :_reduce_39,
   1, 47, :_reduce_40,
   1, 47, :_reduce_41,
-  1, 47, :_reduce_42,
-  1, 47, :_reduce_43,
-  1, 47, :_reduce_44 ]
+  1, 47, :_reduce_42 ]
-racc_reduce_n = 45
+racc_reduce_n = 43
-racc_shift_n = 81
+racc_shift_n = 79
 racc_token_table = {
   false => 0,
@@ -345,140 +345,132 @@ def _reduce_9(val, _values)
 end
 def _reduce_10(val, _values)
- Compiler::Selector.new(attribute_list: val[0], index: val[1])
-end
-def _reduce_11(val, _values)
  Compiler::Selector.new(node_type: val[0], attribute_list: val[1])
 end
-def _reduce_12(val, _values)
+def _reduce_11(val, _values)
  Compiler::Selector.new(node_type: val[0])
 end
-def _reduce_13(val, _values)
- Compiler::Selector.new(attribute_list: val[0])
-end
-def _reduce_14(val, _values)
+def _reduce_12(val, _values)
  Compiler::AttributeList.new(attribute: val[1], rest: val[3])
 end
-def _reduce_15(val, _values)
+def _reduce_13(val, _values)
  Compiler::AttributeList.new(attribute: val[1])
 end
-def _reduce_16(val, _values)
+def _reduce_14(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :!=)
 end
-def _reduce_17(val, _values)
+def _reduce_15(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :!~)
 end
-def _reduce_18(val, _values)
+def _reduce_16(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :=~)
 end
-def _reduce_19(val, _values)
+def _reduce_17(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :>=)
 end
-def _reduce_20(val, _values)
+def _reduce_18(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :>)
 end
-def _reduce_21(val, _values)
+def _reduce_19(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :<=)
 end
-def _reduce_22(val, _values)
+def _reduce_20(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :<)
 end
-def _reduce_23(val, _values)
+def _reduce_21(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :==)
 end
-def _reduce_24(val, _values)
+def _reduce_22(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: :includes)
 end
-def _reduce_25(val, _values)
+def _reduce_23(val, _values)
  Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :!=)
 end
-def _reduce_26(val, _values)
+def _reduce_24(val, _values)
  Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :==)
 end
-def _reduce_27(val, _values)
+def _reduce_25(val, _values)
  Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :not_in)
 end
-def _reduce_28(val, _values)
+def _reduce_26(val, _values)
  Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :in)
 end
-def _reduce_29(val, _values)
+def _reduce_27(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[3], operator: :!=)
 end
-def _reduce_30(val, _values)
+def _reduce_28(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[3], operator: :==)
 end
-def _reduce_31(val, _values)
+def _reduce_29(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[3], operator: :not_in)
 end
-def _reduce_32(val, _values)
+def _reduce_30(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[3], operator: :in)
 end
-def _reduce_33(val, _values)
+def _reduce_31(val, _values)
  Compiler::Array.new(value: val[0], rest: val[1])
 end
-def _reduce_34(val, _values)
+def _reduce_32(val, _values)
  Compiler::Array.new(value: val[0])
 end
-# reduce 35 omitted
+# reduce 33 omitted
-def _reduce_36(val, _values)
+def _reduce_34(val, _values)
  Compiler::DynamicAttribute.new(value: val[1])
 end
-def _reduce_37(val, _values)
+def _reduce_35(val, _values)
  Compiler::Boolean.new(value: val[0])
 end
-def _reduce_38(val, _values)
+def _reduce_36(val, _values)
  Compiler::Float.new(value: val[0])
 end
-def _reduce_39(val, _values)
+def _reduce_37(val, _values)
  Compiler::Integer.new(value: val[0])
 end
-def _reduce_40(val, _values)
+def _reduce_38(val, _values)
  Compiler::Nil.new(value: val[0])
 end
-def _reduce_41(val, _values)
+def _reduce_39(val, _values)
  Compiler::Regexp.new(value: val[0])
 end
-def _reduce_42(val, _values)
+def _reduce_40(val, _values)
  Compiler::String.new(value: val[0])
 end
-def _reduce_43(val, _values)
+def _reduce_41(val, _values)
  Compiler::Symbol.new(value: val[0])
 end
-def _reduce_44(val, _values)
+def _reduce_42(val, _values)
  Compiler::Identifier.new(value: val[0])
 end

data/lib/synvert/core/node_query/parser.y CHANGED Viewed

@@ -19,10 +19,8 @@ rule
   selector
     : tNODE_TYPE attribute_list tINDEX { Compiler::Selector.new(node_type: val[0], attribute_list: val[1], index: val[2]) }
     | tNODE_TYPE tINDEX { Compiler::Selector.new(node_type: val[0], index: val[1]) }
-    | attribute_list tINDEX { Compiler::Selector.new(attribute_list: val[0], index: val[1]) }
     | tNODE_TYPE attribute_list { Compiler::Selector.new(node_type: val[0], attribute_list: val[1]) }
     | tNODE_TYPE { Compiler::Selector.new(node_type: val[0]) }
-    | attribute_list { Compiler::Selector.new(attribute_list: val[0]) }
     ;
   attribute_list

data/lib/synvert/core/node_query.rb CHANGED Viewed

@@ -5,10 +5,10 @@
 # It supports the following selectors:
 #
 # * AST node type: +.class+, +.send+
-# * attribute value: +[receiver = nil]+, +[message = create]+
-# * attribute regex: <code>[key=~/\A:([^'"]+)\z/]</code>, <code>[key!~/\A:([^'"]+)\z/]</code>
-# * attribute conditions: +[message != nil]+, +[value > 1]+, +[value >= 1]+, +[value < 1]+, +[value <= 1]+
-# * nested attribute: +[caller.message = map]+, +[arguments.size = 2]+
+# * attribute value: +.send[receiver = nil]+, +.send[message = create]+
+# * attribute regex: <code>.send[key=~/\A:([^'"]+)\z/]</code>, <code>.send[key!~/\A:([^'"]+)\z/]</code>
+# * attribute conditions: +.send[message != nil]+, +.send[value > 1]+, +.send[value >= 1]+, +.send[value < 1]+, +.send[value <= 1]+
+# * nested attribute: +.send[caller.message = map]+, +.send[arguments.size = 2]+
 # * first or last child: +.def:first-child+, +.send:last-child+
 # * nth-child or nth-last-child: +.def:nth-child(2)+, +.send:nth-last-child(2)+
 # * descendant: +.class .send+
@@ -21,9 +21,9 @@
 #
 # * not_has: +.class:not_has(.def)+, it's same as +:not(:has())+ in css, just to make implementation easy.
 # * nested selector: +.send[arguments = [size = 2][first = .sym][last = .hash]]+
-# * array value: +.send[arguments = (a, b)]+
-# * IN operator: +.send[message IN (try, try!)]+
-# * NOT IN operator: +.send[message NOT IN (create, build)]+
+# * array value: +.send[arguments = (a b)]+
+# * IN operator: +.send[message IN (try try!)]+
+# * NOT IN operator: +.send[message NOT IN (create build)]+
 # * INCLUDES operator: +.send[arguments INCLUDES &block]+
 # * dynamic attribute value: +.hash > .pair[key={{value}}]+
 #

data/lib/synvert/core/version.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 module Synvert
   module Core
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/spec/synvert/core/node_ext_spec.rb CHANGED Viewed

@@ -1033,7 +1033,7 @@ describe Parser::AST::Node do
       node = parse(<<~EOS)
         class Synvert
           def foobar(foo, bar)
-            foo + bar
+            { foo => bar }
           end
         end
       EOS
@@ -1056,10 +1056,12 @@ describe Parser::AST::Node do
               ],
               body: [
                 {
-                  type: :send,
-                  receiver: { name: :foo, type: :lvar },
-                  message: :+,
-                  arguments: [{ name: :bar, type: :lvar }]
+                  type: :hash,
+                  pairs: {
+                    type: :pair,
+                    key: { type: :lvar, name: :foo },
+                    value: { type: :lvar, name: :bar }
+                  }
                 }
               ]
             }

data/spec/synvert/core/node_query/parser_spec.rb CHANGED Viewed

@@ -310,7 +310,7 @@ module Synvert::Core::NodeQuery
       end
       it 'matches arguments' do
-        expression = parser.parse('.send[arguments=[size=2][first=.sym][last=.hash]]')
+        expression = parser.parse('.send[arguments.size=2][arguments.first=.sym][arguments.last=.hash]')
         expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
       end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport