synvert-core 1.2.1 → 1.4.0

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

@@ -25,213 +25,116 @@ module Synvert
 ##### State transition tables begin ###
 
 racc_action_table = [
-     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 ]
+     7,     7,     6,     8,    10,    34,    14,     4,     5,    15,
+    26,    18,    24,    19,    20,    21,    14,    38,    39,    27,
+    28,    29,    30,    31,    32,    33,     7,    41,     7,     6,
+   nil,    34,   nil,     7,     4,     5,    26,   nil,    34,    35,
+   nil,   nil,   nil,    26,   nil,    27,    28,    29,    30,    31,
+    32,    33,    27,    28,    29,    30,    31,    32,    33,     7,
+     6,     7,     6,     7,     6,     4,     5,     4,     5,     4,
+     5 ]
 
 racc_action_check = [
-    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,   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,
-   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,    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 ]
+    21,     0,     0,     1,     4,    21,     7,     0,     0,     8,
+    21,    14,    21,    16,    17,    18,    20,    26,    36,    21,
+    21,    21,    21,    21,    21,    21,    24,    38,     2,     2,
+   nil,    24,   nil,    37,     2,     2,    24,   nil,    37,    24,
+   nil,   nil,   nil,    37,   nil,    24,    24,    24,    24,    24,
+    24,    24,    37,    37,    37,    37,    37,    37,    37,     5,
+     5,     6,     6,    10,    10,     5,     5,     6,     6,    10,
+    10 ]
 
 racc_action_pointer = [
-   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 ]
+    -1,     3,    26,   nil,   -12,    57,    59,    -4,     9,   nil,
+    61,   nil,   nil,   nil,     6,   nil,    -4,     3,    -3,   nil,
+     6,    -2,   nil,   nil,    24,   nil,    -3,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     3,    31,    14,   nil,
+   nil,   nil ]
 
 racc_action_default = [
-   -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 ]
+   -26,   -26,    -2,    -3,   -26,   -26,   -26,    -7,   -26,    -1,
+   -26,    -5,    -6,    -8,   -26,    42,   -26,   -26,   -26,    -4,
+   -10,   -26,    -9,   -11,   -26,   -16,   -26,   -18,   -19,   -20,
+   -21,   -22,   -23,   -24,   -25,   -12,   -26,   -15,   -26,   -13,
+   -14,   -17 ]
 
 racc_goto_table = [
-    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 ]
+    25,    13,    36,    25,    11,    12,     1,    17,     9,    16,
+    23,   nil,   nil,   nil,    22,    40,    25 ]
 
 racc_goto_check = [
-     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 ]
+     3,     4,     7,     3,     2,     2,     1,     5,     1,     2,
+     6,   nil,   nil,   nil,     4,     7,     3 ]
 
 racc_goto_pointer = [
-   nil,     2,    23,     2,   -17,    16,   -41 ]
+   nil,     6,    -1,   -21,    -6,    -7,   -11,   -22 ]
 
 racc_goto_default = [
-   nil,   nil,    42,   nil,   nil,    65,   nil ]
+   nil,   nil,     2,     3,   nil,   nil,    37,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  2, 43, :_reduce_1,
-  2, 43, :_reduce_2,
-  2, 43, :_reduce_3,
-  4, 43, :_reduce_4,
-  4, 43, :_reduce_5,
-  2, 43, :_reduce_6,
-  1, 43, :_reduce_7,
-  3, 44, :_reduce_8,
-  2, 44, :_reduce_9,
-  2, 44, :_reduce_10,
-  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,
-  3, 46, :_reduce_19,
-  3, 46, :_reduce_20,
-  3, 46, :_reduce_21,
-  3, 46, :_reduce_22,
-  4, 46, :_reduce_23,
-  4, 46, :_reduce_24,
-  4, 46, :_reduce_25,
-  4, 46, :_reduce_26,
-  5, 46, :_reduce_27,
-  5, 46, :_reduce_28,
-  5, 46, :_reduce_29,
-  5, 46, :_reduce_30,
-  2, 48, :_reduce_31,
-  1, 48, :_reduce_32,
-  1, 47, :_reduce_none,
-  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 ]
-
-racc_reduce_n = 43
-
-racc_shift_n = 79
+  2, 29, :_reduce_1,
+  1, 29, :_reduce_2,
+  1, 30, :_reduce_3,
+  4, 30, :_reduce_4,
+  2, 30, :_reduce_5,
+  2, 30, :_reduce_6,
+  1, 31, :_reduce_7,
+  2, 31, :_reduce_8,
+  4, 32, :_reduce_9,
+  3, 32, :_reduce_10,
+  3, 33, :_reduce_11,
+  4, 33, :_reduce_12,
+  5, 33, :_reduce_13,
+  2, 35, :_reduce_14,
+  1, 35, :_reduce_15,
+  1, 34, :_reduce_none,
+  3, 34, :_reduce_17,
+  1, 34, :_reduce_18,
+  1, 34, :_reduce_19,
+  1, 34, :_reduce_20,
+  1, 34, :_reduce_21,
+  1, 34, :_reduce_22,
+  1, 34, :_reduce_23,
+  1, 34, :_reduce_24,
+  1, 34, :_reduce_25 ]
+
+racc_reduce_n = 26
+
+racc_shift_n = 42
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :tNODE_TYPE => 2,
-  :tATTRIBUTE => 3,
-  :tKEY => 4,
-  :tIDENTIFIER => 5,
-  :tIDENTIFIER_VALUE => 6,
-  :tINDEX => 7,
+  :tGOTO_SCOPE => 3,
+  :tATTRIBUTE => 4,
+  :tKEY => 5,
+  :tIDENTIFIER => 6,
+  :tIDENTIFIER_VALUE => 7,
   :tPSEUDO_CLASS => 8,
