From 3d70453d907e5730df744380eb532b236d856f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Harrtell?= Date: Tue, 10 Jul 2012 14:03:37 +0200 Subject: [PATCH] Accept parameter tokens --- src/lexer.coffee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lexer.coffee b/src/lexer.coffee index 6898380..fa7acc3 100644 --- a/src/lexer.coffee +++ b/src/lexer.coffee @@ -19,6 +19,7 @@ class Lexer @conditionalToken() or @numberToken() or @stringToken() or + @parameterToken() or @parensToken() or @whitespaceToken() or @literalToken() @@ -87,6 +88,7 @@ class Lexer seperatorToken: -> @tokenizeFromRegex('SEPARATOR', SEPARATOR) literalToken: -> @tokenizeFromRegex('LITERAL', LITERAL, 1, 0) numberToken: -> @tokenizeFromRegex('NUMBER', NUMBER) + parameterToken: -> @tokenizeFromRegex('PARAMETER', PARAMETER) stringToken: -> @tokenizeFromRegex('STRING', STRING, 1, 0) || @tokenizeFromRegex('DBLSTRING', DBLSTRING, 1, 0) @@ -126,6 +128,7 @@ class Lexer SEPARATOR = /^,/ WHITESPACE = /^[ \n\r]+/ LITERAL = /^`?([a-z_][a-z0-9_]{0,})`?/i + PARAMETER = /^\$[0-9]+/ NUMBER = /^[0-9]+(\.[0-9]+)?/ STRING = /^'([^\\']*(?:\\.[^\\']*)*)'/ DBLSTRING = /^"([^\\"]*(?:\\.[^\\"]*)*)"/