fix math operators and reorder regex

Asherlc · Asherlc · commit f1b86cfbb582 · 2013-03-26T14:18:32.000-07:00
diff --git a/lib/coderay/scanners/liquid.rb b/lib/coderay/scanners/liquid.rb
@@ -5,11 +5,11 @@ class Liquid < Scanner
     
     register_for :liquid
    
-    DIRECTIVE_KEYWORDS = "list|endlist|for|endfor|wrap|endwrap|if|endif|unless|endunless|elsif|assignlist|assign|cycle|capture|end|capture|fill|iflist|endiflist|else"
+    DIRECTIVE_KEYWORDS = "endlist|list|endfor|for|endwrap|wrap|endif|if|endunless|unless|elsif|assignlist|assign|cycle|capture|end|capture|fill|endiflist|iflist|else"
 
-    DIRECTIVE_OPERATORS = "=|==|!=|>|<|<=|>=|contains"
+    DIRECTIVE_OPERATORS = "=|==|!=|>|<|<=|>=|contains|\+"
 
-    MATH = "==|=|!=|>|<=|<|>"
+    MATH = /==|=|!=|>|<=|<|>|\+/
 
     FILTER_KEYWORDS = "date|capitalize|downcase|upcase|first|last|join|sort|map|size|escape_once|escape|strip_html|strip_newlines|newline_to_br|replace_first|replace|remove_first|remove|truncate|truncatewords|prepend|append|minus|plus|times|divided_by|split|modulo"
 
@@ -63,7 +63,7 @@ def scan_directive(encoder, options, match)
           end
           scan_spaces(encoder)
           if match = scan(/#{MATH}/)
-            encoder.text_token match, :char
+            encoder.text_token match, :operator
             scan_spaces(encoder)
             scan_selector(encoder, options, match)
           end
@@ -82,7 +82,7 @@ def scan_directive(encoder, options, match)
     end
 
     def scan_output_filters(encoder, options, match)
-      encoder.text_token match, :delimiter
+      encoder.text_token match, :operator
       scan_spaces(encoder)
       if directive = scan(/#{FILTER_KEYWORDS}/)
         encoder.text_token directive, :directive
@@ -125,7 +125,6 @@ def scan_tokens(encoder, options)
         if (match = scan_until(/(?=({{2,3}|{{1,2}%))/) || scan_rest) and not match.empty? and state != :liquid
           Rails.logger.debug "DEBUG: HTML scanning: #{match}"
           if match =~ /^"|^'/
-            #match = match.sub /^"|^'/, ''
             @html_scanner.tokenize(match, { tokens: encoder, state: :attribute_value_string })
           else
             @html_scanner.tokenize(match, tokens: encoder)
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb
@@ -67,7 +67,7 @@ module CodeRay
     :type                => 'type',
     :value               => 'value',
     :variable            => 'variable',
-    
+
     :change              => 'change',
     :delete              => 'delete',
     :head                => 'head',
@@ -76,7 +76,7 @@ module CodeRay
     :eyecatcher          => 'eyecatcher',
     
     :ident               => false,
-    :operator            => false,
+    :operator            => 'operator',
     
     :space               => false,
     :plain               => false
