From 613975b2f84525b77e68f32807c5b37ebf790b1e Mon Sep 17 00:00:00 2001 From: jjenista Date: Thu, 25 Mar 2010 20:12:18 +0000 Subject: [PATCH] print preds stacked for DOT --- Robust/src/Analysis/Disjoint/ExistPredSet.java | 16 ++++++++++++++++ Robust/src/Analysis/Disjoint/HeapRegionNode.java | 2 +- Robust/src/Analysis/Disjoint/RefEdge.java | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Robust/src/Analysis/Disjoint/ExistPredSet.java b/Robust/src/Analysis/Disjoint/ExistPredSet.java index 3d9ae6be..9e07aee0 100644 --- a/Robust/src/Analysis/Disjoint/ExistPredSet.java +++ b/Robust/src/Analysis/Disjoint/ExistPredSet.java @@ -108,6 +108,22 @@ public class ExistPredSet extends Canonical { return preds.hashCode(); } + + public String toStringEscNewline() { + String s = "P["; + + Iterator predItr = preds.iterator(); + while( predItr.hasNext() ) { + ExistPred pred = predItr.next(); + s += pred.toString(); + if( predItr.hasNext() ) { + s += " ||\\n"; + } + } + s += "]"; + return s; + } + public String toString() { String s = "P["; diff --git a/Robust/src/Analysis/Disjoint/HeapRegionNode.java b/Robust/src/Analysis/Disjoint/HeapRegionNode.java index 392eefb2..ddc50725 100644 --- a/Robust/src/Analysis/Disjoint/HeapRegionNode.java +++ b/Robust/src/Analysis/Disjoint/HeapRegionNode.java @@ -316,7 +316,7 @@ public class HeapRegionNode extends RefSrcNode { typeStr+"\\n"+ description+"\\n"+ alpha.toStringEscNewline( hideSubsetReach )+"\\n"+ - preds+"\"]" + preds.toStringEscNewline()+"\"]" ); } diff --git a/Robust/src/Analysis/Disjoint/RefEdge.java b/Robust/src/Analysis/Disjoint/RefEdge.java index c66b699d..8d8e09b0 100644 --- a/Robust/src/Analysis/Disjoint/RefEdge.java +++ b/Robust/src/Analysis/Disjoint/RefEdge.java @@ -226,7 +226,7 @@ public class RefEdge { type.toPrettyString()+"\\n"+ field+"\\n"+ beta.toStringEscNewline( hideSubsetReach )+"\\n"+ - preds.toString()+"\",decorate"+ + preds.toStringEscNewline()+"\",decorate"+ otherAttributes+"]" ); } -- 2.34.1