Store status in flagactionnode

diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index ee17a31785f18b4d4cc0fefbca8d8119dc4b5315..e01e1d309058899053b66ad1bc79eca74a77e0df 100644 (file)
--- 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 41b93f406702464ffa6cc0c49c1492b9cb3fdf27..c79c492fc27053aa325f0729532aac0e466c9aad 100644 (file)
--- 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;
     }