github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-04-11 03:00:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

execution tests still pass -- more lexer block insertion and 2 shift/reduces in the grammar now

Browse Source
This commit is contained in:
Jeremy Ashkenas
2009-12-30 15:52:07 -05:00
parent c822f96145
commit 9a946d2ac5
5 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/coffee_script/lexer.rb
View File

@@ -27,7 +27,7 @@ module CoffeeScript
COMMENT = /\A((#[^\n]*\s*)+)/m
CODE = /\A(=>)/
REGEX = /\A(\/(.*?)[^\\]\/[imgy]{0,4})/
MULTI_DENT = /\A((\n+([ \t]*(?=\S)))+)/
MULTI_DENT = /\A((\n+([ \t]*(?=\S))?)+)/
LAST_DENT = /\n+([ \t]*)\Z/
# Token cleaning regexes.
@@ -47,7 +47,8 @@ module CoffeeScript
# Single-line flavors of block expressions that have unclosed endings.
# The grammar can't disambiguate them, so we insert the implicit indentation.
SINGLE_LINERS = [:ELSE, "=>"]
SINGLE_LINERS = [:ELSE, "=>", :TRY, :FINALLY, :THEN]
SINGLE_CLOSERS = ["\n", :CATCH, :FINALLY, :ELSE]
# The inverse mappings of token pairs we're trying to fix up.
INVERSES = {:INDENT => :OUTDENT, :OUTDENT => :INDENT, '(' => ')', ')' => '('}
@@ -257,13 +258,15 @@ module CoffeeScript
if SINGLE_LINERS.include?(token[0]) && post[0] != :INDENT
line = token[1].line
@tokens.insert(i + 1, [:INDENT, Value.new(2, line)])
idx = i + 1
loop do
i += 1
if !@tokens[i] || @tokens[i][0] == "\n"
@tokens.insert(i, [:OUTDENT, Value.new(2, line)])
idx += 1
if !@tokens[idx] || SINGLE_CLOSERS.include?(@tokens[idx][0])
@tokens.insert(idx, [:OUTDENT, Value.new(2, line)])
break
end
end
@tokens.delete_at(i) if token[0] == :THEN
end
end
end