From: bdemsky <bdemsky>
Date: Wed, 13 Dec 2006 00:58:58 +0000 (+0000)
Subject: Store status in flagactionnode
X-Git-Tag: preEdgeChange~732
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=299e7c3aaee86b30d4fed62ee40dcf34e7be1642;p=IRC.git

Store status in flagactionnode
---

diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index ee17a317..e01e1d30 100644
--- a/Robust/src/IR/Flat/BuildFlat.java
+++ b/Robust/src/IR/Flat/BuildFlat.java
@@ -33,7 +33,7 @@ public class BuildFlat {
     private void flattenTask(TaskDescriptor td) {
 	BlockNode bn=state.getMethodBody(td);
 	FlatNode fn=flattenBlockNode(bn).getBegin();
-	FlatFlagActionNode ffan=new FlatFlagActionNode(false);
+	FlatFlagActionNode ffan=new FlatFlagActionNode(FlatFlagActionNode.PRE);
 	ffan.addNext(fn);
 	FlatMethod fm=new FlatMethod(td, ffan);
 
@@ -129,7 +129,7 @@ public class BuildFlat {
 	    FlatNode last=fn;
 
 	    if (con.getFlagEffects()!=null) {
-		FlatFlagActionNode ffan=new FlatFlagActionNode(false);
+		FlatFlagActionNode ffan=new FlatFlagActionNode(FlatFlagActionNode.NEWOBJECT);
 		FlagEffects fes=con.getFlagEffects();
 		TempDescriptor flagtemp=out_temp;
 		for(int j=0;j<fes.numEffects();j++) {
@@ -743,7 +743,7 @@ public class BuildFlat {
     }
 
     private NodePair flattenTaskExitNode(TaskExitNode ten) {
-	FlatFlagActionNode ffan=new FlatFlagActionNode(true);
+	FlatFlagActionNode ffan=new FlatFlagActionNode(FlatFlagActionNode.TASKEXIT);
 	updateFlagActionNode(ffan, ten.getFlagEffects());
 	NodePair fcn=flattenConstraintCheck(ten.getChecks());
 	ffan.addNext(fcn.getBegin());
diff --git a/Robust/src/IR/Flat/FlatFlagActionNode.java b/Robust/src/IR/Flat/FlatFlagActionNode.java
index 41b93f40..c79c492f 100644
--- a/Robust/src/IR/Flat/FlatFlagActionNode.java
+++ b/Robust/src/IR/Flat/FlatFlagActionNode.java
@@ -6,9 +6,13 @@ import java.util.Iterator;
 
 public class FlatFlagActionNode extends FlatNode {
     Hashtable tempflagpairs; 
-    boolean taskexit;
+    int taskexit;
+    public static final int NEWOBJECT=0;
+    public static final int PRE=1;
+    public static final int TASKEXIT=2;
 
-    public FlatFlagActionNode(boolean taskexit) {
+
+    public FlatFlagActionNode(int taskexit) {
 	tempflagpairs=new Hashtable();
 	this.taskexit=taskexit;
     }