commit 5443e87882f9b88169876f6d043ed54b5ae9023b
author danielsun1106 <realbluesun@hotmail.com> Fri Apr 13 22:23:25 2018 +0800
committer danielsun1106 <realbluesun@hotmail.com> Fri Apr 13 22:23:25 2018 +0800
tree 80d7980a90217be08c31e1769aaf96301fdad8e7
parent 31c5dabf8a47b7854808ec96d565ca00611051d9

Trivial refactoring for `CompilerConfiguration`

src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java

diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 95d4c03..a2164bb 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -940,51 +940,50 @@
         return indyEnabled;
     }
 
-    private boolean compileStatic;
+    {
+        // this object initializer assures that `enableCompileStaticByDefault` must be invoked no matter which constructor called.
+        if (Boolean.getBoolean("groovy.compile.static")) {
+            enableCompileStaticByDefault();
+        }
+    }
     private void enableCompileStaticByDefault() {
-        if (compileStatic) {
-            return;
-        }
-        if (!Boolean.getBoolean("groovy.compile.static")) {
-            return;
-        }
-
         compilationCustomizers.add(
             new CompilationCustomizer(CompilePhase.CONVERSION) {
                 @Override
                 public void call(final SourceUnit source, GeneratorContext context, ClassNode classNode) throws CompilationFailedException {
                     for (ClassNode cn : source.getAST().getClasses()) {
-                        new ClassCodeVisitorSupport() {
-                            @Override
-                            public void visitClass(ClassNode node) {
-                                enableCompileStatic(node);
-                            }
-
-                            private void enableCompileStatic(ClassNode classNode) {
-                                if (!classNode.getAnnotations(ClassHelper.make(GROOVY_TRANSFORM_COMPILE_STATIC)).isEmpty()) {
-                                    return;
-                                }
-                                if (!classNode.getAnnotations(ClassHelper.make(GROOVY_TRANSFORM_COMPILE_DYNAMIC)).isEmpty()) {
-                                    return;
-                                }
-
-                                classNode.addAnnotation(new AnnotationNode(ClassHelper.make(GROOVY_TRANSFORM_COMPILE_STATIC)));
-                            }
-
-                            @Override
-                            protected SourceUnit getSourceUnit() {
-                                return source;
-                            }
-
-                            private static final String GROOVY_TRANSFORM_COMPILE_STATIC = "groovy.transform.CompileStatic";
-                            private static final String GROOVY_TRANSFORM_COMPILE_DYNAMIC = "groovy.transform.CompileDynamic";
-                        }.visitClass(cn);
+                        newClassCodeVisitor(source).visitClass(cn);
                     }
                 }
+
+                private ClassCodeVisitorSupport newClassCodeVisitor(SourceUnit source) {
+                    return new ClassCodeVisitorSupport() {
+                        @Override
+                        public void visitClass(ClassNode node) {
+                            enableCompileStatic(node);
+                        }
+
+                        private void enableCompileStatic(ClassNode classNode) {
+                            if (!classNode.getAnnotations(ClassHelper.make(GROOVY_TRANSFORM_COMPILE_STATIC)).isEmpty()) {
+                                return;
+                            }
+                            if (!classNode.getAnnotations(ClassHelper.make(GROOVY_TRANSFORM_COMPILE_DYNAMIC)).isEmpty()) {
+                                return;
+                            }
+
+                            classNode.addAnnotation(new AnnotationNode(ClassHelper.make(GROOVY_TRANSFORM_COMPILE_STATIC)));
+                        }
+
+                        @Override
+                        protected SourceUnit getSourceUnit() {
+                            return source;
+                        }
+
+                        private static final String GROOVY_TRANSFORM_COMPILE_STATIC = "groovy.transform.CompileStatic";
+                        private static final String GROOVY_TRANSFORM_COMPILE_DYNAMIC = "groovy.transform.CompileDynamic";
+                    };
+                }
             }
         );
-
-        compileStatic = true;
     }
-    { enableCompileStaticByDefault(); }
 }