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

more fiddling with the lexer -- the indentation is super fragile

Browse Source
This commit is contained in:
Jeremy Ashkenas
2009-12-30 21:11:54 -05:00
parent 49714656e1
commit fd83759ef4
2 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/coffee_script/lexer.rb
View File

@@ -24,11 +24,11 @@ module CoffeeScript
JS = /\A(``|`(.*?)[^\\]`)/m
OPERATOR = /\A([+\*&|\/\-%=<>:!]+)/
WHITESPACE = /\A([ \t]+)/
COMMENT = /\A(((\n[ \t]*)?#.*$)+)/
COMMENT = /\A(((\n?[ \t]*)?#.*$)+)/
CODE = /\A(=>)/
REGEX = /\A(\/(.*?)[^\\]\/[imgy]{0,4})/
MULTI_DENT = /\A((\n([ \t]*(?=\S))?)+)/
LAST_DENT = /\n+([ \t]*)\Z/
MULTI_DENT = /\A((\n([ \t]*)?)+)/
LAST_DENT = /\n([ \t]*)/
# Token cleaning regexes.
JS_CLEANER = /(\A`|`\Z)/
@@ -156,7 +156,7 @@ module CoffeeScript
return false unless indent = @chunk[MULTI_DENT, 1]
@line += indent.scan(MULTILINER).size
@i += indent.size
size = indent[LAST_DENT, 1].length
size = indent.scan(LAST_DENT).last.last.length
return newline_token(indent) if size == @indent
if size > @indent
token(:INDENT, size - @indent)