From: bdemsky <bdemsky>
Date: Mon, 21 May 2007 22:02:28 +0000 (+0000)
Subject: support no flag parameters
X-Git-Tag: preEdgeChange~578
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=33e236d0e75ef0f12f9ff9e4face8b20cbaf5494;p=IRC.git

support no flag parameters
---

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 7e249e16..ed2f50f2 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -405,28 +405,37 @@ public class BuildCode {
 	    FlagExpressionNode param_flag=task.getFlag(param_var);
 	    TagExpressionList param_tag=task.getTag(param_var);
 
-	    DNFFlag dflag=param_flag.getDNF();
-	    
-	    Hashtable flags=(Hashtable)flagorder.get(param_type.getClassDesc());
-	    output.println("int parameterdnf_"+i+"_"+task.getSafeSymbol()+"[]={");
-	    for(int j=0;j<dflag.size();j++) {
-		if (j!=0)
-		    output.println(",");
-		Vector term=dflag.get(j);
-		int andmask=0;
-		int checkmask=0;
-		for(int k=0;k<term.size();k++) {
-		    DNFFlagAtom dfa=(DNFFlagAtom)term.get(k);
-		    FlagDescriptor fd=dfa.getFlag();
-		    boolean negated=dfa.getNegated();
-		    int flagid=1<<((Integer)flags.get(fd)).intValue();
-		    andmask|=flagid;
-		    if (!negated)
-			checkmask|=flagid;
+	    int dnfterms;
+	    if (param_flag==null) {
+		output.println("int parameterdnf_"+i+"_"+task.getSafeSymbol()+"[]={");
+		output.println("0x0, 0x0 };");
+		dnfterms=1;
+	    } else {
+
+		DNFFlag dflag=param_flag.getDNF();
+		dnfterms=dflag.size();
+		
+		Hashtable flags=(Hashtable)flagorder.get(param_type.getClassDesc());
+		output.println("int parameterdnf_"+i+"_"+task.getSafeSymbol()+"[]={");
+		for(int j=0;j<dflag.size();j++) {
+		    if (j!=0)
+			output.println(",");
+		    Vector term=dflag.get(j);
+		    int andmask=0;
+		    int checkmask=0;
+		    for(int k=0;k<term.size();k++) {
+			DNFFlagAtom dfa=(DNFFlagAtom)term.get(k);
+			FlagDescriptor fd=dfa.getFlag();
+			boolean negated=dfa.getNegated();
+			int flagid=1<<((Integer)flags.get(fd)).intValue();
+			andmask|=flagid;
+			if (!negated)
+			    checkmask|=flagid;
+		    }
+		    output.print("0x"+Integer.toHexString(andmask)+", 0x"+Integer.toHexString(checkmask));
 		}
-		output.print("0x"+Integer.toHexString(andmask)+", 0x"+Integer.toHexString(checkmask));
+		output.println("};");
 	    }
-	    output.println("};");
 
 	    output.println("int parametertag_"+i+"_"+task.getSafeSymbol()+"[]={");
 	    //BUG...added next line to fix, test with any task program
@@ -446,7 +455,7 @@ public class BuildCode {
 
 	    output.println("struct parameterdescriptor parameter_"+i+"_"+task.getSafeSymbol()+"={");
 	    output.println("/* type */"+param_type.getClassDesc().getId()+",");
-	    output.println("/* number of DNF terms */"+dflag.size()+",");
+	    output.println("/* number of DNF terms */"+dnfterms+",");
 	    output.println("parameterdnf_"+i+"_"+task.getSafeSymbol()+",");
 	    output.println("0,");
 	    //BUG, added next line to fix and else statement...test
diff --git a/Robust/src/IR/TaskDescriptor.java b/Robust/src/IR/TaskDescriptor.java
index 33935f6d..1fa23b89 100644
--- a/Robust/src/IR/TaskDescriptor.java
+++ b/Robust/src/IR/TaskDescriptor.java
@@ -47,7 +47,8 @@ public class TaskDescriptor extends Descriptor {
 	    throw new Error("Can't have parameter named this");
 	VarDescriptor vd=new VarDescriptor(type, paramname);
 	params.add(vd);
-	flagstable.put(vd, fen);
+	if (fen!=null)
+	    flagstable.put(vd, fen);
 	if (tel!=null) {//BUGFIX - added null check here...test with any bristlecone program
 	    tagstable.put(vd, tel);
 	    for(int i=0;i<tel.numTags();i++) {
diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index 33335983..4f8a0aa6 100644
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -176,7 +176,9 @@ public class BuildIR {
 	     TypeDescriptor type=parseTypeDescriptor(paramn);
 
 	     String paramname=paramn.getChild("single").getTerminal();
-	     FlagExpressionNode fen=parseFlagExpression(paramn.getChild("flag").getFirstChild());
+	     FlagExpressionNode fen=null;
+	     if (paramn.getChild("flag")!=null)
+		 fen=parseFlagExpression(paramn.getChild("flag").getFirstChild());
 
 	     ParseNode tagnode=paramn.getChild("tag");
 
diff --git a/Robust/src/IR/Tree/SemanticCheck.java b/Robust/src/IR/Tree/SemanticCheck.java
index a47be0fb..d9b21abe 100644
--- a/Robust/src/IR/Tree/SemanticCheck.java
+++ b/Robust/src/IR/Tree/SemanticCheck.java
@@ -147,7 +147,8 @@ public class SemanticCheck {
 	    if (!param_type.isClass())
 		throw new Error("Cannot have non-object argument to a task");
 	    ClassDescriptor cd=param_type.getClassDesc();
-	    checkFlagExpressionNode(cd, fen);
+	    if (fen!=null)
+		checkFlagExpressionNode(cd, fen);
 	}
 
 	checkFlagEffects(td, td.getFlagEffects(),td.getParameterTable());
diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index 357ee8db..d8121536 100644
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -296,6 +296,13 @@ task_parameter ::=
 		pn.addChild("tag").addChild(texp);
 		RESULT=pn;
 	:}
+        | type:type variable_declarator_id:name LBRACE RBRACE LBRACE tag_expression_list:texp RBRACE {:
+		ParseNode pn=new ParseNode("task_parameter");
+		pn.addChild(type);
+		pn.addChild(name);
+		pn.addChild("tag").addChild(texp);
+		RESULT=pn;
+	:}
 	;
 
 tag_expression_list ::= tag_expression:te {: