X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FAnalysis%2FTaskStateAnalysis%2FTaskAnalysis.java;h=c5b626a943b54fb6fba5f91b1167de91791cc920;hb=e657f2b3171b3fa1c6af965d71b9cf32066e407a;hp=cb8cf7022d805352360dfdb71f492f5743ad202d;hpb=7878f13f1e1ef17792a12adf59fc4f89dacc8229;p=IRC.git

diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
index cb8cf702..c5b626a9 100644
--- a/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TaskAnalysis.java
@@ -47,7 +47,6 @@ public class TaskAnalysis {
 	for(Iterator it_classes=state.getClassSymbolTable().getDescriptorsIterator();it_classes.hasNext();) {
 		
 	    ClassDescriptor cd = (ClassDescriptor)it_classes.next();
-	    System.out.println(cd.getSymbol());
 	    Vector vFlags=new Vector();
 	    FlagDescriptor flag[];
 	    int ctr=0;
@@ -59,7 +58,6 @@ public class TaskAnalysis {
 		
 		for(Iterator it_cflags=superdesc.getFlags();it_cflags.hasNext();) {	
 		    FlagDescriptor fd = (FlagDescriptor)it_cflags.next();
-		    System.out.println(fd.toString());
 		    vFlags.add(fd);
 		}
 	    }
@@ -106,13 +104,6 @@ public class TaskAnalysis {
 	    ClassDescriptor cd=(ClassDescriptor)it_classes.next();
 	    externs=((Integer)extern_flags.get(cd)).intValue();
 	    FlagDescriptor[] fd=(FlagDescriptor[])flags.get(cd);
-
-	    //Debug block
-	    System.out.println("Inside taskAnalysis;\n Class:"+ cd.getSymbol());
-	    System.out.println("No of externs " + externs);
-	    System.out.println("No of flags: "+fd.length);
-	    //Debug block
-	    
 	    flagstates.put(cd,new Hashtable<FlagState,FlagState>());
 	    cdtorootnodes.put(cd,new Vector());
 	}	
@@ -140,18 +131,12 @@ public class TaskAnalysis {
 	    
 	    analyseTasks(trigger);
 	}
-
-
 	
 	/** Creating DOT files */
 	Enumeration e=flagstates.keys();
 	
 	while (e.hasMoreElements()) {
-	    System.out.println("creating dot file");
 	    ClassDescriptor cdtemp=(ClassDescriptor)e.nextElement();
-	    System.out.println((cdtemp.getSymbol()));
-	    
-
 	    createDOTfile(cdtemp);
 	}
     }
@@ -172,12 +157,6 @@ private void analyseTasks(FlagState fs) {
 	TaskDescriptor td = (TaskDescriptor)it_tasks.next();
 	String taskname=td.getSymbol();
 	
-	//**Debug***/
-	System.out.println();
-	System.out.println(cd.getSymbol()+" : "+fs.getTextLabel());
-	System.out.println("Task: "+taskname);
-	//***********
-	
 	/** counter to keep track of the number of parameters (of the task being analyzed) that 
 	 *  are satisfied by the flagstate.
 	 */
@@ -206,10 +185,6 @@ private void analyseTasks(FlagState fs) {
 	    throw new Error("Illegal Operation: A single flagstate cannot satisfy more than one parameter of a task.");
 	
 	
-	//** debug
-	System.out.println("Task:" + taskname +" is triggered");	
-	
-	
 	Set newstates=taganalysis.getFlagStates(td);
 	for(Iterator fsit=newstates.iterator();fsit.hasNext();) {
 	    FlagState fsnew=(FlagState) fsit.next();
@@ -244,22 +219,15 @@ private void analyseTasks(FlagState fs) {
 			throw new Error("PRE FlagActions not supported");
 		    
 		} else if (ffan.getTaskType() == FlatFlagActionNode.TASKEXIT) {
-		    //***
-		    System.out.println("TASKEXIT");
-		    //***
-		    
 		    Vector<FlagState> fsv_taskexit=evalTaskExitNode(ffan,cd,fs,temp);
-		    
 		    for(Enumeration en=fsv_taskexit.elements();en.hasMoreElements();){
 			FlagState fs_taskexit=(FlagState)en.nextElement();
 			if (!sourcenodes.containsKey(fs_taskexit)) {
 			    toprocess.add(fs_taskexit);
-			    
 			}
 			//seen this node already
 			fs_taskexit=canonicalizeFlagState(sourcenodes,fs_taskexit);
 			FEdge newedge=new FEdge(fs_taskexit,taskname);
-			//FEdge newedge=new FEdge(fs_taskexit,td);
 			fs.addEdge(newedge);
 		    }
 		    continue;
@@ -348,6 +316,23 @@ private boolean isTaskTrigger_tag(TagExpressionList tel, FlagState fs){
 
 	processed.add(fstemp);
 	
+	//Process clears first
+	for(Iterator it_ttp=ffan.getTempTagPairs();it_ttp.hasNext();) {
+	    TempTagPair ttp=(TempTagPair)it_ttp.next();
+	    
+	    if (temp==ttp.getTemp()) {
+		Vector<FlagState> oldprocess=processed;
+		processed=new Vector<FlagState>();
+
+		for (Enumeration en=oldprocess.elements();en.hasMoreElements();){
+		    FlagState fsworking=(FlagState)en.nextElement();
+		    if (!ffan.getTagChange(ttp)){
+			processed.addAll(Arrays.asList(fsworking.clearTag(ttp.getTag())));
+		    } else processed.add(fsworking);
+		}
+	    }
+	}
+	//Process sets next
 	for(Iterator it_ttp=ffan.getTempTagPairs();it_ttp.hasNext();) {
 	    TempTagPair ttp=(TempTagPair)it_ttp.next();
 	    
@@ -359,14 +344,11 @@ private boolean isTaskTrigger_tag(TagExpressionList tel, FlagState fs){
 		    FlagState fsworking=(FlagState)en.nextElement();
 		    if (ffan.getTagChange(ttp)){
 			processed.addAll(Arrays.asList(fsworking.setTag(ttp.getTag())));
-		    } else {
-			processed.addAll(Arrays.asList(fsworking.clearTag(ttp.getTag())));
-		    }
+		    } else processed.add(fsworking);
 		}
 	    }
 	}
 	return processed;
-	
     }		
     
 
@@ -386,10 +368,9 @@ private boolean isTaskTrigger_tag(TagExpressionList tel, FlagState fs){
     */
     
     public void createDOTfile(ClassDescriptor cd) throws java.io.IOException {
-		File dotfile_flagstates= new File("graph"+cd.getSymbol()+".dot");
-		FileOutputStream dotstream=new FileOutputStream(dotfile_flagstates,true);
-		FlagState.DOTVisitor.visit(dotstream,((Hashtable)flagstates.get(cd)).values());
-		
+	File dotfile_flagstates= new File("graph"+cd.getSymbol()+".dot");
+	FileOutputStream dotstream=new FileOutputStream(dotfile_flagstates,true);
+	FlagState.DOTVisitor.visit(dotstream,((Hashtable)flagstates.get(cd)).values());
     }
 
     /** Returns the flag states for the class descriptor. */