Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (152783 => 152784)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-17 16:15:35 UTC (rev 152783)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-17 16:26:52 UTC (rev 152784)
@@ -1,3 +1,27 @@
+2013-07-17 Chris Curtis <chris_cur...@apple.com>
+
+ Naming convention on createInvalidParamError is incorrect.
+ https://bugs.webkit.org/show_bug.cgi?id=118756
+
+ Reviewed by Geoffrey Garen.
+
+ Changed the naming of createInvalidParamError to createInvalidParameterError.
+ This corrects the naming convention for the function listed in the WebKit code styling.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::loadVarargs):
+ * jit/JITStubs.cpp:
+ (JSC::DEFINE_STUB_FUNCTION):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * runtime/CommonSlowPaths.h:
+ (JSC::CommonSlowPaths::opIn):
+ * runtime/ExceptionHelpers.cpp:
+ (JSC::createInvalidParameterError):
+ * runtime/ExceptionHelpers.h:
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::hasInstance):
+
2013-07-16 David Farler <dfar...@apple.com>
Typo in DFGInsertionSet.h header guard: "DFGInsectionSet_h" -> "DFGInsertionSet_h"
Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (152783 => 152784)
--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2013-07-17 16:15:35 UTC (rev 152783)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp 2013-07-17 16:26:52 UTC (rev 152784)
@@ -189,7 +189,7 @@
}
if (!arguments.isObject()) {
- callFrame->vm().exception = createInvalidParamError(callFrame, "Function.prototype.apply", arguments);
+ callFrame->vm().exception = createInvalidParameterError(callFrame, "Function.prototype.apply", arguments);
return 0;
}
Modified: trunk/Source/_javascript_Core/jit/JITStubs.cpp (152783 => 152784)
--- trunk/Source/_javascript_Core/jit/JITStubs.cpp 2013-07-17 16:15:35 UTC (rev 152783)
+++ trunk/Source/_javascript_Core/jit/JITStubs.cpp 2013-07-17 16:26:52 UTC (rev 152784)
@@ -1889,7 +1889,7 @@
}
}
- stackFrame.vm->exception = createInvalidParamError(callFrame, "instanceof", baseVal);
+ stackFrame.vm->exception = createInvalidParameterError(callFrame, "instanceof", baseVal);
VM_THROW_EXCEPTION_AT_END();
return JSValue::encode(JSValue());
}
@@ -3301,7 +3301,7 @@
JSValue baseVal = stackFrame.args[1].jsValue();
if (!baseVal.isObject()) {
- stackFrame.vm->exception = createInvalidParamError(stackFrame.callFrame, "in", baseVal);
+ stackFrame.vm->exception = createInvalidParameterError(stackFrame.callFrame, "in", baseVal);
VM_THROW_EXCEPTION();
}
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (152783 => 152784)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2013-07-17 16:15:35 UTC (rev 152783)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2013-07-17 16:26:52 UTC (rev 152784)
@@ -731,7 +731,7 @@
LLINT_RETURN(jsBoolean(baseObject->methodTable()->customHasInstance(baseObject, exec, value)));
}
}
- LLINT_THROW(createInvalidParamError(exec, "instanceof", baseVal));
+ LLINT_THROW(createInvalidParameterError(exec, "instanceof", baseVal));
}
LLINT_SLOW_PATH_DECL(slow_path_instanceof)
Modified: trunk/Source/_javascript_Core/runtime/CommonSlowPaths.h (152783 => 152784)
--- trunk/Source/_javascript_Core/runtime/CommonSlowPaths.h 2013-07-17 16:15:35 UTC (rev 152783)
+++ trunk/Source/_javascript_Core/runtime/CommonSlowPaths.h 2013-07-17 16:26:52 UTC (rev 152784)
@@ -78,7 +78,7 @@
inline bool opIn(ExecState* exec, JSValue propName, JSValue baseVal)
{
if (!baseVal.isObject()) {
- exec->vm().exception = createInvalidParamError(exec, "in", baseVal);
+ exec->vm().exception = createInvalidParameterError(exec, "in", baseVal);
return false;
}
Modified: trunk/Source/_javascript_Core/runtime/ExceptionHelpers.cpp (152783 => 152784)
--- trunk/Source/_javascript_Core/runtime/ExceptionHelpers.cpp 2013-07-17 16:15:35 UTC (rev 152783)
+++ trunk/Source/_javascript_Core/runtime/ExceptionHelpers.cpp 2013-07-17 16:26:52 UTC (rev 152784)
@@ -84,7 +84,7 @@
return createReferenceError(exec, message);
}
-JSObject* createInvalidParamError(ExecState* exec, const char* op, JSValue value)
+JSObject* createInvalidParameterError(ExecState* exec, const char* op, JSValue value)
{
String errorMessage = makeString("'", value.toString(exec)->value(exec), "' is not a valid argument for '", op, "'");
JSObject* exception = createTypeError(exec, errorMessage);
Modified: trunk/Source/_javascript_Core/runtime/ExceptionHelpers.h (152783 => 152784)
--- trunk/Source/_javascript_Core/runtime/ExceptionHelpers.h 2013-07-17 16:15:35 UTC (rev 152783)
+++ trunk/Source/_javascript_Core/runtime/ExceptionHelpers.h 2013-07-17 16:26:52 UTC (rev 152784)
@@ -42,7 +42,7 @@
JSObject* createOutOfMemoryError(JSGlobalObject*);
JSObject* createUndefinedVariableError(ExecState*, const Identifier&);
JSObject* createNotAnObjectError(ExecState*, JSValue);
-JSObject* createInvalidParamError(ExecState*, const char* op, JSValue);
+JSObject* createInvalidParameterError(ExecState*, const char* op, JSValue);
JSObject* createNotAConstructorError(ExecState*, JSValue);
JSObject* createNotAFunctionError(ExecState*, JSValue);
JSObject* createErrorForInvalidGlobalAssignment(ExecState*, const String&);
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (152783 => 152784)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2013-07-17 16:15:35 UTC (rev 152783)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2013-07-17 16:26:52 UTC (rev 152784)
@@ -1400,7 +1400,7 @@
return defaultHasInstance(exec, value, get(exec, exec->propertyNames().prototype));
if (info.implementsHasInstance())
return methodTable()->customHasInstance(this, exec, value);
- throwError(exec, createInvalidParamError(exec, "instanceof" , this));
+ throwError(exec, createInvalidParameterError(exec, "instanceof" , this));
return false;
}
