incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r428873 - /incubator/adffaces/branches/matzew-rc1-plugins-m1/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
Date Fri, 04 Aug 2006 20:31:09 GMT
Author: matzew
Date: Fri Aug  4 13:31:08 2006
New Revision: 428873

URL: http://svn.apache.org/viewvc?rev=428873&view=rev
Log:
ADFFACES-112 ; thx to Mike Elges for providing the patch

Modified:
    incubator/adffaces/branches/matzew-rc1-plugins-m1/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj

Modified: incubator/adffaces/branches/matzew-rc1-plugins-m1/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/branches/matzew-rc1-plugins-m1/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj?rev=428873&r1=428872&r2=428873&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-rc1-plugins-m1/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
(original)
+++ incubator/adffaces/branches/matzew-rc1-plugins-m1/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
Fri Aug  4 13:31:08 2006
@@ -331,21 +331,20 @@
                                                  (AnnotatedToken)prefixToken, 
                                                  (AnnotatedToken)getToken(1));
             }
-    |   LOOKAHEAD(2)  <STRING_LITERAL>  (PrimarySuffix())*  
+    |   LOOKAHEAD(2)  <STRING_LITERAL>      (PrimarySuffix())*  
     |   LOOKAHEAD(2)  <REGULAR_EXPRESSION>  (PrimarySuffix())*    
     |   LOOKAHEAD(2)  Literal() 
     |   FunctionLiteral()
     |   NestedArrayLiteral()                (PrimarySuffix())*
     |   ObjectLiteral() 
     |   <LPAREN> Expression() <RPAREN>      (PrimarySuffix())* 
-    |   AllocationExpression()
+    |   AllocationExpression() (PrimarySuffix())*             
     )
     {
         token_source.setRegValid();
     }
 }
 
-
 void PrimarySuffix():
 {}
 {
@@ -383,11 +382,11 @@
         Token t;
 }
 {
-        LOOKAHEAD(2)  t=<NEW> <THIS>       (NewSuffix())* [Arguments()]
+        LOOKAHEAD(4)  t=<NEW> <THIS>       (LOOKAHEAD(2) NewSuffix())* [LOOKAHEAD(2)
Arguments()] 
             {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED, null, 1);}
-    |   LOOKAHEAD(2)  t=<NEW> Identifier() (NewSuffix())* [Arguments()]
+    |   LOOKAHEAD(4)  t=<NEW> Identifier() (LOOKAHEAD(2) NewSuffix())* [LOOKAHEAD(2)
Arguments()] 
             {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED, null, 1);}
-    |   LOOKAHEAD(2)  t=<NEW> FunctionConstructor() (NewSuffix())*      [Arguments()]
+    |   LOOKAHEAD(4)  t=<NEW> FunctionConstructor() (LOOKAHEAD(2) NewSuffix())* [LOOKAHEAD
(2) Arguments()] 
             {JSParserUtils.annotateToken(t, AnnotationConstants.UNDEFINED, null, 1);}
 }
 
@@ -1081,7 +1080,8 @@
 void FunctionLiteral():
 {}
 {
-        AnonymousFunction()
+        LOOKAHEAD(2) NamedFunction()
+    |   LOOKAHEAD(2) AnonymousFunction()
 }
                           
 Vector FormalParameterList():



Mime
View raw message