Made FlatNode child classes have more descriptive toString()

methods to be able to distinguish them during graph traversal.

diff --git a/Robust/src/IR/Flat/FlatCall.java b/Robust/src/IR/Flat/FlatCall.java
index e05e86e4fddf19842d184c27d21f3577a0095763..439a14fadfa1de4033afe310d66edead075a669f 100644 (file)
--- 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 f7b61f7c720a502ba2e909fde898edc475d0e8b9..e32f9cbd927940f3c3270a657fef630f832c8d27 100644 (file)
--- 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 7531acb2cf7db4eae8ebb3d19989fe5358fa750c..86770bc9b4de138f666e133169f101c91f707f5f 100644 (file)
--- 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 6edc297bb4e3f005b4da4c8c6de3dace51253725..bdb91881ebba4d34350f94ddd238058760944bc5 100644 (file)
--- 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 8f1cf14a13e24e8578afad22f06bef6c75abef22..84244765e759cbf1fc324c7f8fe59ef7a2571465 100644 (file)
--- 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 dace7c433844b8b5971df9ca1ea4b30ebd09fccd..081b36b056f3615c222fcdb4286a8d3e9fbed6f8 100644 (file)
--- 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 ea61e84c3e8856169ca392702bbd7c3ea87696fe..0d189446ddd985fee0cfc62bd50747cf9b76b70d 100644 (file)
--- 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 93b814b41e311ec810fb420e9656c9275927c96b..585143176a89505838601cdbde8b5ad7770a7b0c 100644 (file)
--- 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 2838da06398c86eef83a939b29a5e4b637775544..6d05bee8fa11ce5388f7777a158f9982ff1fc528 100644 (file)
--- 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 f728e2ef9d0347d424c3015d094ff823bb1451ce..48737ecb3c918ad8ce28abaae4c54331dc388b76 100644 (file)
--- 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 4c8bcbaa28897cf089d3e666b28acaf98e1c30d4..5cd20068b18f8202fd36b5915253d7f482ac3edd 100644 (file)
--- 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 ec323f045f6a5ea43a59289dbaa6512663b0113c..fb2d3b978920befd79873b5d524183b51982fc81 100644 (file)
--- 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 c231e079fc1679458d8765906cc19f833b4cda13..d7e748e8037aecef3a23202577ad4efd70081f10 100644 (file)
--- 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 b1742479e233fea86bc8a05268ee6e25363d72ca..e34de29ba394449998f21a72b183ee4b2c8f1454 100644 (file)
--- 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 78ada705a0558388a0abecb661c6080685bc3634..0e48da4d3519254da9b10984c92e70632af2e370 100644 (file)
--- 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() {