github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-19 03:44:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixing the extends keyword when the expressions are complex, and should only be run once -- not that it's good style -- ticket #143

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-02-16 23:23:43 -05:00
parent bedc005d67
commit 0610e20a3c
6 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lexer.coffee
View File

@@ -209,7 +209,8 @@ lex::outdent_token: (move_out) ->
# Matches and consumes non-meaningful whitespace.
lex::whitespace_token: ->
return false unless space: @match WHITESPACE, 1
@tokens[@tokens.length - 1].spaced: true
prev: @tokens[@tokens.length - 1]
prev.spaced: true if prev
@i += space.length
true
@@ -235,7 +236,8 @@ lex::literal_token: ->
tag: if value.match(ASSIGNMENT) then 'ASSIGN' else value
tag: 'TERMINATOR' if value == ';'
if not @tokens[@tokens.length - 1].spaced and CALLABLE.indexOf(@tag()) >= 0
prev: @tokens[@tokens.length - 1]
if CALLABLE.indexOf(@tag()) >= 0 and (not prev or not prev.spaced)
tag: 'CALL_START' if value is '('
tag: 'INDEX_START' if value is '['
@token tag, value