Mercurial > hg > truffle

changeset 22120:fe5df1f36fec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Mon, 31 Aug 2015 18:15:27 -0700
parents 64dcb0a9fabf (diff) 31eb066d75ac (current diff)
children d045a505c2b3
files
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/SimpleREPLClient.java	Mon Aug 31 09:01:36 2015 +0200
+++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/client/SimpleREPLClient.java	Mon Aug 31 18:15:27 2015 -0700
@@ -233,9 +233,11 @@
 
         // Information about where the execution is halted
         /** The source where execution, if any, is halted; null if none. */
-        private Source haltedSource = null;
+        private Source haltedSource;
         /** The line number where execution, if any, is halted; 0 if none. */
         private int haltedLineNumber = 0;
+        /** The name of a source that we can't locate. */
+        private String unknownSourceName = "<unavailable>";
         /** The stack where execution, if any, is halted; null if none. Evaluated lazily. */
         private List<REPLFrame> frames = null;
 
@@ -263,6 +265,7 @@
                 } catch (IOException e1) {
                     this.haltedSource = null;
                     this.haltedLineNumber = 0;
+                    this.unknownSourceName = message.get(REPLMessage.SOURCE_NAME);
                 }
             }
             updatePrompt();
@@ -400,7 +403,7 @@
                 whereLineNumber = frame.locationLineNumber();
             }
             if (whereSource == null) {
-                displayFailReply("Frame " + selectedFrameNumber + ": source unavailable");
+                displayFailReply("Unavalable source=\"" + this.unknownSourceName + "\"");
                 return;
             }
             final int listSize = listSizeOption.getInt();