Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove JSuncaughtExceptionLine, use an error reporter to report line number info instead.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@52865 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
norris%netscape.com
1999-11-05 21:48:05 +00:00
parent aebde57816
commit bef3328b2f
4 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/js/rhino/org/mozilla/javascript/tools/resources/Messages.properties
View File

@@ -89,9 +89,6 @@ msg.format3 =\
msg.uncaughtJSException =\
uncaught JavaScript exception: {0}
msg.uncaughtJSExceptionLine =\
uncaught JavaScript exception ("{0}", line {1}): {2}
msg.jsc.usage =\
Didn''t understand "{0}". \n\
Valid arguments are: \n\

27
mozilla/js/rhino/org/mozilla/javascript/tools/shell/Main.java
View File

@@ -245,6 +245,9 @@ public class Main {
public static void processSource(Context cx, String filename) {
SourceTextManager stm = cx.getSourceTextManager();
if (filename == null || filename.equals("-")) {
// Use the interpreter for interactive input
cx.setOptimizationLevel(-1);
BufferedReader in = new BufferedReader
(new InputStreamReader(Main.in));
if(null != stm)
@@ -292,9 +295,14 @@ public class Main {
// Already printed message, so just fall through.
}
catch (EcmaError ee) {
Context.reportError(ToolErrorReporter.getMessage(
"msg.uncaughtJSException",
ee.toString()));
String msg = ToolErrorReporter.getMessage(
"msg.uncaughtJSException", ee.toString());
if (ee.getSourceName() != null) {
Context.reportError(msg, ee.getSourceName(),
ee.getLineNumber(), null, 0);
} else {
Context.reportError(msg);
}
}
catch (JavaScriptException jse) {
// Need to propagate ThreadDeath exceptions.
@@ -360,16 +368,13 @@ public class Main {
we.printStackTrace();
}
catch (EcmaError ee) {
String msg = ToolErrorReporter.getMessage(
"msg.uncaughtJSException", ee.toString());
if (ee.getSourceName() != null) {
Object[] args = { ee.getSourceName(),
new Integer(ee.getLineNumber()),
ee.toString() };
Context.reportError(ToolErrorReporter.getMessage(
"msg.uncaughtJSExceptionLine", args));
Context.reportError(msg, ee.getSourceName(),
ee.getLineNumber(), null, 0);
} else {
Context.reportError(ToolErrorReporter.getMessage(
"msg.uncaughtJSException",
ee.toString()));
Context.reportError(msg);
}
}
catch (EvaluatorException ee) {

3
mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
View File

@@ -89,9 +89,6 @@ msg.format3 =\
msg.uncaughtJSException =\
uncaught JavaScript exception: {0}
msg.uncaughtJSExceptionLine =\
uncaught JavaScript exception ("{0}", line {1}): {2}
msg.jsc.usage =\
Didn''t understand "{0}". \n\
Valid arguments are: \n\

27
mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java
View File

@@ -245,6 +245,9 @@ public class Main {
public static void processSource(Context cx, String filename) {
SourceTextManager stm = cx.getSourceTextManager();
if (filename == null || filename.equals("-")) {
// Use the interpreter for interactive input
cx.setOptimizationLevel(-1);
BufferedReader in = new BufferedReader
(new InputStreamReader(Main.in));
if(null != stm)
@@ -292,9 +295,14 @@ public class Main {
// Already printed message, so just fall through.
}
catch (EcmaError ee) {
Context.reportError(ToolErrorReporter.getMessage(
"msg.uncaughtJSException",
ee.toString()));
String msg = ToolErrorReporter.getMessage(
"msg.uncaughtJSException", ee.toString());
if (ee.getSourceName() != null) {
Context.reportError(msg, ee.getSourceName(),
ee.getLineNumber(), null, 0);
} else {
Context.reportError(msg);
}
}
catch (JavaScriptException jse) {
// Need to propagate ThreadDeath exceptions.
@@ -360,16 +368,13 @@ public class Main {
we.printStackTrace();
}
catch (EcmaError ee) {
String msg = ToolErrorReporter.getMessage(
"msg.uncaughtJSException", ee.toString());
if (ee.getSourceName() != null) {
Object[] args = { ee.getSourceName(),
new Integer(ee.getLineNumber()),
ee.toString() };
Context.reportError(ToolErrorReporter.getMessage(
"msg.uncaughtJSExceptionLine", args));
Context.reportError(msg, ee.getSourceName(),
ee.getLineNumber(), null, 0);
} else {
Context.reportError(ToolErrorReporter.getMessage(
"msg.uncaughtJSException",
ee.toString()));
Context.reportError(msg);
}
}
catch (EvaluatorException ee) {