synvert-core 1.0.5 → 1.2.0

data/lib/synvert/core/node_query/lexer.rex.rb

@@ -20,6 +20,8 @@ class Synvert::Core::NodeQuery::Lexer
   CLOSE_ARRAY             = /\)/
   OPEN_SELECTOR           = /\(/
   CLOSE_SELECTOR          = /\)/
+  OPEN_GOTO_SCOPE         = /</
+  CLOSE_GOTO_SCOPE        = />/
   OPEN_DYNAMIC_ATTRIBUTE  = /{{/
   CLOSE_DYNAMIC_ATTRIBUTE = /}}/
   NODE_TYPE               = /\.[a-z]+/
@@ -134,7 +136,9 @@ class Synvert::Core::NodeQuery::Lexer
           when text = ss.scan(/:nth-last-child\(\d+\)/) then
             action { [:tINDEX, -text.sub(':nth-last-child(', '').to_i] }
           when text = ss.scan(/:has/) then
-            action { [:tHAS, text[1..-1]] }
+            action { [:tPSEUDO_CLASS, text[1..-1]] }
+          when text = ss.scan(/:not_has/) then
+            action { [:tPSEUDO_CLASS, text[1..-1]] }
           when text = ss.scan(/#{NODE_TYPE}/) then
             action { [:tNODE_TYPE, text[1..]] }
           when text = ss.scan(/>/) then
@@ -147,12 +151,26 @@ class Synvert::Core::NodeQuery::Lexer
             action { [:tOPEN_SELECTOR, text] }
           when text = ss.scan(/#{CLOSE_SELECTOR}/) then
             action { [:tCLOSE_SELECTOR, text] }
+          when text = ss.scan(/#{OPEN_GOTO_SCOPE}/) then
+            action { @state = :GOTO_SCOPE; [:tOPEN_GOTO_SCOPE, text] }
           when text = ss.scan(/#{OPEN_ATTRIBUTE}/) then
             action { @nested_count += 1; @state = :KEY; [:tOPEN_ATTRIBUTE, text] }
           else
             text = ss.string[ss.pos .. -1]
             raise ScanError, "can not match (#{state.inspect}) at #{location}: '#{text}'"
           end
+        when :GOTO_SCOPE then
+          case
+          when ss.skip(/\s+/) then
+            # do nothing
+          when text = ss.scan(/#{IDENTIFIER}/) then
+            action { [:tIDENTIFIER, text] }
+          when text = ss.scan(/#{CLOSE_GOTO_SCOPE}/) then
+            action { @state = nil; [:tCLOSE_GOTO_SCOPE, text] }
+          else
+            text = ss.string[ss.pos .. -1]
+            raise ScanError, "can not match (#{state.inspect}) at #{location}: '#{text}'"
+          end
         when :KEY then
           case
           when ss.skip(/\s+/) then
@@ -189,12 +207,22 @@ class Synvert::Core::NodeQuery::Lexer
           case
           when ss.skip(/\s+/) then
             # do nothing
+          when text = ss.scan(/\[\]=/) then
+            action { [:tIDENTIFIER_VALUE, text] }
+          when text = ss.scan(/\[\]/) then
+            action { [:tIDENTIFIER_VALUE, text] }
+          when text = ss.scan(/:\[\]=/) then
+            action { [:tSYMBOL, text[1..-1].to_sym] }
+          when text = ss.scan(/:\[\]/) then
+            action { [:tSYMBOL, text[1..-1].to_sym] }
           when text = ss.scan(/#{OPEN_DYNAMIC_ATTRIBUTE}/) then
             action { @state = :DYNAMIC_ATTRIBUTE; [:tOPEN_DYNAMIC_ATTRIBUTE, text] }
           when text = ss.scan(/#{OPEN_ARRAY}/) then
             action { @state = :ARRAY_VALUE; [:tOPEN_ARRAY, text] }
           when text = ss.scan(/#{CLOSE_ATTRIBUTE}/) then
             action { @nested_count -= 1; @state = @nested_count == 0 ? nil : :VALUE; [:tCLOSE_ATTRIBUTE, text] }
+          when text = ss.scan(/#{NIL}\?/) then
+            action { [:tIDENTIFIER_VALUE, text] }
           when ss.skip(/#{NIL}/) then
             action { [:tNIL, nil] }
           when ss.skip(/#{TRUE}/) then
@@ -237,10 +265,10 @@ class Synvert::Core::NodeQuery::Lexer
           case
           when ss.skip(/\s+/) then
             # do nothing
-          when text = ss.scan(/,/) then
-            action { [:tCOMMA, text] }
           when text = ss.scan(/#{CLOSE_ARRAY}/) then
             action { @state = :VALUE; [:tCLOSE_ARRAY, text] }
+          when text = ss.scan(/#{NIL}\?/) then
+            action { [:tIDENTIFIER_VALUE, text] }
           when ss.skip(/#{NIL}/) then
             action { [:tNIL, nil] }
           when ss.skip(/#{TRUE}/) then