[SCM] master: frysk-core/frysk/value/ChangeLog

swagiaal@sourceware.org swagiaal@sourceware.org
Fri Dec 14 17:57:00 GMT 2007


The branch, master has been updated
       via  b9cdfd91cf50ad2e4e0f585e24584bac0605a9b4 (commit)
       via  e789830b8711e9c391c1b3b5ecb4aa6f7e7cdb5e (commit)
       via  42cbfde0d852d40ce22ac9aa8dda154c5a35d0fa (commit)
       via  5e768759849ae8019633b39cf20ff28a61c55865 (commit)
       via  7a68bcfd27178606d8b6d87c3157db9923afed29 (commit)
       via  dbdf67198aca66cdd1f84ad68def57fe6ad0d425 (commit)
      from  9c76e9dfce159f2acf341174bf88f23ce9bcbdf3 (commit)

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

- Log -----------------------------------------------------------------
commit b9cdfd91cf50ad2e4e0f585e24584bac0605a9b4
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Fri Dec 14 12:47:14 2007 -0500

    frysk-core/frysk/value/ChangeLog
    +2007-12-14  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * Variable.java (Variable): Handles DwAttributeNotFoundException.
    +
    
    frysk-sys/lib/dwfl/ChangeLog
    +2007-12-14  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * DwarfDie.java (isDefinitionOnly): New function.
    +       (getDeclFile): handles DwAttributeNotFoundException.
    +       (getDeclLine): Ditto.
    +       * cni/DwarfDie.cxx (DwarfDie::get_decl_file): Ditto.
    +

commit e789830b8711e9c391c1b3b5ecb4aa6f7e7cdb5e
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Fri Dec 14 10:58:27 2007 -0500

    swagiaal: Repaced LineColpair with SourceLocation
    
    frysk-core/frysk/debuginfo/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * TypeEntry.java: Use SourceLocation instead of LineColPair.
    +       * TestObjectDeclarationSearchEngine.java: Ditto.
    +
    
    frysk-core/frysk/expr/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * TestbedSymTab.java (scratchSourceLocation): use SourceLocation.
    +
    
    frysk-core/frysk/scopes/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * LineColPair.java: Deleted
    +
    
    frysk-core/frysk/value/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * ObjectDeclaration.java: Use SourceLocation instead of LineColPair
    +       * EnumType.java (Member.getSourceLocation): Ditto.
    +       * CompositeType.java: Ditto.
    +       * Variable.java: Ditto.
    +       * TestComposite.java: Ditto..
    +

commit 42cbfde0d852d40ce22ac9aa8dda154c5a35d0fa
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Thu Dec 13 17:28:57 2007 -0500

    swagiaal: Moved DOM knowledge from SourceLocation to LineXXX
    
    frysk-core/frysk/debuginfo/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * DebugInfoFrame.java (getLineXXX): New function.
    +
    
    frysk-core/frysk/rt/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * LineXXX.java: New.
    +
    
    frysk-core/frysk/scopes/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * SourceLocation.java: Removed DOM and proc knowledge.
    +
    
    frysk-gui/frysk/gui/srcwin/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       Created LineXXX to contain dom related information instead of
    +       SourceLocation.
    +       * InlineBuffer.java: Updated.
    +       * CurrentStackView.java: Updated.
    +       * SourceView.java: Updated.

