synvert-core 1.1.1 → 1.3.0

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

@@ -25,179 +25,88 @@ module Synvert
 ##### State transition tables begin ###
 
 racc_action_table = [
-     6,    18,    19,     9,    59,    20,    21,     8,     6,    28,
-    29,     8,    59,    51,     6,    49,     6,    23,    24,     8,
-    59,    51,     3,     4,     5,     8,    30,     8,    31,    51,
-    32,    44,    52,    53,    54,    55,    56,    57,    58,     8,
-    52,    53,    54,    55,    56,    57,    58,    69,    52,    53,
-    54,    55,    56,    57,    58,     6,    70,    72,    73,    59,
-    77,    84,    85,     6,    86,    87,     8,    59,    51,     6,
-    88,     6,    89,    90,     8,    59,    51,    10,    11,    12,
-     8,   nil,     8,   nil,    51,   nil,   nil,    52,    53,    54,
-    55,    56,    57,    58,   nil,    52,    53,    54,    55,    56,
-    57,    58,   nil,    52,    53,    54,    55,    56,    57,    58,
-     6,   nil,   nil,   nil,    59,   nil,   nil,   nil,     6,   nil,
-   nil,     8,    59,    51,   nil,   nil,     6,   nil,   nil,     8,
-    59,    51,   nil,    67,   nil,   nil,   nil,     8,   nil,    51,
-   nil,   nil,    52,    53,    54,    55,    56,    57,    58,   nil,
-    52,    53,    54,    55,    56,    57,    58,   nil,    52,    53,
-    54,    55,    56,    57,    58,     6,   nil,   nil,   nil,    59,
-   nil,   nil,   nil,     6,   nil,   nil,     8,    59,    51,   nil,
-   nil,    74,     6,   nil,     8,   nil,    51,   nil,   nil,    78,
-     3,     4,     5,     8,   nil,   nil,   nil,    52,    53,    54,
-    55,    56,    57,    58,   nil,    52,    53,    54,    55,    56,
-    57,    58,     6,   nil,   nil,   nil,    59,   nil,   nil,   nil,
-     6,   nil,   nil,     8,    59,    51,   nil,   nil,    80,     6,
-     6,     8,   nil,    51,    59,   nil,    82,     3,     4,     5,
-     8,     8,   nil,    51,    52,    53,    54,    55,    56,    57,
-    58,   nil,    52,    53,    54,    55,    56,    57,    58,   nil,
-   nil,     6,    52,    53,    54,    55,    56,    57,    58,     3,
-     4,     5,     8,     6,   nil,   nil,   nil,     6,   nil,   nil,
-   nil,     3,     4,     5,     8,     3,     4,     5,     8,     6,
-   nil,   nil,   nil,     6,   nil,   nil,   nil,     3,     4,     5,
-     8,     3,     4,     5,     8,     6,   nil,   nil,   nil,     6,
-   nil,   nil,   nil,     3,     4,     5,     8,     3,     4,     5,
-     8,    40,    33,    35,    34,    37,    36,    39,    38,    43,
-    42,    41 ]
+     7,     8,     7,    12,    41,    10,    11,     7,     4,     5,
+    33,    41,    31,    14,    16,    17,    18,    33,     6,    20,
+    42,    34,    35,    36,    37,    38,    39,    40,    34,    35,
+    36,    37,    38,    39,    40,     7,     7,    22,    24,    41,
+    26,    27,     4,     5,    28,    33,    16,     7,    45,    46,
+    48,   nil,     6,     4,     5,   nil,    34,    35,    36,    37,
+    38,    39,    40,     6,     7,   nil,     7,   nil,     7,   nil,
+     4,     5,     4,     5,     4,     5,   nil,   nil,   nil,   nil,
+     6,   nil,     6,   nil,     6 ]
 
 racc_action_check = [
-    33,     6,     6,     1,    33,     7,     7,     6,    34,    17,
-    17,    33,    34,    33,     0,    33,    35,     8,     9,    34,
-    35,    34,     0,     0,     0,     0,    19,    35,    21,    35,
-    22,    29,    33,    33,    33,    33,    33,    33,    33,    32,
-    34,    34,    34,    34,    34,    34,    34,    42,    35,    35,
-    35,    35,    35,    35,    35,    36,    43,    45,    46,    36,
-    51,    71,    75,    37,    76,    77,    36,    37,    36,     2,
-    79,    38,    81,    83,    37,    38,    37,     2,     2,     2,
-     2,   nil,    38,   nil,    38,   nil,   nil,    36,    36,    36,
-    36,    36,    36,    36,   nil,    37,    37,    37,    37,    37,
-    37,    37,   nil,    38,    38,    38,    38,    38,    38,    38,
-    39,   nil,   nil,   nil,    39,   nil,   nil,   nil,    40,   nil,
-   nil,    39,    40,    39,   nil,   nil,    41,   nil,   nil,    40,
-    41,    40,   nil,    40,   nil,   nil,   nil,    41,   nil,    41,
-   nil,   nil,    39,    39,    39,    39,    39,    39,    39,   nil,
-    40,    40,    40,    40,    40,    40,    40,   nil,    41,    41,
-    41,    41,    41,    41,    41,    49,   nil,   nil,   nil,    49,
-   nil,   nil,   nil,    67,   nil,   nil,    49,    67,    49,   nil,
-   nil,    49,     3,   nil,    67,   nil,    67,   nil,   nil,    67,
-     3,     3,     3,     3,   nil,   nil,   nil,    49,    49,    49,
-    49,    49,    49,    49,   nil,    67,    67,    67,    67,    67,
-    67,    67,    69,   nil,   nil,   nil,    69,   nil,   nil,   nil,
-    70,   nil,   nil,    69,    70,    69,   nil,   nil,    69,     4,
-    86,    70,   nil,    70,    86,   nil,    70,     4,     4,     4,
-     4,    86,   nil,    86,    69,    69,    69,    69,    69,    69,
-    69,   nil,    70,    70,    70,    70,    70,    70,    70,   nil,
-   nil,     5,    86,    86,    86,    86,    86,    86,    86,     5,
-     5,     5,     5,    10,   nil,   nil,   nil,    11,   nil,   nil,
-   nil,    10,    10,    10,    10,    11,    11,    11,    11,    12,
-   nil,   nil,   nil,    30,   nil,   nil,   nil,    12,    12,    12,
-    12,    30,    30,    30,    30,    31,   nil,   nil,   nil,    44,
-   nil,   nil,   nil,    31,    31,    31,    31,    44,    44,    44,
-    44,    23,    23,    23,    23,    23,    23,    23,    23,    23,
-    23,    23 ]
+    27,     1,     0,     4,    27,     3,     3,    31,     0,     0,
+    27,    31,    27,     6,     7,     8,    11,    31,     0,    14,
+    31,    27,    27,    27,    27,    27,    27,    27,    31,    31,
+    31,    31,    31,    31,    31,    44,     2,    16,    19,    44,
+    21,    22,     2,     2,    23,    44,    26,     5,    33,    43,
+    45,   nil,     2,     5,     5,   nil,    44,    44,    44,    44,
+    44,    44,    44,     5,    12,   nil,    18,   nil,    20,   nil,
+    12,    12,    18,    18,    20,    20,   nil,   nil,   nil,   nil,
+    12,   nil,    18,   nil,    20 ]
 
 racc_action_pointer = [
-    12,     3,    67,   180,   227,   259,    -6,    -2,    13,    18,
-   271,   275,   287,   nil,   nil,   nil,   nil,     2,   nil,     7,
-   nil,     9,    16,   300,   nil,   nil,   nil,   nil,   nil,    12,
-   291,   303,    26,    -2,     6,    14,    53,    61,    69,   108,
-   116,   124,    30,    39,   307,    37,    38,   nil,   nil,   163,
-   nil,    27,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   171,   nil,   210,
-   218,    41,   nil,   nil,   nil,    44,    55,    49,   nil,    52,
-   nil,    54,   nil,    55,   nil,   nil,   228,   nil,   nil,   nil,
-   nil,   nil ]
+     0,     1,    34,    -2,   -13,    45,     8,     4,    15,   nil,
+   nil,     0,    62,   nil,     0,   nil,    33,   nil,    64,    21,
+    66,    29,    21,    27,   nil,   nil,    36,    -2,   nil,   nil,
+   nil,     5,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    34,    33,    37,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -49,   -49,    -5,   -49,   -49,   -49,   -16,   -17,   -49,   -49,
-   -49,   -49,   -49,    -4,    -6,    -7,    -8,   -15,   -10,   -49,
-   -11,   -49,   -49,   -49,    92,    -1,    -2,    -3,    -9,   -49,
-   -49,   -49,   -19,   -49,   -49,   -49,   -49,   -49,   -49,   -49,
-   -49,   -49,   -49,   -49,   -49,   -49,   -49,   -18,   -20,   -49,
-   -39,   -49,   -41,   -42,   -43,   -44,   -45,   -46,   -47,   -48,
-   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -49,   -28,   -49,
-   -49,   -49,   -13,   -14,   -29,   -49,   -38,   -49,   -30,   -49,
-   -31,   -49,   -32,   -49,   -12,   -33,   -49,   -40,   -34,   -35,
-   -36,   -37 ]
+   -28,   -28,    -2,    -3,   -28,   -28,   -28,    -9,   -28,    -1,
+    -4,   -28,   -28,    -7,   -28,   -10,   -28,    49,   -28,   -28,
+   -28,   -28,   -28,   -28,    -6,    -8,   -12,   -28,    -5,   -11,
+   -13,   -28,   -18,   -28,   -20,   -21,   -22,   -23,   -24,   -25,
+   -26,   -27,   -14,   -28,   -17,   -28,   -15,   -16,   -19 ]
 
 racc_goto_table = [
-     1,    22,    13,    14,    15,    16,   nil,    17,   nil,   nil,
-    25,    26,    27,   nil,    75,     2,   nil,     2,     2,     2,
-     2,   nil,   nil,   nil,   nil,     2,     2,     2,   nil,   nil,
-    45,    46,    79,    47,    81,    83,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    71,     2,     2,   nil,   nil,   nil,
-   nil,    91,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
-    48,    60,    61,    62,    63,    64,    65,    66,    68 ]
+    15,    32,    13,    43,     1,    32,     9,    21,    30,    19,
+   nil,   nil,   nil,   nil,   nil,    23,    47,    25,    32,    29 ]
 
 racc_goto_check = [
-     1,     4,     1,     1,     1,     1,   nil,     3,   nil,   nil,
-     1,     1,     1,   nil,     6,     2,   nil,     2,     2,     2,
-     2,   nil,   nil,   nil,   nil,     2,     2,     2,   nil,   nil,
-     1,     1,     6,     3,     6,     6,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     1,     2,     2,   nil,   nil,   nil,
-   nil,     6,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
-     5,     5,     5,     5,     5,     5,     5,     5,     5 ]
+     4,     3,     2,     7,     1,     3,     1,     5,     6,     2,
+   nil,   nil,   nil,   nil,   nil,     2,     7,     2,     3,     4 ]
 
 racc_goto_pointer = [
-   nil,     0,    15,     1,    -7,    27,   -35 ]
+   nil,     4,    -3,   -26,    -7,    -9,   -19,   -28 ]
 
 racc_goto_default = [
-   nil,   nil,    50,     7,   nil,    76,   nil ]
+   nil,   nil,     2,     3,   nil,   nil,    44,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 42, :_reduce_1,
-  3, 42, :_reduce_2,
-  3, 42, :_reduce_3,
-  2, 42, :_reduce_4,
-  1, 42, :_reduce_5,
-  2, 42, :_reduce_6,
-  2, 42, :_reduce_7,
-  2, 42, :_reduce_8,
-  3, 43, :_reduce_9,
-  2, 43, :_reduce_10,
-  2, 43, :_reduce_11,
-  6, 43, :_reduce_12,
-  5, 43, :_reduce_13,
-  5, 43, :_reduce_14,
-  2, 43, :_reduce_15,
-  1, 43, :_reduce_16,
-  1, 43, :_reduce_17,
-  4, 44, :_reduce_18,
-  3, 44, :_reduce_19,
-  3, 45, :_reduce_20,
-  3, 45, :_reduce_21,
-  3, 45, :_reduce_22,
-  3, 45, :_reduce_23,
-  3, 45, :_reduce_24,
-  3, 45, :_reduce_25,
-  3, 45, :_reduce_26,
-  3, 45, :_reduce_27,
-  3, 45, :_reduce_28,
-  4, 45, :_reduce_29,
-  4, 45, :_reduce_30,
-  4, 45, :_reduce_31,
-  4, 45, :_reduce_32,
-  5, 45, :_reduce_33,
-  5, 45, :_reduce_34,
-  5, 45, :_reduce_35,
-  5, 45, :_reduce_36,
-  3, 47, :_reduce_37,
-  1, 47, :_reduce_38,
-  1, 46, :_reduce_none,
-  3, 46, :_reduce_40,
-  1, 46, :_reduce_41,
-  1, 46, :_reduce_42,
-  1, 46, :_reduce_43,
-  1, 46, :_reduce_44,
-  1, 46, :_reduce_45,
-  1, 46, :_reduce_46,
-  1, 46, :_reduce_47,
-  1, 46, :_reduce_48 ]
-
-racc_reduce_n = 49
-
-racc_shift_n = 92
+  2, 31, :_reduce_1,
+  1, 31, :_reduce_2,
+  1, 32, :_reduce_3,
+  2, 32, :_reduce_4,
+  5, 32, :_reduce_5,
+  4, 32, :_reduce_6,
+  2, 32, :_reduce_7,
+  4, 32, :_reduce_8,
+  1, 33, :_reduce_9,
+  2, 33, :_reduce_10,
+  4, 34, :_reduce_11,
+  3, 34, :_reduce_12,
+  3, 35, :_reduce_13,
+  4, 35, :_reduce_14,
+  5, 35, :_reduce_15,
+  2, 37, :_reduce_16,
+  1, 37, :_reduce_17,
+  1, 36, :_reduce_none,
+  3, 36, :_reduce_19,
+  1, 36, :_reduce_20,
+  1, 36, :_reduce_21,
+  1, 36, :_reduce_22,
+  1, 36, :_reduce_23,
+  1, 36, :_reduce_24,
+  1, 36, :_reduce_25,
+  1, 36, :_reduce_26,
+  1, 36, :_reduce_27 ]
+
+racc_reduce_n = 28
+
+racc_shift_n = 49
 
 racc_token_table = {
   false => 0,
@@ -209,40 +118,29 @@ racc_token_table = {
   :tIDENTIFIER_VALUE => 6,
   :tINDEX => 7,
   :tPSEUDO_CLASS => 8,
-  :tCOMMA => 9,
-  :tCHILD => 10,
-  :tSUBSEQUENT_SIBLING => 11,
-  :tNEXT_SIBLING => 12,
-  :tOPEN_ATTRIBUTE => 13,
-  :tCLOSE_ATTRIBUTE => 14,
-  :tOPEN_DYNAMIC_ATTRIBUTE => 15,
-  :tCLOSE_DYNAMIC_ATTRIBUTE => 16,
-  :tOPEN_ARRAY => 17,
-  :tCLOSE_ARRAY => 18,
-  :tOPEN_SELECTOR => 19,
-  :tCLOSE_SELECTOR => 20,
-  :tEQUAL => 21,
-  :tNOT_EQUAL => 22,
-  :tMATCH => 23,
-  :tNOT_MATCH => 24,
-  :tGREATER_THAN => 25,
-  :tGREATER_THAN_OR_EQUAL => 26,
-  :tLESS_THAN => 27,
-  :tLESS_THAN_OR_EQUAL => 28,
-  :tIN => 29,
-  :tNOT_IN => 30,
-  :tINCLUDES => 31,
-  :tARRAY_VALUE => 32,
-  :tDYNAMIC_ATTRIBUTE => 33,
-  :tBOOLEAN => 34,
-  :tFLOAT => 35,
-  :tINTEGER => 36,
-  :tNIL => 37,
-  :tREGEXP => 38,
-  :tSTRING => 39,
-  :tSYMBOL => 40 }
-
-racc_nt_base = 41
+  :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,
+  :tOPEN_GOTO_SCOPE => 18,
+  :tCLOSE_GOTO_SCOPE => 19,
+  :tOPERATOR => 20,
+  :tARRAY_VALUE => 21,
+  :tDYNAMIC_ATTRIBUTE => 22,
+  :tBOOLEAN => 23,
+  :tFLOAT => 24,
+  :tINTEGER => 25,
+  :tNIL => 26,
+  :tREGEXP => 27,
+  :tSTRING => 28,
+  :tSYMBOL => 29 }
+
+racc_nt_base = 30
 
 racc_use_result_var = false
 
