Skip to content
Snippets Groups Projects
Commit 4ad45bf1 authored by norris%netscape.com's avatar norris%netscape.com
Browse files

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

parent 634fa1c3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
js/rhino/org/mozilla/javascript/tools/resources/Messages.properties
+ 0
− 3
View file @ 4ad45bf1
......@@ -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\
......
js/rhino/org/mozilla/javascript/tools/shell/Main.java
+ 16
− 11
View file @ 4ad45bf1
......@@ -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) {
......
js/rhino/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
+ 0
− 3
View file @ 4ad45bf1
......@@ -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\
......
js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java
+ 16
− 11
View file @ 4ad45bf1
......@@ -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) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment