Changeset 41045 in webkit for trunk/JavaScriptCore

Timestamp:

Feb 17, 2009, 4:14:30 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-02-17 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Fixed <rdar://problem/6595040> REGRESSION: ​http://www.amnestyusa.org/
fails to load.

amnestyusa.org uses the Optimist JavaScript library, which adds event
listeners by concatenating string-ified functions. This is only sure to
be syntactically valid if the string-ified functions end in semicolons.

• parser/Lexer.cpp: (JSC::Lexer::isWhiteSpace):
• parser/Lexer.h: (JSC::Lexer::isWhiteSpace): (JSC::Lexer::isLineTerminator): Added some helper functions for examining whitespace.

• runtime/FunctionPrototype.cpp: (JSC::appendSemicolonIfNeeded): (JSC::functionProtoFuncToString): When string-ifying a function, insert a semicolon in the last non-whitespace position, if one doesn't already exist.

LayoutTests:

2009-02-17 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Test for <rdar://problem/6595040> REGRESSION: ​http://www.amnestyusa.org/
fails to load.

• fast/js/function-toString-semicolon-insertion-expected.txt: Added.
• fast/js/function-toString-semicolon-insertion.html: Added.
• fast/js/resources/function-toString-semicolon-insertion.js: Added. (compileAndSerialize):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/Lexer.cpp (modified) (2 diffs)
• parser/Lexer.h (modified) (2 diffs)
• runtime/FunctionPrototype.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-02-17  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Sam Weinig.
+        
+        Fixed <rdar://problem/6595040> REGRESSION: http://www.amnestyusa.org/
+        fails to load.
+        
+        amnestyusa.org uses the Optimist JavaScript library, which adds event
+        listeners by concatenating string-ified functions. This is only sure to
+        be syntactically valid if the string-ified functions end in semicolons.
+
+        * parser/Lexer.cpp:
+        (JSC::Lexer::isWhiteSpace):
+        * parser/Lexer.h:
+        (JSC::Lexer::isWhiteSpace):
+        (JSC::Lexer::isLineTerminator): Added some helper functions for examining
+        whitespace.
+
+        * runtime/FunctionPrototype.cpp:
+        (JSC::appendSemicolonIfNeeded):
+        (JSC::functionProtoFuncToString): When string-ifying a function, insert
+        a semicolon in the last non-whitespace position, if one doesn't already exist.
+
 2009-02-16  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/parser/Lexer.cpp

@@ -34 +34 @@
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
-#include <wtf/unicode/Unicode.h>
 
 using namespace WTF;
@@ -590 +589 @@
 bool Lexer::isWhiteSpace() const
 {
-    return m_current == '\t' || m_current == 0x0b || m_current == 0x0c || isSeparatorSpace(m_current);
+    return isWhiteSpace(m_current);
 }
 

trunk/JavaScriptCore/parser/Lexer.h

@@ -28 +28 @@
 #include "SourceCode.h"
 #include <wtf/Vector.h>
+#include <wtf/unicode/Unicode.h>
 
 namespace JSC {
@@ -90 +91 @@
         void clear();
         SourceCode sourceCode(int openBrace, int closeBrace, int firstLine) { return SourceCode(m_source->provider(), openBrace, closeBrace + 1, firstLine); }
+
+        static inline bool isWhiteSpace(int ch)
+        {
+            return ch == '\t' || ch == 0x0b || ch == 0x0c || WTF::Unicode::isSeparatorSpace(ch);
+        }
+
+        static inline bool isLineTerminator(int ch)
+        {
+            return ch == '\r' || ch == '\n' || ch == 0x2028 || ch == 0x2029;
+        }
 
     private:

trunk/JavaScriptCore/runtime/FunctionPrototype.cpp

@@ -64 +64 @@
 // Functions
 
+// Compatibility hack for the Optimost JavaScript library. (See <rdar://problem/6595040>.)
+static inline void insertSemicolonIfNeeded(UString& functionBody)
+{
+    ASSERT(functionBody[0] == '{');
+    ASSERT(functionBody[functionBody.size() - 1] == '}');
+
+    for (size_t i = functionBody.size() - 2; i > 0; --i) {
+        UChar ch = functionBody[i];
+        if (!Lexer::isWhiteSpace(ch) && !Lexer::isLineTerminator(ch)) {
+            if (ch != ';')
+                functionBody = functionBody.substr(0, i + 1) + ";" + functionBody.substr(i + 1, functionBody.size() - (i + 1));
+            return;
+        }
+    }
+}
+
 JSValuePtr functionProtoFuncToString(ExecState* exec, JSObject*, JSValuePtr thisValue, const ArgList&)
 {
     if (thisValue.isObject(&JSFunction::info)) {
         JSFunction* function = asFunction(thisValue);
-        return jsString(exec, "function " + function->name(&exec->globalData()) + "(" + function->body()->paramString() + ") " + function->body()->toSourceString());
+        UString functionBody = function->body()->toSourceString();
+        insertSemicolonIfNeeded(functionBody);
+        return jsString(exec, "function " + function->name(&exec->globalData()) + "(" + function->body()->paramString() + ") " + functionBody);
     }