@@ -272,10 +170,7 @@ Racc_token_to_s_table = [
   "tIDENTIFIER_VALUE",
   "tINDEX",
   "tPSEUDO_CLASS",
-  "tCOMMA",
-  "tCHILD",
-  "tSUBSEQUENT_SIBLING",
-  "tNEXT_SIBLING",
+  "tRELATIONSHIP",
   "tOPEN_ATTRIBUTE",
   "tCLOSE_ATTRIBUTE",
   "tOPEN_DYNAMIC_ATTRIBUTE",
@@ -284,17 +179,9 @@ Racc_token_to_s_table = [
   "tCLOSE_ARRAY",
   "tOPEN_SELECTOR",
   "tCLOSE_SELECTOR",
-  "tEQUAL",
-  "tNOT_EQUAL",
-  "tMATCH",
-  "tNOT_MATCH",
-  "tGREATER_THAN",
-  "tGREATER_THAN_OR_EQUAL",
-  "tLESS_THAN",
-  "tLESS_THAN_OR_EQUAL",
-  "tIN",
-  "tNOT_IN",
-  "tINCLUDES",
+  "tOPEN_GOTO_SCOPE",
+  "tCLOSE_GOTO_SCOPE",
+  "tOPERATOR",
   "tARRAY_VALUE",
   "tDYNAMIC_ATTRIBUTE",
   "tBOOLEAN",
@@ -307,6 +194,7 @@ Racc_token_to_s_table = [
   "$start",
   "expression",
   "selector",
+  "simple_selector",
   "attribute_list",
   "attribute",
   "value",
@@ -319,192 +207,108 @@ Racc_debug_parser = false
 # reduce 0 omitted
 
 def _reduce_1(val, _values)
- Compiler::Expression.new(selector: val[0], rest: val[2], relationship: :child)
+ Compiler::Expression.new(selector: val[0], rest: val[1])
 end
 
 def _reduce_2(val, _values)
- Compiler::Expression.new(selector: val[0], rest: val[2], relationship: :subsequent_sibling)
+ Compiler::Expression.new(selector: val[0])
 end
 
 def _reduce_3(val, _values)
- Compiler::Expression.new(selector: val[0], rest: val[2], relationship: :next_sibling)
+ Compiler::Selector.new(simple_selector: val[0])
 end
 
 def _reduce_4(val, _values)
- Compiler::Expression.new(selector: val[0], rest: val[1], relationship: :descendant)
+ Compiler::Selector.new(simple_selector: val[0], index: val[1])
 end
 
 def _reduce_5(val, _values)
- Compiler::Expression.new(selector: val[0])
+ Compiler::Selector.new(simple_selector: val[0], pseudo_class: val[1], pseudo_selector: val[3])
 end
 
 def _reduce_6(val, _values)
- Compiler::Expression.new(rest: val[1], relationship: :child)
+ Compiler::Selector.new(pseudo_class: val[0], pseudo_selector: val[2])
 end
 
 def _reduce_7(val, _values)
- Compiler::Expression.new(rest: val[1], relationship: :subsequent_sibling)
+ Compiler::Selector.new(relationship: val[0], rest: val[1])
 end
 
 def _reduce_8(val, _values)
- Compiler::Expression.new(rest: val[1], relationship: :next_sibling)
+ Compiler::Selector.new(goto_scope: val[1], rest: val[3])
 end
 
 def _reduce_9(val, _values)
- Compiler::Selector.new(node_type: val[0], attribute_list: val[1], index: val[2])
+ Compiler::SimpleSelector.new(node_type: val[0])
 end
 
 def _reduce_10(val, _values)
- Compiler::Selector.new(node_type: val[0], index: val[1])
+ Compiler::SimpleSelector.new(node_type: val[0], attribute_list: val[1])
 end
 
 def _reduce_11(val, _values)
- Compiler::Selector.new(attribute_list: val[0], index: val[1])
+ Compiler::AttributeList.new(attribute: val[1], rest: val[3])
 end
 
 def _reduce_12(val, _values)
- Compiler::Selector.new(node_type: val[0], attribute_list: val[1], pseudo_class: val[2], pseudo_expression: val[4])
+ Compiler::AttributeList.new(attribute: val[1])
 end
 
 def _reduce_13(val, _values)
- Compiler::Selector.new(node_type: val[0], pseudo_class: val[1], pseudo_expression: val[3])
+ Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1])
 end
 
 def _reduce_14(val, _values)
- Compiler::Selector.new(attribute_list: val[0], pseudo_class: val[1], pseudo_expression: val[3])
+ Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: val[1])
 end
 
 def _reduce_15(val, _values)
