Changeset 1272 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Jun 4, 2002, 3:33:26 PM (23 years ago)

Author:

darin

Message:

Improve the speed of the JavaScript string append operation by growing
the capacity so we don't need to reallocate the string every time.

Also fix script execution so it doesn't use recursion to advance from
one statement to the next, using iteration instead.

• Makefile.am: Stop using BUILT_SOURCES to build JavaScriptCore-stamp, because this causes the Project Builder project to build *before* the subdir. Intead, use an all-am rule in a way more similar to all our other directories.

• kjs/grammar.y: Link the SourceElementsNode in the opposite direction, so we can walk the list and execute each element instead of using recursion to reverse the list.
• kjs/grammar.cpp: Check in new generated file.

• kjs/nodes.cpp: (SourceElementsNode::execute): (SourceElementsNode::processFuncDecl): (SourceElementsNode::processVarDecls): Use loops instead of recursion.

• kjs/ustring.h: Don't initialize all UChar objects to 0. This was wasting a *huge* amount of time.
• kjs/ustring.cpp: (UString::Rep::create): Add a "capacity" along with the length. (UString::append): Include 50% extra capacity when appending. (UString::operator=): Reuse the buffer if possible rather than always creating a new one.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -3136 +3136 @@
   KJS_CHECKEXCEPTION
 
+#ifdef APPLE_CHANGES
+  Completion c1 = element->execute(exec);
+  KJS_CHECKEXCEPTION;
+  if (c1.complType() != Normal)
+    return c1;
+  
+  for (SourceElementsNode *node = elements; node; node = node->elements) {
+    Completion c2 = node->element->execute(exec);
+    if (c2.complType() != Normal)
+      return c2;
+    // The spec says to return c2 here, but it seems that mozilla returns c1 if
+    // c2 doesn't have a value
+    if (!c2.value().isNull())
+      c1 = c2;
+  }
+  
+  return c1;
+#else
   if (!elements)
     return element->execute(exec);
@@ -3153 +3171 @@
   else
     return c2;
+#endif
 }
 
@@ -3158 +3177 @@
 void SourceElementsNode::processFuncDecl(ExecState *exec)
 {
+#ifdef APPLE_CHANGES
+  for (SourceElementsNode *node = this; node; node = node->elements) {
+    node->element->processFuncDecl(exec);
+  }
+#else
   if (elements)
     elements->processFuncDecl(exec);
 
   element->processFuncDecl(exec);
+#endif
 }
 
 void SourceElementsNode::processVarDecls(ExecState *exec)
 {
+#ifdef APPLE_CHANGES
+  for (SourceElementsNode *node = this; node; node = node->elements) {
+    node->element->processVarDecls(exec);
+  }
+#else
   if (elements)
     elements->processVarDecls(exec);
 
   element->processVarDecls(exec);
+#endif
 }