From 8e13c5ea2692d564d540b50098a3b3ac64340917 Mon Sep 17 00:00:00 2001 From: "igor%mir2.org" Date: Mon, 29 Aug 2005 14:59:27 +0000 Subject: [PATCH] Yet another improvement in not-a-function reporting. Now for foo.bar() when bar does not exist Rhino prints "Can not find function bar" git-svn-id: svn://10.0.0.236/trunk@179198 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java | 3 +++ .../src/org/mozilla/javascript/resources/Messages.properties | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java index b6ce79b5f37..d58ac312a49 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java @@ -3304,6 +3304,9 @@ public class ScriptRuntime { // XXX Use value for better error reporting String msg = (messageHelper == null) ? "null" : messageHelper.toString(); + if (value == Scriptable.NOT_FOUND) { + return typeError1("msg.function.not.found", msg); + } return typeError2("msg.isnt.function", msg, value == null ? "null" : value.getClass().getName()); } diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/resources/Messages.properties b/mozilla/js/rhino/src/org/mozilla/javascript/resources/Messages.properties index 1ea0b18bf15..94715e969bc 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/resources/Messages.properties +++ b/mozilla/js/rhino/src/org/mozilla/javascript/resources/Messages.properties @@ -451,6 +451,9 @@ msg.undef.with =\ msg.isnt.function =\ {0} is not a function, it is {1}. +msg.function.not.found =\ + Cannot find function {0}. + msg.isnt.xml.object =\ {0} is not an xml object.