- Compiler::Selector.new(node_type: val[0], attribute_list: val[1])
+ Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1])
 end
 
 def _reduce_16(val, _values)
- Compiler::Selector.new(node_type: val[0])
+ Compiler::Array.new(value: val[0], rest: val[1])
 end
 
 def _reduce_17(val, _values)
- Compiler::Selector.new(attribute_list: val[0])
-end
-
-def _reduce_18(val, _values)
- Compiler::AttributeList.new(attribute: val[1], rest: val[3])
-end
-
-def _reduce_19(val, _values)
- Compiler::AttributeList.new(attribute: val[1])
-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: :=~)
-end
-
-def _reduce_23(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :>=)
-end
-
-def _reduce_24(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :>)
-end
-
-def _reduce_25(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :<=)
-end
-
-def _reduce_26(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :<)
-end
-
-def _reduce_27(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :==)
-end
-
-def _reduce_28(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :includes)
-end
-
-def _reduce_29(val, _values)
- Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :!=)
-end
-
-def _reduce_30(val, _values)
- Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :==)
-end
-
-def _reduce_31(val, _values)
- Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :not_in)
-end
-
-def _reduce_32(val, _values)
- Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: :in)
-end
-
-def _reduce_33(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[3], operator: :!=)
-end
-
-def _reduce_34(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[3], operator: :==)
-end
-
-def _reduce_35(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[3], operator: :not_in)
-end
-
-def _reduce_36(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[3], operator: :in)
-end
-
-def _reduce_37(val, _values)
- Compiler::Array.new(value: val[0], rest: val[2])
-end
-
-def _reduce_38(val, _values)
  Compiler::Array.new(value: val[0])
 end
 
