GROOVY-3693

If an enum had static fields and also a static block, statements for initializing static fields were getting positioned after the static block causing un-initialized values of such static fields to be seen inside the static block. Corrected the positioning of static field init statements.

git-svn-id: http://svn.codehaus.org/groovy/trunk/groovy/groovy-core@17420 a5544e8c-8a19-0410-ba12-f9af4593a198

Author: roshandawrani

src/main/org/codehaus/groovy/ast/ClassNode.java

@@ -16,9 +16,12 @@
 package org.codehaus.groovy.ast;
 
 import org.codehaus.groovy.GroovyBugError;
+import org.codehaus.groovy.ast.expr.BinaryExpression;
 import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.FieldExpression;
 import org.codehaus.groovy.ast.expr.MapExpression;
 import org.codehaus.groovy.ast.expr.TupleExpression;
+import org.codehaus.groovy.ast.stmt.ExpressionStatement;
 import org.codehaus.groovy.ast.stmt.Statement;
 import org.codehaus.groovy.ast.stmt.BlockStatement;
 import org.codehaus.groovy.control.CompilePhase;
@@ -697,17 +700,22 @@ public List<Statement> getObjectInitializerStatements() {
         return objectInitializers;
     }
 
-    public void addStaticInitializerStatements(List<Statement> staticStatements, boolean fieldInit) {
+    private MethodNode getOrAddStaticConstructorNode() {
         MethodNode method = null;
-        List<MethodNode> declaredMethods = getDeclaredMethods("<clinit>");
+        List declaredMethods = getDeclaredMethods("<clinit>");
         if (declaredMethods.isEmpty()) {
             method =
                     addMethod("<clinit>", ACC_STATIC, ClassHelper.VOID_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, new BlockStatement());
             method.setSynthetic(true);
         }
         else {
-            method = declaredMethods.get(0);
+            method = (MethodNode) declaredMethods.get(0);
         }
+        return method;
+    }
+    
+    public void addStaticInitializerStatements(List<Statement> staticStatements, boolean fieldInit) {
+        MethodNode method = getOrAddStaticConstructorNode();
         BlockStatement block = null;
         Statement statement = method.getCode();
         if (statement == null) {
@@ -735,6 +743,33 @@ else if (statement instanceof BlockStatement) {
         }
     }
 
+    public void positionStmtsAfterEnumInitStmts(List<Statement> staticFieldStatements) {
+        MethodNode method = getOrAddStaticConstructorNode();
+        Statement statement = method.getCode();
+        if (statement instanceof BlockStatement) {
+        	BlockStatement block = (BlockStatement) statement;
+        	// add given statements for explicitly declared static fields just after enum-special fields
+        	// are found - the $VALUES binary expression marks the end of such fields.
+        	List<Statement> blockStatements = block.getStatements();
+        	ListIterator<Statement> litr = blockStatements.listIterator();
+        	while(litr.hasNext()) {
+        		Statement stmt = litr.next();
+        		if(stmt instanceof ExpressionStatement && 
+        				((ExpressionStatement)stmt).getExpression() instanceof BinaryExpression) {
+        			BinaryExpression bExp = (BinaryExpression) ((ExpressionStatement)stmt).getExpression();
+        			if (bExp.getLeftExpression() instanceof FieldExpression) {
+        				FieldExpression fExp = (FieldExpression) bExp.getLeftExpression();
+        				if(fExp.getFieldName().equals("$VALUES")) {
+        					for(Statement tmpStmt : staticFieldStatements) {
+        						litr.add(tmpStmt);
+        					}
+        				}
+        			}
+        		}
+        	}
+        }
+    }
+    
     /**
      * This methods returns a list of all methods of the given name
      * defined in the current class

src/main/org/codehaus/groovy/classgen/Verifier.java

@@ -746,10 +746,10 @@ protected void addInitialization(ClassNode node, ConstructorNode constructorNode
 
         List statements = new ArrayList();
         List staticStatements = new ArrayList();
-        final boolean isEnumClassNode = isEnum(node);
-        List initStmtsAfterEnumValuesInit = new ArrayList();
+        final boolean isEnum = node.isEnum();
+        List<Statement> initStmtsAfterEnumValuesInit = new ArrayList();
         Set explicitStaticPropsInEnum = new HashSet();
-        if(isEnumClassNode) {
+        if(isEnum) {
         	for (Iterator iter = node.getProperties().iterator(); iter.hasNext();) {
         		PropertyNode propNode = (PropertyNode) iter.next();
         		if(!propNode.isSynthetic() && propNode.getField().isStatic()) {
@@ -759,7 +759,7 @@ protected void addInitialization(ClassNode node, ConstructorNode constructorNode
         }
         for (Iterator iter = node.getFields().iterator(); iter.hasNext();) {
         	addFieldInitialization(statements, staticStatements, 
-        			(FieldNode) iter.next(), isEnumClassNode, 
+        			(FieldNode) iter.next(), isEnum, 
         			initStmtsAfterEnumValuesInit, explicitStaticPropsInEnum);
         }
         statements.addAll(node.getObjectInitializerStatements());
@@ -788,26 +788,22 @@ else if (code != null) {
         }
 
         if (!staticStatements.isEmpty()) {
-        	if(isEnumClassNode) {
+        	if(isEnum) {
         		/*
         		 * GROOVY-3161: initialize statements for explicitly declared static fields 
         		 * inside an enum should come after enum values are initialized
         		 */
         		staticStatements.removeAll(initStmtsAfterEnumValuesInit);
         		node.addStaticInitializerStatements(staticStatements, true);
         		if(!initStmtsAfterEnumValuesInit.isEmpty()) {
-        			node.addStaticInitializerStatements(initStmtsAfterEnumValuesInit, false);
+        			node.positionStmtsAfterEnumInitStmts(initStmtsAfterEnumValuesInit);
         		}
         	} else {
         		node.addStaticInitializerStatements(staticStatements, true);
         	}
         }
     }
 
-    private boolean isEnum(ClassNode node) {
-    	return (node.getModifiers() & Opcodes.ACC_ENUM) != 0;
-    }
-
     private ConstructorCallExpression getFirstIfSpecialConstructorCall(Statement code) {
         if (code == null || !(code instanceof ExpressionStatement)) return null;
 

src/test/gls/enums/EnumTest.groovy

@@ -270,6 +270,11 @@ class EnumTest extends GroovyTestCase {
             assert obj.getEnumVar() == Class3110.Enum3110.FOO
         """
     }
+
+    void testStaticFieldInitValuesInAStaticBlock() {
+        // GROOVY-3693 - trigger enum class load to test it - asserts are present in the enum 
+        GrooyColors3693.r
+    }
 }
 
 enum UsCoin {
@@ -292,4 +297,15 @@ enum Foo3284 {
       call = c
     }
     final Closure call
+}
+
+enum GrooyColors3693 {
+    r, g, b
+    static List list = [1, 2]
+    static init() {
+        assert list == [1, 2]
+    }
+    static { 
+        init() 
+    }
 }