Author: awiner
Date: Tue Dec 12 14:48:54 2006
New Revision: 486388
URL: http://svn.apache.org/viewvc?view=rev&rev=486388
Log:
ADFFACES-320: Obfuscation of addition statement where one of the items being
added is an increment statement. Patch from Kamran Kashanian
Modified:
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
Modified:
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java?view=diff&rev=486388&r1=486387&r2=486388
==============================================================================
---
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java
(original)
+++
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java
Tue Dec 12 14:48:54 2006
@@ -26,10 +26,13 @@
SPECIAL_TYPES.add("Assert");
SPECIAL_TYPES.add("Logger");
}
+
+ public static final int PREFIX_WS = 1;
+ public static final int INFIX_WS = 2;
protected int _annotationKind = AnnotationConstants.UNDEFINED;
protected Object _annotationObject;
- protected int _wsSensitive;
+ protected int _wsSensitive = 0;
protected boolean _remove;
protected boolean _funcUsesEval;
protected String _type = "undefined";
@@ -98,11 +101,11 @@
}
public boolean isPrefixWSSensitive() {
- return _wsSensitive == 1;
+ return _wsSensitive == PREFIX_WS;
}
public boolean isInfixWSSensitive() {
- return _wsSensitive == 2;
+ return _wsSensitive == INFIX_WS;
}
public boolean isRemovableKeyword() {
Modified:
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj?view=diff&rev=486388&r1=486387&r2=486388
==============================================================================
---
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
(original)
+++
incubator/adffaces/trunk/plugins/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
Tue Dec 12 14:48:54 2006
@@ -383,11 +383,11 @@
}
{
LOOKAHEAD(4) t=<NEW> <THIS> (LOOKAHEAD(2) NewSuffix())*
[LOOKAHEAD(2) Arguments()]
- {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, 1);}
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.PREFIX_WS);}
| LOOKAHEAD(4) t=<NEW> Identifier() (LOOKAHEAD(2) NewSuffix())*
[LOOKAHEAD(2) Arguments()]
- {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, 1);}
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.PREFIX_WS);}
| LOOKAHEAD(4) t=<NEW> FunctionConstructor() (LOOKAHEAD(2)
NewSuffix())* [LOOKAHEAD (2) Arguments()]
- {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, 1);}
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.PREFIX_WS);}
}
@@ -411,17 +411,23 @@
}
{
t=<DELETE>
- {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, 1);}
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
| t=<VOID>
- {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, 1);}
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
| t=<TYPEOF>
- {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, 1);}
- | <INCR>
- | <DECR>
- | <PLUS>
- | <MINUS>
- | <TILDE>
- | <BANG>
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
+ | t=<INCR>
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
+ | t=<DECR>
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
+ | t=<PLUS>
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
+ | t=<MINUS>
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
+ | t=<TILDE>
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
+ | t=<BANG>
+ {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.INFIX_WS);}
}
void UnaryExpression():
@@ -448,7 +454,7 @@
void AddOp():
{}
{
- <PLUS>
+ <PLUS>
| <MINUS>
}
@@ -491,11 +497,11 @@
| t=<INSTANCEOF>
{JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED,
- null, 2);}
+ null,
AnnotatedToken.INFIX_WS);}
| t=<IN>
{JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED,
- null, 2);})
+ null,
AnnotatedToken.INFIX_WS);})
ShiftExpression())*
}
@@ -508,7 +514,7 @@
( ( RelOp()
| t=<INSTANCEOF>
{JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED,
- null, 2);})
+ null, AnnotatedToken.INFIX_WS);})
ShiftExpression())*
}
@@ -743,7 +749,7 @@
Token t;
}
{
- t=<VAR> {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, 1);}
+ t=<VAR> {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED,
null, AnnotatedToken.PREFIX_WS);}
VariableDeclarationList(t) Sc()
}
@@ -839,7 +845,7 @@
<IF> <LPAREN> Expression() <RPAREN>
Statement()
[ LOOKAHEAD(1) t=<ELSE> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED,
- null, 1);}
+ null,
AnnotatedToken.PREFIX_WS);}
Statement()
]
}
@@ -888,7 +894,7 @@
}
{
<FOR> <LPAREN> t=<VAR> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED,
- null, 1);}
+ null,
AnnotatedToken.PREFIX_WS);}
VariableDeclarationList(t) <SEMICOLON>
[Expression()] <SEMICOLON>
[Expression()] <RPAREN>
@@ -902,7 +908,7 @@
{
<FOR> <LPAREN> ExpressionNoIN()
t=<IN> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED,
- null, 2);}
+ null,
AnnotatedToken.INFIX_WS);}
ExpressionNoIN() <RPAREN>
Statement()
}
@@ -913,14 +919,14 @@
}
{
<FOR> <LPAREN>
- t=<VAR> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, 1);}
+ t=<VAR> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, AnnotatedToken.PREFIX_WS);}
t=Identifier()
{
- JSParserUtils.annotateToken(t,
AnnotationConstants.VAR_IDENTIFIER, null, 1);
+ JSParserUtils.annotateToken(t,
AnnotationConstants.VAR_IDENTIFIER, null, AnnotatedToken.PREFIX_WS);
JSParserUtils.pushToken(_contextStack,
(AnnotatedToken)t);
}
[Initializer()]
- t=<IN> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, 2);}
+ t=<IN> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, AnnotatedToken.INFIX_WS);}
ExpressionNoIN()
<RPAREN>
Statement()
@@ -943,7 +949,7 @@
Token t;
}
{
- t=<RETURN> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, 1);}
+ t=<RETURN> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, AnnotatedToken.PREFIX_WS);}
[Expression()] Sc()
}
@@ -967,7 +973,7 @@
Token t;
}
{
- t=<THROW> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, 1);}
+ t=<THROW> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, AnnotatedToken.PREFIX_WS);}
[Expression()] Sc()
}
@@ -976,7 +982,7 @@
Token t;
}
{
- t=<CASE> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, 1);}
+ t=<CASE> {JSParserUtils.annotateToken(t,
AnnotationConstants.UNDEFINED, null, AnnotatedToken.PREFIX_WS);}
Expression() <COLON>
| <_DEFAULT> <COLON>
}
@@ -1018,7 +1024,7 @@
AnnotationConstants.FUNCTION_PARAM_IDENTIFIER,
null, -1);
JSParserUtils.annotateToken(tFunction,
AnnotationConstants.NAMED_FUNCTION,
- params, 1);
+ params,
AnnotatedToken.PREFIX_WS);
JSParserUtils.pushTokens(_contextStack, params);
}