-# reduce 39 omitted
+# reduce 18 omitted
 
-def _reduce_40(val, _values)
+def _reduce_19(val, _values)
  Compiler::DynamicAttribute.new(value: val[1])
 end
 
-def _reduce_41(val, _values)
+def _reduce_20(val, _values)
  Compiler::Boolean.new(value: val[0])
 end
 
-def _reduce_42(val, _values)
+def _reduce_21(val, _values)
  Compiler::Float.new(value: val[0])
 end
 
-def _reduce_43(val, _values)
+def _reduce_22(val, _values)
  Compiler::Integer.new(value: val[0])
 end
 
-def _reduce_44(val, _values)
+def _reduce_23(val, _values)
  Compiler::Nil.new(value: val[0])
 end
 
-def _reduce_45(val, _values)
+def _reduce_24(val, _values)
  Compiler::Regexp.new(value: val[0])
 end
 
-def _reduce_46(val, _values)
+def _reduce_25(val, _values)
  Compiler::String.new(value: val[0])
 end
 
-def _reduce_47(val, _values)
+def _reduce_26(val, _values)
  Compiler::Symbol.new(value: val[0])
 end
 
-def _reduce_48(val, _values)
+def _reduce_27(val, _values)
  Compiler::Identifier.new(value: val[0])
 end
 

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

@@ -1,63 +1,41 @@
 class Synvert::Core::NodeQuery::Parser
 options no_result_var
-token tNODE_TYPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tINDEX tPSEUDO_CLASS tCOMMA
-      tCHILD tSUBSEQUENT_SIBLING tNEXT_SIBLING
-      tOPEN_ATTRIBUTE tCLOSE_ATTRIBUTE tOPEN_DYNAMIC_ATTRIBUTE tCLOSE_DYNAMIC_ATTRIBUTE tOPEN_ARRAY tCLOSE_ARRAY tOPEN_SELECTOR tCLOSE_SELECTOR
-      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
+token tNODE_TYPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tINDEX 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
+      tOPERATOR tARRAY_VALUE tDYNAMIC_ATTRIBUTE tBOOLEAN tFLOAT tINTEGER tNIL tREGEXP tSTRING tSYMBOL
 rule
   expression
-    : selector tCHILD expression { Compiler::Expression.new(selector: val[0], rest: val[2], relationship: :child) }
-    | selector tSUBSEQUENT_SIBLING expression { Compiler::Expression.new(selector: val[0], rest: val[2], relationship: :subsequent_sibling) }
-    | selector tNEXT_SIBLING expression { Compiler::Expression.new(selector: val[0], rest: val[2], relationship: :next_sibling) }
-    | selector expression { Compiler::Expression.new(selector: val[0], rest: val[1], relationship: :descendant) }
+    : selector expression { Compiler::Expression.new(selector: val[0], rest: val[1]) }
     | selector { Compiler::Expression.new(selector: val[0]) }
