waypoint -- going to try to clean up regex_token

This commit is contained in:
Jeremy Ashkenas
2010-03-08 20:57:28 -05:00
parent 3291bd2a4a
commit 3396dce2bb
3 changed files with 13 additions and 13 deletions

View File

@@ -127,9 +127,9 @@ exports.Lexer: class Lexer
# JavaScript and Ruby.
regex_token: ->
return false unless starts @chunk, '/'
return false unless regex: @balanced_token ['/', '/']
return false if regex.length < 3 or regex.match /^\/\s+|\n/
return false if include NOT_REGEX, @tag()
return false unless regex: @balanced_token ['/', '/']
return false if regex.length < 3 or regex.match /^\/\s+/m
flags: ['i', 'm', 'g', 'y']
while (index: flags.indexOf @chunk.substr regex.length, 1) >= 0
regex += flags[index]
@@ -337,8 +337,8 @@ exports.Lexer: class Lexer
break unless levels.length
i += 1
if levels.length
throw new Error "SyntaxError: Unterminated ${levels.pop()[0]} starting on line ${@line + 1}" unless delimited[0][0] is '/'
return false
return false if delimited[0][0] is '/'
throw new Error "SyntaxError: Unterminated ${levels.pop()[0]} starting on line ${@line + 1}"
return false if i is 0
return str.substring(0, i)