From: bdemsky <bdemsky>
Date: Thu, 18 May 2006 23:06:21 +0000 (+0000)
Subject: Checking in code to put flags into createobjectnodes
X-Git-Tag: preEdgeChange~877
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=631bfe6d202d7df27e919b58be6c380c6815d6c5;p=IRC.git

Checking in code to put flags into createobjectnodes
---

diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index f2f95aa4..d119eae8 100644
--- a/Robust/src/IR/Flat/BuildFlat.java
+++ b/Robust/src/IR/Flat/BuildFlat.java
@@ -138,7 +138,19 @@ public class BuildFlat {
 	    //Call to constructor
 	    FlatCall fc=new FlatCall(md, null, out_temp, temps);
 	    last.addNext(fc);
-	    return new NodePair(fn,fc); 
+	    last=fc;
+	    if (con.getFlagEffects()!=null) {
+		FlatFlagActionNode ffan=new FlatFlagActionNode(false);
+		FlagEffects fes=con.getFlagEffects();
+		TempDescriptor flagtemp=outtemp;
+		for(int j=0;j<fes.numEffects();j++) {
+		    FlagEffect fe=fes.getEffect(j);
+		    ffan.addFlagAction(flagtemp, fe.getFlag(), fe.getStatus());
+		}
+		last.addNext(ffan);
+		last=ffan;
+	    }
+	    return new NodePair(fn,last); 
 	} else {
 	    FlatNode first=null;
 	    FlatNode last=null;
diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index c9368be4..6e297958 100644
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -292,6 +292,12 @@ public class BuildIR {
 	    for(int i=0;i<args.size();i++) {
 		con.addArgument((ExpressionNode)args.get(i));
 	    }
+	    /* Could have flag set here */
+	    if (pn.getChild("flag_list")!=null) {
+		FlagEffects fe=new FlagEffects(null);
+		parseFlagEffect(fe, pn.getChild("flag_list"));
+		con.addFlagEffects(fe);
+	    }
 	    return con;
 	} else if (isNode(pn,"createarray")) {
 	    System.out.println(pn.PPrint(3,true));
diff --git a/Robust/src/IR/Tree/CreateObjectNode.java b/Robust/src/IR/Tree/CreateObjectNode.java
index afeae5fb..6cbb9bf9 100644
--- a/Robust/src/IR/Tree/CreateObjectNode.java
+++ b/Robust/src/IR/Tree/CreateObjectNode.java
@@ -7,12 +7,21 @@ public class CreateObjectNode extends ExpressionNode {
     TypeDescriptor td;
     Vector argumentlist;
     MethodDescriptor md;
+    FlagEffects fe;
 
     public CreateObjectNode(TypeDescriptor type) {
 	td=type;
 	argumentlist=new Vector();
     }
 
+    public void addFlagEffects(FlagEffects fe) {
+	this.fe=fe;
+    }
+
+    public FlagEffects getFlagEffects() {
+	return fe;
+    }
+
     public void addArgument(ExpressionNode en) {
 	argumentlist.add(en);
     }
diff --git a/Robust/src/IR/Tree/SemanticCheck.java b/Robust/src/IR/Tree/SemanticCheck.java
index 9a78cb42..5782b95f 100644
--- a/Robust/src/IR/Tree/SemanticCheck.java
+++ b/Robust/src/IR/Tree/SemanticCheck.java
@@ -457,6 +457,24 @@ public class SemanticCheck {
 
 	TypeDescriptor typetolookin=con.getType();
 	checkTypeDescriptor(typetolookin);
+
+	/* Check flag effects */
+	if (con.getFlagEffects()!=null) {
+	    FlagEffects fe=con.getFlagEffects();
+	    ClassDescriptor cd=typetolookin.getClassDesc();
+	    
+	    for(int j=0;j<fe.numEffects();j++) {
+		FlagEffect flag=fe.getEffect(j);
+		String name=flag.getName();
+		FlagDescriptor flag_d=(FlagDescriptor)cd.getFlagTable().get(name);
+		//Make sure the flag is declared
+		if (flag_d==null)
+		    throw new Error("Flag descriptor "+name+" undefined in class: "+cd.getSymbol());
+		flag.setFlag(flag_d);
+	    }
+	}
+
+
 	if ((!typetolookin.isClass())&&(!typetolookin.isArray())) 
 	    throw new Error("Can't allocate primitive type:"+con.printNode(0));
 
@@ -754,9 +772,7 @@ public class SemanticCheck {
 	default:
 	    throw new Error();
 	}
-
-     
-
+   
 	if (td!=null)
 	    if (!typeutil.isSuperorType(td, on.getType())) {
 		System.out.println(td);
diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index 8811df08..52c5e099 100644
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -235,6 +235,7 @@ non terminal ParseNode flag_effects_opt;
 non terminal ParseNode flag_effects;
 non terminal ParseNode flag_effect;
 non terminal ParseNode flag_list;
+non terminal ParseNode flag_list_opt;
 non terminal ParseNode flag_change;
 
 start with goal;
@@ -339,6 +340,10 @@ flag_effect ::= IDENTIFIER:id LBRACE flag_list:fl RBRACE {:
 		RESULT=pn;
 	:};
 
+flag_list_opt ::= LPAREN flag_list:fl RPAREN {:RESULT=fl;:}
+	| {: RESULT = new ParseNode("empty"); :}
+	;
+
 flag_list ::= flag_change:fc {: 
 		ParseNode pn=new ParseNode("flag_list");
 		pn.addChild(fc);
@@ -1168,10 +1173,11 @@ primary_no_new_array ::=
 //	|	name DOT THIS
 	;
 class_instance_creation_expression ::=
-		NEW class_or_interface_type:type LPAREN argument_list_opt:args RPAREN {: 
+		NEW class_or_interface_type:type LPAREN argument_list_opt:args RPAREN flag_effects_opt:feo {: 
 		ParseNode pn=new ParseNode("createobject");
 		pn.addChild(type);
 		pn.addChild(args);
+		pn.addChild(feo);
 		RESULT=pn;
 	:}
 //	|	NEW class_or_interface_type LPAREN argument_list_opt RPAREN class_body
diff --git a/Robust/src/designnotes b/Robust/src/designnotes
index 968817c7..eba714f0 100644
--- a/Robust/src/designnotes
+++ b/Robust/src/designnotes
@@ -7,8 +7,8 @@ Assumptions:
 Task parameters can't be modified
 
 How do we handle new object allocation?
-Idea #1: Simply lose precision -- don't even attempt analysis
-         Improvement - let set flags at allocation
+Idea #1: Set flags at allocation
+	 Only allow flag setting at exit for parameters
 
 Non parameter variables: 
 1) Type must contain flags