-    | 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) }
 
   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 tPSEUDO_CLASS tOPEN_SELECTOR expression tCLOSE_SELECTOR { Compiler::Selector.new(node_type: val[0], attribute_list: val[1], pseudo_class: val[2], pseudo_expression: val[4]) }
-    | tNODE_TYPE tPSEUDO_CLASS tOPEN_SELECTOR expression tCLOSE_SELECTOR { Compiler::Selector.new(node_type: val[0], pseudo_class: val[1], pseudo_expression: val[3]) }
-    | attribute_list tPSEUDO_CLASS tOPEN_SELECTOR expression tCLOSE_SELECTOR { Compiler::Selector.new(attribute_list: val[0], pseudo_class: val[1], pseudo_expression: val[3]) }
-    | 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]) }
-    ;
+    : simple_selector { Compiler::Selector.new(simple_selector: val[0]) }
+    | simple_selector tINDEX { Compiler::Selector.new(simple_selector: val[0], index: val[1]) }
+    | simple_selector tPSEUDO_CLASS tOPEN_SELECTOR selector tCLOSE_SELECTOR { Compiler::Selector.new(simple_selector: val[0], pseudo_class: val[1], pseudo_selector: val[3]) }
+    | 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]) }
+    | tOPEN_GOTO_SCOPE tIDENTIFIER tCLOSE_GOTO_SCOPE selector { Compiler::Selector.new(goto_scope: val[1], rest: val[3]) }
+
+  simple_selector
+    : tNODE_TYPE { Compiler::SimpleSelector.new(node_type: val[0]) }
+    | tNODE_TYPE attribute_list { Compiler::SimpleSelector.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 tCOMMA array_value { Compiler::Array.new(value: val[0], rest: val[2]) }
+    : value array_value { Compiler::Array.new(value: val[0], rest: val[1]) }
     | value { Compiler::Array.new(value: val[0]) }
 
   value
-    : selector
+    : simple_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]) }