This is the mail archive of the frysk-cvs@sources.redhat.com mailing list for the frysk project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[SCM] master: Refactor DebugInfoFrame.getLines() to DebugInfoFrame.getLine().


The branch, master has been updated
       via  2be25cf2737c5c61f4f77659d8b49d0a44f22e33 (commit)
       via  b6103c109b1d0b9dd22601a6c65318e6c91c9a0d (commit)
      from  a1527a9d2fb548cc3875e329672368a5da0b96d9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 2be25cf2737c5c61f4f77659d8b49d0a44f22e33
Author: Andrew Cagney <cagney@redhat.com>
Date:   Tue Dec 11 13:26:50 2007 -0500

    Refactor DebugInfoFrame.getLines() to DebugInfoFrame.getLine().
    
    frysk-core/frysk/debuginfo/ChangeLog
    2007-12-11  Andrew Cagney  <cagney@redhat.com>
    
    	* DebugInfoFrame.java (getLine()): Replace getLines().
    	* TestDebugInfoStackTrace.java: Update.
    
    frysk-core/frysk/dom/ChangeLog
    2007-12-11  Andrew Cagney  <cagney@redhat.com>
    
    	* DOMFactory.java: Update, DebugInfoFrame.getLines() replaced by
    	getLine().
    
    frysk-core/frysk/hpd/ChangeLog
    2007-12-11  Andrew Cagney  <cagney@redhat.com>
    
    	* ListCommand.java: Update; DebugInfoFrame's .getLines() replaced
    	by getLine().
    	* StepCommand.java: Ditto.
    	* StepNextiCommand.java: Ditto.
    	* StepNextCommand.java: Ditto.
    	* StepInstructionCommand.java: Ditto.
    	* StepFinishCommand.java: Ditto.
    
    frysk-core/frysk/rt/ChangeLog
    2007-12-11  Andrew Cagney  <cagney@redhat.com>
    
    	* Line.java (UNKNOWN): New.
    
    frysk-core/frysk/stepping/ChangeLog
    2007-12-11  Andrew Cagney  <cagney@redhat.com>
    
    	* TestStepping.java: Update; DebugInfoFrame's .getLines() replaced
    	by getLine().
    	* TestSteppingEngine.java: Ditto.
    
    frysk-gui/frysk/gui/srcwin/ChangeLog
    2007-12-11  Andrew Cagney  <cagney@redhat.com>
    
    	* CurrentStackView.java: Update DebugInfoFrame's .getLines()
    	replaced by .getLine().
    	* InlineBuffer.java: Ditto.
    	* SourceBuffer.java: Ditto.
    	* SourceView.java: Ditto.
    	* SourceWindow.java: Ditto.

commit b6103c109b1d0b9dd22601a6c65318e6c91c9a0d
Author: Andrew Cagney <cagney@redhat.com>
Date:   Tue Dec 11 12:10:52 2007 -0500

    Re-indent frysk.rt.Line.
    
    frysk-core/frysk/rt/ChangeLog
    2007-12-11  Andrew Cagney  <cagney@redhat.com>
    
    	* Line.java: Re-indent.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog               |    5 +
 frysk-core/frysk/debuginfo/DebugInfoFrame.java     |   59 ++++-----
 .../frysk/debuginfo/TestDebugInfoStackTrace.java   |   27 ++--
 frysk-core/frysk/dom/ChangeLog                     |    5 +
 frysk-core/frysk/dom/DOMFactory.java               |    8 +-
 frysk-core/frysk/hpd/ChangeLog                     |   10 ++
 frysk-core/frysk/hpd/ListCommand.java              |   15 +-
 frysk-core/frysk/hpd/StepCommand.java              |    7 +-
 frysk-core/frysk/hpd/StepFinishCommand.java        |    7 +-
 frysk-core/frysk/hpd/StepInstructionCommand.java   |    7 +-
 frysk-core/frysk/hpd/StepNextCommand.java          |    5 +-
 frysk-core/frysk/hpd/StepNextiCommand.java         |    5 +-
 frysk-core/frysk/rt/ChangeLog                      |    6 +
 frysk-core/frysk/rt/Line.java                      |  136 +++++++++-----------
 frysk-core/frysk/stepping/ChangeLog                |    6 +
 frysk-core/frysk/stepping/TestStepping.java        |   47 ++++----
 frysk-core/frysk/stepping/TestSteppingEngine.java  |   31 +++--
 frysk-gui/frysk/gui/srcwin/ChangeLog               |    9 ++
 frysk-gui/frysk/gui/srcwin/CurrentStackView.java   |   17 +--
 frysk-gui/frysk/gui/srcwin/InlineBuffer.java       |   13 +-
 frysk-gui/frysk/gui/srcwin/SourceBuffer.java       |   79 ++++++------
 frysk-gui/frysk/gui/srcwin/SourceView.java         |   16 +--
 frysk-gui/frysk/gui/srcwin/SourceWindow.java       |   72 +++++-----
 23 files changed, 306 insertions(+), 286 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index d10406e..e82cb97 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-11  Andrew Cagney  <cagney@redhat.com>