-  :tCHILD => 9,
-  :tSUBSEQUENT_SIBLING => 10,
-  :tNEXT_SIBLING => 11,
-  :tOPEN_ATTRIBUTE => 12,
-  :tCLOSE_ATTRIBUTE => 13,
-  :tOPEN_DYNAMIC_ATTRIBUTE => 14,
-  :tCLOSE_DYNAMIC_ATTRIBUTE => 15,
-  :tOPEN_ARRAY => 16,
-  :tCLOSE_ARRAY => 17,
-  :tOPEN_SELECTOR => 18,
-  :tCLOSE_SELECTOR => 19,
-  :tOPEN_GOTO_SCOPE => 20,
-  :tCLOSE_GOTO_SCOPE => 21,
-  :tEQUAL => 22,
-  :tNOT_EQUAL => 23,
-  :tMATCH => 24,
-  :tNOT_MATCH => 25,
-  :tGREATER_THAN => 26,
-  :tGREATER_THAN_OR_EQUAL => 27,
-  :tLESS_THAN => 28,
-  :tLESS_THAN_OR_EQUAL => 29,
-  :tIN => 30,
-  :tNOT_IN => 31,
-  :tINCLUDES => 32,
-  :tARRAY_VALUE => 33,
-  :tDYNAMIC_ATTRIBUTE => 34,
-  :tBOOLEAN => 35,
-  :tFLOAT => 36,
-  :tINTEGER => 37,
-  :tNIL => 38,
-  :tREGEXP => 39,
-  :tSTRING => 40,
-  :tSYMBOL => 41 }
-
-racc_nt_base = 42
+  :tRELATIONSHIP => 9,
+  :tOPEN_ATTRIBUTE => 10,
+  :tCLOSE_ATTRIBUTE => 11,
+  :tOPEN_DYNAMIC_ATTRIBUTE => 12,
+  :tCLOSE_DYNAMIC_ATTRIBUTE => 13,
+  :tOPEN_ARRAY => 14,
+  :tCLOSE_ARRAY => 15,
+  :tOPEN_SELECTOR => 16,
+  :tCLOSE_SELECTOR => 17,
+  :tOPERATOR => 18,
+  :tARRAY_VALUE => 19,
+  :tDYNAMIC_ATTRIBUTE => 20,
+  :tBOOLEAN => 21,
+  :tFLOAT => 22,
+  :tINTEGER => 23,
+  :tNIL => 24,
+  :tREGEXP => 25,
+  :tSTRING => 26,
+  :tSYMBOL => 27 }
+
+racc_nt_base = 28
 
 racc_use_result_var = false
 