commit 5e768759849ae8019633b39cf20ff28a61c55865
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Thu Dec 13 12:08:41 2007 -0500

    swagiaal: Moved frysk.rt.Line to frysk.scopes.SourceLocation.
    
    frysk-core/frysk/debuginfo/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       Moved frysk.rt.Line to frysk.scopes.SourceLocation.
    +       * TestDebugInfoStackTrace.java: Updated.
    +       * DebugInfoFrame.java: Updated.
    +
    
    frysk-core/frysk/dom/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       Moved frysk.rt.Line to frysk.scopes.SourceLocation.
    +       * DOMFactory.java: Updated.
    +
    
    frysk-core/frysk/hpd/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       Moved frysk.rt.Line to frysk.scopes.SourceLocation.
    +       * StepNextiCommand.java:
    +       * StepNextCommand.java: Updated.
    +       * StepInstructionCommand.java: Updated.
    +       * StepFinishCommand.java: Updated.
    +       * StepCommand.java: Updated.
    +       * ListCommand.java: Updated.
    +
    
    frysk-core/frysk/scopes/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * SourceLocation.java: Moved frysk.rt.Line to here.
    +
    
    frysk-core/frysk/stepping/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       Moved frysk.rt.Line to frysk.scopes.SourceLocation.
    +       * TestSteppingEngine.java: Updated.
    +       * TestStepping.java: Updated.
    +
    
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       Moved frysk.rt.Line to frysk.scopes.SourceLocation.
    +       * SourceView.java: Updated.
    +       * SourceWindow.java: Updated.
    +       * SourceBuffer.java: Updated.
    +       * InlineBuffer.java: Updated.
    +       * CurrentStackView.java: Updated.
    +

commit 7a68bcfd27178606d8b6d87c3157db9923afed29
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Thu Dec 13 11:55:46 2007 -0500

    swagiaal: Changed DwarfDie.getDeclFile() now returns File.
    
    frysk-core/frysk/hpd/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       DwarfDie.getDeclFile() now returns File.
    +       * ListCommand.java (interpret): Updated
    +
    
    frysk-sys/lib/dwfl/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * DwarfDie.java (getDeclFile): Now returns File.
    +

commit dbdf67198aca66cdd1f84ad68def57fe6ad0d425
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date:   Thu Dec 13 11:49:10 2007 -0500

    swagiaal: Changed DwarfDiegetDeclLine() to return int.
    
    frysk-sys/lib/dwfl/ChangeLog
    +2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
    +
    +       * DwarfDie.java (getDeclLine): Now returns int instead of long.
    +       * cni/DwarfDie.cxx (DwarfDie::get_decl_line): returns int
    +       instead of long.
    +

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

