[MERGE chakra-core#32] Use correct error message for String functions prohibiting a RegExp argument

Gorkem Yakin · Gorkem Yakin · commit 4e4d4f00f11b · 2016-01-13T10:34:08.000-08:00
Merge pull request chakra-core#32 from goyakin:string-isRegExp-error-message
diff --git a/lib/Parser/rterrors.h b/lib/Parser/rterrors.h
@@ -322,3 +322,5 @@ RT_ERROR_MSG(JSERR_ClassSuperInBaseClass, 5629, "", "Unexpected call to 'super'
 RT_ERROR_MSG(JSERR_ClassDerivedConstructorInvalidReturnType, 5630, "", "Derived class constructor can return only object or undefined", kjstTypeError, 0)
 RT_ERROR_MSG(JSERR_ClassStaticMethodCannotBePrototype, 5631, "", "Class static member cannot be named 'prototype'", kjstTypeError, 0)
 RT_ERROR_MSG(JSERR_ClassConstructorCannotBeCalledWithoutNew, 5632, "%s: cannot be called without the new keyword", "Class constructor cannot be called without the new keyword", kjstTypeError, 0)
+
+RT_ERROR_MSG(JSERR_FunctionArgument_FirstCannotBeRegExp, 5633, "%s: first argument cannot be a RegExp", "First argument cannot be a RegExp", kjstTypeError, 0)
diff --git a/lib/Runtime/Library/JavascriptString.cpp b/lib/Runtime/Library/JavascriptString.cpp
@@ -1266,7 +1266,7 @@ namespace Js
         {
             if (!isRegExpAnAllowedArg && JavascriptRegExp::Is(args[1]))
             {
-                JavascriptError::ThrowTypeError(scriptContext, JSERR_This_NeedString, apiNameForErrorMsg);
+                JavascriptError::ThrowTypeError(scriptContext, JSERR_FunctionArgument_FirstCannotBeRegExp, apiNameForErrorMsg);
             }
             else if (JavascriptString::Is(args[1]))
             {

Original file line number	Diff line number	Diff line change
`@@ -1266,7 +1266,7 @@ namespace Js`
`1266`	`1266`	`{`
`1267`	`1267`	`if (!isRegExpAnAllowedArg && JavascriptRegExp::Is(args[1]))`
`1268`	`1268`	`{`
`1269`		`- JavascriptError::ThrowTypeError(scriptContext, JSERR_This_NeedString, apiNameForErrorMsg);`
	`1269`	`+ JavascriptError::ThrowTypeError(scriptContext, JSERR_FunctionArgument_FirstCannotBeRegExp, apiNameForErrorMsg);`
`1270`	`1270`	`}`
`1271`	`1271`	`else if (JavascriptString::Is(args[1]))`
`1272`	`1272`	`{`