@@ -255,15 +158,13 @@ Racc_token_to_s_table = [
   "$end",
   "error",
   "tNODE_TYPE",
+  "tGOTO_SCOPE",
   "tATTRIBUTE",
   "tKEY",
   "tIDENTIFIER",
   "tIDENTIFIER_VALUE",
-  "tINDEX",
   "tPSEUDO_CLASS",
-  "tCHILD",
-  "tSUBSEQUENT_SIBLING",
-  "tNEXT_SIBLING",
+  "tRELATIONSHIP",
   "tOPEN_ATTRIBUTE",
   "tCLOSE_ATTRIBUTE",
   "tOPEN_DYNAMIC_ATTRIBUTE",
@@ -272,19 +173,7 @@ Racc_token_to_s_table = [
   "tCLOSE_ARRAY",
   "tOPEN_SELECTOR",
   "tCLOSE_SELECTOR",
-  "tOPEN_GOTO_SCOPE",
-  "tCLOSE_GOTO_SCOPE",
-  "tEQUAL",
-  "tNOT_EQUAL",
-  "tMATCH",
-  "tNOT_MATCH",
-  "tGREATER_THAN",
-  "tGREATER_THAN_OR_EQUAL",
-  "tLESS_THAN",
-  "tLESS_THAN_OR_EQUAL",
-  "tIN",
-  "tNOT_IN",
-  "tINCLUDES",
+  "tOPERATOR",
   "tARRAY_VALUE",
   "tDYNAMIC_ATTRIBUTE",
   "tBOOLEAN",
@@ -297,6 +186,7 @@ Racc_token_to_s_table = [
   "$start",
   "expression",
   "selector",
+  "basic_selector",
   "attribute_list",
   "attribute",
   "value",
@@ -309,168 +199,100 @@ Racc_debug_parser = false
 # reduce 0 omitted
 
 def _reduce_1(val, _values)
- Compiler::Expression.new(rest: val[1], relationship: :child)
+ Compiler::Expression.new(selector: val[0], rest: val[1])
 end
 
 def _reduce_2(val, _values)
- Compiler::Expression.new(rest: val[1], relationship: :subsequent_sibling)
+ Compiler::Expression.new(selector: val[0])
 end
 
 def _reduce_3(val, _values)
- Compiler::Expression.new(rest: val[1], relationship: :next_sibling)
+ Compiler::Selector.new(basic_selector: val[0])
 end
 
 def _reduce_4(val, _values)
- Compiler::Expression.new(goto_scope: val[1], rest: val[3])
+ Compiler::Selector.new(pseudo_class: val[0], pseudo_selector: val[2])
 end
 
 def _reduce_5(val, _values)
- Compiler::Expression.new(relationship: val[0].to_sym, rest: val[2])
+ Compiler::Selector.new(relationship: val[0], rest: val[1])
 end
 
 def _reduce_6(val, _values)
- Compiler::Expression.new(selector: val[0], rest: val[1])
+ Compiler::Selector.new(goto_scope: val[0], rest: val[1])
 end
 
 def _reduce_7(val, _values)
- Compiler::Expression.new(selector: val[0])
+ Compiler::BasicSelector.new(node_type: val[0])
 end
 
 def _reduce_8(val, _values)
- Compiler::Selector.new(node_type: val[0], attribute_list: val[1], index: val[2])
+ Compiler::BasicSelector.new(node_type: val[0], attribute_list: val[1])
 end
 
 def _reduce_9(val, _values)
- Compiler::Selector.new(node_type: val[0], index: val[1])
+ Compiler::AttributeList.new(attribute: val[1], rest: val[3])
 end
 
 def _reduce_10(val, _values)
- Compiler::Selector.new(node_type: val[0], attribute_list: val[1])
+ Compiler::AttributeList.new(attribute: val[1])
 end
 
 def _reduce_11(val, _values)
- Compiler::Selector.new(node_type: val[0])
+ Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1])
 end
 
 def _reduce_12(val, _values)
- Compiler::AttributeList.new(attribute: val[1], rest: val[3])
+ Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: val[1])
 end
 
 def _reduce_13(val, _values)
- Compiler::AttributeList.new(attribute: val[1])
+ Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1])
 end
 
 def _reduce_14(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :!=)
-end
-
-def _reduce_15(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :!~)
-end
-
-def _reduce_16(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :=~)
-end
-
-def _reduce_17(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :>=)
-end
-
-def _reduce_18(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :>)
-end
-
-def _reduce_19(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :<=)
-end
-
-def _reduce_20(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :<)
-end
-
-def _reduce_21(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :==)
-end
-
-def _reduce_22(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :includes)
-end
-
-def _reduce_23(val, _values)
- Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :!=)
-end
-
-def _reduce_24(val, _values)
- Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :==)
-end
-
-def _reduce_25(val, _values)
- Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :not_in)
-end
-
-def _reduce_26(val, _values)
- Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :in)
-end
-
-def _reduce_27(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[3], operator: :!=)
-end
-
-def _reduce_28(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[3], operator: :==)
-end
-
-def _reduce_29(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[3], operator: :not_in)
-end
-
-def _reduce_30(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[3], operator: :in)
-end
-
-def _reduce_31(val, _values)
  Compiler::Array.new(value: val[0], rest: val[1])
 end
 
-def _reduce_32(val, _values)
+def _reduce_15(val, _values)
  Compiler::Array.new(value: val[0])
 end
 
