[javascriptlint-commit] SF.net SVN: javascriptlint:[338] trunk/jsengine/tokenizer/__init__.py
Status: Beta
Brought to you by:
matthiasmiller
From: <mat...@us...> - 2013-10-09 20:30:38
|
Revision: 338 http://sourceforge.net/p/javascriptlint/code/338 Author: matthiasmiller Date: 2013-10-09 20:30:33 +0000 (Wed, 09 Oct 2013) Log Message: ----------- Tweak to _Tokens object Modified Paths: -------------- trunk/jsengine/tokenizer/__init__.py Modified: trunk/jsengine/tokenizer/__init__.py =================================================================== --- trunk/jsengine/tokenizer/__init__.py 2013-10-09 20:21:32 UTC (rev 337) +++ trunk/jsengine/tokenizer/__init__.py 2013-10-09 20:30:33 UTC (rev 338) @@ -30,101 +30,100 @@ return self._literal class _Tokens(object): - def __init__(self): - # Load symbols - self.ASSIGN_ULSHIFT = _Token('sym', '<<<=') - self.ASSIGN_URSHIFT = _Token('sym', '>>>=') - self.EQ_STRICT = _Token('sym', '===') - self.NE_STRICT = _Token('sym', '!==') - self.URSHIFT = _Token('sym', '>>>') - self.ASSIGN_LSHIFT = _Token('sym', '<<=') - self.ASSIGN_RSHIFT = _Token('sym', '>>=') - self.LE = _Token('sym', '<=') - self.GE = _Token('sym', '>=') - self.EQ = _Token('sym', '==') - self.NE = _Token('sym', '!=') - self.INC = _Token('sym', '++') - self.DEC = _Token('sym', '--') - self.LSHIFT = _Token('sym', '<<') - self.RSHIFT = _Token('sym', '>>') - self.LOGICAL_AND = _Token('sym', '&&') - self.LOGICAL_OR = _Token('sym', '||') - self.ASSIGN_ADD = _Token('sym', '+=') - self.ASSIGN_SUB = _Token('sym', '-=') - self.ASSIGN_MUL = _Token('sym', '*=') - self.ASSIGN_MOD = _Token('sym', '%=') - self.ASSIGN_BIT_AND = _Token('sym', '&=') - self.ASSIGN_BIT_OR = _Token('sym', '|=') - self.ASSIGN_BIT_XOR = _Token('sym', '^=') - self.ASSIGN_DIV = _Token('sym', '/=') - self.LBRACE = _Token('sym', '{') - self.RBRACE = _Token('sym', '}') - self.LPAREN = _Token('sym', '(') - self.RPAREN = _Token('sym', ')') - self.LBRACKET = _Token('sym', '[') - self.RBRACKET = _Token('sym', ']') - self.DOT = _Token('sym', '.') - self.SEMI = _Token('sym', ';') - self.COMMA = _Token('sym', ',') - self.LT = _Token('sym', '<') - self.GT = _Token('sym', '>') - self.ADD = _Token('sym', '+') - self.SUB = _Token('sym', '-') - self.MUL = _Token('sym', '*') - self.MOD = _Token('sym', '%') - self.BIT_OR = _Token('sym', '|') - self.BIT_AND = _Token('sym', '&') - self.BIT_XOR = _Token('sym', '^') - self.LOGICAL_NOT = _Token('sym', '!') - self.BIT_NOT = _Token('sym', '~') - self.QUESTION = _Token('sym', '?') - self.COLON = _Token('sym', ':') - self.ASSIGN = _Token('sym', '=') - self.DIV = _Token('sym', '/') + # Symbols + ASSIGN_ULSHIFT = _Token('sym', '<<<=') + ASSIGN_URSHIFT = _Token('sym', '>>>=') + EQ_STRICT = _Token('sym', '===') + NE_STRICT = _Token('sym', '!==') + URSHIFT = _Token('sym', '>>>') + ASSIGN_LSHIFT = _Token('sym', '<<=') + ASSIGN_RSHIFT = _Token('sym', '>>=') + LE = _Token('sym', '<=') + GE = _Token('sym', '>=') + EQ = _Token('sym', '==') + NE = _Token('sym', '!=') + INC = _Token('sym', '++') + DEC = _Token('sym', '--') + LSHIFT = _Token('sym', '<<') + RSHIFT = _Token('sym', '>>') + LOGICAL_AND = _Token('sym', '&&') + LOGICAL_OR = _Token('sym', '||') + ASSIGN_ADD = _Token('sym', '+=') + ASSIGN_SUB = _Token('sym', '-=') + ASSIGN_MUL = _Token('sym', '*=') + ASSIGN_MOD = _Token('sym', '%=') + ASSIGN_BIT_AND = _Token('sym', '&=') + ASSIGN_BIT_OR = _Token('sym', '|=') + ASSIGN_BIT_XOR = _Token('sym', '^=') + ASSIGN_DIV = _Token('sym', '/=') + LBRACE = _Token('sym', '{') + RBRACE = _Token('sym', '}') + LPAREN = _Token('sym', '(') + RPAREN = _Token('sym', ')') + LBRACKET = _Token('sym', '[') + RBRACKET = _Token('sym', ']') + DOT = _Token('sym', '.') + SEMI = _Token('sym', ';') + COMMA = _Token('sym', ',') + LT = _Token('sym', '<') + GT = _Token('sym', '>') + ADD = _Token('sym', '+') + SUB = _Token('sym', '-') + MUL = _Token('sym', '*') + MOD = _Token('sym', '%') + BIT_OR = _Token('sym', '|') + BIT_AND = _Token('sym', '&') + BIT_XOR = _Token('sym', '^') + LOGICAL_NOT = _Token('sym', '!') + BIT_NOT = _Token('sym', '~') + QUESTION = _Token('sym', '?') + COLON = _Token('sym', ':') + ASSIGN = _Token('sym', '=') + DIV = _Token('sym', '/') - # Load keywords - self.BREAK = _Token('kw', 'break') - self.CASE = _Token('kw', 'case') - self.CATCH = _Token('kw', 'catch') - self.CONTINUE = _Token('kw', 'continue') - self.DEFAULT = _Token('kw', 'default') - self.DELETE = _Token('kw', 'delete') - self.DO = _Token('kw', 'do') - self.ELSE = _Token('kw', 'else') - self.FALSE = _Token('kw', 'false') - self.FINALLY = _Token('kw', 'finally') - self.FOR = _Token('kw', 'for') - self.FUNCTION = _Token('kw', 'function') - self.IF = _Token('kw', 'if') - self.IN = _Token('kw', 'in') - self.INSTANCEOF = _Token('kw', 'instanceof') - self.NEW = _Token('kw', 'new') - self.NULL = _Token('kw', 'null') - self.RETURN = _Token('kw', 'return') - self.SWITCH = _Token('kw', 'switch') - self.THIS = _Token('kw', 'this') - self.THROW = _Token('kw', 'throw') - self.TRUE = _Token('kw', 'true') - self.TYPEOF = _Token('kw', 'typeof') - self.TRY = _Token('kw', 'try') - self.VAR = _Token('kw', 'var') - self.VOID = _Token('kw', 'void') - self.WHILE = _Token('kw', 'while') - self.WITH = _Token('kw', 'with') + # Keywords + BREAK = _Token('kw', 'break') + CASE = _Token('kw', 'case') + CATCH = _Token('kw', 'catch') + CONTINUE = _Token('kw', 'continue') + DEFAULT = _Token('kw', 'default') + DELETE = _Token('kw', 'delete') + DO = _Token('kw', 'do') + ELSE = _Token('kw', 'else') + FALSE = _Token('kw', 'false') + FINALLY = _Token('kw', 'finally') + FOR = _Token('kw', 'for') + FUNCTION = _Token('kw', 'function') + IF = _Token('kw', 'if') + IN = _Token('kw', 'in') + INSTANCEOF = _Token('kw', 'instanceof') + NEW = _Token('kw', 'new') + NULL = _Token('kw', 'null') + RETURN = _Token('kw', 'return') + SWITCH = _Token('kw', 'switch') + THIS = _Token('kw', 'this') + THROW = _Token('kw', 'throw') + TRUE = _Token('kw', 'true') + TYPEOF = _Token('kw', 'typeof') + TRY = _Token('kw', 'try') + VAR = _Token('kw', 'var') + VOID = _Token('kw', 'void') + WHILE = _Token('kw', 'while') + WITH = _Token('kw', 'with') - # Load other tokens - self.C_COMMENT = _Token('other', '/*') - self.CPP_COMMENT = _Token('other', '//') - self.HTML_COMMENT = _Token('other', '<!--') - self.ERROR = _Token('other', 'err') - self.EOF = _Token('other', 'eof') - self.EOL = _Token('other', 'eol') - self.NAME = _Token('other', '(name)') - self.NUMBER = _Token('other', '(num)') - self.OPERATOR = _Token('other', '(op)') - self.REGEXP = _Token('other', '(re)') - self.SPACE = _Token('other', '(sp)') - self.STRING = _Token('other', '(str)') + # Other tokens + C_COMMENT = _Token('other', '/*') + CPP_COMMENT = _Token('other', '//') + HTML_COMMENT = _Token('other', '<!--') + ERROR = _Token('other', 'err') + EOF = _Token('other', 'eof') + EOL = _Token('other', 'eol') + NAME = _Token('other', '(name)') + NUMBER = _Token('other', '(num)') + OPERATOR = _Token('other', '(op)') + REGEXP = _Token('other', '(re)') + SPACE = _Token('other', '(sp)') + STRING = _Token('other', '(str)') tok = _Tokens() _KEYWORDS = dict((t.literal, t) for t in _ALL_TOKENS if t.category == 'kw') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |