From 668d2ed757152a1870cd09dd7edff6b4f4b84175 Mon Sep 17 00:00:00 2001
From: jjenista <jjenista>
Date: Fri, 29 Feb 2008 22:33:22 +0000
Subject: [PATCH] Made FlatNode child classes have more descriptive toString()
 methods to be able to distinguish them during graph traversal.

---
 Robust/src/IR/Flat/FlatCall.java           | 2 +-
 Robust/src/IR/Flat/FlatCastNode.java       | 2 +-
 Robust/src/IR/Flat/FlatCondBranch.java     | 2 +-
 Robust/src/IR/Flat/FlatElementNode.java    | 2 +-
 Robust/src/IR/Flat/FlatFieldNode.java      | 2 +-
 Robust/src/IR/Flat/FlatFlagActionNode.java | 2 +-
 Robust/src/IR/Flat/FlatGlobalConvNode.java | 6 ++++--
 Robust/src/IR/Flat/FlatLiteralNode.java    | 6 ++++--
 Robust/src/IR/Flat/FlatMethod.java         | 7 +++++--
 Robust/src/IR/Flat/FlatNew.java            | 8 ++++----
 Robust/src/IR/Flat/FlatOpNode.java         | 8 +++++---
 Robust/src/IR/Flat/FlatReturnNode.java     | 2 +-
 Robust/src/IR/Flat/FlatSetElementNode.java | 2 +-
 Robust/src/IR/Flat/FlatSetFieldNode.java   | 2 +-
 Robust/src/IR/Flat/FlatTagDeclaration.java | 2 +-
 15 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/Robust/src/IR/Flat/FlatCall.java b/Robust/src/IR/Flat/FlatCall.java
