[SCM] master: Eliminate Type.isTypedef and Type.setTypedefFIXME. (5311)

[SCM] master: Eliminate Type.isTypedef and Type.setTypedefFIXME. (5311)

[scox]

The branch, master has been updated
       via  e885dc3eb4142c9a1787b55c0dc33a30b7a07b1f (commit)
      from  fd5a20b87a3d6c171fe8888b6d006b9241f1928c (commit)

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

- Log -----------------------------------------------------------------
commit e885dc3eb4142c9a1787b55c0dc33a30b7a07b1f
Author: Stan Cox <scox@redhat.com>
Date:   Mon Nov 19 15:23:58 2007 -0500

    Eliminate Type.isTypedef and Type.setTypedefFIXME. (5311)
    
    * Type.java (isTypedef): Delete.
    (setTypedefFIXME): Delete.
    * CompositeType.java (toPrint): Remove isTypedef reference.
    * TypeEntry.java (getType): Remove setTypedefFIXME from STRUCTURE_TYPE_.

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

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog      |    4 ++++
 frysk-core/frysk/debuginfo/TypeEntry.java |    8 ++------
 frysk-core/frysk/value/ChangeLog          |    6 ++++++
 frysk-core/frysk/value/CompositeType.java |   11 +----------
 frysk-core/frysk/value/Type.java          |   18 ------------------
 5 files changed, 13 insertions(+), 34 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index b21149f..511f81f 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-19  Stan Cox  <scox@redhat.com>
+
+	* TypeEntry.java (getType): Remove setTypedefFIXME from STRUCTURE_TYPE_.
+
 2007-11-17  Andrew Cagney  <cagney@redhat.com>
 
 	* DebugInfo.java (printNoSymbolTable(String,boolean)): Delete.
diff --git a/frysk-core/frysk/debuginfo/TypeEntry.java b/frysk-core/frysk/debuginfo/TypeEntry.java
index 5ba8c9a..8e7444a 100644
--- a/frysk-core/frysk/debuginfo/TypeEntry.java
+++ b/frysk-core/frysk/debuginfo/TypeEntry.java
@@ -325,12 +325,8 @@ public class TypeEntry
 	    break;
 	}
 	case DwTag.STRUCTURE_TYPE_: {
-	    boolean noTypeDef = (typeDie.getType() == null);
-	    String name = noTypeDef ? typeDie.getName() : typeDie.getType()
-		    .getName();
-	    GccStructOrClassType classType = getGccStructOrClassType(type, name);
-	    if (type != typeDie.getType() && noTypeDef == false)
-		classType.setTypedefFIXME(true);
+	    GccStructOrClassType classType = 
+		getGccStructOrClassType(type, typeDie.getName());
 	    returnType = classType;
 	    break;
 	}
diff --git a/frysk-core/frysk/value/ChangeLog b/frysk-core/frysk/value/ChangeLog
index 3b2cf17..a36eaef 100644
--- a/frysk-core/frysk/value/ChangeLog
+++ b/frysk-core/frysk/value/ChangeLog
@@ -1,5 +1,11 @@
 2007-11-19  Stan Cox  <scox@redhat.com>
 
+	* Type.java (isTypedef): Delete.
+	(setTypedefFIXME): Delete.
+	* CompositeType.java (toPrint): Remove isTypedef reference.
+
+2007-11-19  Stan Cox  <scox@redhat.com>
+
 	* Type.java (toPrint(PrintWriter, Location, ByteBuffer, Format, int)):
 	Add indent parameter.  Change all implementers.
 	(toPrint(PrintWriter writer, int indent)): Likewise.
diff --git a/frysk-core/frysk/value/CompositeType.java b/frysk-core/frysk/value/CompositeType.java
index 7bc3c43..27de857 100644
--- a/frysk-core/frysk/value/CompositeType.java
+++ b/frysk-core/frysk/value/CompositeType.java
@@ -283,13 +283,6 @@ public abstract class CompositeType
     }
 
     public void toPrint(PrintWriter writer, int indentation) {
-	// FIXME: going away.
-	if (this.isTypedef() && this.getName() != null
-	    && this.getName().length() > 0) {
-	    writer.print(this.getName());
-	    return;
-	}
-
 	if (indentation == 0)
 	    indentation = 2;
 	String indentPrefix = "";
@@ -339,9 +332,7 @@ public abstract class CompositeType
 		}
 	    }
 	    writer.print(indentPrefix);
-	    if (member.type.isTypedef())
-		writer.print(member.type.getName());
-	    else if (member.type instanceof ArrayType) {
+	    if (member.type instanceof ArrayType) {
 		// For handling int x[2]
 		printName = false;
 		((ArrayType) member.type).toPrint(writer, member.name, indentation + 2);
diff --git a/frysk-core/frysk/value/Type.java b/frysk-core/frysk/value/Type.java
index 861e818..f9c16e7 100644
--- a/frysk-core/frysk/value/Type.java
+++ b/frysk-core/frysk/value/Type.java
@@ -58,13 +58,9 @@ public abstract class Type {
     // XXX: Is NAME a more target dependant attribute?
     private final String name;
   
-    // XXX: Not needed; made redundant by TypeDef.
-    private boolean isTypedef;
-
     Type (String name, int size) {
 	this.name = name;
 	this.size = size;
-	this.isTypedef = false;
     }
 
     public int getSize() {
@@ -176,20 +172,6 @@ public abstract class Type {
 	throw new InvalidOperatorException(this, "");
     }
 
-    public boolean isTypedef()
-    {
-	return isTypedef;
-    }
-
-    /**
-     * FIXME: Instead of setting the typedef, a TypeDef type can be
-     * created.
-     */
-    public void setTypedefFIXME(boolean isTypedef)
-    {
-	this.isTypedef = isTypedef;
-    }
-
     /**
      * Pack this TYPE into bigSize and bitOffset.
      */


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