2003/04/30 04:08:37

darcs-hash:20040130065928-0c9ea-d7adb8ba798b7d2ce7ff354b048bfd52ae4419eb.gz

diff --git a/src/org/mozilla/javascript/Parser.java b/src/org/mozilla/javascript/Parser.java
index 9e23a8c..8f2647f 100644 (file)
--- a/src/org/mozilla/javascript/Parser.java
+++ b/src/org/mozilla/javascript/Parser.java
@@ -210,8 +210,11 @@ class Parser {
         source.append((char) ts.FUNCTION);\r
 \r
         if (ts.matchToken(ts.NAME)) {\r
-            name = ts.getString();\r
-            source.addString(ts.NAME, name);\r
+            // HACK: XWT does not support named functions
+            throw new IOException(
+                "named functions are not supported, use anonymos "+
+                "declaration (myfun = function() {...}"
+            );
         }\r
         else\r
             ; // it's an anonymous function\r

diff --git a/src/org/mozilla/javascript/TokenStream.java b/src/org/mozilla/javascript/TokenStream.java
index 25b5fc3..c1a47cd 100644 (file)
--- a/src/org/mozilla/javascript/TokenStream.java
+++ b/src/org/mozilla/javascript/TokenStream.java
@@ -784,6 +784,14 @@ public class TokenStream {
         if (c == EOF_CHAR)\r
             return EOF;\r
 \r
+        // HACK: XWT "and" as "&&" support
+        if (c == 'a' || c == 'A') {
+            if (in.match('n') || in.match('N')) {
+                if (in.match('d') || in.match('D')) return AND;
+                in.unread();
+            }
+        }
+
         // identifier/keyword/instanceof?\r
         // watch out for starting with a <backslash>\r
         boolean isUnicodeEscapeStart = false;\r