Summary of changes:
 .project                                           |   86 +++++++++++++++++++-
 frysk-core/frysk/debuginfo/ChangeLog               |   15 ++++
 frysk-core/frysk/debuginfo/DebugInfoFrame.java     |   31 +++++--
 .../frysk/debuginfo/TestDebugInfoStackTrace.java   |   16 ++--
 .../TestObjectDeclarationSearchEngine.java         |    2 +-
 frysk-core/frysk/debuginfo/TypeEntry.java          |   30 ++++----
 frysk-core/frysk/dom/ChangeLog                     |    5 +
 frysk-core/frysk/dom/DOMFactory.java               |    5 +-
 frysk-core/frysk/dom/DOMImage.java                 |    4 +-
 frysk-core/frysk/expr/ChangeLog                    |    4 +
 frysk-core/frysk/expr/TestbedSymTab.java           |   25 +++---
 frysk-core/frysk/hpd/ChangeLog                     |   15 ++++
 frysk-core/frysk/hpd/ListCommand.java              |   10 ++-
 frysk-core/frysk/hpd/StepCommand.java              |    4 +-
 frysk-core/frysk/hpd/StepFinishCommand.java        |    4 +-
 frysk-core/frysk/hpd/StepInstructionCommand.java   |    4 +-
 frysk-core/frysk/hpd/StepNextCommand.java          |    4 +-
 frysk-core/frysk/hpd/StepNextiCommand.java         |    4 +-
 frysk-core/frysk/rt/ChangeLog                      |    4 +
 frysk-core/frysk/rt/{Line.java => LineXXX.java}    |   48 +++---------
 frysk-core/frysk/scopes/ChangeLog                  |   12 +++
 .../{LineColPair.java => SourceLocation.java}      |   41 +++++++---
 frysk-core/frysk/stepping/ChangeLog                |    6 ++
 frysk-core/frysk/stepping/TestStepping.java        |   44 +++++-----
 frysk-core/frysk/stepping/TestSteppingEngine.java  |   23 +++---
 frysk-core/frysk/value/ChangeLog                   |   12 +++
 frysk-core/frysk/value/CompositeType.java          |   43 +++++-----
 frysk-core/frysk/value/EnumType.java               |    6 +-
 frysk-core/frysk/value/ObjectDeclaration.java      |    4 +-
 frysk-core/frysk/value/TestComposite.java          |   78 +++++++++---------
 frysk-core/frysk/value/Variable.java               |   18 +++--
 frysk-gui/frysk/gui/srcwin/ChangeLog               |   17 ++++
 frysk-gui/frysk/gui/srcwin/CurrentStackView.java   |   15 ++--
 frysk-gui/frysk/gui/srcwin/InlineBuffer.java       |   16 ++--
 frysk-gui/frysk/gui/srcwin/SourceBuffer.java       |   75 +++++++++--------
 frysk-gui/frysk/gui/srcwin/SourceView.java         |    8 +-
 frysk-gui/frysk/gui/srcwin/SourceWindow.java       |   35 ++++----
 frysk-sys/lib/dwfl/ChangeLog                       |   17 ++++
 frysk-sys/lib/dwfl/DwarfDie.java                   |   36 +++++++-
 frysk-sys/lib/dwfl/cni/DwarfDie.cxx                |    4 +-
 40 files changed, 536 insertions(+), 294 deletions(-)
 mode change 120000 => 100644 .project
 rename frysk-core/frysk/rt/{Line.java => LineXXX.java} (80%)
 rename frysk-core/frysk/scopes/{LineColPair.java => SourceLocation.java} (78%)

First 500 lines of diff:
diff --git a/.project b/.project
deleted file mode 120000
index d59caed..9c5213b
--- a/.project
+++ /dev/null
@@ -1 +0,0 @@
-frysk-top/.project
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index d59caed..9c5213b
--- /dev/null
+++ b/.project
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>frysk.patches</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value><project>/.externalToolBuilders/Create Bin dir.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value><project>/.externalToolBuilders/Autogen.sh.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value><project>/.externalToolBuilders/Make.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value><project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value><project>/.externalToolBuilders/Make Check.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>clean,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value><project>/.externalToolBuilders/Cleaner.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>build</name>
+			<type>2</type>
+			<locationURI>build</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index aef00ea..c38d9f8 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,18 @@
+2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* TypeEntry.java: Use SourceLocation instead of LineColPair.
+	* TestObjectDeclarationSearchEngine.java: Ditto.
+
+2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com> 
+
+	* DebugInfoFrame.java (getLineXXX): New function.
+	
+2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	Moved frysk.rt.Line to frysk.scopes.SourceLocation.
+	* TestDebugInfoStackTrace.java: Updated.
+	* DebugInfoFrame.java: Updated.
+
 2007-12-11  Andrew Cagney  <cagney@redhat.com>
 	
 	* DebugInfoFrame.java (getLine()): Replace getLines().
diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
index 4355846..8f2229e 100644
--- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java
+++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
@@ -48,7 +48,8 @@ import lib.dwfl.Dwfl;
 import lib.dwfl.DwflDieBias;
 import lib.dwfl.DwflLine;
 import frysk.dwfl.DwflCache;
-import frysk.rt.Line;
+import frysk.rt.LineXXX;
+import frysk.scopes.SourceLocation;
 import frysk.scopes.Scope;
 import frysk.scopes.ScopeFactory;
 import frysk.scopes.Subprogram;
