github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-18 11:31:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

converted the tests to use optional parentheses -- lot's of little subtleties to work out

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-01-24 23:40:45 -05:00
parent 70e3a6ef2f
commit a5d39efdd2
25 changed files with 106 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/coffee_script/lexer.rb
View File

@@ -163,7 +163,7 @@ module CoffeeScript
@line += indent.scan(MULTILINER).size
@i += indent.size
next_character = @chunk[MULTI_DENT, 4]
no_newlines = next_character == '.' || (last_value.to_s.match(NO_NEWLINE) && !last_value.match(CODE))
no_newlines = next_character == '.' || (last_value.to_s.match(NO_NEWLINE) && @tokens[-2][0] != '.' && !last_value.match(CODE))
return suppress_newlines(indent) if no_newlines
size = indent.scan(LAST_DENT).last.last.length
return newline_token(indent) if size == @indent
@@ -242,13 +242,19 @@ module CoffeeScript
# make use of splats.
def tag_parameters
i = 0
tagged = false
loop do
i -= 1
tok = @tokens[i]
return if !tok
next if ['.', ','].include?(tok[0])
if ['.', ','].include?(tok[0])
tagged = false
next
end
return if tagged
return if tok[0] != :IDENTIFIER
tok[0] = :PARAM
tagged = true
end
end