This revision contains an attempt to patch the Java8 dynamicjava code

ponderosaTX · ponderosaTX · commit 2b10ea2ed0a7 · 2014-12-26T12:53:04.000-06:00
repository so that it will build.  The attempt did not succeed, but
they enable javacc to run successfully and the compiler to get past a
blatant error (declaring a constructor with name LambdaExpression in
the MethodReference class).  Unfortunately, the code base was left in
a highly inconsistent state: 15 syntax errors (involving the addition of
the new file/class MethodReference.java) still remain.
diff --git a/dynamicjava/build.xml b/dynamicjava/build.xml
@@ -32,7 +32,7 @@
   
   <property environment="env" />
   <property name="java6-home" value="${env.JAVA6_HOME}" />
-  <property name="javacc-home"  value="${env.JAVACC_HOME}" />
+  <property name="javacc-home" value="${env.JAVACC_HOME}" />
   <property name="clover-jar" value="${env.CLOVER_JAR}" />
   <property name="findbugs-home" value="${env.FINDBUGS_HOME}" />
   
@@ -56,8 +56,7 @@
 
   <fileset id="libs" dir="lib" includes="*.jar" /> <!-- Only include jars that are at the top level (not in buildlib) -->
   
-  
-  
+    
   <!-- ************
        Help Targets
        ************ -->
@@ -282,8 +281,6 @@
       <patternset excludes="META-INF/**" />
     </unjar>
   </target>
-  
-  
 
   <!-- ***************
        Testing Targets
diff --git a/dynamicjava/src/koala/dynamicjava/parser/grammar.jj b/dynamicjava/src/koala/dynamicjava/parser/grammar.jj
@@ -795,7 +795,7 @@ PARSER_END(Parser)
     | < CLASS: "class" >
     | < CONST: "const" >
     | < CONTINUE: "continue" >
-    | < DEFAULT: "default" >
+    | < _DEFAULT: "default" >
     | < DO: "do" >
     | < DOUBLE: "double" >
     | < ELSE: "else" >
diff --git a/dynamicjava/src/koala/dynamicjava/tree/MethodReference.java b/dynamicjava/src/koala/dynamicjava/tree/MethodReference.java
@@ -5,7 +5,7 @@
 public class MethodReference extends PrimaryExpression {
   private Option<TypeName> typ;
   private Option<String> methodName;
-  public LambdaExpression(TypeName type,
+  public MethodReference(TypeName type,
                           String methodName) {
     this(type, methodName, SourceInfo.NONE);
   }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`public class MethodReference extends PrimaryExpression {`
`6`	`6`	`private Option<TypeName> typ;`
`7`	`7`	`private Option<String> methodName;`
`8`		`- public LambdaExpression(TypeName type,`
	`8`	`+ public MethodReference(TypeName type,`
`9`	`9`	`String methodName) {`
`10`	`10`	`this(type, methodName, SourceInfo.NONE);`
`11`	`11`	`}`