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

Issue #748 -- trailing reserved idenitifer.

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-10-10 11:42:25 -04:00
parent 45ed62931b
commit f6ca5d814c
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lexer.js
View File

@@ -563,7 +563,7 @@
}; };
Lexer.prototype.unfinished = function() { Lexer.prototype.unfinished = function() {
var prev, value; var prev, value;
return (prev = last(this.tokens, 1)) && prev[0] !== '.' && (value = this.value()) && NO_NEWLINE.test(value) && !CODE.test(value) && !ASSIGNED.test(this.chunk); return (prev = last(this.tokens, 1)) && prev[0] !== '.' && (value = this.value()) && !value.reserved && NO_NEWLINE.test(value) && !CODE.test(value) && !ASSIGNED.test(this.chunk);
}; };
Lexer.prototype.escapeLines = function(str, heredoc) { Lexer.prototype.escapeLines = function(str, heredoc) {
return str.replace(MULTILINER, heredoc ? '\\n' : ''); return str.replace(MULTILINER, heredoc ? '\\n' : '');

4
src/lexer.coffee
View File

@@ -486,8 +486,8 @@ exports.Lexer = class Lexer
# Are we in the midst of an unfinished expression? # Are we in the midst of an unfinished expression?
unfinished: -> unfinished: ->
(prev = last @tokens, 1) and prev[0] isnt '.' and (prev = last @tokens, 1) and prev[0] isnt '.' and
(value = @value()) and NO_NEWLINE.test(value) and not CODE.test(value) and (value = @value()) and not value.reserved and
not ASSIGNED.test(@chunk) NO_NEWLINE.test(value) and not CODE.test(value) and not ASSIGNED.test(@chunk)
# Converts newlines for string literals. # Converts newlines for string literals.
escapeLines: (str, heredoc) -> escapeLines: (str, heredoc) ->

9
test/test_if.coffee
View File

@@ -135,3 +135,12 @@ ok result is 70
# Issue #738 # Issue #738
func = if true then -> 1 func = if true then -> 1
eq func(), 1 eq func(), 1
# Issue #748. Trailing reserved identifiers.
obj = delete: true
result = if obj.delete
101
ok result is 101