summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners/lua.rb
diff options
context:
space:
mode:
authorNathan Youngman <git@nathany.com>2012-10-27 23:41:52 -0600
committerNathan Youngman <git@nathany.com>2012-10-27 23:42:23 -0600
commit279348d3c2159df4ce6ac5949ada0177aa7c7159 (patch)
treee0ef2a73dc786397c698021fc8abba224e956409 /lib/coderay/scanners/lua.rb
parent308fd388b4646ff77263f05634547c6f3cc3e895 (diff)
downloadcoderay-279348d3c2159df4ce6ac5949ada0177aa7c7159.tar.gz
:map token kind
Use :map instead of :table. It's more generic, and won't be confused with the :table rendering style.
Diffstat (limited to 'lib/coderay/scanners/lua.rb')
-rw-r--r--lib/coderay/scanners/lua.rb14
1 files changed, 7 insertions, 7 deletions
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)