8000 Lua scanner, tweaked (finally!) by korny · Pull Request #141 · rubychan/coderay · GitHub
[go: up one dir, main page]
Skip to content
8000

Lua scanner, tweaked (finally!) #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jun 22, 2013
Merged

Lua scanner, tweaked (finally!) #141

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
501df76
Lua scanner for CodeRay. Meta-commit.
Apr 22, 2012
3dd6140
Merge remote-tracking branch 'Quintus/luascanner-onecommit' into lua-…
korny Jun 19, 2012
8979cc6
use case+when instead of send and methods
korny Jun 19, 2012
2b16d11
fix for Ruby 1.8, escape { and } in regexps
korny Jun 19, 2012
39517be
Merge branch 'master' into lua-scanner
nathany Sep 11, 2012
c23e73b
Merge remote-tracking branch 'origin/lua-scanner-faster' into lua-sca…
nathany Sep 11, 2012
b081c1f
escape = in regex (my editor gets confused:-)
nathany Sep 11, 2012
308fd38
Merge branch 'master' into lua-scanner
korny Oct 7, 2012
279348d
:map token kind
nathany Oct 28, 2012
0392439
Merge remote-tracking branch 'origin/master' into lua-scanner
nathany Oct 28, 2012
34e823d
Merge branch 'master' into lua-scanner
korny Mar 10, 2013
69246fc
Merge branch 'master' into lua-scanner
korny Jun 12, 2013
5b1a49f
Merge branch 'master' into lua-scanner
korny Jun 22, 2013
d0d1b12
whitespace
korny Jun 22, 2013
90adb39
add lua file type
korny Jun 22, 2013
fbaf55d
more helpful error messages from DebugLint
korny Jun 22, 2013
c0dc9f2
move .map styles before .string
korny Jun 22, 2013
da14250
cleanup Lua scanner, fix end_group(:map) issue
korny Jun 22, 2013
492dd59
Merge branch 'master' into lua-scanner
korny Jun 22, 2013
06cf0ba
changelog
korny Jun 22, 2013
90c401c
some more code cleanups before merge
korny Jun 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix for Ruby 1.8, escape { and } in regexps
  • Loading branch information
@korny
korny committed Jun 19, 2012
commit 2b16d115f7d6caf21864934df763556e126d6357
12 changes: 6 additions & 6 deletions lib/coderay/scanners/lua.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -99,13 +99,13 @@ def handle_state_initial

@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)
Expand Down
0