+	
+	* DebugInfoFrame.java (getLine()): Replace getLines().
+	* TestDebugInfoStackTrace.java: Update.
+	
 2007-12-11  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	CompositeType constructors and add functions now take LineColPair argument.
diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
index 657d399..4355846 100644
--- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java
+++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
@@ -61,8 +61,6 @@ public class DebugInfoFrame extends FrameDecorator {
     private Subprogram subprogram;
     private Scope scope;
 
-    private Line[] lines;
-
     private LinkedList inlinedSubprograms;
 
     private final TypeEntry typeEntry;
@@ -161,49 +159,40 @@ public class DebugInfoFrame extends FrameDecorator {
     }
 
     /**
-     * Return this frame's list of lines as an array; returns an empty array if
-     * there is no line number information available. The lack of line-number
-     * information can be determined with the test: <<tt>>.getLines().length == 0</tt>.
-     * XXX: When there are multiple lines, it isn't clear if there is a well
-     * defined ordering of the information; for instance: outer-to-inner or
-     * inner-to-outer.
+     * Return this frame's list of lines as an array; returns an empty
+     * array if there is no line number information available. The
+     * lack of line-number information can be determined with the
+     * test: <<tt>>.getLine() == Line.NULL</tt>.
      */
-    public Line[] getLines ()
-    {
-      if (this.lines == null)
-        {
-	  Dwfl dwfl = DwflCache.getDwfl(this.getTask());
+    public Line getLine() {
+	if (this.line == null) {
+	    Dwfl dwfl = DwflCache.getDwfl(this.getTask());
   	    // The innermost frame and frames which were
   	    // interrupted during execution use their PC to get
   	    // the line in source. All other frames have their PC
   	    // set to the line after the inner frame call and must
   	    // be decremented by one.
   	    DwflLine dwflLine = dwfl.getSourceLine(getAdjustedAddress());
-  	    if (dwflLine != null)
-  	      {
+  	    if (dwflLine != null) {
   		File f = new File(dwflLine.getSourceFile());
-  		if (! f.isAbsolute())
-  		  {
-  		    /* The file refers to a path relative to the compilation
-  		     * directory; so prepend the path to that directory in
-  		     * front of it. */
+  		if (! f.isAbsolute()) {
+  		    // The file refers to a path relative to the
+  		    // compilation directory; so prepend the path to
+  		    // that directory in front of it.
   		    File parent = new File(dwflLine.getCompilationDir());
   		    f = new File(parent, dwflLine.getSourceFile());
-  		  }
-
-  		this.lines = new Line[] { new Line(f, dwflLine.getLineNum(),
-  						   dwflLine.getColumn(),
-  						   this.getTask().getProc()) };
-  	      }
-
-  	  
-  	// If the fetch failed, mark it as unknown.
-  	if (this.lines == null)
-  	  this.lines = new Line[0];
+		}
+  		this.line = new Line(f, dwflLine.getLineNum(),
+				     dwflLine.getColumn(),
+				     this.getTask().getProc());
+	    }
+	    // If the fetch failed, mark it as unknown.
+	    if (this.line == null)
+		this.line = Line.UNKNOWN;
         }
-
-      return this.lines;
+	return this.line;
     }
+    private Line line;
 
     public void toPrint(PrintWriter writer, boolean printParameters,
 		 boolean fullpath){
@@ -225,12 +214,12 @@ public class DebugInfoFrame extends FrameDecorator {
 	    writer.print(") ");
           
 	    if (fullpath) {
-		Line line = this.getLines()[0];
+		Line line = this.getLine();
 		writer.print(line.getFile().getPath());
 		writer.print("#");
 		writer.print(line.getLine());
 	    } else {
-		Line line = this.getLines()[0];
+		Line line = this.getLine();
 		writer.print(".../"+line.getFile().getName());
 		writer.print("#");
 		writer.print(line.getLine());
diff --git a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
index b986d8a..38ec790 100644
--- a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
+++ b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
@@ -151,7 +151,7 @@ public class TestDebugInfoStackTrace
 
     assertNotNull(frame);
     assertNull(frame.getInner());
-    line = frame.getLines()[0];
+    line = frame.getLine();
     symbol = frame.getSymbol();
     assertEquals ("file name", "funit-rt-looper.c", line.getFile().getName());
     //XXX: See #3259
@@ -161,7 +161,7 @@ public class TestDebugInfoStackTrace
     frame = frame.getOuterDebugInfoFrame();
     assertNotNull (frame);
     assertNotNull(frame.getInner());
-    line = frame.getLines()[0];
+    line = frame.getLine();
     symbol = frame.getSymbol();
     assertEquals("file name", "funit-rt-looper.c", line.getFile().getName());
     assertEquals(71, line.getLine ());
@@ -170,7 +170,7 @@ public class TestDebugInfoStackTrace
     frame = frame.getOuterDebugInfoFrame();
     assertNotNull(frame);
     assertNotNull(frame.getInner());
-    line = frame.getLines()[0];
+    line = frame.getLine();
     symbol = frame.getSymbol();
     assertEquals("file name", "funit-rt-looper.c", line.getFile().getName());
     assertEquals("line number", 81, line.getLine());
@@ -179,7 +179,7 @@ public class TestDebugInfoStackTrace
     frame = frame.getOuterDebugInfoFrame();
     assertNotNull(frame);
     assertNotNull(frame.getInner());
-    line = frame.getLines()[0];
+    line = frame.getLine();
     symbol = frame.getSymbol();
     assertEquals("file name", "funit-rt-looper.c", line.getFile().getName());
     assertEquals("line number", 117, line.getLine());
@@ -328,14 +328,13 @@ public class TestDebugInfoStackTrace
 
     DebugInfoFrame frame = DebugInfoStackFactory.createDebugInfoStackTrace(myTask);
     
-    if (frame.getLines().length == 0)
-      {
+    if (frame.getLine() == Line.UNKNOWN) {
         this.lineMap.put(myTask, new Integer(0));
         steppingEngine.stepLine(myTask.getProc().getTasks());
         return;
       }
       
-    Line line = frame.getLines()[0];
+    Line line = frame.getLine();
     this.lineMap.put(myTask, new Integer(line.getLine()));
     steppingEngine.stepLine(myTask.getProc().getTasks());
   }
@@ -510,13 +509,13 @@ public class TestDebugInfoStackTrace
       {
 
         int lineNum;
-            if (sFrame.getLines().length == 0)
+            if (sFrame.getLine() == Line.UNKNOWN)
               {
                 lineNum = 0;
               }
             else
               {
-                line = sFrame.getLines()[0];
+                line = sFrame.getLine();
                 lineNum = line.getLine();
               }
             this.lineMap.put(myTask, new Integer(lineNum));
@@ -578,7 +577,7 @@ public class TestDebugInfoStackTrace
                 DebugInfoFrame frame = DebugInfoStackFactory.createDebugInfoStackTrace(myTask);
 
                 /* Make sure we're not missing any frames */
-                if (frame.getLines()[0].getLine() > 95)
+                if (frame.getLine().getLine() > 95)
                   {
                     assertEquals ("demangled name", "jump",
 				  frame.getSymbol().getDemangledName());
@@ -653,8 +652,8 @@ public class TestDebugInfoStackTrace
           {
             frameTracker[task_count][i][0] = "" + frame.toString();
             
-            if (frame.getLines().length > 0)
-              frameTracker[task_count][i][1] = frame.getLines()[0].getFile().getAbsolutePath();
+            if (frame.getLine() != Line.UNKNOWN)
+              frameTracker[task_count][i][1] = frame.getLine().getFile().getAbsolutePath();
             else
               frameTracker[task_count][i][1] = "";
             
@@ -665,8 +664,8 @@ public class TestDebugInfoStackTrace
             else
               frameTracker[task_count][i][3] = "" + frame.getInner().toString();
             
-            if (frame.getLines().length > 0)
-              frameTracker[task_count][i][4] = "" + frame.getLines()[0].getLine();
+            if (frame.getLine() != Line.UNKNOWN)
+              frameTracker[task_count][i][4] = "" + frame.getLine().getLine();
             else
               frameTracker[task_count][i][4] = "" + 0;
             
diff --git a/frysk-core/frysk/dom/ChangeLog b/frysk-core/frysk/dom/ChangeLog
index 5334558..8665866 100644
--- a/frysk-core/frysk/dom/ChangeLog
+++ b/frysk-core/frysk/dom/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-11  Andrew Cagney  <cagney@redhat.com>
+
+	* DOMFactory.java: Update, DebugInfoFrame.getLines() replaced by
+	getLine().
+
 2007-08-14  Rick Moseley  <rmoseley@redhat.com>
 
 	* DOMFactory.java: Move printDOM() to DOMCommon.
diff --git a/frysk-core/frysk/dom/DOMFactory.java b/frysk-core/frysk/dom/DOMFactory.java
index 2338b83..88222af 100644
--- a/frysk-core/frysk/dom/DOMFactory.java
+++ b/frysk-core/frysk/dom/DOMFactory.java
@@ -42,7 +42,7 @@ package frysk.dom;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
-
+import frysk.rt.Line;
 import frysk.debuginfo.DebugInfoFrame;
 import frysk.proc.Proc;
 
@@ -57,10 +57,10 @@ public class DOMFactory
   {
     DOMFrysk dom = null;
 
-    if (frame.getLines().length == 0)
+    if (frame.getLine() == Line.UNKNOWN)
       return null;
     
-    File file = frame.getLines()[0].getFile();
+    File file = frame.getLine().getFile();
     String sourcefile = file.getPath();
 
     String filename = file.getName ();
@@ -88,7 +88,7 @@ public class DOMFactory
     if (source == null)
       {
         DOMImage image = dom.getImage(proc.getMainTask().getName());
-        image.addSource(proc, frame.getLines()[0], dom);
+        image.addSource(proc, frame.getLine(), dom);
       }
     hashmap.put(proc, dom);
     // if we are debugging the DOM, print it out now
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 5d2b6e7..3050030 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-11  Andrew Cagney  <cagney@redhat.com>
+
+	* ListCommand.java: Update; DebugInfoFrame's .getLines() replaced
+	by getLine().
+	* StepCommand.java: Ditto.
+	* StepNextiCommand.java: Ditto.
+	* StepNextCommand.java: Ditto.
+	* StepInstructionCommand.java: Ditto.
+	* StepFinishCommand.java: Ditto.
+
 2007-12-10  Andrew Cagney  <cagney@redhat.com>
 
 	* TestInput.java (check): Check out-of-range requests.
diff --git a/frysk-core/frysk/hpd/ListCommand.java b/frysk-core/frysk/hpd/ListCommand.java
index f3ee33d..1b356ae 100644
--- a/frysk-core/frysk/hpd/ListCommand.java
+++ b/frysk-core/frysk/hpd/ListCommand.java
@@ -44,6 +44,7 @@ import java.util.List;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.LineNumberReader;
+import frysk.rt.Line;
 import java.util.Iterator;
 import lib.dwfl.DwarfDie;
 import lib.dwfl.DwTag; 
@@ -96,7 +97,7 @@ class ListCommand extends ParameterizedCommand {
 	    cli.outWriter.print(taskData.getID());
 	    cli.outWriter.println("]");
             DebugInfoFrame frame = cli.getTaskFrame(task);
-            if (frame.getLines().length == 0) {
+            if (frame.getLine() == Line.UNKNOWN) {
 		cli.outWriter.println("No symbol table is available.");
 		continue;
             }
@@ -107,7 +108,7 @@ class ListCommand extends ParameterizedCommand {
                 }
                 catch (NumberFormatException ignore) {
                     if ((cmd.parameter(0)).compareTo("$EXEC") == 0)
-                        line = frame.getLines()[0].getLine() - 10;
+                        line = frame.getLine().getLine() - 10;
                     else {
                         DwarfDie funcDie = null;
 			DebugInfo debugInfo = cli.getTaskDebugInfo(task);
@@ -134,21 +135,21 @@ class ListCommand extends ParameterizedCommand {
 		    line += windowSize;
 		}
 	    }
-            else if (frame.getLines()[0].getLine() != exec_line) {
+            else if (frame.getLine().getLine() != exec_line) {
                 // list around pc.
-                exec_line = frame.getLines()[0].getLine();
+                exec_line = frame.getLine().getLine();
                 line = exec_line - 10;
             }
  
             if (file == null) {
-                if (frame.getLines().length > 0) {
-                    file = (frame.getLines()[0]).getFile();
+                if (frame.getLine() != Line.UNKNOWN) {
+                    file = (frame.getLine()).getFile();
                     if (file == null) {
                         cli.addMessage("No symbol table is available.",
                                        Message.TYPE_NORMAL);
                         return;
                     }
-                    line = (frame.getLines()[0]).getLine() - 10;
+                    line = (frame.getLine()).getLine() - 10;
 		    if (exec_line == 0)
 			exec_line = line;
                 }
diff --git a/frysk-core/frysk/hpd/StepCommand.java b/frysk-core/frysk/hpd/StepCommand.java
index c0ddf4b..03f1338 100644
--- a/frysk-core/frysk/hpd/StepCommand.java
+++ b/frysk-core/frysk/hpd/StepCommand.java
@@ -44,6 +44,7 @@ import java.util.LinkedList;
 import java.util.List;
 import frysk.proc.Task;
 import frysk.debuginfo.DebugInfoFrame;
+import frysk.rt.Line;
 
 public class StepCommand extends ParameterizedCommand {
     StepCommand() {
@@ -74,14 +75,14 @@ public class StepCommand extends ParameterizedCommand {
 		Task task = (Task) taskIter.next();
 		DebugInfoFrame rf = cli.getTaskFrame(task);
 
-		if (rf.getLines().length == 0)
+		if (rf.getLine() == Line.UNKNOWN)
 		    cli.addMessage("Task stopped at address 0x"
 			    + Long.toHexString(rf.getAdjustedAddress()),
 			    Message.TYPE_NORMAL);
 		else
 		    cli.addMessage("Task stopped at line "
-			    + rf.getLines()[0].getLine() + " in file "
-			    + rf.getLines()[0].getFile(), Message.TYPE_NORMAL);
+			    + rf.getLine().getLine() + " in file "
+			    + rf.getLine().getFile(), Message.TYPE_NORMAL);
 	    }
 	} else
 	    cli.addMessage("Not attached to any process",
diff --git a/frysk-core/frysk/hpd/StepFinishCommand.java b/frysk-core/frysk/hpd/StepFinishCommand.java
index cce79f5..776b0a5 100644
--- a/frysk-core/frysk/hpd/StepFinishCommand.java
+++ b/frysk-core/frysk/hpd/StepFinishCommand.java
@@ -44,6 +44,7 @@ import java.util.LinkedList;
 import java.util.List;
 import frysk.debuginfo.DebugInfoFrame;
 import frysk.proc.Task;
+import frysk.rt.Line;
 
 public class StepFinishCommand extends ParameterizedCommand {
 
@@ -79,14 +80,14 @@ public class StepFinishCommand extends ParameterizedCommand {
 		Task task = (Task) taskIter.next();
 		DebugInfoFrame rf = cli.getTaskFrame(task);
 
-		if (rf.getLines().length == 0)
+		if (rf.getLine() == Line.UNKNOWN)
 		    cli.addMessage("Task stopped at address 0x"
 			    + Long.toHexString(rf.getAdjustedAddress()),
 			    Message.TYPE_NORMAL);
 		else
 		    cli.addMessage("Task stopped at line "
-			    + rf.getLines()[0].getLine() + " in file "
-			    + rf.getLines()[0].getFile(), Message.TYPE_NORMAL);
+			    + rf.getLine().getLine() + " in file "
+			    + rf.getLine().getFile(), Message.TYPE_NORMAL);
 	    }
 	} else
 	    cli.addMessage("Not attached to any process",
diff --git a/frysk-core/frysk/hpd/StepInstructionCommand.java b/frysk-core/frysk/hpd/StepInstructionCommand.java
index f016808..6ad24e5 100644
--- a/frysk-core/frysk/hpd/StepInstructionCommand.java
+++ b/frysk-core/frysk/hpd/StepInstructionCommand.java
@@ -44,6 +44,7 @@ import java.util.LinkedList;
 import java.util.List;
 import frysk.proc.Task;
 import frysk.debuginfo.DebugInfoFrame;
+import frysk.rt.Line;
 
 public class StepInstructionCommand extends ParameterizedCommand {
     private static final String full = "Step a process by an instruction. "
@@ -74,14 +75,14 @@ public class StepInstructionCommand extends ParameterizedCommand {
 		Task task = (Task) stepped.next();
 		DebugInfoFrame rf = cli.getTaskFrame(task);
 
-		if (rf.getLines().length == 0)
+		if (rf.getLine() == Line.UNKNOWN)
 		    cli.addMessage("Task stopped at address 0x"
 			    + Long.toHexString(rf.getAdjustedAddress()),
 			    Message.TYPE_NORMAL);
 		else
 		    cli.addMessage("Task stopped at line "
-			    + rf.getLines()[0].getLine() + " in file "
-			    + rf.getLines()[0].getFile(), Message.TYPE_NORMAL);
+			    + rf.getLine().getLine() + " in file "
+			    + rf.getLine().getFile(), Message.TYPE_NORMAL);
 	    }
 	} else
 	    cli.addMessage("Not attached to any process",
diff --git a/frysk-core/frysk/hpd/StepNextCommand.java b/frysk-core/frysk/hpd/StepNextCommand.java
index e1dda1f..0bee845 100644
--- a/frysk-core/frysk/hpd/StepNextCommand.java
+++ b/frysk-core/frysk/hpd/StepNextCommand.java
@@ -44,6 +44,7 @@ import java.util.LinkedList;
 import java.util.List;
 import frysk.debuginfo.DebugInfoFrame;
 import frysk.proc.Task;
+import frysk.rt.Line;
 
 public class StepNextCommand extends ParameterizedCommand {
 
@@ -83,10 +84,10 @@ public class StepNextCommand extends ParameterizedCommand {
               Task task = (Task)taskIter.next();
               DebugInfoFrame rf =  cli.getTaskFrame(task);
               
-              if (rf.getLines().length == 0)
+              if (rf.getLine() == Line.UNKNOWN)
                 cli.addMessage("Task stopped at address 0x" + Long.toHexString(rf.getAdjustedAddress()), Message.TYPE_NORMAL);
               else
-                cli.addMessage("Task stopped at line " + rf.getLines()[0].getLine() + " in file " + rf.getLines()[0].getFile(), Message.TYPE_NORMAL);
+                cli.addMessage("Task stopped at line " + rf.getLine().getLine() + " in file " + rf.getLine().getFile(), Message.TYPE_NORMAL);
             }
         }
       else
diff --git a/frysk-core/frysk/hpd/StepNextiCommand.java b/frysk-core/frysk/hpd/StepNextiCommand.java
index a8a00aa..bb8d79a 100644
--- a/frysk-core/frysk/hpd/StepNextiCommand.java
+++ b/frysk-core/frysk/hpd/StepNextiCommand.java
@@ -44,6 +44,7 @@ import java.util.LinkedList;
 import java.util.List;
 import frysk.debuginfo.DebugInfoFrame;
 import frysk.proc.Task;
+import frysk.rt.Line;
 
 public class StepNextiCommand extends ParameterizedCommand {
 
@@ -83,10 +84,10 @@ public class StepNextiCommand extends ParameterizedCommand {
               Task task = (Task)taskIter.next();
               DebugInfoFrame rf =  cli.getTaskFrame(task);
               
-              if (rf.getLines().length == 0)
+              if (rf.getLine() == Line.UNKNOWN)
                 cli.addMessage("Task stopped at address 0x" + Long.toHexString(rf.getAdjustedAddress()), Message.TYPE_NORMAL);
               else
-                cli.addMessage("Task stopped at line " + rf.getLines()[0].getLine() + " in file " + rf.getLines()[0].getFile(), Message.TYPE_NORMAL);
+                cli.addMessage("Task stopped at line " + rf.getLine().getLine() + " in file " + rf.getLine().getFile(), Message.TYPE_NORMAL);
             }
         }
       else
diff --git a/frysk-core/frysk/rt/ChangeLog b/frysk-core/frysk/rt/ChangeLog
index d4afa91..a9ad9c0 100644
--- a/frysk-core/frysk/rt/ChangeLog
+++ b/frysk-core/frysk/rt/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-11  Andrew Cagney  <cagney@redhat.com>
+
+	* Line.java (UNKNOWN): New.
+
+	* Line.java: Re-indent.
+
 2007-11-27  Tim Moore  <timoore@redhat.com>
 
 	* BreakpointManager.java (manageProcess): Wrap await call inside
diff --git a/frysk-core/frysk/rt/Line.java b/frysk-core/frysk/rt/Line.java
index 00abee0..d7f07b1 100644
--- a/frysk-core/frysk/rt/Line.java
+++ b/frysk-core/frysk/rt/Line.java
@@ -47,93 +47,83 @@ import frysk.dom.DOMFrysk;
 import frysk.dom.DOMFunction;


hooks/post-receive
--
frysk system monitor/debugger


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]