Permalink
Browse files

Merge branch 'release/0.5.1'

  • Loading branch information...
2 parents 34f7729 + 928b2de commit df54e64eef6e59d00bb8f640b056dfafd5ab9b87 @rspivak committed Jun 6, 2011
Showing with 17 additions and 20 deletions.
  1. +4 −0 CHANGES
  2. +5 −0 CREDIT
  3. +1 −1 setup.py
  4. +1 −16 src/slimit/lexer.py
  5. +2 −2 src/slimit/lextab.py
  6. +3 −0 src/slimit/tests/test_lexer.py
  7. +1 −1 src/slimit/yacctab.py
View
@@ -1,6 +1,10 @@
Change History
==============
+0.5.1 (2011-06-06)
+----------------
+- Bugfix: https://github.com/rspivak/slimit/issues/2
+
0.5 (2011-06-06)
----------------
- Added name mangling
View
5 CREDIT
@@ -0,0 +1,5 @@
+
+Bug reports
+-----------
+
+- Rui Pereira
View
@@ -17,7 +17,7 @@ def read(*rel_names):
setup(
name='slimit',
- version='0.5',
+ version='0.5.1',
url='http://slimit.org',
license='MIT',
description='SlimIt - JavaScript minifier',
View
@@ -202,16 +202,13 @@ def next(self):
'BREAK', 'CASE', 'CATCH', 'CONTINUE', 'DEBUGGER', 'DEFAULT', 'DELETE',
'DO', 'ELSE', 'FINALLY', 'FOR', 'FUNCTION', 'IF', 'IN',
'INSTANCEOF', 'NEW', 'RETURN', 'SWITCH', 'THIS', 'THROW', 'TRY',
- 'TYPEOF', 'VAR', 'VOID', 'WHILE', 'WITH',
+ 'TYPEOF', 'VAR', 'VOID', 'WHILE', 'WITH', 'NULL', 'TRUE', 'FALSE',
# future reserved words
# 'CLASS', 'CONST', 'ENUM', 'EXPORT', 'EXTENDS', 'IMPORT', 'SUPER',
)
keywords_dict = dict((key.lower(), key) for key in keywords)
tokens = (
- # Literals
- 'NULL', 'TRUE', 'FALSE',
-
# Punctuators
'PERIOD', 'COMMA', 'SEMI', 'COLON', # . , ; :
'PLUS', 'MINUS', 'MULT', 'DIV', 'MOD', # + - * / %
@@ -378,18 +375,6 @@ def t_regex_error(self, token):
)
""" # "
- # Literals
- def t_NULL(self, token):
- r'null'
- return token
-
- def t_TRUE(self, token):
- r'true'
- return token
-
- def t_FALSE(self, token):
- r'false'
- return token
# XXX: <ZWNJ> <ZWJ> ?
identifier_start = r'(?:' + r'[a-zA-Z_$]' + r'|' + LETTER + r')+'
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -71,6 +71,9 @@ def test_illegal_unicode_char_in_identifier(self):
),
(ur'\u03c0 \u03c0_tail var\ua67c',
[ur'ID \u03c0', ur'ID \u03c0_tail', ur'ID var\ua67c']),
+ # https://github.com/rspivak/slimit/issues/2
+ ('nullify truelie falsepositive',
+ ['ID nullify', 'ID truelie', 'ID falsepositive']),
# Keywords
# ('break case ...', ['BREAK break', 'CASE case', ...])
View

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit df54e64

Please sign in to comment.