-# reduce 33 omitted
+# reduce 16 omitted
 
-def _reduce_34(val, _values)
+def _reduce_17(val, _values)
  Compiler::DynamicAttribute.new(value: val[1])
 end
 
-def _reduce_35(val, _values)
+def _reduce_18(val, _values)
  Compiler::Boolean.new(value: val[0])
 end
 
-def _reduce_36(val, _values)
+def _reduce_19(val, _values)
  Compiler::Float.new(value: val[0])
 end
 
-def _reduce_37(val, _values)
+def _reduce_20(val, _values)
  Compiler::Integer.new(value: val[0])
 end
 
-def _reduce_38(val, _values)
+def _reduce_21(val, _values)
  Compiler::Nil.new(value: val[0])
 end
 
-def _reduce_39(val, _values)
+def _reduce_22(val, _values)
  Compiler::Regexp.new(value: val[0])
 end
 
-def _reduce_40(val, _values)
+def _reduce_23(val, _values)
  Compiler::String.new(value: val[0])
 end
 
-def _reduce_41(val, _values)
+def _reduce_24(val, _values)
  Compiler::Symbol.new(value: val[0])
 end
 
-def _reduce_42(val, _values)
+def _reduce_25(val, _values)
  Compiler::Identifier.new(value: val[0])
 end
 

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

@@ -1,58 +1,39 @@
 class Synvert::Core::NodeQuery::Parser
 options no_result_var
-token tNODE_TYPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tINDEX tPSEUDO_CLASS
-      tCHILD tSUBSEQUENT_SIBLING tNEXT_SIBLING
+token tNODE_TYPE tGOTO_SCOPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tPSEUDO_CLASS tRELATIONSHIP
       tOPEN_ATTRIBUTE tCLOSE_ATTRIBUTE tOPEN_DYNAMIC_ATTRIBUTE tCLOSE_DYNAMIC_ATTRIBUTE
-      tOPEN_ARRAY tCLOSE_ARRAY tOPEN_SELECTOR tCLOSE_SELECTOR tOPEN_GOTO_SCOPE tCLOSE_GOTO_SCOPE
-      tEQUAL tNOT_EQUAL tMATCH tNOT_MATCH tGREATER_THAN tGREATER_THAN_OR_EQUAL tLESS_THAN tLESS_THAN_OR_EQUAL tIN tNOT_IN tINCLUDES
-      tARRAY_VALUE tDYNAMIC_ATTRIBUTE tBOOLEAN tFLOAT tINTEGER tNIL tREGEXP tSTRING tSYMBOL
+      tOPEN_ARRAY tCLOSE_ARRAY tOPEN_SELECTOR tCLOSE_SELECTOR
+      tOPERATOR tARRAY_VALUE tDYNAMIC_ATTRIBUTE tBOOLEAN tFLOAT tINTEGER tNIL tREGEXP tSTRING tSYMBOL
 rule
   expression
-    : tCHILD expression { Compiler::Expression.new(rest: val[1], relationship: :child) }
-    | tSUBSEQUENT_SIBLING expression { Compiler::Expression.new(rest: val[1], relationship: :subsequent_sibling) }
-    | tNEXT_SIBLING expression { Compiler::Expression.new(rest: val[1], relationship: :next_sibling) }
-    | tOPEN_GOTO_SCOPE tIDENTIFIER tCLOSE_GOTO_SCOPE expression { Compiler::Expression.new(goto_scope: val[1], rest: val[3]) }
-    | tPSEUDO_CLASS tOPEN_SELECTOR expression tCLOSE_SELECTOR { Compiler::Expression.new(relationship: val[0].to_sym, rest: val[2]) }
-    | selector expression { Compiler::Expression.new(selector: val[0], rest: val[1]) }
+    : selector expression { Compiler::Expression.new(selector: val[0], rest: val[1]) }
     | selector { Compiler::Expression.new(selector: val[0]) }
 
   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]) }
-    | tNODE_TYPE attribute_list { Compiler::Selector.new(node_type: val[0], attribute_list: val[1]) }
-    | tNODE_TYPE { Compiler::Selector.new(node_type: val[0]) }
-    ;
+    : basic_selector { Compiler::Selector.new(basic_selector: val[0]) }
+    | tPSEUDO_CLASS tOPEN_SELECTOR selector tCLOSE_SELECTOR { Compiler::Selector.new(pseudo_class: val[0], pseudo_selector: val[2]) }
+    | tRELATIONSHIP selector { Compiler::Selector.new(relationship: val[0], rest: val[1]) }
+    | tGOTO_SCOPE selector { Compiler::Selector.new(goto_scope: val[0], rest: val[1]) }
+
+  basic_selector
+    : tNODE_TYPE { Compiler::BasicSelector.new(node_type: val[0]) }
+    | tNODE_TYPE attribute_list { Compiler::BasicSelector.new(node_type: val[0], attribute_list: val[1]) }
 
   attribute_list
     : tOPEN_ATTRIBUTE attribute tCLOSE_ATTRIBUTE attribute_list { Compiler::AttributeList.new(attribute: val[1], rest: val[3]) }
     | tOPEN_ATTRIBUTE attribute tCLOSE_ATTRIBUTE { Compiler::AttributeList.new(attribute: val[1]) }
-    ;
 
   attribute
-    : tKEY tNOT_EQUAL value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :!=) }
-    | tKEY tNOT_MATCH value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :!~) }
-    | tKEY tMATCH value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :=~) }
-    | tKEY tGREATER_THAN_OR_EQUAL value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :>=) }
-    | tKEY tGREATER_THAN value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :>) }
-    | tKEY tLESS_THAN_OR_EQUAL value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :<=) }
-    | tKEY tLESS_THAN value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :<) }
-    | tKEY tEQUAL value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :==) }
-    | tKEY tINCLUDES value { Compiler::Attribute.new(key: val[0], value: val[2], operator: :includes) }
-    | tKEY tNOT_EQUAL tOPEN_ARRAY tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :!=) }
-    | tKEY tEQUAL tOPEN_ARRAY tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :==) }
-    | tKEY tNOT_IN tOPEN_ARRAY tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :not_in) }
-    | tKEY tIN tOPEN_ARRAY tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :in) }
-    | tKEY tNOT_EQUAL tOPEN_ARRAY array_value tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: val[3], operator: :!=) }
-    | tKEY tEQUAL tOPEN_ARRAY array_value tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: val[3], operator: :==) }
-    | tKEY tNOT_IN tOPEN_ARRAY array_value tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: val[3], operator: :not_in) }
-    | tKEY tIN tOPEN_ARRAY array_value tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: val[3], operator: :in) }
+    : tKEY tOPERATOR value { Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1]) }
+    | tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: val[1]) }
+    | tKEY tOPERATOR tOPEN_ARRAY array_value tCLOSE_ARRAY { Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1]) }
 
   array_value
     : value array_value { Compiler::Array.new(value: val[0], rest: val[1]) }
     | value { Compiler::Array.new(value: val[0]) }
 
   value
-    : selector
+    : basic_selector
     | tOPEN_DYNAMIC_ATTRIBUTE tDYNAMIC_ATTRIBUTE tCLOSE_DYNAMIC_ATTRIBUTE { Compiler::DynamicAttribute.new(value: val[1]) }
     | tBOOLEAN { Compiler::Boolean.new(value: val[0]) }
     | tFLOAT { Compiler::Float.new(value: val[0]) }

data/lib/synvert/core/node_query.rb

@@ -9,12 +9,10 @@
 # * 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+
 # * child: +.class > .def+
-# * following sibling: <code>.def:first-child + .def</code>
-# * subsequnt sibling: +.def:first-child ~ .def+
+# * following sibling: <code>.def + .def</code>
+# * subsequnt sibling: +.def ~ .def+
 # * has: +.class:has(.def)+
 #
 # It also supports some custom selectors:
@@ -26,6 +24,7 @@
 # * NOT IN operator: +.send[message NOT IN (create build)]+
 # * INCLUDES operator: +.send[arguments INCLUDES &block]+
 # * dynamic attribute value: +.hash > .pair[key={{value}}]+
+# * goto scope: +.class body > .def+
 #
 # @example
 #   # it matches methods call nodes, like `puts message` or `p message`

data/lib/synvert/core/rewriter/action/delete_action.rb

@@ -7,9 +7,11 @@ module Synvert::Core
     #
     # @param instance [Synvert::Core::Rewriter::Instance]
     # @param selectors [Array<Symbol, String>] used to select child nodes
-    def initialize(instance, *selectors)
+    # @option and_comma [Boolean] delete extra comma.
+    def initialize(instance, *selectors, and_comma: false)
       super(instance, nil)
       @selectors = selectors
+      @and_comma = and_comma
     end
 
     # The rewritten code, always empty string.
@@ -26,7 +28,7 @@ module Synvert::Core
       @end_pos = @selectors.map { |selector| @node.child_node_range(selector) }
                            .compact.map(&:end_pos).max
       squeeze_spaces
-      remove_comma
+      remove_comma if @and_comma
     end
   end
 end