index e05e86e4..439a14fa 100644
--- a/Robust/src/IR/Flat/FlatCall.java
+++ b/Robust/src/IR/Flat/FlatCall.java
@@ -35,7 +35,7 @@ public class FlatCall extends FlatNode {
     }
 
     public String toString() {
-	String st="";
+	String st="FlatCall_";
 	if (dst==null) {
 	    if (method==null)
 		st+="null(";
diff --git a/Robust/src/IR/Flat/FlatCastNode.java b/Robust/src/IR/Flat/FlatCastNode.java
index f7b61f7c..e32f9cbd 100644
--- a/Robust/src/IR/Flat/FlatCastNode.java
+++ b/Robust/src/IR/Flat/FlatCastNode.java
@@ -13,7 +13,7 @@ public class FlatCastNode extends FlatNode {
     }
 
     public String toString() {
-	return dst.toString()+"=("+type.toString()+")"+src.toString();
+	return "FlatCastNode_"+dst.toString()+"=("+type.toString()+")"+src.toString();
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatCondBranch.java b/Robust/src/IR/Flat/FlatCondBranch.java
index 7531acb2..86770bc9 100644
--- a/Robust/src/IR/Flat/FlatCondBranch.java
+++ b/Robust/src/IR/Flat/FlatCondBranch.java
@@ -30,7 +30,7 @@ public class FlatCondBranch extends FlatNode {
     }
 
     public String toString(String negjump) {
-	return "if (!"+test_cond.toString()+") goto "+negjump;
+	return "FlatCondBranch_if (!"+test_cond.toString()+") goto "+negjump;
     }
 
     public void addNext(FlatNode n) {
diff --git a/Robust/src/IR/Flat/FlatElementNode.java b/Robust/src/IR/Flat/FlatElementNode.java
index 6edc297b..bdb91881 100644
--- a/Robust/src/IR/Flat/FlatElementNode.java
+++ b/Robust/src/IR/Flat/FlatElementNode.java
@@ -29,7 +29,7 @@ public class FlatElementNode extends FlatNode {
     }
 
     public String toString() {
-	return dst.toString()+"="+src.toString()+"["+index.toString()+"]";
+	return "FlatElementNode_"+dst.toString()+"="+src.toString()+"["+index.toString()+"]";
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatFieldNode.java b/Robust/src/IR/Flat/FlatFieldNode.java
index 8f1cf14a..84244765 100644
--- a/Robust/src/IR/Flat/FlatFieldNode.java
+++ b/Robust/src/IR/Flat/FlatFieldNode.java
@@ -25,7 +25,7 @@ public class FlatFieldNode extends FlatNode {
     }
 
     public String toString() {
-	return dst.toString()+"="+src.toString()+"."+field.getSymbol();
+	return "FlatFieldNode_"+dst.toString()+"="+src.toString()+"."+field.getSymbol();
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatFlagActionNode.java b/Robust/src/IR/Flat/FlatFlagActionNode.java
index dace7c43..081b36b0 100644
--- a/Robust/src/IR/Flat/FlatFlagActionNode.java
+++ b/Robust/src/IR/Flat/FlatFlagActionNode.java
@@ -87,7 +87,7 @@ public class FlatFlagActionNode extends FlatNode {
     }
 
     public String toString() {
-	String st="FlatFlagActionNode";
+	String st="FlatFlagActionNode_";
 	for(Iterator it=tempflagpairs.keySet().iterator();it.hasNext();) {
 	    TempFlagPair tfp=(TempFlagPair)it.next();
 	    st+=getFlagChange(tfp)?"":"!";
diff --git a/Robust/src/IR/Flat/FlatGlobalConvNode.java b/Robust/src/IR/Flat/FlatGlobalConvNode.java
index ea61e84c..0d189446 100644
--- a/Robust/src/IR/Flat/FlatGlobalConvNode.java
+++ b/Robust/src/IR/Flat/FlatGlobalConvNode.java
@@ -14,10 +14,12 @@ public class FlatGlobalConvNode extends FlatNode {
     }
 
     public String toString() {
+	String str = "FlatGlobalConvNode_"+src.toString();
 	if (makePtr)
-	    return src.toString()+"=(PTR)"+src.toString()+" "+lb;
+	    str += "=(PTR)";
 	else
-	    return src.toString()+"=(OID)"+src.toString()+" "+lb;
+	    str += "=(OID)";
+	return str+src.toString()+" "+lb;
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatLiteralNode.java b/Robust/src/IR/Flat/FlatLiteralNode.java
index 93b814b4..58514317 100644
--- a/Robust/src/IR/Flat/FlatLiteralNode.java
+++ b/Robust/src/IR/Flat/FlatLiteralNode.java
@@ -25,10 +25,12 @@ public class FlatLiteralNode extends FlatNode {
     }
 
     public String toString() {
+	String str = "FlatLiteralNode_"+dst;
 	if (value==null)
-	    return dst+"=null";
+	    str += "=null";
 	else
-	    return dst+"="+escapeString(value.toString());
+	    str += "="+escapeString(value.toString());
+	return str;
     }
     protected static String escapeString(String st) {
 	String new_st="";
diff --git a/Robust/src/IR/Flat/FlatMethod.java b/Robust/src/IR/Flat/FlatMethod.java
index 2838da06..6d05bee8 100644
--- a/Robust/src/IR/Flat/FlatMethod.java
+++ b/Robust/src/IR/Flat/FlatMethod.java
@@ -27,10 +27,13 @@ public class FlatMethod extends FlatNode {
     }
 
     public String toString() {
+	String ret = "FlatMethod_";
 	if( method != null ) {
-	    return method.toString();
+	    ret += method.toString();
+	} else {
+	    ret += task.toString();
 	}
-	return task.toString();
+	return ret;
     }
 
     public MethodDescriptor getMethod() {
diff --git a/Robust/src/IR/Flat/FlatNew.java b/Robust/src/IR/Flat/FlatNew.java
index f728e2ef..48737ecb 100644
--- a/Robust/src/IR/Flat/FlatNew.java
+++ b/Robust/src/IR/Flat/FlatNew.java
@@ -26,10 +26,10 @@ public class FlatNew extends FlatNode {
     }
 
     public String toString() {
-	if (size==null)
-	    return dst.toString()+"= NEW "+type.toString();
-	else
-	    return dst.toString()+"= NEW "+type.toString()+"["+size.toString()+"]";
+	String str = "FlatNew_"+dst.toString()+"= NEW "+type.toString();
+	if (size!=null)
+	    str += "["+size.toString()+"]";
+	return str;
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatOpNode.java b/Robust/src/IR/Flat/FlatOpNode.java
index 4c8bcbaa..5cd20068 100644
--- a/Robust/src/IR/Flat/FlatOpNode.java
+++ b/Robust/src/IR/Flat/FlatOpNode.java
@@ -32,12 +32,14 @@ public class FlatOpNode extends FlatNode {
     }
 
     public String toString() {
+	String str = "FlatOpNode_"+dest.toString();
 	if (right!=null)
-	    return dest.toString()+"="+left.toString()+op.toString()+right.toString();
+	    str += "="+left.toString()+op.toString()+right.toString();
 	else if (op.getOp()==Operation.ASSIGN)
-	    return dest.toString()+" = "+left.toString();
+	    str += " = "+left.toString();
 	else
-	    return dest.toString()+" "+op.toString() +" "+left.toString();
+	    str += " "+op.toString() +" "+left.toString();
+	return str;
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatReturnNode.java b/Robust/src/IR/Flat/FlatReturnNode.java
index ec323f04..fb2d3b97 100644
--- a/Robust/src/IR/Flat/FlatReturnNode.java
+++ b/Robust/src/IR/Flat/FlatReturnNode.java
@@ -8,7 +8,7 @@ public class FlatReturnNode extends FlatNode {
     }
 
     public String toString() {
-	return "return "+tempdesc;
+	return "FlatReturnNode_return "+tempdesc;
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatSetElementNode.java b/Robust/src/IR/Flat/FlatSetElementNode.java
index c231e079..d7e748e8 100644
--- a/Robust/src/IR/Flat/FlatSetElementNode.java
+++ b/Robust/src/IR/Flat/FlatSetElementNode.java
@@ -29,7 +29,7 @@ public class FlatSetElementNode extends FlatNode {
     }
 
     public String toString() {
-	return dst.toString()+"["+index.toString()+"]="+src.toString();
+	return "FlatSetElementNode_"+dst.toString()+"["+index.toString()+"]="+src.toString();
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatSetFieldNode.java b/Robust/src/IR/Flat/FlatSetFieldNode.java
index b1742479..e34de29b 100644
--- a/Robust/src/IR/Flat/FlatSetFieldNode.java
+++ b/Robust/src/IR/Flat/FlatSetFieldNode.java
@@ -25,7 +25,7 @@ public class FlatSetFieldNode extends FlatNode {
     }
 
     public String toString() {
-	return dst.toString()+"."+field.getSymbol()+"="+src.toString();
+	return "FlatSetFieldNode_"+dst.toString()+"."+field.getSymbol()+"="+src.toString();
     }
 
     public int kind() {
diff --git a/Robust/src/IR/Flat/FlatTagDeclaration.java b/Robust/src/IR/Flat/FlatTagDeclaration.java
index 78ada705..0e48da4d 100644
--- a/Robust/src/IR/Flat/FlatTagDeclaration.java
+++ b/Robust/src/IR/Flat/FlatTagDeclaration.java
@@ -11,7 +11,7 @@ public class FlatTagDeclaration extends FlatNode {
     }
 
     public String toString() {
-	return dst.toString()+"= new Tag("+type.toString()+")";
+	return "FlatTagDeclaration_"+dst.toString()+"= new Tag("+type.toString()+")";
     }
 
     public int kind() {
-- 
2.34.1