Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed syntax errors while minifying jquery-3.2.1 #279

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed syntax errors while minifying jquery-3.2.1 #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7f6945
Fixed syntax errors while minifying jquery-3.2.1
awegmueller Apr 20, 2017
05983d9
Remove final and native from the list of reserved keywords
cguglielmo Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ build/build_tmp
build/yuicompressor*.jar
.project
.classpath
/bin/
2 changes: 1 addition & 1 deletion ant.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ lib.dir = lib
doc.dir = doc
build.dir = build
product.name = yuicompressor
version.number = 2.4.9
version.number = 2.4.9-BSI-2
jar.name = ${product.name}-${version.number}.jar
dist.package.name = ${product.name}-${version.number}
3 changes: 0 additions & 3 deletions src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,13 @@ public class JavaScriptCompressor {
reserved.add("enum");
reserved.add("export");
reserved.add("extends");
reserved.add("final");
reserved.add("float");
reserved.add("goto");
reserved.add("implements");
reserved.add("import");
reserved.add("int");
reserved.add("interface");
reserved.add("long");
reserved.add("native");
reserved.add("package");
reserved.add("private");
reserved.add("protected");
Expand All @@ -230,7 +228,6 @@ public class JavaScriptCompressor {
reserved.add("static");
reserved.add("super");
reserved.add("synchronized");
reserved.add("throws");
reserved.add("transient");
reserved.add("volatile");
// These are not reserved, but should be taken into account
Expand Down
5 changes: 0 additions & 5 deletions src/org/mozilla/javascript/TokenStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ private static int stringToKeyword(String name)
Id_double = Token.RESERVED,
Id_enum = Token.RESERVED,
Id_extends = Token.RESERVED,
Id_final = Token.RESERVED,
Id_finally = Token.FINALLY,
Id_float = Token.RESERVED,
Id_goto = Token.RESERVED,
Expand All @@ -152,7 +151,6 @@ private static int stringToKeyword(String name)
Id_int = Token.RESERVED,
Id_interface = Token.RESERVED,
Id_long = Token.RESERVED,
Id_native = Token.RESERVED,
Id_package = Token.RESERVED,
Id_private = Token.RESERVED,
Id_protected = Token.RESERVED,
Expand Down Expand Up @@ -215,7 +213,6 @@ private static int stringToKeyword(String name)
case 'l': X="false";id=Id_false; break L;
case 'n': c=s.charAt(0);
if (c=='c') { X="const";id=Id_const; }
else if (c=='f') { X="final";id=Id_final; }
break L;
case 'o': c=s.charAt(0);
if (c=='f') { X="float";id=Id_float; }
Expand All @@ -226,12 +223,10 @@ private static int stringToKeyword(String name)
case 't': X="catch";id=Id_catch; break L;
} break L;
case 6: switch (s.charAt(1)) {
case 'a': X="native";id=Id_native; break L;
case 'e': c=s.charAt(0);
if (c=='d') { X="delete";id=Id_delete; }
else if (c=='r') { X="return";id=Id_return; }
break L;
case 'h': X="throws";id=Id_throws; break L;
case 'm': X="import";id=Id_import; break L;
case 'o': X="double";id=Id_double; break L;
case 't': X="static";id=Id_static; break L;
Expand Down