synvert-core 1.2.0 → 1.3.1

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

@@ -1,60 +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]) }
-    | 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]) }
-    ;
+    : 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/node_query.rb

@@ -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/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

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

@@ -6,8 +6,11 @@ module Synvert::Core
     # Initialize a RemoveAction.
     #
     # @param instance [Synvert::Core::Rewriter::RemoveAction]
-    def initialize(instance)
+    # @param options [Hash] options.
+    # @option and_comma [Boolean] delete extra comma.
+    def initialize(instance, and_comma: false)
       super(instance, nil)
+      @and_comma = and_comma
     end
 
     # The rewritten code, always empty string.
@@ -27,7 +30,7 @@ module Synvert::Core
         @begin_pos = @node.loc.expression.begin_pos
         @end_pos = @node.loc.expression.end_pos
         squeeze_spaces
-        remove_comma
+        remove_comma if @and_command
       end
     end
 

data/lib/synvert/core/rewriter/instance.rb

@@ -333,8 +333,10 @@ module Synvert::Core
     #   with_node type: 'send', message: { in: %w[puts p] } do
     #     remove
     #   end
-    def remove
-      @actions << Rewriter::RemoveAction.new(self).process
+    # @param options [Hash] options.
+    # @option and_comma [Boolean] delete extra comma.
+    def remove(**options)
+      @actions << Rewriter::RemoveAction.new(self, **options).process
     end
 
     # Parse +delete+ dsl, it creates a {Synvert::Core::Rewriter::DeleteAction} to delete child nodes.
@@ -346,8 +348,10 @@ module Synvert::Core
     #     delete :receiver, :dot
     #   end
     # @param selectors [Array<Symbol>] selector names of child node.
-    def delete(*selectors)
-      @actions << Rewriter::DeleteAction.new(self, *selectors).process
+    # @param options [Hash]
+    # @option and_comma [Boolean] delete extra comma.
+    def delete(*selectors, **options)
+      @actions << Rewriter::DeleteAction.new(self, *selectors, **options).process
     end
 
     # Parse +wrap+ dsl, it creates a {Synvert::Core::Rewriter::WrapAction} to

data/lib/synvert/core/version.rb

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

data/spec/synvert/core/node_ext_spec.rb

@@ -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/lexer_spec.rb

@@ -29,7 +29,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -42,7 +42,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNIL, nil],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -55,7 +55,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -68,7 +68,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, "[]"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -81,7 +81,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -93,7 +93,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -106,7 +106,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tFLOAT, 1.1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -119,7 +119,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tBOOLEAN, true],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -132,7 +132,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "create!"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -145,7 +145,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "empty?"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -158,7 +158,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "<"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -169,7 +169,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "="],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -180,7 +180,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, ">"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -193,7 +193,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments.first"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, ""],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -206,7 +206,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "[]"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -219,7 +219,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :[]=],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -232,7 +232,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "nil?"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -245,7 +245,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "pair"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "key"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_DYNAMIC_ATTRIBUTE, "{{"],
           [:tDYNAMIC_ATTRIBUTE, "value"],
           [:tCLOSE_DYNAMIC_ATTRIBUTE, "}}"],
@@ -265,11 +265,11 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -287,20 +287,20 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "size"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tINTEGER, 2],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "first"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "str"],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "last"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "str"],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -316,7 +316,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_EQUAL, "!="],
+          [:tOPERATOR, "!="],
           [:tIDENTIFIER_VALUE, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -328,7 +328,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tGREATER_THAN, ">"],
+          [:tOPERATOR, ">"],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -340,7 +340,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tLESS_THAN, "<"],
+          [:tOPERATOR, "<"],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -352,7 +352,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tGREATER_THAN_OR_EQUAL, ">="],
+          [:tOPERATOR, ">="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -364,7 +364,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tLESS_THAN_OR_EQUAL, "<="],
+          [:tOPERATOR, "<="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -377,7 +377,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tMATCH, "=~"],
+          [:tOPERATOR, "=~"],
           [:tREGEXP, /create/i],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -390,7 +390,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_MATCH, "!~"],
+          [:tOPERATOR, "!~"],
           [:tREGEXP, /create/i],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -403,7 +403,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ARRAY, "("],
           [:tCLOSE_ARRAY, ")"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -417,7 +417,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ARRAY, "("],
           [:tSYMBOL, :create],
           [:tCLOSE_ARRAY, ")"],
@@ -432,7 +432,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tNOT_EQUAL, "!="],
+          [:tOPERATOR, "!="],
           [:tOPEN_ARRAY, "("],
           [:tSYMBOL, :create],
           [:tCLOSE_ARRAY, ")"],
@@ -447,7 +447,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tIN, "IN"],
+          [:tOPERATOR, "in"],
           [:tOPEN_ARRAY, "("],
           [:tIDENTIFIER_VALUE, "create"],
           [:tIDENTIFIER_VALUE, "build"],
@@ -463,7 +463,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_IN, "NOT IN"],
+          [:tOPERATOR, "not_in"],
           [:tOPEN_ARRAY, "("],
           [:tIDENTIFIER_VALUE, "create"],
           [:tIDENTIFIER_VALUE, "build"],
@@ -479,7 +479,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tINCLUDES, "INCLUDES"],
+          [:tOPERATOR, "includes"],
           [:tIDENTIFIER_VALUE, "&block"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -494,7 +494,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver.message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -509,7 +509,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tINDEX, 0]
@@ -523,7 +523,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tINDEX, -1]
@@ -537,7 +537,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tINDEX, 0]
@@ -551,7 +551,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tINDEX, -1]
@@ -571,7 +571,7 @@ module Synvert::Core::NodeQuery
     context 'child' do
       it 'matches' do
         source = '.def > .send'
-        expected_tokens = [[:tNODE_TYPE, "def"], [:tCHILD, ">"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "def"], [:tRELATIONSHIP, ">"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -579,7 +579,7 @@ module Synvert::Core::NodeQuery
     context 'subsequent sibling' do
       it 'matches' do
         source = '.send ~ .send'
-        expected_tokens = [[:tNODE_TYPE, "send"], [:tSUBSEQUENT_SIBLING, "~"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "send"], [:tRELATIONSHIP, "~"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -587,7 +587,7 @@ module Synvert::Core::NodeQuery
     context 'next sibling' do
       it 'matches' do
         source = '.send + .send'
-        expected_tokens = [[:tNODE_TYPE, "send"], [:tNEXT_SIBLING, "+"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "send"], [:tRELATIONSHIP, "+"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -599,7 +599,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "class"],
           [:tPSEUDO_CLASS, "has"],
           [:tOPEN_SELECTOR, "("],
-          [:tCHILD, ">"],
+          [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"],
           [:tCLOSE_SELECTOR, ")"]
         ]
@@ -614,7 +614,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "class"],
           [:tPSEUDO_CLASS, "not_has"],
           [:tOPEN_SELECTOR, "("],
-          [:tCHILD, ">"],
+          [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"],
           [:tCLOSE_SELECTOR, ")"]
         ]
@@ -630,7 +630,7 @@ module Synvert::Core::NodeQuery
           [:tOPEN_GOTO_SCOPE, "<"],
           [:tIDENTIFIER, "body"],
           [:tCLOSE_GOTO_SCOPE, ">"],
-          [:tCHILD, ">"],
+          [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"]
         ]
         assert_tokens source, expected_tokens