@@ -164,7 +165,7 @@ public class DebugInfoFrame extends FrameDecorator {
      * lack of line-number information can be determined with the
      * test: <<tt>>.getLine() == Line.NULL</tt>.
      */
-    public Line getLine() {
+    public SourceLocation getLine() {
 	if (this.line == null) {
 	    Dwfl dwfl = DwflCache.getDwfl(this.getTask());
   	    // The innermost frame and frames which were
@@ -182,18 +183,30 @@ public class DebugInfoFrame extends FrameDecorator {
   		    File parent = new File(dwflLine.getCompilationDir());
   		    f = new File(parent, dwflLine.getSourceFile());
 		}
-  		this.line = new Line(f, dwflLine.getLineNum(),
-				     dwflLine.getColumn(),
-				     this.getTask().getProc());
+  		this.line = new SourceLocation(f, dwflLine.getLineNum(),
+				     dwflLine.getColumn());
 	    }
 	    // If the fetch failed, mark it as unknown.
 	    if (this.line == null)
-		this.line = Line.UNKNOWN;
+		this.line = SourceLocation.UNKNOWN;
         }
 	return this.line;
     }
-    private Line line;
+    private SourceLocation line;
 
+    /**
+     * XXX: This function should not be used DOM information (LineXXX)
+     * should be moved out of DebugInfoFrame.
+     * @return
+     */
+    public LineXXX getLineXXX(){
+	if(this.lineXXX == null){
+	    this.lineXXX = new LineXXX(this.getLine(), this.getTask().getProc());
+	}
+	return lineXXX;
+    }
+    LineXXX lineXXX;
+    
     public void toPrint(PrintWriter writer, boolean printParameters,
 		 boolean fullpath){
         Subprogram subprogram = this.getSubprogram();
@@ -214,12 +227,12 @@ public class DebugInfoFrame extends FrameDecorator {
 	    writer.print(") ");
           
 	    if (fullpath) {
-		Line line = this.getLine();
+		SourceLocation line = this.getLine();
 		writer.print(line.getFile().getPath());
 		writer.print("#");
 		writer.print(line.getLine());
 	    } else {
-		Line line = this.getLine();
+		SourceLocation 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 38ec790..2854d88 100644
--- a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
+++ b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java
@@ -49,7 +49,7 @@ import frysk.event.Event;
 import frysk.proc.Manager;
 import frysk.proc.Proc;
 import frysk.proc.Task;
-import frysk.rt.Line;
+import frysk.scopes.SourceLocation;
 import frysk.stack.Frame;
 import frysk.stack.StackFactory;
 import frysk.stepping.SteppingEngine;
@@ -146,7 +146,7 @@ public class TestDebugInfoStackTrace
   private void firstTestBacktraceAssertions ()
   {
     DebugInfoFrame frame = DebugInfoStackFactory.createDebugInfoStackTrace(myTask);
-    Line line;
+    SourceLocation line;
     Symbol symbol;
 
     assertNotNull(frame);
@@ -328,13 +328,13 @@ public class TestDebugInfoStackTrace
 
     DebugInfoFrame frame = DebugInfoStackFactory.createDebugInfoStackTrace(myTask);
     
-    if (frame.getLine() == Line.UNKNOWN) {
+    if (frame.getLine() == SourceLocation.UNKNOWN) {
         this.lineMap.put(myTask, new Integer(0));
         steppingEngine.stepLine(myTask.getProc().getTasks());
         return;
       }
       
-    Line line = frame.getLine();
+    SourceLocation line = frame.getLine();
     this.lineMap.put(myTask, new Integer(line.getLine()));
     steppingEngine.stepLine(myTask.getProc().getTasks());
   }
@@ -503,13 +503,13 @@ public class TestDebugInfoStackTrace
   public void pushPopAssertions ()
   {
     DebugInfoFrame sFrame = DebugInfoStackFactory.createDebugInfoStackTrace(myTask);
-    Line line = null; 
+    SourceLocation line = null; 
     
     if (this.testState == PUSH || this.testState == POP)
       {
 
         int lineNum;
-            if (sFrame.getLine() == Line.UNKNOWN)
+            if (sFrame.getLine() == SourceLocation.UNKNOWN)
               {
                 lineNum = 0;
               }
@@ -652,7 +652,7 @@ public class TestDebugInfoStackTrace
           {
             frameTracker[task_count][i][0] = "" + frame.toString();
             
-            if (frame.getLine() != Line.UNKNOWN)
+            if (frame.getLine() != SourceLocation.UNKNOWN)
               frameTracker[task_count][i][1] = frame.getLine().getFile().getAbsolutePath();
             else
               frameTracker[task_count][i][1] = "";
@@ -664,7 +664,7 @@ public class TestDebugInfoStackTrace
             else
               frameTracker[task_count][i][3] = "" + frame.getInner().toString();
             
-            if (frame.getLine() != Line.UNKNOWN)
+            if (frame.getLine() != SourceLocation.UNKNOWN)
               frameTracker[task_count][i][4] = "" + frame.getLine().getLine();
             else
               frameTracker[task_count][i][4] = "" + 0;
diff --git a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
index aec571f..11ca3ff 100644
--- a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
+++ b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
@@ -170,7 +170,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 
 	assertNotNull("Variable found", objectDeclaration);
 	assertEquals("Correct name", variableName, objectDeclaration.getName() );
-	assertEquals("Found the correct variable on the correct line ", variableLine, objectDeclaration.getLineCol().getLine());
+	assertEquals("Found the correct variable on the correct line ", variableLine, objectDeclaration.getSourceLocation().getLine());
 	
 	//Negative test:
 	try {
diff --git a/frysk-core/frysk/debuginfo/TypeEntry.java b/frysk-core/frysk/debuginfo/TypeEntry.java
index 8d8391a..9d9ed3b 100644
--- a/frysk-core/frysk/debuginfo/TypeEntry.java
+++ b/frysk-core/frysk/debuginfo/TypeEntry.java
@@ -40,7 +40,7 @@
 package frysk.debuginfo;
 
 import frysk.isa.ISA;
-import frysk.scopes.LineColPair;
+import frysk.scopes.SourceLocation;
 import frysk.value.Access;
 import frysk.value.ArrayType;
 import frysk.value.CharType;
@@ -155,11 +155,11 @@ public class TypeEntry
 
 	    }
 	    
-	    LineColPair lineColPair;
+	    SourceLocation sourceLocation;
 	    try{
-		lineColPair = new LineColPair(member.getDeclLine(), member.getDeclColumn());
+		sourceLocation = new SourceLocation(member.getDeclFile(), member.getDeclLine(), member.getDeclColumn());
 	    }catch(DwAttributeNotFoundException e){
-		lineColPair = new LineColPair(-1,-1);
+		sourceLocation = SourceLocation.UNKNOWN;
 	    }
 	    
 	    Access access = null;
@@ -172,9 +172,9 @@ public class TypeEntry
 	    if (member.getTag() == DwTag.SUBPROGRAM) {
 		Value v = getSubprogramValue(member);
 		if(hasArtifitialParameter(member)){
-		    classType.addMember(member.getName(), lineColPair, v.getType(), offset, access);
+		    classType.addMember(member.getName(), sourceLocation, v.getType(), offset, access);
 		}else{
-		    classType.addStaticMember(locationExpression, member.getName(), lineColPair, v.getType(), offset, access);
+		    classType.addStaticMember(locationExpression, member.getName(), sourceLocation, v.getType(), offset, access);
 		}
 		continue;
 	    }
@@ -192,18 +192,18 @@ public class TypeEntry
 		    int bitOffset = member
 		    .getAttrConstant(DwAt.BIT_OFFSET);
 		    if(staticMember){
-			classType.addStaticBitFieldMember(locationExpression, member.getName(), lineColPair, memberType, offset, access,
+			classType.addStaticBitFieldMember(locationExpression, member.getName(), sourceLocation, memberType, offset, access,
 				    bitOffset, bitSize);
 		    }else{
-			classType.addBitFieldMember(member.getName(), lineColPair, memberType, offset, access,
+			classType.addBitFieldMember(member.getName(), sourceLocation, memberType, offset, access,
 				    bitOffset, bitSize);
 		    }
 		}
 		else{
 		    if(staticMember){
-			classType.addStaticMember(locationExpression, member.getName(), lineColPair, memberType, offset, access);
+			classType.addStaticMember(locationExpression, member.getName(), sourceLocation, memberType, offset, access);
 		    }else{
-			classType.addMember(member.getName(), lineColPair, memberType, offset, access);
+			classType.addMember(member.getName(), sourceLocation, memberType, offset, access);
 		    }
 		    
 		}
@@ -211,10 +211,10 @@ public class TypeEntry
 	    }
 	    else{
 		if(staticMember){
-		    classType.addStaticMember(locationExpression, member.getName(), lineColPair, new UnknownType(member
+		    classType.addStaticMember(locationExpression, member.getName(), sourceLocation, new UnknownType(member
 			.getName()), offset, access);
 		}else{
-		    classType.addMember(member.getName(), lineColPair, new UnknownType(member
+		    classType.addMember(member.getName(), sourceLocation, new UnknownType(member
 				.getName()), offset, access);
 		}
 	    }
@@ -263,11 +263,11 @@ public class TypeEntry
 		offset = 0; // union
 	    }
 
-	    LineColPair lineColPair;
+	    SourceLocation lineColPair;
 	    try{
-		lineColPair = new LineColPair(member.getDeclLine(), member.getDeclColumn());
+		lineColPair = new SourceLocation(member.getDeclFile(),member.getDeclLine(), member.getDeclColumn());
 	    }catch(DwAttributeNotFoundException e){
-		lineColPair = new LineColPair(-1,-1);
+		lineColPair = SourceLocation.UNKNOWN;
 	    }
 	    
 	    Access access = null;
diff --git a/frysk-core/frysk/dom/ChangeLog b/frysk-core/frysk/dom/ChangeLog
index 8665866..bebfb75 100644
--- a/frysk-core/frysk/dom/ChangeLog
+++ b/frysk-core/frysk/dom/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	Moved frysk.rt.Line to frysk.scopes.SourceLocation.
+	* DOMFactory.java: Updated.
+
 2007-12-11  Andrew Cagney  <cagney@redhat.com>
 
 	* DOMFactory.java: Update, DebugInfoFrame.getLines() replaced by
diff --git a/frysk-core/frysk/dom/DOMFactory.java b/frysk-core/frysk/dom/DOMFactory.java
index 88222af..28a8bfc 100644
--- a/frysk-core/frysk/dom/DOMFactory.java
+++ b/frysk-core/frysk/dom/DOMFactory.java
@@ -42,7 +42,8 @@ package frysk.dom;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
-import frysk.rt.Line;
+
+import frysk.scopes.SourceLocation;
 import frysk.debuginfo.DebugInfoFrame;
 import frysk.proc.Proc;
 
@@ -57,7 +58,7 @@ public class DOMFactory
   {
     DOMFrysk dom = null;
 
-    if (frame.getLine() == Line.UNKNOWN)
+    if (frame.getLine() == SourceLocation.UNKNOWN)
       return null;
     
     File file = frame.getLine().getFile();
diff --git a/frysk-core/frysk/dom/DOMImage.java b/frysk-core/frysk/dom/DOMImage.java
index 9dd8dea..41e2837 100644
--- a/frysk-core/frysk/dom/DOMImage.java
+++ b/frysk-core/frysk/dom/DOMImage.java
@@ -49,7 +49,7 @@ import java.util.Iterator;
 
 import frysk.dom.cparser.CDTParser;
 import frysk.proc.Proc;
-import frysk.rt.Line;
+import frysk.scopes.SourceLocation;
 
 import org.jdom.Element;
 
@@ -121,7 +121,7 @@ public class DOMImage
      * 
      */
 	
-    public DOMSource addSource (Proc proc, Line line, DOMFrysk dom) throws IOException
+    public DOMSource addSource (Proc proc, SourceLocation line, DOMFrysk dom) throws IOException
     {
 //    Get the list of include file paths associated with this image
       ArrayList arrayincpaths = DOMCommon.getIncludePaths(proc.getExe());
diff --git a/frysk-core/frysk/expr/ChangeLog b/frysk-core/frysk/expr/ChangeLog
index 01f7557..dd7057d 100644
--- a/frysk-core/frysk/expr/ChangeLog
+++ b/frysk-core/frysk/expr/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* TestbedSymTab.java (scratchSourceLocation): use SourceLocation.
+
 2007-12-11  Andrew Cagney  <cagney@redhat.com>
 
 	* TestArithmetics.java (checkErrorExpr(String,String)): New.
diff --git a/frysk-core/frysk/expr/TestbedSymTab.java b/frysk-core/frysk/expr/TestbedSymTab.java
index 7a96973..4391ac4 100644
--- a/frysk-core/frysk/expr/TestbedSymTab.java
+++ b/frysk-core/frysk/expr/TestbedSymTab.java
@@ -39,31 +39,32 @@
 
 package frysk.expr;
 
-import java.util.Iterator;
 import inua.eio.ByteBuffer;
 import inua.eio.ByteOrder;
+
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 
 import frysk.Config;
-import frysk.scopes.LineColPair;
+import frysk.scopes.SourceLocation;
+import frysk.value.ClassType;
 import frysk.value.ObjectDeclaration;
+import frysk.value.ScratchLocation;
+import frysk.value.StandardTypes;
 import frysk.value.Type;
 import frysk.value.Value;
 import frysk.value.Variable;
-import java.util.HashMap;
-import frysk.value.StandardTypes;
-import frysk.value.ClassType;
-import frysk.value.ScratchLocation;
 
 class TestbedSymTab implements ExprSymTab {
-    private final LineColPair scratchLineColPair = new LineColPair(0,0);
+    private final SourceLocation scratchSourceLocation = SourceLocation.UNKNOWN;
     
     private Type classType = new ClassType(null, 12)
-	.addMember("alpha", scratchLineColPair, StandardTypes.INT32B_T, 0, null)
-	.addMember("beta", scratchLineColPair, StandardTypes.INT32B_T, 4, null)
-	.addMember("gamma", scratchLineColPair, StandardTypes.INT16B_T, 8, null)
-	.addBitFieldMember("iota", scratchLineColPair, StandardTypes.INT32B_T, 8, null, 16, 8) // 0x0000ff00
-	.addBitFieldMember("epsilon", scratchLineColPair, StandardTypes.INT32B_T, 8, null, 24, 8); // 0x000000ff
+	.addMember("alpha", scratchSourceLocation, StandardTypes.INT32B_T, 0, null)
+	.addMember("beta", scratchSourceLocation, StandardTypes.INT32B_T, 4, null)
+	.addMember("gamma", scratchSourceLocation, StandardTypes.INT16B_T, 8, null)
+	.addBitFieldMember("iota", scratchSourceLocation, StandardTypes.INT32B_T, 8, null, 16, 8) // 0x0000ff00
+	.addBitFieldMember("epsilon", scratchSourceLocation, StandardTypes.INT32B_T, 8, null, 24, 8); // 0x000000ff
     private byte[] buf = {
 	0x01, 0x02, 0x03, 0x04, // alpha
 	0x05, 0x06, 0x07, 0x08, // beta
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 2e671e9..cae4d71 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,18 @@
+2007-12-13  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	Moved frysk.rt.Line to frysk.scopes.SourceLocation.
+	* StepNextiCommand.java: 


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



More information about the Frysk-cvs mailing list