Changeset 34499 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Jun 11, 2008, 3:01:40 PM (17 years ago)

Author:

Darin Adler

Message:

2008-06-11 Darin Adler <Darin Adler>

Reviewed by Maciej.

• a little bit of cleanup and prep for some upcoming optimizations

• JavaScriptCore.exp: Re-sorted this file (with sort command line tool).
• VM/CodeBlock.cpp: (KJS::CodeBlock::dump): Fixed printf to avoid warnings -- to use %lu we need to make sure the type is unsigned long.
• kjs/object.cpp: (KJS::Error::create): Eliminated unused error names array, and also put the strings into the code since there was already a switch statment. This also avoids having to contemplate a hypothetical access past the end of the array.
• kjs/object.h: Got rid of errorNames.
• kjs/property_slot.cpp: Deleted unused ungettableGetter.
• kjs/property_slot.h: Ditto.
• wtf/AlwaysInline.h: Added LIKELY alongside UNLIKELY.

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/object.cpp

@@ -520 +520 @@
 // ------------------------------ Error ----------------------------------------
 
-const char * const errorNamesArr[] = {
-  I18N_NOOP("Error"), // GeneralError
-  I18N_NOOP("Evaluation error"), // EvalError
-  I18N_NOOP("Range error"), // RangeError
-  I18N_NOOP("Reference error"), // ReferenceError
-  I18N_NOOP("Syntax error"), // SyntaxError
-  I18N_NOOP("Type error"), // TypeError
-  I18N_NOOP("URI error"), // URIError
-};
-
-const char * const * const Error::errorNames = errorNamesArr;
-
-JSObject *Error::create(ExecState *exec, ErrorType errtype, const UString &message,
-                         int lineno, int sourceId, const UString &sourceURL)
-{
-  JSObject *cons;
+JSObject* Error::create(ExecState* exec, ErrorType errtype, const UString& message,
+    int lineno, int sourceId, const UString& sourceURL)
+{
+  JSObject* cons;
+  const char* name;
   switch (errtype) {
   case EvalError:
     cons = exec->lexicalGlobalObject()->evalErrorConstructor();
+    name = "Evaluation error";
     break;
   case RangeError:
     cons = exec->lexicalGlobalObject()->rangeErrorConstructor();
+    name = "Range error";
     break;
   case ReferenceError:
     cons = exec->lexicalGlobalObject()->referenceErrorConstructor();
+    name = "Reference error";
     break;
   case SyntaxError:
     cons = exec->lexicalGlobalObject()->syntaxErrorConstructor();
+    name = "Syntax error";
     break;
   case TypeError:
     cons = exec->lexicalGlobalObject()->typeErrorConstructor();
+    name = "Type error";
     break;
   case URIError:
     cons = exec->lexicalGlobalObject()->URIErrorConstructor();
+    name = "URI error";
     break;
   default:
     cons = exec->lexicalGlobalObject()->errorConstructor();
+    name = "Error";
     break;
   }
@@ -562 +558 @@
   List args;
   if (message.isEmpty())
-    args.append(jsString(errorNames[errtype]));
+    args.append(jsString(name));
   else
     args.append(jsString(message));