You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/10/06 09:28:20 UTC

[4/4] groovy git commit: Trivial refactoring: extract method `addPhaseOperations`

Trivial refactoring: extract method `addPhaseOperations`

(cherry picked from commit d28483e97deca733913c618a9e4230fc6ed8495d)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/1439565e
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/1439565e
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/1439565e

Branch: refs/heads/GROOVY_2_5_X
Commit: 1439565ec9b70e7dec369cf9f201f40a66ee19b7
Parents: d604b3c
Author: Daniel Sun <su...@apache.org>
Authored: Sat Oct 6 16:42:02 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sat Oct 6 17:27:11 2018 +0800

----------------------------------------------------------------------
 .../groovy/control/CompilationUnit.java         | 34 +++++++++++---------
 1 file changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/1439565e/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
index 0b14860..5ecc461 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
@@ -176,6 +176,25 @@ public class CompilationUnit extends ProcessingUnit {
         this.optimizer = new OptimizerVisitor(this);
 
         initPhaseOperations();
+        addPhaseOperations();
+
+        applyCompilationCustomizers(configuration);
+
+        this.classgenCallback = null;
+        this.classNodeResolver = new ClassNodeResolver();
+    }
+
+    private void initPhaseOperations() {
+        int cnt = Phases.ALL + 1;
+        phaseOperations = new LinkedList[cnt];
+        newPhaseOperations = new LinkedList[cnt];
+        for (int i = 0; i < phaseOperations.length; i++) {
+            phaseOperations[i] = new LinkedList();
+            newPhaseOperations[i] = new LinkedList();
+        }
+    }
+
+    private void addPhaseOperations() {
         addPhaseOperation(new SourceUnitOperation() {
             public void call(SourceUnit source) throws CompilationFailedException {
                 source.parse();
@@ -262,21 +281,6 @@ public class CompilationUnit extends ProcessingUnit {
                 }
             }
         }, Phases.INSTRUCTION_SELECTION);
-
-        applyCompilationCustomizers(configuration);
-
-        this.classgenCallback = null;
-        this.classNodeResolver = new ClassNodeResolver();
-    }
-
-    private void initPhaseOperations() {
-        int cnt = Phases.ALL + 1;
-        phaseOperations = new LinkedList[cnt];
-        newPhaseOperations = new LinkedList[cnt];
-        for (int i = 0; i < phaseOperations.length; i++) {
-            phaseOperations[i] = new LinkedList();
-            newPhaseOperations[i] = new LinkedList();
-        }
     }
 
     private void applyCompilationCustomizers(CompilerConfiguration configuration) {