From 501df7613c67bcd743eaa00071f0dbb179607394 Mon Sep 17 00:00:00 2001
From: Quintus <sutniuq@gmx.net>
Date: Sun, 22 Apr 2012 22:10:42 +0200
Subject: Lua scanner for CodeRay. Meta-commit. This commit is a super-commit
 containing all the subcommits for implementing the Lua scanner.

---
 lib/coderay/scanners/lua.rb | 267 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 267 insertions(+)
 create mode 100644 lib/coderay/scanners/lua.rb

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
new file mode 100644
index 0000000..e7706fc
--- /dev/null
+++ b/lib/coderay/scanners/lua.rb
@@ -0,0 +1,267 @@
+# -*- coding: utf-8 -*-
+
+# Scanner for the Lua[http://lua.org] programming lanuage.
+#
+# The language’s complete syntax is defined in
+# {the Lua manual}[http://www.lua.org/manual/5.2/manual.html],
+# which is what this scanner tries to conform to.
+class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
+
+  register_for :lua
+  file_extension "lua"
+  title "Lua"
+
+  # Keywords used in Lua.
+  KEYWORDS = %w[and break do else elseif end
+  for function goto if in
+  local not or repeat return
+  then until while
+  ]
+
+  # Constants set by the Lua core.
+  PREDEFINED_CONSTANTS = %w[false true nil]
+
+  # The expressions contained in this array are parts of Lua’s `basic'
+  # library. Although it’s not entirely necessary to load that library,
+  # it is highly recommended and one would have to provide own implementations
+  # of some of these expressions if one does not do so. They however aren’t
+  # keywords, neither are they constants, but nearly predefined, so they
+  # get tagged as `predefined' rather than anything else.
+  #
+  # This list excludes values of form `_UPPERCASE' because the Lua manual
+  # requires such identifiers to be reserved by Lua anyway and they are
+  # highlighted directly accordingly, without the need for specific
+  # identifiers to be listed here.
+  PREDEFINED_EXPRESSIONS = %w[
+  assert collectgarbage dofile error getmetatable
+  ipairs load loadfile next pairs pcall print
+  rawequal rawget rawlen rawset select setmetatable
+  tonumber tostring type xpcall
+  ]
+
+  # Automatic token kind selection for normal words.
+  IDENT_KIND = CodeRay::WordList.new(:ident)
+    .add(KEYWORDS, :keyword)
+    .add(PREDEFINED_CONSTANTS, :predefined_constant)
+    .add(PREDEFINED_EXPRESSIONS, :predefined)
+
+  protected
+
+  # Scanner initialization.
+  def setup
+    @state       = :initial
+    @brace_depth = 0
+  end
+
+  # CodeRay entry hook. Starts parsing.
+  def scan_tokens(encoder, options)
+    @encoder = encoder
+    @options = options
+
+    send(:"handle_state_#@state") until eos?
+
+    @encoder
+  end
+
+  def handle_state_initial
+    if match = scan(/\-\-\[\=*\[/)   #--[[ long (possibly multiline) comment ]]
+      @num_equals = match.count("=") # Number must match for comment end
+      @encoder.begin_group(:comment)
+      @encoder.text_token(match, :delimiter)
+      @state = :long_comment
+
+    elsif match = scan(/--.*?$/) # --Lua comment
+      @encoder.text_token(match, :comment)
+
+    elsif match = scan(/\[=*\[/)     # [[ long (possibly multiline) string ]]
+      @num_equals = match.count("=") # Number must match for comment end
+      @encoder.begin_group(:string)
+      @encoder.text_token(match, :delimiter)
+      @state = :long_string
+
+    elsif match = scan(/::\s*[a-zA-Z_][a-zA-Z0-9_]+\s*::/) # ::goto_label::
+      @encoder.text_token(match, :label)
+
+    elsif match = scan(/_[A-Z]+/) # _UPPERCASE are names reserved for Lua
+      @encoder.text_token(match, :predefined)
+
+    elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/) # Normal letters (or letters followed by digits)
+      kind = IDENT_KIND[match]
+
+      # Extra highlighting for entities following certain keywords
+      if kind == :keyword and match == "function"
+        @state = :function_expected
+      elsif kind == :keyword and match == "goto"
+        @state = :goto_label_expected
+      elsif kind == :keyword and match == "local"
+        @state = :local_var_expected
+      end
+
+      @encoder.text_token(match, kind)
+
+    elsif match = scan(/{/) # Opening table brace {
+      @encoder.begin_group(:table)
+      @encoder.text_token(match, @brace_depth >= 1 ? :inline_delimiter : :delimiter)
+      @brace_depth += 1
+      @state        = :table
+
+    elsif match = scan(/}/) # Closing table brace }
+      if @brace_depth == 1
+        @brace_depth = 0
+        @encoder.text_token(match, :delimiter)
+      elsif @brace_depth == 0 # Mismatched brace
+        @encoder.text_token(match, :error)
+      else
+        @brace_depth -= 1
+        @encoder.text_token(match, :inline_delimiter)
+        @state = :table
+      end
+      @encoder.end_group(:table)
+
+    elsif match = scan(/["']/) # String delimiters " and '
+      @encoder.begin_group(:string)
+      @encoder.text_token(match, :delimiter)
+      @start_delim = match
+      @state       = :string
+
+                      # ↓Prefix                hex number ←|→ decimal number
+    elsif match = scan(/-? (?:0x\h* \. \h+ (?:p[+\-]?\d+)? | \d*\.\d+ (?:e[+\-]?\d+)?)/ix) # hexadecimal constants have no E power, decimal ones no P power
+      @encoder.text_token(match, :float)
+
+                      # ↓Prefix         hex number ←|→ decimal number
+    elsif match = scan(/-? (?:0x\h+ (?:p[+\-]?\d+)? | \d+ (?:e[+\-]?\d+)?)/ix) # hexadecimal constants have no E power, decimal ones no P power
+      @encoder.text_token(match, :integer)
+
+    elsif match = scan(/[\+\-\*\/%^\#=~<>\(\)\[\]:;,] | \.(?!\d)/x) # Operators
+      @encoder.text_token(match, :operator)
+
+    elsif match = scan(/\s+/) # Space
+      @encoder.text_token(match, :space)
+
+    else # Invalid stuff. Note that Lua doesn’t accept multibyte chars outside of strings, hence these are also errors.
+      @encoder.text_token(getch, :error)
+    end
+
+    # It may be that we’re scanning a full-blown subexpression of a table
+    # (tables can contain full expressions in parts).
+    # If this is the case, return to :table scanning state.
+    @state = :table if @state == :initial && @brace_depth >= 1
+  end
+
+  def handle_state_function_expected
+    if match = scan(/\(.*?\)/m) # x = function() # "Anonymous" function without explicit name
+      @encoder.text_token(match, :operator)
+      @state = :initial
+    elsif match = scan(/[a-zA-Z_] (?:[a-zA-Z0-9_\.] (?!\.\d))* [\.\:]/x) # function tbl.subtbl.foo() | function tbl:foo() # Colon only allowed as last separator
+      @encoder.text_token(match, :ident)
+    elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/) # function foo()
+      @encoder.text_token(match, :function)
+      @state = :initial
+    elsif match = scan(/\s+/) # Between the `function' keyword and the ident may be any amount of whitespace
+      @encoder.text_token(match, :space)
+    else
+      @encoder.text_token(getch, :error)
+      @state = :initial
+    end
+  end
+
+  def handle_state_goto_label_expected
+    if match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
+      @encoder.text_token(match, :label)
+      @state = :initial
+    elsif match = scan(/\s+/) # Between the `goto' keyword and the label may be any amount of whitespace
+      @encoder.text_token(match, :space)
+    else
+      @encoder.text_token(getch, :error)
+    end
+  end
+
+  def handle_state_local_var_expected
+    if match = scan(/function/) # local function ...
+      @encoder.text_token(match, :keyword)
+      @state = :function_expected
+    elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
+      @encoder.text_token(match, :local_variable)
+    elsif match = scan(/,/)
+      @encoder.text_token(match, :operator)
+    elsif match = scan(/=/)
+      @encoder.text_token(match, :operator)
+      # After encountering the equal sign, arbitrary expressions are
+      # allowed again, so just return to the main state for further
+      # parsing.
+      @state = :initial
+    elsif match = scan(/\n/)
+      @encoder.text_token(match, :space)
+      @state = :initial
+    elsif match = scan(/\s+/)
+      @encoder.text_token(match, :space)
+    else
+      @encoder.text_token(getch, :error)
+    end
+  end
+
+  def handle_state_long_comment
+    if match = scan(/.*?(?=\]={#@num_equals}\])/m)
+      @encoder.text_token(match, :content)
+
+      delim = scan(/\]={#@num_equals}\]/)
+      @encoder.text_token(delim, :delimiter)
+    else # No terminator found till EOF
+      @encoder.text_token(rest, :error)
+      terminate
+    end
+    @encoder.end_group(:comment)
+    @state = :initial
+  end
+
+  def handle_state_long_string
+    if match = scan(/.*?(?=\]={#@num_equals}\])/m) # Long strings do not interpret any escape sequences
+      @encoder.text_token(match, :content)
+
+      delim = scan(/\]={#@num_equals}\]/)
+      @encoder.text_token(delim, :delimiter)
+    else # No terminator found till EOF
+      @encoder.text_token(rest, :error)
+      terminate
+    end
+    @encoder.end_group(:string)
+    @state = :initial
+  end
+
+  def handle_state_string
+    if match = scan(/[^\\#@start_delim\n]+/) # Everything except \ and the start delimiter character is string content (newlines are only allowed if preceeded by \ or \z)
+      @encoder.text_token(match, :content)
+    elsif match = scan(/\\(?:['"abfnrtv\\]|z\s*|x\h\h|\d{1,3}|\n)/m)
+      @encoder.text_token(match, :char)
+    elsif match = scan(Regexp.compile(@start_delim))
+      @encoder.text_token(match, :delimiter)
+      @encoder.end_group(:string)
+      @state = :initial
+    elsif match = scan(/\n/) # Lua forbids unescaped newlines in normal non-long strings
+      @encoder.text_token("\\n\n", :error) # Visually appealing error indicator--otherwise users may wonder whether the highlighter cannot highlight multine strings
+      @encoder.end_group(:string)
+      @state = :initial
+    else
+      @encoder.text_token(getch, :error)
+    end
+  end
+
+  def handle_state_table
+    if match = scan(/[,;]/)
+      @encoder.text_token(match, :operator)
+    elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]* (?=\s*=)/x)
+      @encoder.text_token(match, :key)
+      @encoder.text_token(scan(/\s+/), :space) if check(/\s+/)
+      @encoder.text_token(scan(/=/), :operator)
+      @state = :initial
+    elsif match = scan(/\s+/m)
+      @encoder.text_token(match, :space)
+    else
+      # Note this clause doesn’t advance the scan pointer, it’s a kind of
+      # "retry with other options" (the :initial state then of course
+      # advances the pointer).
+      @state = :initial
+    end
+  end
+
+end
-- 
cgit v1.2.1


From 8979cc621431248fded86c341e2102a67c5344bb Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Tue, 19 Jun 2012 17:45:49 +0200
Subject: use case+when instead of send and methods

---
 lib/coderay/scanners/lua.rb | 64 ++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
index e7706fc..e712061 100644
--- a/lib/coderay/scanners/lua.rb
+++ b/lib/coderay/scanners/lua.rb
@@ -40,10 +40,10 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
   ]
 
   # Automatic token kind selection for normal words.
-  IDENT_KIND = CodeRay::WordList.new(:ident)
-    .add(KEYWORDS, :keyword)
-    .add(PREDEFINED_CONSTANTS, :predefined_constant)
-    .add(PREDEFINED_EXPRESSIONS, :predefined)
+  IDENT_KIND = CodeRay::WordList.new(:ident).
+    add(KEYWORDS, :keyword).
+    add(PREDEFINED_CONSTANTS, :predefined_constant).
+    add(PREDEFINED_EXPRESSIONS, :predefined)
 
   protected
 
@@ -57,13 +57,11 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
   def scan_tokens(encoder, options)
     @encoder = encoder
     @options = options
-
-    send(:"handle_state_#@state") until eos?
-
-    @encoder
-  end
-
-  def handle_state_initial
+    
+    until eos?
+  case state
+        
+  when :initial
     if match = scan(/\-\-\[\=*\[/)   #--[[ long (possibly multiline) comment ]]
       @num_equals = match.count("=") # Number must match for comment end
       @encoder.begin_group(:comment)
@@ -99,13 +97,13 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
 
       @encoder.text_token(match, kind)
 
-    elsif match = scan(/{/) # Opening table brace {
+    elsif match = scan(/\{/) # Opening table brace {
       @encoder.begin_group(:table)
       @encoder.text_token(match, @brace_depth >= 1 ? :inline_delimiter : :delimiter)
       @brace_depth += 1
       @state        = :table
 
-    elsif match = scan(/}/) # Closing table brace }
+    elsif match = scan(/\}/) # Closing table brace }
       if @brace_depth == 1
         @brace_depth = 0
         @encoder.text_token(match, :delimiter)
@@ -146,9 +144,8 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     # (tables can contain full expressions in parts).
     # If this is the case, return to :table scanning state.
     @state = :table if @state == :initial && @brace_depth >= 1
-  end
-
-  def handle_state_function_expected
+    
+  when :function_expected
     if match = scan(/\(.*?\)/m) # x = function() # "Anonymous" function without explicit name
       @encoder.text_token(match, :operator)
       @state = :initial
@@ -163,9 +160,8 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
       @encoder.text_token(getch, :error)
       @state = :initial
     end
-  end
 
-  def handle_state_goto_label_expected
+  when :goto_label_expected
     if match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
       @encoder.text_token(match, :label)
       @state = :initial
@@ -174,9 +170,8 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     else
       @encoder.text_token(getch, :error)
     end
-  end
-
-  def handle_state_local_var_expected
+  
+  when :local_var_expected
     if match = scan(/function/) # local function ...
       @encoder.text_token(match, :keyword)
       @state = :function_expected
@@ -198,9 +193,8 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     else
       @encoder.text_token(getch, :error)
     end
-  end
-
-  def handle_state_long_comment
+    
+  when :long_comment
     if match = scan(/.*?(?=\]={#@num_equals}\])/m)
       @encoder.text_token(match, :content)
 
@@ -212,9 +206,8 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     end
     @encoder.end_group(:comment)
     @state = :initial
-  end
-
-  def handle_state_long_string
+    
+  when :long_string
     if match = scan(/.*?(?=\]={#@num_equals}\])/m) # Long strings do not interpret any escape sequences
       @encoder.text_token(match, :content)
 
@@ -226,9 +219,8 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     end
     @encoder.end_group(:string)
     @state = :initial
-  end
-
-  def handle_state_string
+    
+  when :string
     if match = scan(/[^\\#@start_delim\n]+/) # Everything except \ and the start delimiter character is string content (newlines are only allowed if preceeded by \ or \z)
       @encoder.text_token(match, :content)
     elsif match = scan(/\\(?:['"abfnrtv\\]|z\s*|x\h\h|\d{1,3}|\n)/m)
@@ -244,9 +236,8 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     else
       @encoder.text_token(getch, :error)
     end
-  end
-
-  def handle_state_table
+  
+  when :table
     if match = scan(/[,;]/)
       @encoder.text_token(match, :operator)
     elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]* (?=\s*=)/x)
@@ -262,6 +253,13 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
       # advances the pointer).
       @state = :initial
     end
+  else
+    raise
+  end
+
+    end
+
+    @encoder
   end
 
 end
-- 
cgit v1.2.1


From e796a247e5bf2395ec72b0ae98d68bcb648f5368 Mon Sep 17 00:00:00 2001
From: Joel Holdbrooks <cjholdbrooks@gmail.com>
Date: Tue, 3 Jul 2012 18:19:05 -0700
Subject: use "id" instead of "constant" for css ids

---
 lib/coderay/scanners/css.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/css.rb b/lib/coderay/scanners/css.rb
index 7b731ef..c473574 100644
--- a/lib/coderay/scanners/css.rb
+++ b/lib/coderay/scanners/css.rb
@@ -8,7 +8,7 @@ module Scanners
     KINDS_NOT_LOC = [
       :comment,
       :class, :pseudo_class, :type,
-      :constant, :directive,
+      :id, :directive,
       :key, :value, :operator, :color, :float, :string,
       :error, :important,
     ]  # :nodoc:
@@ -73,7 +73,7 @@ module Scanners
               encoder.text_token match, :class
               next
             elsif match = scan(RE::Id)
-              encoder.text_token match, :constant
+              encoder.text_token match, :id
               next
             elsif match = scan(RE::PseudoClass)
               encoder.text_token match, :pseudo_class
-- 
cgit v1.2.1


From 4eb4324c6fb20b9b5e7f73f17bc21e4a17fd3073 Mon Sep 17 00:00:00 2001
From: Joel Holdbrooks <cjholdbrooks@gmail.com>
Date: Tue, 24 Jul 2012 10:59:50 -0700
Subject: use :tag instead of :type for identifiers

---
 lib/coderay/scanners/css.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/css.rb b/lib/coderay/scanners/css.rb
index c473574..503e14e 100644
--- a/lib/coderay/scanners/css.rb
+++ b/lib/coderay/scanners/css.rb
@@ -7,7 +7,7 @@ module Scanners
     
     KINDS_NOT_LOC = [
       :comment,
-      :class, :pseudo_class, :type,
+      :class, :pseudo_class, :tag,
       :id, :directive,
       :key, :value, :operator, :color, :float, :string,
       :error, :important,
@@ -67,7 +67,7 @@ module Scanners
         elsif case states.last
           when :initial, :media
             if match = scan(/(?>#{RE::Ident})(?!\()|\*/ox)
-              encoder.text_token match, :type
+              encoder.text_token match, :tag
               next
             elsif match = scan(RE::Class)
               encoder.text_token match, :class
@@ -102,7 +102,7 @@ module Scanners
             
           when :media_before_name
             if match = scan(RE::Ident)
-              encoder.text_token match, :type
+              encoder.text_token match, :tag
               states[-1] = :media_after_name
               next
             end
-- 
cgit v1.2.1


From b081c1f3ab670301199005c04ecbc11614593285 Mon Sep 17 00:00:00 2001
From: Nathan Youngman <git@nathany.com>
Date: Tue, 11 Sep 2012 15:04:45 -0600
Subject: escape = in regex (my editor gets confused:-)

---
 lib/coderay/scanners/lua.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
index e712061..e640397 100644
--- a/lib/coderay/scanners/lua.rb
+++ b/lib/coderay/scanners/lua.rb
@@ -57,10 +57,10 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
   def scan_tokens(encoder, options)
     @encoder = encoder
     @options = options
-    
+
     until eos?
   case state
-        
+
   when :initial
     if match = scan(/\-\-\[\=*\[/)   #--[[ long (possibly multiline) comment ]]
       @num_equals = match.count("=") # Number must match for comment end
@@ -144,7 +144,7 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     # (tables can contain full expressions in parts).
     # If this is the case, return to :table scanning state.
     @state = :table if @state == :initial && @brace_depth >= 1
-    
+
   when :function_expected
     if match = scan(/\(.*?\)/m) # x = function() # "Anonymous" function without explicit name
       @encoder.text_token(match, :operator)
@@ -170,7 +170,7 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     else
       @encoder.text_token(getch, :error)
     end
-  
+
   when :local_var_expected
     if match = scan(/function/) # local function ...
       @encoder.text_token(match, :keyword)
@@ -179,7 +179,7 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
       @encoder.text_token(match, :local_variable)
     elsif match = scan(/,/)
       @encoder.text_token(match, :operator)
-    elsif match = scan(/=/)
+    elsif match = scan(/\=/)
       @encoder.text_token(match, :operator)
       # After encountering the equal sign, arbitrary expressions are
       # allowed again, so just return to the main state for further
@@ -193,7 +193,7 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     else
       @encoder.text_token(getch, :error)
     end
-    
+
   when :long_comment
     if match = scan(/.*?(?=\]={#@num_equals}\])/m)
       @encoder.text_token(match, :content)
@@ -206,7 +206,7 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     end
     @encoder.end_group(:comment)
     @state = :initial
-    
+
   when :long_string
     if match = scan(/.*?(?=\]={#@num_equals}\])/m) # Long strings do not interpret any escape sequences
       @encoder.text_token(match, :content)
@@ -219,7 +219,7 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     end
     @encoder.end_group(:string)
     @state = :initial
-    
+
   when :string
     if match = scan(/[^\\#@start_delim\n]+/) # Everything except \ and the start delimiter character is string content (newlines are only allowed if preceeded by \ or \z)
       @encoder.text_token(match, :content)
@@ -236,14 +236,14 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
     else
       @encoder.text_token(getch, :error)
     end
-  
+
   when :table
     if match = scan(/[,;]/)
       @encoder.text_token(match, :operator)
     elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]* (?=\s*=)/x)
       @encoder.text_token(match, :key)
       @encoder.text_token(scan(/\s+/), :space) if check(/\s+/)
-      @encoder.text_token(scan(/=/), :operator)
+      @encoder.text_token(scan(/\=/), :operator)
       @state = :initial
     elsif match = scan(/\s+/m)
       @encoder.text_token(match, :space)
-- 
cgit v1.2.1


From aeac6672fbe70702288b259605cb863493ad8ac2 Mon Sep 17 00:00:00 2001
From: SHIMOMURA Sho <graueule@gmail.com>
Date: Sun, 21 Oct 2012 01:23:56 +0900
Subject: TaskPaper scanner for CodeRay

---
 lib/coderay/scanners/taskpaper.rb | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 lib/coderay/scanners/taskpaper.rb

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/taskpaper.rb b/lib/coderay/scanners/taskpaper.rb
new file mode 100644
index 0000000..c6eb3b3
--- /dev/null
+++ b/lib/coderay/scanners/taskpaper.rb
@@ -0,0 +1,34 @@
+module CodeRay
+module Scanners
+  
+  class Taskpaper < Scanner
+    
+    register_for :taskpaper
+    file_extension 'taskpaper'
+    
+  protected
+    
+    def scan_tokens encoder, options
+      until eos?
+        if match = scan(/^\S.*:.*$/)                  # project
+          encoder.text_token(match, :project)
+        elsif match = scan(/^-.+@done(?:\(.*)?.*$/)   # completed task
+          encoder.text_token(match, :complete)
+        elsif match = scan(/^-.+$/)                   # task
+          encoder.text_token(match, :plain)
+        elsif match = scan(/^.+$/)                    # comment
+          encoder.text_token(match, :comment)
+        elsif match = scan(/\s+/)                     # space
+          encoder.text_token(match, :space)
+        else                                          # other
+          encoder.text_token getch, :error
+        end
+      end
+      
+      encoder
+    end
+    
+  end
+  
+end
+end
-- 
cgit v1.2.1


From 279348d3c2159df4ce6ac5949ada0177aa7c7159 Mon Sep 17 00:00:00 2001
From: Nathan Youngman <git@nathany.com>
Date: Sat, 27 Oct 2012 23:41:52 -0600
Subject: :map token kind

Use :map instead of :table. It's more generic, and won't be confused with the :table rendering style.
---
 lib/coderay/scanners/lua.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
index e640397..64763dc 100644
--- a/lib/coderay/scanners/lua.rb
+++ b/lib/coderay/scanners/lua.rb
@@ -98,10 +98,10 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
       @encoder.text_token(match, kind)
 
     elsif match = scan(/\{/) # Opening table brace {
-      @encoder.begin_group(:table)
+      @encoder.begin_group(:map)
       @encoder.text_token(match, @brace_depth >= 1 ? :inline_delimiter : :delimiter)
       @brace_depth += 1
-      @state        = :table
+      @state        = :map
 
     elsif match = scan(/\}/) # Closing table brace }
       if @brace_depth == 1
@@ -112,9 +112,9 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
       else
         @brace_depth -= 1
         @encoder.text_token(match, :inline_delimiter)
-        @state = :table
+        @state = :map
       end
-      @encoder.end_group(:table)
+      @encoder.end_group(:map)
 
     elsif match = scan(/["']/) # String delimiters " and '
       @encoder.begin_group(:string)
@@ -142,8 +142,8 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
 
     # It may be that we’re scanning a full-blown subexpression of a table
     # (tables can contain full expressions in parts).
-    # If this is the case, return to :table scanning state.
-    @state = :table if @state == :initial && @brace_depth >= 1
+    # If this is the case, return to :map scanning state.
+    @state = :map if @state == :initial && @brace_depth >= 1
 
   when :function_expected
     if match = scan(/\(.*?\)/m) # x = function() # "Anonymous" function without explicit name
@@ -237,7 +237,7 @@ class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
       @encoder.text_token(getch, :error)
     end
 
-  when :table
+  when :map
     if match = scan(/[,;]/)
       @encoder.text_token(match, :operator)
     elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]* (?=\s*=)/x)
-- 
cgit v1.2.1


From 51526173dd7ee640171ee597d3c380c5dda42762 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 10 Mar 2013 22:40:10 +0100
Subject: support multi-line comments in JavaScript diff

---
 lib/coderay/scanners/java_script.rb | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb
index 43ecb18..75881a0 100644
--- a/lib/coderay/scanners/java_script.rb
+++ b/lib/coderay/scanners/java_script.rb
@@ -54,10 +54,17 @@ module Scanners
     
   protected
     
+    def setup
+      @state = :initial
+    end
+    
     def scan_tokens encoder, options
       
-      state = :initial
-      string_delimiter = nil
+      state, string_delimiter = options[:state] || @state
+      if string_delimiter
+        encoder.begin_group state
+      end
+      
       value_expected = true
       key_expected = false
       function_expected = false
@@ -72,9 +79,10 @@ module Scanners
             value_expected = true if !value_expected && match.index(?\n)
             encoder.text_token match, :space
             
-          elsif match = scan(%r! // [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .* ) !mx)
+          elsif match = scan(%r! // [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .*() ) !mx)
             value_expected = true
             encoder.text_token match, :comment
+            state = :open_multi_line_comment if self[1]
             
           elsif check(/\.?\d/)
             key_expected = value_expected = false
@@ -182,13 +190,28 @@ module Scanners
             raise_inspect "else case \" reached; %p not handled." % peek(1), encoder
           end
           
+        when :open_multi_line_comment
+          if match = scan(%r! .*? \*/ !mx)
+            state = :initial
+          else
+            match = scan(%r! .+ !mx)
+          end
+          value_expected = true
+          encoder.text_token match, :comment if match
+          
         else
-          raise_inspect 'Unknown state', encoder
+          #:nocov:
+          raise_inspect 'Unknown state: %p' % [state], encoder
+          #:nocov:
           
         end
         
       end
       
+      if options[:keep_state]
+        @state = state, string_delimiter
+      end
+      
       if [:string, :regexp].include? state
         encoder.end_group state
       end
-- 
cgit v1.2.1


From 469dba8c6378fb62ebf12c4a2f32b6be433bb16e Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Mon, 11 Mar 2013 02:23:22 +0100
Subject: added Sass scanner (work in progress)

---
 lib/coderay/scanners/css.rb  |  31 +++----
 lib/coderay/scanners/sass.rb | 203 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 217 insertions(+), 17 deletions(-)
 create mode 100644 lib/coderay/scanners/sass.rb

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/css.rb b/lib/coderay/scanners/css.rb
index 7b731ef..003eed6 100644
--- a/lib/coderay/scanners/css.rb
+++ b/lib/coderay/scanners/css.rb
@@ -15,19 +15,17 @@ module Scanners
     
     module RE  # :nodoc:
       Hex = /[0-9a-fA-F]/
-      Unicode = /\\#{Hex}{1,6}(?:\r\n|\s)?/ # differs from standard because it allows uppercase hex too
-      Escape = /#{Unicode}|\\[^\r\n\f0-9a-fA-F]/
-      NMChar = /[-_a-zA-Z0-9]|#{Escape}/
-      NMStart = /[_a-zA-Z]|#{Escape}/
-      NL = /\r\n|\r|\n|\f/
-      String1 = /"(?:[^\n\r\f\\"]|\\#{NL}|#{Escape})*"?/  # TODO: buggy regexp
-      String2 = /'(?:[^\n\r\f\\']|\\#{NL}|#{Escape})*'?/  # TODO: buggy regexp
+      Unicode = /\\#{Hex}{1,6}\b/ # differs from standard because it allows uppercase hex too
+      Escape = /#{Unicode}|\\[^\n0-9a-fA-F]/
+      NMChar = /[-_a-zA-Z0-9]/
+      NMStart = /[_a-zA-Z]/
+      String1 = /"(?:[^\n\\"]+|\\\n|#{Escape})*"?/  # TODO: buggy regexp
+      String2 = /'(?:[^\n\\']+|\\\n|#{Escape})*'?/  # TODO: buggy regexp
       String = /#{String1}|#{String2}/
       
       HexColor = /#(?:#{Hex}{6}|#{Hex}{3})/
-      Color = /#{HexColor}/
       
-      Num = /-?(?:[0-9]+|[0-9]*\.[0-9]+)/
+      Num = /-?(?:[0-9]*\.[0-9]+|[0-9]+)/
       Name = /#{NMChar}+/
       Ident = /-?#{NMStart}#{NMChar}*/
       AtKeyword = /@#{Ident}/
@@ -35,16 +33,15 @@ module Scanners
       
       reldimensions = %w[em ex px]
       absdimensions = %w[in cm mm pt pc]
-      Unit = Regexp.union(*(reldimensions + absdimensions + %w[s]))
+      Unit = Regexp.union(*(reldimensions + absdimensions + %w[s dpi dppx deg]))
       
       Dimension = /#{Num}#{Unit}/
       
-      Comment = %r! /\* (?: .*? \*/ | .* ) !mx
-      Function = /(?:url|alpha|attr|counters?)\((?:[^)\n\r\f]|\\\))*\)?/
+      Function = /(?:url|alpha|attr|counters?)\((?:[^)\n]|\\\))*\)?/
       
-      Id = /##{Name}/
+      Id = /(?!#{HexColor}\b(?!-))##{Name}/
       Class = /\.#{Name}/
-      PseudoClass = /:#{Name}/
+      PseudoClass = /::?#{Ident}/
       AttributeSelector = /\[[^\]]*\]?/
     end
     
@@ -52,7 +49,7 @@ module Scanners
     
     def setup
       @state = :initial
-      @value_expected = nil
+      @value_expected = false
     end
     
     def scan_tokens encoder, options
@@ -158,7 +155,7 @@ module Scanners
         elsif match = scan(/(?: #{RE::Dimension} | #{RE::Percentage} | #{RE::Num} )/ox)
           encoder.text_token match, :float
           
-        elsif match = scan(/#{RE::Color}/o)
+        elsif match = scan(/#{RE::HexColor}/o)
           encoder.text_token match, :color
           
         elsif match = scan(/! *important/)
@@ -170,7 +167,7 @@ module Scanners
         elsif match = scan(RE::AtKeyword)
           encoder.text_token match, :directive
           
-        elsif match = scan(/ [+>:;,.=()\/] /x)
+        elsif match = scan(/ [+>~:;,.=()\/] /x)
           if match == ':'
             value_expected = true
           elsif match == ';'
diff --git a/lib/coderay/scanners/sass.rb b/lib/coderay/scanners/sass.rb
new file mode 100644
index 0000000..89d7737
--- /dev/null
+++ b/lib/coderay/scanners/sass.rb
@@ -0,0 +1,203 @@
+module CodeRay
+module Scanners
+  
+  # A scanner for Sass.
+  class Sass < CSS
+    
+    register_for :sass
+    file_extension 'sass'
+    
+    SASS_FUNCTION = /(?:inline-image|linear-gradient|color-stops|mix|lighten|darken|rotate|image-url|image-width|image-height|sprite|sprite-url|sprite-path|sprite-file|sprite-map|sprite-position|unquote|join|round|ceil|floor|nth)/
+    
+    STRING_CONTENT_PATTERN = {
+      "'" => /(?:[^\n\'\#]+|\\\n|#{RE::Escape}|#(?!\{))+/,
+      '"' => /(?:[^\n\"\#]+|\\\n|#{RE::Escape}|#(?!\{))+/,
+    }
+    
+  protected
+    
+    def setup
+      @state = :initial
+      @value_expected = false
+    end
+    
+    def scan_tokens encoder, options
+      states = Array(options[:state] || @state)
+      string_delimiter = nil
+      value_expected = @value_expected
+      
+      until eos?
+        
+        if match = scan(/\s+/)
+          encoder.text_token match, :space
+          value_expected = false if match.index(/\n/)
+          
+        elsif states.last == :sass_inline && (match = scan(/\}/))
+          encoder.text_token match, :inline_delimiter
+          encoder.end_group :inline
+          states.pop
+        
+        elsif case states.last
+          when :initial, :media, :sass_inline
+            if match = scan(/(?>#{RE::Ident})(?!\()/ox)
+              encoder.text_token match, value_expected ? :value : (check(/.*:/) ? :key : :type)
+              next
+            elsif !value_expected && (match = scan(/\*/))
+              encoder.text_token match, :type
+              next
+            elsif match = scan(RE::Class)
+              encoder.text_token match, :class
+              next
+            elsif match = scan(RE::Id)
+              encoder.text_token match, :constant
+              next
+            elsif match = scan(RE::PseudoClass)
+              encoder.text_token match, :pseudo_class
+              next
+            elsif match = scan(RE::AttributeSelector)
+              # TODO: Improve highlighting inside of attribute selectors.
+              encoder.text_token match[0,1], :operator
+              encoder.text_token match[1..-2], :attribute_name if match.size > 2
+              encoder.text_token match[-1,1], :operator if match[-1] == ?]
+              next
+            elsif match = scan(/(\=|@mixin +)#{RE::Ident}/o)
+              encoder.text_token match, :function
+              next
+            elsif match = scan(/@media/)
+              encoder.text_token match, :directive
+              # states.push :media_before_name
+              next
+            end
+          
+          when :block
+            if match = scan(/(?>#{RE::Ident})(?!\()/ox)
+              if value_expected
+                encoder.text_token match, :value
+              else
+                encoder.text_token match, :key
+              end
+              next
+            end
+            
+          when :string
+            if match = scan(STRING_CONTENT_PATTERN[string_delimiter])
+              encoder.text_token match, :content
+            elsif match = scan(/['"]/)
+              encoder.text_token match, :delimiter
+              encoder.end_group :string
+              string_delimiter = nil
+              states.pop
+            elsif match = scan(/#\{/)
+              encoder.begin_group :inline
+              encoder.text_token match, :inline_delimiter
+              states.push :sass_inline
+            elsif match = scan(/ \\ | $ /x)
+              encoder.end_group state
+              encoder.text_token match, :error unless match.empty?
+              states.pop
+            else
+              raise_inspect "else case #{string_delimiter} reached; %p not handled." % peek(1), encoder
+            end
+          
+          else
+            #:nocov:
+            raise_inspect 'Unknown state', encoder
+            #:nocov:
+            
+          end
+          
+        elsif match = scan(/\$#{RE::Ident}/o)
+          encoder.text_token match, :variable
+          next
+        
+        elsif match = scan(/&/)
+          encoder.text_token match, :local_variable
+          
+        elsif match = scan(/\+#{RE::Ident}/o)
+          encoder.text_token match, :include
+          value_expected = true
+          
+        elsif match = scan(/\/\*(?:.*?\*\/|.*)|\/\/.*/)
+          encoder.text_token match, :comment
+          
+        elsif match = scan(/#\{/)
+          encoder.begin_group :inline
+          encoder.text_token match, :inline_delimiter
+          states.push :sass_inline
+          
+        elsif match = scan(/\{/)
+          value_expected = false
+          encoder.text_token match, :operator
+          states.push :block
+          
+        elsif match = scan(/\}/)
+          value_expected = false
+          encoder.text_token match, :operator
+          if states.last == :block || states.last == :media
+            states.pop
+          end
+          
+        elsif match = scan(/['"]/)
+          encoder.begin_group :string
+          string_delimiter = match
+          encoder.text_token match, :delimiter
+          states.push :string
+          
+        elsif match = scan(/#{SASS_FUNCTION}/o)
+          encoder.text_token match, :predefined
+          
+        elsif match = scan(/#{RE::Function}/o)
+          encoder.begin_group :function
+          start = match[/^[-\w]+\(/]
+          encoder.text_token start, :delimiter
+          if match[-1] == ?)
+            encoder.text_token match[start.size..-2], :content
+            encoder.text_token ')', :delimiter
+          else
+            encoder.text_token match[start.size..-1], :content
+          end
+          encoder.end_group :function
+          
+        elsif match = scan(/(?: #{RE::Dimension} | #{RE::Percentage} | #{RE::Num} )/ox)
+          encoder.text_token match, :float
+          
+        elsif match = scan(/#{RE::HexColor}/o)
+          encoder.text_token match, :color
+          
+        elsif match = scan(/! *(?:important|optional)/)
+          encoder.text_token match, :important
+          
+        elsif match = scan(/(?:rgb|hsl)a?\([^()\n]*\)?/)
+          encoder.text_token match, :color
+          
+        elsif match = scan(/@else if\b|#{RE::AtKeyword}/)
+          encoder.text_token match, :directive
+          value_expected = true
+          
+        elsif match = scan(/ == | != | [-+*\/>~:;,.=()] /x)
+          if match == ':'
+            value_expected = true
+          elsif match == ';'
+            value_expected = false
+          end
+          encoder.text_token match, :operator
+          
+        else
+          encoder.text_token getch, :error
+          
+        end
+        
+      end
+      
+      if options[:keep_state]
+        @state = states
+        @value_expected = value_expected
+      end
+      
+      encoder
+    end
+    
+  end
+  
+end
+end
-- 
cgit v1.2.1


From 2708fd32f45a6de34249ffbd5331c6df9c985889 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Thu, 11 Apr 2013 21:02:31 +0200
Subject: fix order of SASS_FUNCTIONs

---
 lib/coderay/scanners/sass.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/sass.rb b/lib/coderay/scanners/sass.rb
index 89d7737..b1b1cba 100644
--- a/lib/coderay/scanners/sass.rb
+++ b/lib/coderay/scanners/sass.rb
@@ -7,7 +7,7 @@ module Scanners
     register_for :sass
     file_extension 'sass'
     
-    SASS_FUNCTION = /(?:inline-image|linear-gradient|color-stops|mix|lighten|darken|rotate|image-url|image-width|image-height|sprite|sprite-url|sprite-path|sprite-file|sprite-map|sprite-position|unquote|join|round|ceil|floor|nth)/
+    SASS_FUNCTION = /(?:inline-image|linear-gradient|color-stops|mix|lighten|darken|rotate|image-url|image-width|image-height|sprite-url|sprite-path|sprite-file|sprite-map|sprite-position|sprite|unquote|join|round|ceil|floor|nth)/
     
     STRING_CONTENT_PATTERN = {
       "'" => /(?:[^\n\'\#]+|\\\n|#{RE::Escape}|#(?!\{))+/,
-- 
cgit v1.2.1


From 1952ef4c4dd1105665a3a4f9a0266598d6acf892 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 9 Jun 2013 06:22:39 +0200
Subject: two fixes for CSS scanner

---
 lib/coderay/scanners/css.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/css.rb b/lib/coderay/scanners/css.rb
index 7b731ef..dd5106e 100644
--- a/lib/coderay/scanners/css.rb
+++ b/lib/coderay/scanners/css.rb
@@ -27,7 +27,7 @@ module Scanners
       HexColor = /#(?:#{Hex}{6}|#{Hex}{3})/
       Color = /#{HexColor}/
       
-      Num = /-?(?:[0-9]+|[0-9]*\.[0-9]+)/
+      Num = /-?(?:[0-9]+(?!\.\d)|[0-9]*\.[0-9]+)/
       Name = /#{NMChar}+/
       Ident = /-?#{NMStart}#{NMChar}*/
       AtKeyword = /@#{Ident}/
@@ -44,7 +44,7 @@ module Scanners
       
       Id = /##{Name}/
       Class = /\.#{Name}/
-      PseudoClass = /:#{Name}/
+      PseudoClass = /::?#{Name}/
       AttributeSelector = /\[[^\]]*\]?/
     end
     
-- 
cgit v1.2.1


From 667d4262e42b5866859fb9eb91a0617c1722e7a4 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 9 Jun 2013 06:24:29 +0200
Subject: avoid empty tokens in Diff output, fix split_into_parts

---
 lib/coderay/scanners/diff.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb
index 38efaf4..8e3bf3c 100644
--- a/lib/coderay/scanners/diff.rb
+++ b/lib/coderay/scanners/diff.rb
@@ -45,7 +45,7 @@ module Scanners
           if match = scan(/--- |\+\+\+ |=+|_+/)
             encoder.begin_line line_kind = :head
             encoder.text_token match, :head
-            if match = scan(/.*?(?=$|[\t\n\x00]|  \(revision)/)
+            if match = scan(/.+?(?=$|[\t\n\x00]|  \(revision)/)
               encoder.text_token match, :filename
               if options[:highlight_code] && match != '/dev/null'
                 file_type = CodeRay::FileType.fetch(match, :text)
-- 
cgit v1.2.1


From 1ad75645ad880ede3c0590fd6a700b1847cc3fe4 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 9 Jun 2013 07:14:12 +0200
Subject: don't allow \x00 in diff filenames

---
 lib/coderay/scanners/diff.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb
index 8e3bf3c..af0f755 100644
--- a/lib/coderay/scanners/diff.rb
+++ b/lib/coderay/scanners/diff.rb
@@ -45,7 +45,7 @@ module Scanners
           if match = scan(/--- |\+\+\+ |=+|_+/)
             encoder.begin_line line_kind = :head
             encoder.text_token match, :head
-            if match = scan(/.+?(?=$|[\t\n\x00]|  \(revision)/)
+            if match = scan(/[^\x00\n]+?(?=$|[\t\n]|  \(revision)/)
               encoder.text_token match, :filename
               if options[:highlight_code] && match != '/dev/null'
                 file_type = CodeRay::FileType.fetch(match, :text)
-- 
cgit v1.2.1


From 8563acc7e29e3d5bf5281aedbc0b7088abe44877 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 9 Jun 2013 19:30:49 +0200
Subject: fix Sass highlighting in diff

---
 lib/coderay/scanners/sass.rb | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/sass.rb b/lib/coderay/scanners/sass.rb
index b1b1cba..17514c0 100644
--- a/lib/coderay/scanners/sass.rb
+++ b/lib/coderay/scanners/sass.rb
@@ -18,13 +18,11 @@ module Scanners
     
     def setup
       @state = :initial
-      @value_expected = false
     end
     
     def scan_tokens encoder, options
       states = Array(options[:state] || @state)
       string_delimiter = nil
-      value_expected = @value_expected
       
       until eos?
         
@@ -191,7 +189,6 @@ module Scanners
       
       if options[:keep_state]
         @state = states
-        @value_expected = value_expected
       end
       
       encoder
-- 
cgit v1.2.1


From 5bea8e3041de85266c3596627224ced102f195e0 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 9 Jun 2013 19:31:10 +0200
Subject: don't nest :string recursively in :sass_inline

---
 lib/coderay/scanners/sass.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/sass.rb b/lib/coderay/scanners/sass.rb
index 17514c0..0eb2caa 100644
--- a/lib/coderay/scanners/sass.rb
+++ b/lib/coderay/scanners/sass.rb
@@ -139,7 +139,14 @@ module Scanners
           encoder.begin_group :string
           string_delimiter = match
           encoder.text_token match, :delimiter
-          states.push :string
+          if states.include? :sass_inline
+            content = scan_until(/(?=#{string_delimiter}|\}|\z)/)
+            encoder.text_token content, :content unless content.empty?
+            encoder.text_token string_delimiter, :delimiter if scan(/#{string_delimiter}/)
+            encoder.end_group :string
+          else
+            states.push :string
+          end
           
         elsif match = scan(/#{SASS_FUNCTION}/o)
           encoder.text_token match, :predefined
-- 
cgit v1.2.1


From a69d5d43b79a4f2cf5aaccc50b2275bf0dab4aba Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Mon, 10 Jun 2013 23:29:14 +0200
Subject: accept all idents as Ruby 1.9 hash keys (#126)

---
 lib/coderay/scanners/ruby.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb
index c5cf1e2..c282f31 100644
--- a/lib/coderay/scanners/ruby.rb
+++ b/lib/coderay/scanners/ruby.rb
@@ -96,7 +96,7 @@ module Scanners
                                       /#{patterns::METHOD_NAME}/o)
               
               kind = patterns::IDENT_KIND[match]
-              if kind == :ident && value_expected != :colon_expected && scan(/:(?!:)/)
+              if value_expected != :colon_expected && scan(/:(?!:)/)
                 value_expected = true
                 encoder.text_token match, :key
                 encoder.text_token ':',   :operator
-- 
cgit v1.2.1


From 33f1a738ea85ea40a5fe760ac2591065f3e29033 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Mon, 10 Jun 2013 23:59:47 +0200
Subject: reset string_delimiter when detecting open string

---
 lib/coderay/scanners/java_script.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb
index 8587b06..9eb0a0a 100644
--- a/lib/coderay/scanners/java_script.rb
+++ b/lib/coderay/scanners/java_script.rb
@@ -184,6 +184,7 @@ module Scanners
           elsif match = scan(/ \\ | $ /x)
             encoder.end_group state
             encoder.text_token match, :error unless match.empty?
+            string_delimiter = nil
             key_expected = value_expected = false
             state = :initial
           else
-- 
cgit v1.2.1


From b159057934d2c84c0a25c83f6cbe59010345d0a7 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Tue, 11 Jun 2013 03:29:54 +0200
Subject: tweak CSS tag/id token kind patch from noprompt

---
 lib/coderay/scanners/css.rb  | 4 ++--
 lib/coderay/scanners/sass.rb | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/css.rb b/lib/coderay/scanners/css.rb
index 22c6bfc..732f9c5 100644
--- a/lib/coderay/scanners/css.rb
+++ b/lib/coderay/scanners/css.rb
@@ -10,7 +10,7 @@ module Scanners
       :class, :pseudo_class, :tag,
       :id, :directive,
       :key, :value, :operator, :color, :float, :string,
-      :error, :important,
+      :error, :important, :type,
     ]  # :nodoc:
     
     module RE  # :nodoc:
@@ -99,7 +99,7 @@ module Scanners
             
           when :media_before_name
             if match = scan(RE::Ident)
-              encoder.text_token match, :tag
+              encoder.text_token match, :type
               states[-1] = :media_after_name
               next
             end
diff --git a/lib/coderay/scanners/sass.rb b/lib/coderay/scanners/sass.rb
index 0eb2caa..218ee57 100644
--- a/lib/coderay/scanners/sass.rb
+++ b/lib/coderay/scanners/sass.rb
@@ -38,16 +38,16 @@ module Scanners
         elsif case states.last
           when :initial, :media, :sass_inline
             if match = scan(/(?>#{RE::Ident})(?!\()/ox)
-              encoder.text_token match, value_expected ? :value : (check(/.*:/) ? :key : :type)
+              encoder.text_token match, value_expected ? :value : (check(/.*:/) ? :key : :tag)
               next
             elsif !value_expected && (match = scan(/\*/))
-              encoder.text_token match, :type
+              encoder.text_token match, :tag
               next
             elsif match = scan(RE::Class)
               encoder.text_token match, :class
               next
             elsif match = scan(RE::Id)
-              encoder.text_token match, :constant
+              encoder.text_token match, :id
               next
             elsif match = scan(RE::PseudoClass)
               encoder.text_token match, :pseudo_class
-- 
cgit v1.2.1


From 2e4e83bf84282d6ce7fbc9eeff2cbe1c79788a9b Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Tue, 11 Jun 2013 16:30:26 +0200
Subject: tweak Sass scanner: comments, includes, functions

---
 lib/coderay/scanners/sass.rb | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/sass.rb b/lib/coderay/scanners/sass.rb
index 218ee57..167051d 100644
--- a/lib/coderay/scanners/sass.rb
+++ b/lib/coderay/scanners/sass.rb
@@ -7,8 +7,6 @@ module Scanners
     register_for :sass
     file_extension 'sass'
     
-    SASS_FUNCTION = /(?:inline-image|linear-gradient|color-stops|mix|lighten|darken|rotate|image-url|image-width|image-height|sprite-url|sprite-path|sprite-file|sprite-map|sprite-position|sprite|unquote|join|round|ceil|floor|nth)/
-    
     STRING_CONTENT_PATTERN = {
       "'" => /(?:[^\n\'\#]+|\\\n|#{RE::Escape}|#(?!\{))+/,
       '"' => /(?:[^\n\"\#]+|\\\n|#{RE::Escape}|#(?!\{))+/,
@@ -26,10 +24,22 @@ module Scanners
       
       until eos?
         
-        if match = scan(/\s+/)
+        if bol? && (match = scan(/(?>( +)?(\/[\*\/])(.+)?)(?=\n)/))
+          encoder.text_token self[1], :space if self[1]
+          encoder.begin_group :comment
+          encoder.text_token self[2], :delimiter
+          encoder.text_token self[3], :content if self[3]
+          if match = scan(/(?:\n+#{self[1]} .*)+/)
+            encoder.text_token match, :content
+          end
+          encoder.end_group :comment
+        elsif match = scan(/\n|[^\n\S]+\n?/)
           encoder.text_token match, :space
-          value_expected = false if match.index(/\n/)
-          
+          if match.index(/\n/)
+            value_expected = false
+            states.pop if states.last == :include
+          end
+        
         elsif states.last == :sass_inline && (match = scan(/\}/))
           encoder.text_token match, :inline_delimiter
           encoder.end_group :inline
@@ -61,7 +71,11 @@ module Scanners
             elsif match = scan(/(\=|@mixin +)#{RE::Ident}/o)
               encoder.text_token match, :function
               next
-            elsif match = scan(/@media/)
+            elsif match = scan(/@import\b/)
+              encoder.text_token match, :directive
+              states << :include
+              next
+            elsif match = scan(/@media\b/)
               encoder.text_token match, :directive
               # states.push :media_before_name
               next
@@ -90,13 +104,19 @@ module Scanners
               encoder.text_token match, :inline_delimiter
               states.push :sass_inline
             elsif match = scan(/ \\ | $ /x)
-              encoder.end_group state
+              encoder.end_group :string
               encoder.text_token match, :error unless match.empty?
               states.pop
             else
               raise_inspect "else case #{string_delimiter} reached; %p not handled." % peek(1), encoder
             end
           
+          when :include
+            if match = scan(/[^\s'",]+/)
+              encoder.text_token match, :include
+              next
+            end
+          
           else
             #:nocov:
             raise_inspect 'Unknown state', encoder
@@ -148,9 +168,6 @@ module Scanners
             states.push :string
           end
           
-        elsif match = scan(/#{SASS_FUNCTION}/o)
-          encoder.text_token match, :predefined
-          
         elsif match = scan(/#{RE::Function}/o)
           encoder.begin_group :function
           start = match[/^[-\w]+\(/]
@@ -163,6 +180,9 @@ module Scanners
           end
           encoder.end_group :function
           
+        elsif match = scan(/[a-z][-a-z_]*(?=\()/o)
+          encoder.text_token match, :predefined
+          
         elsif match = scan(/(?: #{RE::Dimension} | #{RE::Percentage} | #{RE::Num} )/ox)
           encoder.text_token match, :float
           
-- 
cgit v1.2.1


From abdc3e4a18b664e9d6e20e06913a0aa342f8ca73 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Wed, 12 Jun 2013 15:49:44 +0200
Subject: tweak Taskpaper scanner, cleanup doc_string kind

---
 lib/coderay/scanners/taskpaper.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/taskpaper.rb b/lib/coderay/scanners/taskpaper.rb
index c6eb3b3..42670bc 100644
--- a/lib/coderay/scanners/taskpaper.rb
+++ b/lib/coderay/scanners/taskpaper.rb
@@ -10,17 +10,19 @@ module Scanners
     
     def scan_tokens encoder, options
       until eos?
-        if match = scan(/^\S.*:.*$/)                  # project
-          encoder.text_token(match, :project)
-        elsif match = scan(/^-.+@done(?:\(.*)?.*$/)   # completed task
-          encoder.text_token(match, :complete)
-        elsif match = scan(/^-.+$/)                   # task
+        if match = scan(/\S.*:.*$/)                  # project
+          encoder.text_token(match, :namespace)
+        elsif match = scan(/-.+@done.*/)             # completed task
+          encoder.text_token(match, :done)
+        elsif match = scan(/-(?:[^@\n]+|@(?!due))*/) # task
           encoder.text_token(match, :plain)
-        elsif match = scan(/^.+$/)                    # comment
+        elsif match = scan(/@due.*/)                 # comment
+          encoder.text_token(match, :important)
+        elsif match = scan(/.+/)                     # comment
           encoder.text_token(match, :comment)
-        elsif match = scan(/\s+/)                     # space
+        elsif match = scan(/\s+/)                    # space
           encoder.text_token(match, :space)
-        else                                          # other
+        else                                         # other
           encoder.text_token getch, :error
         end
       end
-- 
cgit v1.2.1


From 65eeaca6c18bea379b966559084e47d6fb45c75c Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Wed, 12 Jun 2013 16:19:41 +0200
Subject: add python binary string

---
 lib/coderay/scanners/python.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/python.rb b/lib/coderay/scanners/python.rb
index a9492ab..09c8b6e 100644
--- a/lib/coderay/scanners/python.rb
+++ b/lib/coderay/scanners/python.rb
@@ -157,12 +157,12 @@ module Scanners
             encoder.text_token match, :operator
           
           elsif match = scan(/(u?r?|b)?("""|"|'''|')/i)
+            modifiers = self[1]
             string_delimiter = self[2]
-            string_type = docstring_coming ? :docstring : :string
+            string_type = docstring_coming ? :docstring : (modifiers == 'b' ? :binary : :string)
             docstring_coming = false if docstring_coming
             encoder.begin_group string_type
             string_raw = false
-            modifiers = self[1]
             unless modifiers.empty?
               string_raw = !!modifiers.index(?r)
               encoder.text_token modifiers, :modifier
-- 
cgit v1.2.1


From fc21c91d7a89d98785e494ffd41e9f3adbdfed81 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Wed, 19 Jun 2013 11:50:04 +0200
Subject: use different key/value heuristic in JSON scanner

---
 lib/coderay/scanners/json.rb | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/json.rb b/lib/coderay/scanners/json.rb
index 4e0f462..3754a9b 100644
--- a/lib/coderay/scanners/json.rb
+++ b/lib/coderay/scanners/json.rb
@@ -14,15 +14,17 @@ module Scanners
     
     ESCAPE = / [bfnrt\\"\/] /x  # :nodoc:
     UNICODE_ESCAPE = / u[a-fA-F0-9]{4} /x  # :nodoc:
+    KEY = / (?> (?: [^\\"]+ | \\. )* ) " \s* : /x
     
   protected
     
+    def setup
+      @state = :initial
+    end
+    
     # See http://json.org/ for a definition of the JSON lexic/grammar.
     def scan_tokens encoder, options
-      
-      state = :initial
-      stack = []
-      key_expected = false
+      state = options[:state] || @state
       
       until eos?
         
@@ -32,18 +34,11 @@ module Scanners
           if match = scan(/ \s+ /x)
             encoder.text_token match, :space
           elsif match = scan(/"/)
-            state = key_expected ? :key : :string
+            state = check(/#{KEY}/o) ? :key : :string
             encoder.begin_group state
             encoder.text_token match, :delimiter
           elsif match = scan(/ [:,\[{\]}] /x)
             encoder.text_token match, :operator
-            case match
-            when ':' then key_expected = false
-            when ',' then key_expected = true if stack.last == :object
-            when '{' then stack << :object; key_expected = true
-            when '[' then stack << :array
-            when '}', ']' then stack.pop  # no error recovery, but works for valid JSON
-            end
           elsif match = scan(/ true | false | null /x)
             encoder.text_token match, :value
           elsif match = scan(/ -? (?: 0 | [1-9]\d* ) /x)
@@ -82,6 +77,10 @@ module Scanners
         end
       end
       
+      if options[:keep_state]
+        @state = state
+      end
+      
       if [:string, :key].include? state
         encoder.end_group state
       end
-- 
cgit v1.2.1


From da1425058e9b9e04bd988ddf606331d9cd0c827b Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 23 Jun 2013 01:06:33 +0200
Subject: cleanup Lua scanner, fix end_group(:map) issue - use local instead of
 instance variables

---
 lib/coderay/scanners/lua.rb | 524 ++++++++++++++++++++++----------------------
 1 file changed, 267 insertions(+), 257 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
index 64763dc..3bee275 100644
--- a/lib/coderay/scanners/lua.rb
+++ b/lib/coderay/scanners/lua.rb
@@ -1,265 +1,275 @@
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
-# Scanner for the Lua[http://lua.org] programming lanuage.
-#
-# The language’s complete syntax is defined in
-# {the Lua manual}[http://www.lua.org/manual/5.2/manual.html],
-# which is what this scanner tries to conform to.
-class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
+module CodeRay
+module Scanners
 
-  register_for :lua
-  file_extension "lua"
-  title "Lua"
-
-  # Keywords used in Lua.
-  KEYWORDS = %w[and break do else elseif end
-  for function goto if in
-  local not or repeat return
-  then until while
-  ]
-
-  # Constants set by the Lua core.
-  PREDEFINED_CONSTANTS = %w[false true nil]
-
-  # The expressions contained in this array are parts of Lua’s `basic'
-  # library. Although it’s not entirely necessary to load that library,
-  # it is highly recommended and one would have to provide own implementations
-  # of some of these expressions if one does not do so. They however aren’t
-  # keywords, neither are they constants, but nearly predefined, so they
-  # get tagged as `predefined' rather than anything else.
+  # Scanner for the Lua[http://lua.org] programming lanuage.
   #
-  # This list excludes values of form `_UPPERCASE' because the Lua manual
-  # requires such identifiers to be reserved by Lua anyway and they are
-  # highlighted directly accordingly, without the need for specific
-  # identifiers to be listed here.
-  PREDEFINED_EXPRESSIONS = %w[
-  assert collectgarbage dofile error getmetatable
-  ipairs load loadfile next pairs pcall print
-  rawequal rawget rawlen rawset select setmetatable
-  tonumber tostring type xpcall
-  ]
-
-  # Automatic token kind selection for normal words.
-  IDENT_KIND = CodeRay::WordList.new(:ident).
-    add(KEYWORDS, :keyword).
-    add(PREDEFINED_CONSTANTS, :predefined_constant).
-    add(PREDEFINED_EXPRESSIONS, :predefined)
-
-  protected
-
-  # Scanner initialization.
-  def setup
-    @state       = :initial
-    @brace_depth = 0
-  end
-
-  # CodeRay entry hook. Starts parsing.
-  def scan_tokens(encoder, options)
-    @encoder = encoder
-    @options = options
-
-    until eos?
-  case state
-
-  when :initial
-    if match = scan(/\-\-\[\=*\[/)   #--[[ long (possibly multiline) comment ]]
-      @num_equals = match.count("=") # Number must match for comment end
-      @encoder.begin_group(:comment)
-      @encoder.text_token(match, :delimiter)
-      @state = :long_comment
-
-    elsif match = scan(/--.*?$/) # --Lua comment
-      @encoder.text_token(match, :comment)
-
-    elsif match = scan(/\[=*\[/)     # [[ long (possibly multiline) string ]]
-      @num_equals = match.count("=") # Number must match for comment end
-      @encoder.begin_group(:string)
-      @encoder.text_token(match, :delimiter)
-      @state = :long_string
-
-    elsif match = scan(/::\s*[a-zA-Z_][a-zA-Z0-9_]+\s*::/) # ::goto_label::
-      @encoder.text_token(match, :label)
-
-    elsif match = scan(/_[A-Z]+/) # _UPPERCASE are names reserved for Lua
-      @encoder.text_token(match, :predefined)
-
-    elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/) # Normal letters (or letters followed by digits)
-      kind = IDENT_KIND[match]
-
-      # Extra highlighting for entities following certain keywords
-      if kind == :keyword and match == "function"
-        @state = :function_expected
-      elsif kind == :keyword and match == "goto"
-        @state = :goto_label_expected
-      elsif kind == :keyword and match == "local"
-        @state = :local_var_expected
+  # The language’s complete syntax is defined in
+  # {the Lua manual}[http://www.lua.org/manual/5.2/manual.html],
+  # which is what this scanner tries to conform to.
+  class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
+    
+    register_for :lua
+    file_extension "lua"
+    title "Lua"
+    
+    # Keywords used in Lua.
+    KEYWORDS = %w[and break do else elseif end
+    for function goto if in
+    local not or repeat return
+    then until while
+    ]
+    
+    # Constants set by the Lua core.
+    PREDEFINED_CONSTANTS = %w[false true nil]
+    
+    # The expressions contained in this array are parts of Lua’s `basic'
+    # library. Although it’s not entirely necessary to load that library,
+    # it is highly recommended and one would have to provide own implementations
+    # of some of these expressions if one does not do so. They however aren’t
+    # keywords, neither are they constants, but nearly predefined, so they
+    # get tagged as `predefined' rather than anything else.
+    #
+    # This list excludes values of form `_UPPERCASE' because the Lua manual
+    # requires such identifiers to be reserved by Lua anyway and they are
+    # highlighted directly accordingly, without the need for specific
+    # identifiers to be listed here.
+    PREDEFINED_EXPRESSIONS = %w[
+    assert collectgarbage dofile error getmetatable
+    ipairs load loadfile next pairs pcall print
+    rawequal rawget rawlen rawset select setmetatable
+    tonumber tostring type xpcall
+    ]
+    
+    # Automatic token kind selection for normal words.
+    IDENT_KIND = CodeRay::WordList.new(:ident).
+      add(KEYWORDS, :keyword).
+      add(PREDEFINED_CONSTANTS, :predefined_constant).
+      add(PREDEFINED_EXPRESSIONS, :predefined)
+    
+    protected
+    
+    # Scanner initialization.
+    def setup
+      @state       = :initial
+      @brace_depth = 0
+    end
+    
+    # CodeRay entry hook. Starts parsing.
+    def scan_tokens(encoder, options)
+      state = options[:state] || @state
+      
+      until eos?
+        case state
+        
+        when :initial
+          if match = scan(/\-\-\[\=*\[/)   #--[[ long (possibly multiline) comment ]]
+            @num_equals = match.count("=") # Number must match for comment end
+            encoder.begin_group(:comment)
+            encoder.text_token(match, :delimiter)
+            state = :long_comment
+          
+          elsif match = scan(/--.*$/) # --Lua comment
+            encoder.text_token(match, :comment)
+          
+          elsif match = scan(/\[=*\[/)     # [[ long (possibly multiline) string ]]
+            @num_equals = match.count("=") # Number must match for comment end
+            encoder.begin_group(:string)
+            encoder.text_token(match, :delimiter)
+            state = :long_string
+          
+          elsif match = scan(/::\s*[a-zA-Z_][a-zA-Z0-9_]+\s*::/) # ::goto_label::
+            encoder.text_token(match, :label)
+          
+          elsif match = scan(/_[A-Z]+/) # _UPPERCASE are names reserved for Lua
+            encoder.text_token(match, :predefined)
+          
+          elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/) # Normal letters (or letters followed by digits)
+            kind = IDENT_KIND[match]
+            
+            # Extra highlighting for entities following certain keywords
+            if kind == :keyword and match == "function"
+              state = :function_expected
+            elsif kind == :keyword and match == "goto"
+              state = :goto_label_expected
+            elsif kind == :keyword and match == "local"
+              state = :local_var_expected
+            end
+            
+            encoder.text_token(match, kind)
+          
+          elsif match = scan(/\{/) # Opening table brace {
+            encoder.begin_group(:map)
+            encoder.text_token(match, @brace_depth >= 1 ? :inline_delimiter : :delimiter)
+            @brace_depth += 1
+            state        = :map
+          
+          elsif match = scan(/\}/) # Closing table brace }
+            if @brace_depth == 1
+              @brace_depth = 0
+              encoder.text_token(match, :delimiter)
+              encoder.end_group(:map)
+            elsif @brace_depth == 0 # Mismatched brace
+              encoder.text_token(match, :error)
+            else
+              @brace_depth -= 1
+              encoder.text_token(match, :inline_delimiter)
+              encoder.end_group(:map)
+              state = :map
+            end
+          
+          elsif match = scan(/["']/) # String delimiters " and '
+            encoder.begin_group(:string)
+            encoder.text_token(match, :delimiter)
+            @start_delim = match
+            state       = :string
+          
+                            # ↓Prefix                hex number ←|→ decimal number
+          elsif match = scan(/-? (?:0x\h* \. \h+ (?:p[+\-]?\d+)? | \d*\.\d+ (?:e[+\-]?\d+)?)/ix) # hexadecimal constants have no E power, decimal ones no P power
+            encoder.text_token(match, :float)
+          
+                            # ↓Prefix         hex number ←|→ decimal number
+          elsif match = scan(/-? (?:0x\h+ (?:p[+\-]?\d+)? | \d+ (?:e[+\-]?\d+)?)/ix) # hexadecimal constants have no E power, decimal ones no P power
+            encoder.text_token(match, :integer)
+          
+          elsif match = scan(/[\+\-\*\/%^\#=~<>\(\)\[\]:;,] | \.(?!\d)/x) # Operators
+            encoder.text_token(match, :operator)
+          
+          elsif match = scan(/\s+/) # Space
+            encoder.text_token(match, :space)
+          
+          else # Invalid stuff. Note that Lua doesn’t accept multibyte chars outside of strings, hence these are also errors.
+            encoder.text_token(getch, :error)
+          end
+          
+          # It may be that we’re scanning a full-blown subexpression of a table
+          # (tables can contain full expressions in parts).
+          # If this is the case, return to :map scanning state.
+          state = :map if state == :initial && @brace_depth >= 1
+        
+        when :function_expected
+          if match = scan(/\(.*?\)/m) # x = function() # "Anonymous" function without explicit name
+            encoder.text_token(match, :operator)
+            state = :initial
+          elsif match = scan(/[a-zA-Z_] (?:[a-zA-Z0-9_\.] (?!\.\d))* [\.\:]/x) # function tbl.subtbl.foo() | function tbl:foo() # Colon only allowed as last separator
+            encoder.text_token(match, :ident)
+          elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/) # function foo()
+            encoder.text_token(match, :function)
+            state = :initial
+          elsif match = scan(/\s+/) # Between the `function' keyword and the ident may be any amount of whitespace
+            encoder.text_token(match, :space)
+          else
+            encoder.text_token(getch, :error)
+            state = :initial
+          end
+        
+        when :goto_label_expected
+          if match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
+            encoder.text_token(match, :label)
+            state = :initial
+          elsif match = scan(/\s+/) # Between the `goto' keyword and the label may be any amount of whitespace
+            encoder.text_token(match, :space)
+          else
+            encoder.text_token(getch, :error)
+          end
+        
+        when :local_var_expected
+          if match = scan(/function/) # local function ...
+            encoder.text_token(match, :keyword)
+            state = :function_expected
+          elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
+            encoder.text_token(match, :local_variable)
+          elsif match = scan(/,/)
+            encoder.text_token(match, :operator)
+          elsif match = scan(/\=/)
+            encoder.text_token(match, :operator)
+            # After encountering the equal sign, arbitrary expressions are
+            # allowed again, so just return to the main state for further
+            # parsing.
+            state = :initial
+          elsif match = scan(/\n/)
+            encoder.text_token(match, :space)
+            state = :initial
+          elsif match = scan(/\s+/)
+            encoder.text_token(match, :space)
+          else
+            encoder.text_token(getch, :error)
+          end
+        
+        when :long_comment
+          if match = scan(/.*?(?=\]={#@num_equals}\])/m)
+            encoder.text_token(match, :content)
+            
+            delim = scan(/\]={#@num_equals}\]/)
+            encoder.text_token(delim, :delimiter)
+          else # No terminator found till EOF
+            encoder.text_token(rest, :error)
+            terminate
+          end
+          encoder.end_group(:comment)
+          state = :initial
+        
+        when :long_string
+          if match = scan(/.*?(?=\]={#@num_equals}\])/m) # Long strings do not interpret any escape sequences
+            encoder.text_token(match, :content)
+            
+            delim = scan(/\]={#@num_equals}\]/)
+            encoder.text_token(delim, :delimiter)
+          else # No terminator found till EOF
+            encoder.text_token(rest, :error)
+            terminate
+          end
+          encoder.end_group(:string)
+          state = :initial
+        
+        when :string
+          if match = scan(/[^\\#@start_delim\n]+/) # Everything except \ and the start delimiter character is string content (newlines are only allowed if preceeded by \ or \z)
+            encoder.text_token(match, :content)
+          elsif match = scan(/\\(?:['"abfnrtv\\]|z\s*|x\h\h|\d{1,3}|\n)/m)
+            encoder.text_token(match, :char)
+          elsif match = scan(Regexp.compile(@start_delim))
+            encoder.text_token(match, :delimiter)
+            encoder.end_group(:string)
+            state = :initial
+          elsif match = scan(/\n/) # Lua forbids unescaped newlines in normal non-long strings
+            encoder.text_token("\\n\n", :error) # Visually appealing error indicator--otherwise users may wonder whether the highlighter cannot highlight multine strings
+            encoder.end_group(:string)
+            state = :initial
+          else
+            encoder.text_token(getch, :error)
+          end
+        
+        when :map
+          if match = scan(/[,;]/)
+            encoder.text_token(match, :operator)
+          elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]* (?=\s*=)/x)
+            encoder.text_token(match, :key)
+            encoder.text_token(scan(/\s+/), :space) if check(/\s+/)
+            encoder.text_token(scan(/\=/), :operator)
+            state = :initial
+          elsif match = scan(/\s+/m)
+            encoder.text_token(match, :space)
+          else
+            # Note this clause doesn’t advance the scan pointer, it’s a kind of
+            # "retry with other options" (the :initial state then of course
+            # advances the pointer).
+            state = :initial
+          end
+        else
+          raise
+        end
+        
       end
-
-      @encoder.text_token(match, kind)
-
-    elsif match = scan(/\{/) # Opening table brace {
-      @encoder.begin_group(:map)
-      @encoder.text_token(match, @brace_depth >= 1 ? :inline_delimiter : :delimiter)
-      @brace_depth += 1
-      @state        = :map
-
-    elsif match = scan(/\}/) # Closing table brace }
-      if @brace_depth == 1
-        @brace_depth = 0
-        @encoder.text_token(match, :delimiter)
-      elsif @brace_depth == 0 # Mismatched brace
-        @encoder.text_token(match, :error)
-      else
-        @brace_depth -= 1
-        @encoder.text_token(match, :inline_delimiter)
-        @state = :map
+      
+      if options[:keep_state]
+        @state = state
       end
-      @encoder.end_group(:map)
-
-    elsif match = scan(/["']/) # String delimiters " and '
-      @encoder.begin_group(:string)
-      @encoder.text_token(match, :delimiter)
-      @start_delim = match
-      @state       = :string
-
-                      # ↓Prefix                hex number ←|→ decimal number
-    elsif match = scan(/-? (?:0x\h* \. \h+ (?:p[+\-]?\d+)? | \d*\.\d+ (?:e[+\-]?\d+)?)/ix) # hexadecimal constants have no E power, decimal ones no P power
-      @encoder.text_token(match, :float)
-
-                      # ↓Prefix         hex number ←|→ decimal number
-    elsif match = scan(/-? (?:0x\h+ (?:p[+\-]?\d+)? | \d+ (?:e[+\-]?\d+)?)/ix) # hexadecimal constants have no E power, decimal ones no P power
-      @encoder.text_token(match, :integer)
-
-    elsif match = scan(/[\+\-\*\/%^\#=~<>\(\)\[\]:;,] | \.(?!\d)/x) # Operators
-      @encoder.text_token(match, :operator)
-
-    elsif match = scan(/\s+/) # Space
-      @encoder.text_token(match, :space)
-
-    else # Invalid stuff. Note that Lua doesn’t accept multibyte chars outside of strings, hence these are also errors.
-      @encoder.text_token(getch, :error)
-    end
-
-    # It may be that we’re scanning a full-blown subexpression of a table
-    # (tables can contain full expressions in parts).
-    # If this is the case, return to :map scanning state.
-    @state = :map if @state == :initial && @brace_depth >= 1
-
-  when :function_expected
-    if match = scan(/\(.*?\)/m) # x = function() # "Anonymous" function without explicit name
-      @encoder.text_token(match, :operator)
-      @state = :initial
-    elsif match = scan(/[a-zA-Z_] (?:[a-zA-Z0-9_\.] (?!\.\d))* [\.\:]/x) # function tbl.subtbl.foo() | function tbl:foo() # Colon only allowed as last separator
-      @encoder.text_token(match, :ident)
-    elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/) # function foo()
-      @encoder.text_token(match, :function)
-      @state = :initial
-    elsif match = scan(/\s+/) # Between the `function' keyword and the ident may be any amount of whitespace
-      @encoder.text_token(match, :space)
-    else
-      @encoder.text_token(getch, :error)
-      @state = :initial
-    end
-
-  when :goto_label_expected
-    if match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
-      @encoder.text_token(match, :label)
-      @state = :initial
-    elsif match = scan(/\s+/) # Between the `goto' keyword and the label may be any amount of whitespace
-      @encoder.text_token(match, :space)
-    else
-      @encoder.text_token(getch, :error)
-    end
-
-  when :local_var_expected
-    if match = scan(/function/) # local function ...
-      @encoder.text_token(match, :keyword)
-      @state = :function_expected
-    elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
-      @encoder.text_token(match, :local_variable)
-    elsif match = scan(/,/)
-      @encoder.text_token(match, :operator)
-    elsif match = scan(/\=/)
-      @encoder.text_token(match, :operator)
-      # After encountering the equal sign, arbitrary expressions are
-      # allowed again, so just return to the main state for further
-      # parsing.
-      @state = :initial
-    elsif match = scan(/\n/)
-      @encoder.text_token(match, :space)
-      @state = :initial
-    elsif match = scan(/\s+/)
-      @encoder.text_token(match, :space)
-    else
-      @encoder.text_token(getch, :error)
-    end
-
-  when :long_comment
-    if match = scan(/.*?(?=\]={#@num_equals}\])/m)
-      @encoder.text_token(match, :content)
-
-      delim = scan(/\]={#@num_equals}\]/)
-      @encoder.text_token(delim, :delimiter)
-    else # No terminator found till EOF
-      @encoder.text_token(rest, :error)
-      terminate
-    end
-    @encoder.end_group(:comment)
-    @state = :initial
-
-  when :long_string
-    if match = scan(/.*?(?=\]={#@num_equals}\])/m) # Long strings do not interpret any escape sequences
-      @encoder.text_token(match, :content)
-
-      delim = scan(/\]={#@num_equals}\]/)
-      @encoder.text_token(delim, :delimiter)
-    else # No terminator found till EOF
-      @encoder.text_token(rest, :error)
-      terminate
-    end
-    @encoder.end_group(:string)
-    @state = :initial
-
-  when :string
-    if match = scan(/[^\\#@start_delim\n]+/) # Everything except \ and the start delimiter character is string content (newlines are only allowed if preceeded by \ or \z)
-      @encoder.text_token(match, :content)
-    elsif match = scan(/\\(?:['"abfnrtv\\]|z\s*|x\h\h|\d{1,3}|\n)/m)
-      @encoder.text_token(match, :char)
-    elsif match = scan(Regexp.compile(@start_delim))
-      @encoder.text_token(match, :delimiter)
-      @encoder.end_group(:string)
-      @state = :initial
-    elsif match = scan(/\n/) # Lua forbids unescaped newlines in normal non-long strings
-      @encoder.text_token("\\n\n", :error) # Visually appealing error indicator--otherwise users may wonder whether the highlighter cannot highlight multine strings
-      @encoder.end_group(:string)
-      @state = :initial
-    else
-      @encoder.text_token(getch, :error)
-    end
-
-  when :map
-    if match = scan(/[,;]/)
-      @encoder.text_token(match, :operator)
-    elsif match = scan(/[a-zA-Z_][a-zA-Z0-9_]* (?=\s*=)/x)
-      @encoder.text_token(match, :key)
-      @encoder.text_token(scan(/\s+/), :space) if check(/\s+/)
-      @encoder.text_token(scan(/\=/), :operator)
-      @state = :initial
-    elsif match = scan(/\s+/m)
-      @encoder.text_token(match, :space)
-    else
-      # Note this clause doesn’t advance the scan pointer, it’s a kind of
-      # "retry with other options" (the :initial state then of course
-      # advances the pointer).
-      @state = :initial
+      
+      encoder
     end
-  else
-    raise
+    
   end
-
-    end
-
-    @encoder
-  end
-
+  
+end
 end
-- 
cgit v1.2.1


From 90c401c9001e0a670360a55d1189e9f814ae7592 Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Sun, 23 Jun 2013 01:17:49 +0200
Subject: some more code cleanups before merge

---
 lib/coderay/scanners/lua.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
index 3bee275..25bebbe 100644
--- a/lib/coderay/scanners/lua.rb
+++ b/lib/coderay/scanners/lua.rb
@@ -8,17 +8,17 @@ module Scanners
   # The language’s complete syntax is defined in
   # {the Lua manual}[http://www.lua.org/manual/5.2/manual.html],
   # which is what this scanner tries to conform to.
-  class CodeRay::Scanners::Lua < CodeRay::Scanners::Scanner
+  class Lua < Scanner
     
     register_for :lua
-    file_extension "lua"
-    title "Lua"
+    file_extension 'lua'
+    title 'Lua'
     
     # Keywords used in Lua.
     KEYWORDS = %w[and break do else elseif end
-    for function goto if in
-    local not or repeat return
-    then until while
+      for function goto if in
+      local not or repeat return
+      then until while
     ]
     
     # Constants set by the Lua core.
@@ -36,10 +36,10 @@ module Scanners
     # highlighted directly accordingly, without the need for specific
     # identifiers to be listed here.
     PREDEFINED_EXPRESSIONS = %w[
-    assert collectgarbage dofile error getmetatable
-    ipairs load loadfile next pairs pcall print
-    rawequal rawget rawlen rawset select setmetatable
-    tonumber tostring type xpcall
+      assert collectgarbage dofile error getmetatable
+      ipairs load loadfile next pairs pcall print
+      rawequal rawget rawlen rawset select setmetatable
+      tonumber tostring type xpcall
     ]
     
     # Automatic token kind selection for normal words.
@@ -52,7 +52,7 @@ module Scanners
     
     # Scanner initialization.
     def setup
-      @state       = :initial
+      @state = :initial
       @brace_depth = 0
     end
     
-- 
cgit v1.2.1