From e9e33066e1961c46a5d73afb7983688165315d93 Mon Sep 17 00:00:00 2001
From: jjenista <jjenista>
Date: Mon, 10 May 2010 22:22:17 +0000
Subject: [PATCH] Added the this() explicit constructor invocation which is
 very similar to super() already part of the compiler.  This helps when
 porting benchmarks that use this invocation

---
 Robust/src/IR/Tree/BuildIR.java               | 11 +++++++
 Robust/src/Parse/java14.cup                   |  8 +++--
 Robust/src/Tests/explicitConstrInvok/makefile | 32 +++++++++++++++++++
 .../src/Tests/explicitConstrInvok/test.java   | 29 +++++++++++++++++
 4 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 Robust/src/Tests/explicitConstrInvok/makefile
 create mode 100644 Robust/src/Tests/explicitConstrInvok/test.java

diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index e9176923..d57a4068 100644
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -623,6 +623,17 @@ public class BuildIR {
       }
       BlockExpressionNode ben=new BlockExpressionNode(min);
       bn.addFirstBlockStatement(ben);
+
+    } else if (bodyn!=null&&bodyn.getChild("explconstrinv")!=null) {
+      ParseNode eci=bodyn.getChild("explconstrinv");
+      NameDescriptor nd=new NameDescriptor(cn.getSymbol());
+      Vector args=parseArgumentList(eci);
+      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/Parse/java14.cup b/Robust/src/Parse/java14.cup
index 80c2f593..dbe8dda0 100644
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -1019,8 +1019,12 @@ constructor_body ::=
 	|	LBRACE RBRACE {: RESULT=new ParseNode("empty"); :}
 	;
 explicit_constructor_invocation ::=
-//		THIS LPAREN argument_list_opt RPAREN SEMICOLON
-//	|	
+	THIS LPAREN argument_list_opt:alo RPAREN SEMICOLON {:
+	     ParseNode pn=new ParseNode("explconstrinv");
+	     pn.addChild(alo);
+	     RESULT=pn;
+	:}
+	|	
 SUPER LPAREN argument_list_opt:alo RPAREN SEMICOLON {: 
 	ParseNode pn=new ParseNode("superinvoke");
 	pn.addChild(alo);
diff --git a/Robust/src/Tests/explicitConstrInvok/makefile b/Robust/src/Tests/explicitConstrInvok/makefile
new file mode 100644
index 00000000..459733be
--- /dev/null
+++ b/Robust/src/Tests/explicitConstrInvok/makefile
@@ -0,0 +1,32 @@
+PROGRAM=test
+
+SOURCE_FILES=$(PROGRAM).java
+
+BUILDSCRIPT=~/research/Robust/src/buildscript
+
+BSFLAGS= -mainclass Test 
+
+all: $(PROGRAM).bin
+
+view: PNGs
+	eog *.png &
+
+PNGs: DOTs
+	d2p *COMPLETE*.dot
+
+DOTs: $(PROGRAM).bin
+
+$(PROGRAM).bin: $(SOURCE_FILES)
+	$(BUILDSCRIPT) $(BSFLAGS) $(DEBUGFLAGS) -o $(PROGRAM) $(SOURCE_FILES)
+
+OLDBSFLAGS= -mainclass Test -justanalyze -ownership -ownallocdepth 1 -ownwritedots final -enable-assertions
+old: $(SOURCE_FILES)
+	$(BUILDSCRIPT) $(OLDBSFLAGS) $(SOURCE_FILES) -o $(PROGRAM)
+
+clean:
+	rm -f  $(PROGRAM).bin
+	rm -fr tmpbuilddirectory
+	rm -f  *~
+	rm -f  *.dot
+	rm -f  *.png
+	rm -f  aliases.txt
diff --git a/Robust/src/Tests/explicitConstrInvok/test.java b/Robust/src/Tests/explicitConstrInvok/test.java
new file mode 100644
index 00000000..62cd501c
--- /dev/null
+++ b/Robust/src/Tests/explicitConstrInvok/test.java
@@ -0,0 +1,29 @@
+public class Bar {
+  public Bar() {
+    System.out.println( "1. I'm the super" );
+  }
+}
+
+public class Foo extends Bar {
+
+  public Foo( int i ) {    
+    this();
+    System.out.println( "3. I see the number "+i );
+  }
+
+  public Foo() {
+    super();
+    System.out.println( "2. I see nothing" );
+  }
+
+  public Foo f;
+}
+
+
+public class Test {
+
+  static public void main( String[] args ) {
+    Foo f = new Foo( 7 );
+  }   
+
+}
-- 
2.34.1