GenerationStrategy is now a strategy

2012-12-24 14:48:22 +04:00
parent 758bebafa4
commit a91b113cc3
10 changed files with 140 additions and 73 deletions
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.codegen;
+
+import com.intellij.openapi.util.Pair;
+import com.intellij.util.containers.MultiMap;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.codegen.state.GenerationState;
+import org.jetbrains.jet.codegen.state.GenerationStrategy;
+import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.psi.JetPsiUtil;
+import org.jetbrains.jet.lang.psi.JetScript;
+import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
+import org.jetbrains.jet.lang.resolve.java.JvmClassName;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript;
+
+public class KotlinCodegenFacade {
+    public static void compileCorrectFiles(
+            @NotNull GenerationState state,
+            @NotNull GenerationStrategy strategy, @NotNull CompilationErrorHandler errorHandler
+    ) {
+        for (JetFile file : state.getFiles()) {
+            if (file.isScript()) {
+                String name = ScriptNameUtil.classNameForScript(file);
+                JetScript script = file.getScript();
+                assert script != null;
+                registerClassNameForScript(state.getBindingTrace(), script, JvmClassName.byInternalName(name));
+            }
+        }
+
+        state.getScriptCodegen().registerEarlierScripts(Collections.<Pair<ScriptDescriptor, JvmClassName>>emptyList());
+
+        state.beforeCompile();
+
+        MultiMap<FqName, JetFile> namespaceGrouping = new MultiMap<FqName, JetFile>();
+        for (JetFile file : state.getFiles()) {
+            if (file == null) throw new IllegalArgumentException("A null file given for compilation");
+            namespaceGrouping.putValue(JetPsiUtil.getFQName(file), file);
+        }
+
+        for (Map.Entry<FqName, Collection<JetFile>> entry : namespaceGrouping.entrySet()) {
+            strategy.generateNamespace(state, entry.getKey(), entry.getValue(), errorHandler);
+        }
+    }
+
+    private KotlinCodegenFacade() {}
+}
@@ -27,7 +27,7 @@ import org.jetbrains.jet.codegen.context.CodegenContext;
 import org.jetbrains.jet.codegen.context.ScriptContext;
 import org.jetbrains.jet.codegen.signature.JvmMethodSignature;
 import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.GenerationStrategy;
+import org.jetbrains.jet.codegen.state.StandardGenerationStrategy;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
@@ -251,7 +251,7 @@ public class ScriptCodegen extends MemberCodegen {
        registerClassNameForScript(state.getBindingTrace(), script, className);

        state.beforeCompile();
-        GenerationStrategy.STANDARD.generateNamespace(
+        StandardGenerationStrategy.INSTANCE.generateNamespace(
                state,
                JetPsiUtil.getFQName((JetFile) script.getContainingFile()),
                Collections.singleton((JetFile) script.getContainingFile()),
@@ -16,62 +16,18 @@

 package org.jetbrains.jet.codegen.state;

-import com.intellij.openapi.util.Pair;
-import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.codegen.CompilationErrorHandler;
-import org.jetbrains.jet.codegen.NamespaceCodegen;
-import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.psi.JetPsiUtil;
-import org.jetbrains.jet.lang.psi.JetScript;
-import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
-import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.FqName;

 import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;

-import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript;
-
-public class GenerationStrategy {
-    public static final GenerationStrategy STANDARD = new GenerationStrategy();
-
-    protected GenerationStrategy () {
-    }
-
-    public void generateNamespace(GenerationState state,
-            FqName fqName,
-            Collection<JetFile> jetFiles,
-            CompilationErrorHandler errorHandler
-    ) {
-        NamespaceCodegen codegen = state.getFactory().forNamespace(fqName, jetFiles);
-        codegen.generate(errorHandler);
-    }
-
-    public final void compileCorrectFiles(GenerationState state, @NotNull CompilationErrorHandler errorHandler) {
-        for (JetFile file : state.getFiles()) {
-            if (file.isScript()) {
-                String name = ScriptNameUtil.classNameForScript(file);
-                JetScript script = file.getScript();
-                assert script != null;
-                registerClassNameForScript(state.getBindingTrace(), script, JvmClassName.byInternalName(name));
-            }
-        }
-
-        state.getScriptCodegen().registerEarlierScripts(Collections.<Pair<ScriptDescriptor, JvmClassName>>emptyList());
-
-        state.beforeCompile();
-
-        MultiMap<FqName, JetFile> namespaceGrouping = new MultiMap<FqName, JetFile>();
-        for (JetFile file : state.getFiles()) {
-            if (file == null) throw new IllegalArgumentException("A null file given for compilation");
-            namespaceGrouping.putValue(JetPsiUtil.getFQName(file), file);
-        }
-
-        for (Map.Entry<FqName, Collection<JetFile>> entry : namespaceGrouping.entrySet()) {
-            generateNamespace(state, entry.getKey(), entry.getValue(), errorHandler);
-        }
-    }
+public interface GenerationStrategy {
+    void generateNamespace(
+            @NotNull GenerationState state,
+            @NotNull FqName fqName,
+            @NotNull Collection<JetFile> jetFiles,
+            @NotNull CompilationErrorHandler errorHandler
+    );
 }
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.codegen.state;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.codegen.CompilationErrorHandler;
+import org.jetbrains.jet.codegen.NamespaceCodegen;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+
+import java.util.Collection;
+
+public class StandardGenerationStrategy implements GenerationStrategy {
+    public static final GenerationStrategy INSTANCE = new StandardGenerationStrategy();
+
+    private StandardGenerationStrategy() {
+    }
+
+    @Override
+    public void generateNamespace(
+            @NotNull GenerationState state,
+            @NotNull FqName fqName,
+            @NotNull Collection<JetFile> jetFiles,
+            @NotNull CompilationErrorHandler errorHandler
+    ) {
+        NamespaceCodegen codegen = state.getFactory().forNamespace(fqName, jetFiles);
+        codegen.generate(errorHandler);
+    }
+
+}