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

synvert-core 1.2.1 → 1.3.0

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

checksums.yaml +4 -4
data/CHANGELOG.md +6 -0
data/Gemfile +9 -0
data/lib/synvert/core/node_query/compiler/attribute.rb +6 -18
data/lib/synvert/core/node_query/compiler/comparable.rb +26 -19
data/lib/synvert/core/node_query/compiler/expression.rb +8 -76
data/lib/synvert/core/node_query/compiler/identifier.rb +1 -1
data/lib/synvert/core/node_query/compiler/regexp.rb +2 -2
data/lib/synvert/core/node_query/compiler/selector.rb +102 -20
data/lib/synvert/core/node_query/compiler/simple_selector.rb +29 -0
data/lib/synvert/core/node_query/compiler/string.rb +1 -1
data/lib/synvert/core/node_query/compiler.rb +1 -0
data/lib/synvert/core/node_query/lexer.rex +19 -16
data/lib/synvert/core/node_query/lexer.rex.rb +33 -27
data/lib/synvert/core/node_query/parser.racc.rb +117 -279
data/lib/synvert/core/node_query/parser.y +17 -34
data/lib/synvert/core/version.rb +1 -1
data/spec/synvert/core/node_query/lexer_spec.rb +48 -48
data/spec/synvert/core/node_query/parser_spec.rb +138 -106
data/spec/synvert/core/rewriter/instance_spec.rb +3 -3
data/spec/synvert/core/rewriter/scope/query_scope_spec.rb +3 -3
data/synvert-core-ruby.gemspec +0 -10
metadata +3 -128

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

@@ -25,167 +25,88 @@ 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,     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 = [
-    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 ]
+    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 = [
-   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 ]
+     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 = [
-   -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 ]
+   -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 = [
-    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 ]
+    15,    32,    13,    43,     1,    32,     9,    21,    30,    19,
+   nil,   nil,   nil,   nil,   nil,    23,    47,    25,    32,    29 ]
 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 ]
+     4,     3,     2,     7,     1,     3,     1,     5,     6,     2,
+   nil,   nil,   nil,   nil,   nil,     2,     7,     2,     3,     4 ]
 racc_goto_pointer = [
-   nil,     2,    23,     2,   -17,    16,   -41 ]
+   nil,     4,    -3,   -26,    -7,    -9,   -19,   -28 ]
 racc_goto_default = [
-   nil,   nil,    42,   nil,   nil,    65,   nil ]
+   nil,   nil,     2,     3,   nil,   nil,    44,   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, 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,
@@ -197,41 +118,29 @@ racc_token_table = {
   :tIDENTIFIER_VALUE => 6,
   :tINDEX => 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,
+  :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
@@ -261,9 +170,7 @@ Racc_token_to_s_table = [
   "tIDENTIFIER_VALUE",
   "tINDEX",
   "tPSEUDO_CLASS",
-  "tCHILD",
-  "tSUBSEQUENT_SIBLING",
-  "tNEXT_SIBLING",
+  "tRELATIONSHIP",
   "tOPEN_ATTRIBUTE",
   "tCLOSE_ATTRIBUTE",
   "tOPEN_DYNAMIC_ATTRIBUTE",
@@ -274,17 +181,7 @@ Racc_token_to_s_table = [
   "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 +194,7 @@ Racc_token_to_s_table = [
   "$start",
   "expression",
   "selector",
+  "simple_selector",
   "attribute_list",
   "attribute",
   "value",
@@ -309,168 +207,108 @@ 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(simple_selector: val[0])
 end
 def _reduce_4(val, _values)
- Compiler::Expression.new(goto_scope: val[1], rest: val[3])
+ Compiler::Selector.new(simple_selector: val[0], index: val[1])
 end
 def _reduce_5(val, _values)
- Compiler::Expression.new(relationship: val[0].to_sym, rest: val[2])
+ Compiler::Selector.new(simple_selector: val[0], pseudo_class: val[1], pseudo_selector: val[3])
 end
 def _reduce_6(val, _values)
- Compiler::Expression.new(selector: val[0], rest: val[1])
+ Compiler::Selector.new(pseudo_class: val[0], pseudo_selector: val[2])
 end
 def _reduce_7(val, _values)
- Compiler::Expression.new(selector: val[0])
+ Compiler::Selector.new(relationship: val[0], rest: val[1])
 end
 def _reduce_8(val, _values)
- Compiler::Selector.new(node_type: val[0], attribute_list: val[1], index: val[2])
+ Compiler::Selector.new(goto_scope: val[1], rest: val[3])
 end
 def _reduce_9(val, _values)
- Compiler::Selector.new(node_type: val[0], index: val[1])
+ Compiler::SimpleSelector.new(node_type: val[0])
 end
 def _reduce_10(val, _values)
- Compiler::Selector.new(node_type: val[0], attribute_list: val[1])
+ Compiler::SimpleSelector.new(node_type: val[0], attribute_list: val[1])
 end
 def _reduce_11(val, _values)
- Compiler::Selector.new(node_type: val[0])
+ Compiler::AttributeList.new(attribute: val[1], rest: val[3])
 end
 def _reduce_12(val, _values)
- Compiler::AttributeList.new(attribute: val[1], rest: val[3])
+ Compiler::AttributeList.new(attribute: val[1])
 end
 def _reduce_13(val, _values)
- Compiler::AttributeList.new(attribute: val[1])
+ Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1])
 end
 def _reduce_14(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :!=)
+ Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: val[1])
 end
 def _reduce_15(val, _values)
- Compiler::Attribute.new(key: val[0], value: val[2], operator: :!~)
+ Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1])
 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_17(val, _values)
  Compiler::Array.new(value: val[0])
 end
-# reduce 33 omitted
+# reduce 18 omitted
-def _reduce_34(val, _values)
+def _reduce_19(val, _values)
  Compiler::DynamicAttribute.new(value: val[1])
 end
-def _reduce_35(val, _values)
+def _reduce_20(val, _values)
  Compiler::Boolean.new(value: val[0])
 end
-def _reduce_36(val, _values)
+def _reduce_21(val, _values)
  Compiler::Float.new(value: val[0])
 end
-def _reduce_37(val, _values)
+def _reduce_22(val, _values)
  Compiler::Integer.new(value: val[0])
 end
-def _reduce_38(val, _values)
+def _reduce_23(val, _values)
  Compiler::Nil.new(value: val[0])
 end
-def _reduce_39(val, _values)
+def _reduce_24(val, _values)
  Compiler::Regexp.new(value: val[0])
 end
-def _reduce_40(val, _values)
+def _reduce_25(val, _values)
  Compiler::String.new(value: val[0])
 end
-def _reduce_41(val, _values)
+def _reduce_26(val, _values)
  Compiler::Symbol.new(value: val[0])
 end
-def _reduce_42(val, _values)
+def _reduce_27(val, _values)
  Compiler::Identifier.new(value: val[0])
 end

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

@@ -1,58 +1,41 @@
 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 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
-      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
+      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]) }
-    ;
+    : 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 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]) }

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

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