From: bdemsky <bdemsky>
Date: Sat, 3 Nov 2007 07:16:28 +0000 (+0000)
Subject: support a bit more java
X-Git-Tag: preEdgeChange~401
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b9cdb318709330dbca8eba39436236b5e32d0fbc;p=IRC.git

support a bit more java
---

diff --git a/Robust/src/IR/Tree/BlockNode.java b/Robust/src/IR/Tree/BlockNode.java
index 62b3b67d..47ebb1f5 100644
--- a/Robust/src/IR/Tree/BlockNode.java
+++ b/Robust/src/IR/Tree/BlockNode.java
@@ -24,6 +24,10 @@ public class BlockNode extends TreeNode {
 	blockstatements.add(bsn);
     }
 
+    public void addFirstBlockStatement(BlockStatementNode bsn) {
+	blockstatements.insertElementAt(bsn,0);
+    }
+
     public void setStyle(int style) {
 	printStyle=style;
     }
diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index 08c113d2..f307880d 100644
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -540,7 +540,22 @@ public class BuildIR {
 	ParseNode bodyn0=pn.getChild("body");
 	ParseNode bodyn=bodyn0.getChild("constructor_body");
 	cn.addMethod(md);
-	BlockNode bn=parseBlock(bodyn);
+	BlockNode bn=null;
+	if (bodyn!=null&&bodyn.getChild("block_statement_list")!=null)
+	    bn=parseBlock(bodyn);
+	else
+	    bn=new BlockNode();
+	if (bodyn!=null&&bodyn.getChild("superinvoke")!=null) {
+	    ParseNode sin=bodyn.getChild("superinvoke");
+	    NameDescriptor nd=new NameDescriptor("super");
+	    Vector args=parseArgumentList(sin);
+	    MethodInvokeNode min=new MethodInvokeNode(nd);
+	    for(int i=0;i<args.size();i++) {
+		min.addArgument((ExpressionNode)args.get(i));
+	    }
+	    BlockExpressionNode ben=new BlockExpressionNode(min);
+	    bn.addFirstBlockStatement(ben);
+	}
 	state.addTreeCode(md,bn);
     }
 
diff --git a/Robust/src/IR/Tree/SemanticCheck.java b/Robust/src/IR/Tree/SemanticCheck.java
index 84e18d9b..7680db3d 100644
--- a/Robust/src/IR/Tree/SemanticCheck.java
+++ b/Robust/src/IR/Tree/SemanticCheck.java
@@ -677,7 +677,10 @@ public class SemanticCheck {
 	    typetolookin=min.getExpression().getType();
 	} else if (min.getBaseName()!=null) {
 	    String rootname=min.getBaseName().getRoot();
-	    if (nametable.get(rootname)!=null) {
+	    if (rootname.equals("super")) {
+		ClassDescriptor supercd=((MethodDescriptor)md).getClassDesc().getSuperDesc();
+		typetolookin=new TypeDescriptor(supercd);
+	    } else if (nametable.get(rootname)!=null) {
 		//we have an expression
 		min.setExpression(translateNameDescriptorintoExpression(min.getBaseName()));
 		checkExpressionNode(md, nametable, min.getExpression(), null);
@@ -689,6 +692,10 @@ public class SemanticCheck {
 		    throw new Error(min.getBaseName()+" undefined");
 		typetolookin=new TypeDescriptor(cd);
 	    }
+	} else if ((md instanceof MethodDescriptor)&&min.getMethodName().equals("super")) {
+	    ClassDescriptor supercd=((MethodDescriptor)md).getClassDesc().getSuperDesc();
+	    min.methodid=supercd.getSymbol();
+	    typetolookin=new TypeDescriptor(supercd);
 	} else if (md instanceof MethodDescriptor) {
 	    typetolookin=new TypeDescriptor(((MethodDescriptor)md).getClassDesc());
 	} else {
diff --git a/Robust/src/IR/TypeUtil.java b/Robust/src/IR/TypeUtil.java
index dae65785..9471925c 100644
--- a/Robust/src/IR/TypeUtil.java
+++ b/Robust/src/IR/TypeUtil.java
@@ -30,6 +30,9 @@ public class TypeUtil {
 	    String superc=cd.getSuper();
 	    if (superc!=null) {
 		ClassDescriptor cd_super=getClass(superc);
+		if (cd_super==null) {
+		    throw new Error("Couldn't find class:"+superc);
+		}
 		supertable.put(cd,cd_super);
 	    }
 	}
diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index d071f337..92665a47 100644
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -152,7 +152,7 @@ non terminal ParseNode method_body;
 // 19.8.5) Constructor Declarations
 non terminal ParseNode constructor_declaration, constructor_declarator;
 non terminal ParseNode constructor_body;
-//non terminal ParseNode explicit_constructor_invocation;
+non terminal ParseNode explicit_constructor_invocation;
 // 19.9.1) Interface Declarations
 //non terminal ParseNode interface_declaration;
 //non terminal ParseNode extends_interfaces_opt, extends_interfaces;
@@ -983,8 +983,17 @@ constructor_declarator ::=
 	:}
 	;
 constructor_body ::=
-//		LBRACE explicit_constructor_invocation:eci block_statements:bs RBRACE |
-//		LBRACE explicit_constructor_invocation RBRACE |
+		LBRACE explicit_constructor_invocation:eci block_statements:bs RBRACE {: 
+			ParseNode pn=new ParseNode("constructor_body");
+			pn.addChild(eci);
+			pn.addChild(bs);
+			RESULT=pn;
+	:} |
+		LBRACE explicit_constructor_invocation:eci RBRACE {: 
+			ParseNode pn=new ParseNode("constructor_body");
+			pn.addChild(eci);
+			RESULT=pn;
+	:} |
 		LBRACE block_statements:block RBRACE {: 
 		ParseNode pn=new ParseNode("constructor_body");
 		pn.addChild(block);
@@ -992,12 +1001,17 @@ constructor_body ::=
 	:}
 	|	LBRACE RBRACE {: RESULT=new ParseNode("empty"); :}
 	;
-//explicit_constructor_invocation ::=
+explicit_constructor_invocation ::=
 //		THIS LPAREN argument_list_opt RPAREN SEMICOLON
-//	|	SUPER LPAREN argument_list_opt RPAREN SEMICOLON
+//	|	
+SUPER LPAREN argument_list_opt:alo RPAREN SEMICOLON {: 
+	ParseNode pn=new ParseNode("superinvoke");
+	pn.addChild(alo);
+	RESULT=pn;
+:}
 //	|	primary DOT THIS LPAREN argument_list_opt RPAREN SEMICOLON
 //	|	primary DOT SUPER LPAREN argument_list_opt RPAREN SEMICOLON
-//	;
+	;
 
 // 19.9) Interfaces
 
@@ -1530,7 +1544,15 @@ method_invocation ::=
 		pn.addChild(args);
 		RESULT=pn;
 	:}
-//	|	SUPER DOT IDENTIFIER LPAREN argument_list_opt RPAREN
+	|	SUPER DOT IDENTIFIER:id LPAREN argument_list_opt:args RPAREN {: 
+		ParseNode name=new ParseNode("name");
+		name.addChild("base").addChild("name").addChild("identifier").addChild("super");
+		name.addChild("identifier").addChild(id);
+		ParseNode pn=new ParseNode("methodinvoke1");
+		pn.addChild(name);
+		pn.addChild(args);
+		RESULT=pn;
+	:}
 //	|	name DOT SUPER DOT IDENTIFIER LPAREN argument_list_opt RPAREN
 	;
 array_access ::=