From 1f15e57918bae3b90fb3f3df769fd3dccd7e1fa7 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 28 Jan 2014 16:11:56 +0400 Subject: [PATCH] Change built-ins generators package from 'runtime' to 'builtins' --- .../GenerateRangeIntrinsics.java} | 12 +++++------- .../jet/generators/{runtime => builtins}/common.kt | 4 ++-- .../generators/{runtime => builtins}/functions.kt | 6 +++--- .../generators/{runtime => builtins}/iterators.kt | 4 ++-- .../{runtime => builtins}/progressionIterators.kt | 6 +++--- .../generators/{runtime => builtins}/progressions.kt | 6 +++--- .../jet/generators/{runtime => builtins}/ranges.kt | 6 +++--- 7 files changed, 21 insertions(+), 23 deletions(-) rename generators/src/org/jetbrains/jet/generators/{runtime/GenerateRanges.java => builtins/GenerateRangeIntrinsics.java} (94%) rename generators/src/org/jetbrains/jet/generators/{runtime => builtins}/common.kt (95%) rename generators/src/org/jetbrains/jet/generators/{runtime => builtins}/functions.kt (96%) rename generators/src/org/jetbrains/jet/generators/{runtime => builtins}/iterators.kt (93%) rename generators/src/org/jetbrains/jet/generators/{runtime => builtins}/progressionIterators.kt (93%) rename generators/src/org/jetbrains/jet/generators/{runtime => builtins}/progressions.kt (95%) rename generators/src/org/jetbrains/jet/generators/{runtime => builtins}/ranges.kt (94%) diff --git a/generators/src/org/jetbrains/jet/generators/runtime/GenerateRanges.java b/generators/src/org/jetbrains/jet/generators/builtins/GenerateRangeIntrinsics.java similarity index 94% rename from generators/src/org/jetbrains/jet/generators/runtime/GenerateRanges.java rename to generators/src/org/jetbrains/jet/generators/builtins/GenerateRangeIntrinsics.java index faa6da08e45..7751d3d0868 100644 --- a/generators/src/org/jetbrains/jet/generators/runtime/GenerateRanges.java +++ b/generators/src/org/jetbrains/jet/generators/builtins/GenerateRangeIntrinsics.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.generators.runtime; +package org.jetbrains.jet.generators.builtins; import com.intellij.openapi.util.io.FileUtil; @@ -25,7 +25,7 @@ import java.io.PrintStream; import java.util.Arrays; import java.util.List; -public class GenerateRanges { +public class GenerateRangeIntrinsics { private static String castIfNecessary(String what, String thisType, String otherType) { if (thisType.equals("byte") && otherType.equals("char") || thisType.equals("char") && otherType.equals("short")) { return "(" + otherType + ") " + what; @@ -34,7 +34,7 @@ public class GenerateRanges { } public static void main(String[] args) throws IOException { - PrintStream out = new PrintStream(new FileOutputStream("runtime/src/jet/runtime/Ranges.java")); + PrintStream out = new PrintStream(new FileOutputStream("core/runtime.jvm/src/jet/runtime/Ranges.java")); try { String copyright = "injector-generator/copyright.txt"; out.println(FileUtil.loadFile(new File(copyright))); @@ -46,7 +46,7 @@ public class GenerateRanges { out.println("import jet.*;"); out.println(); - out.println("/* This file is generated by " + GenerateRanges.class.getName() + ". DO NOT EDIT! */"); + out.println("/* This file is generated by " + GenerateRangeIntrinsics.class.getName() + ". DO NOT EDIT! */"); out.println("public class Ranges {"); List strings = Arrays.asList("byte", "short", "int", "long", "float", "double", "char"); @@ -95,10 +95,8 @@ public class GenerateRanges { finally { out.close(); } - - } - private GenerateRanges() { + private GenerateRangeIntrinsics() { } } diff --git a/generators/src/org/jetbrains/jet/generators/runtime/common.kt b/generators/src/org/jetbrains/jet/generators/builtins/common.kt similarity index 95% rename from generators/src/org/jetbrains/jet/generators/runtime/common.kt rename to generators/src/org/jetbrains/jet/generators/builtins/common.kt index 4367b8e90d5..9852d102ebc 100644 --- a/generators/src/org/jetbrains/jet/generators/runtime/common.kt +++ b/generators/src/org/jetbrains/jet/generators/builtins/common.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.generators.runtime +package org.jetbrains.jet.generators.builtins import java.io.File import kotlin.properties.Delegates import java.io.PrintWriter -import org.jetbrains.jet.generators.runtime.ProgressionKind.* +import org.jetbrains.jet.generators.builtins.ProgressionKind.* enum class ProgressionKind { BYTE diff --git a/generators/src/org/jetbrains/jet/generators/runtime/functions.kt b/generators/src/org/jetbrains/jet/generators/builtins/functions.kt similarity index 96% rename from generators/src/org/jetbrains/jet/generators/runtime/functions.kt rename to generators/src/org/jetbrains/jet/generators/builtins/functions.kt index 89798c4928f..12fa2825d15 100644 --- a/generators/src/org/jetbrains/jet/generators/runtime/functions.kt +++ b/generators/src/org/jetbrains/jet/generators/builtins/functions.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.generators.runtime.functions +package org.jetbrains.jet.generators.builtins.functions import java.io.PrintWriter -import org.jetbrains.jet.generators.runtime.functions.FunctionKind.* -import org.jetbrains.jet.generators.runtime.* +import org.jetbrains.jet.generators.builtins.functions.FunctionKind.* +import org.jetbrains.jet.generators.builtins.* val MAX_PARAM_COUNT = 22 diff --git a/generators/src/org/jetbrains/jet/generators/runtime/iterators.kt b/generators/src/org/jetbrains/jet/generators/builtins/iterators.kt similarity index 93% rename from generators/src/org/jetbrains/jet/generators/runtime/iterators.kt rename to generators/src/org/jetbrains/jet/generators/builtins/iterators.kt index 6bb3f5e14da..d20f33426d2 100644 --- a/generators/src/org/jetbrains/jet/generators/runtime/iterators.kt +++ b/generators/src/org/jetbrains/jet/generators/builtins/iterators.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.generators.runtime.iterators +package org.jetbrains.jet.generators.builtins.iterators -import org.jetbrains.jet.generators.runtime.* +import org.jetbrains.jet.generators.builtins.* import java.io.PrintWriter enum class IteratorKind { diff --git a/generators/src/org/jetbrains/jet/generators/runtime/progressionIterators.kt b/generators/src/org/jetbrains/jet/generators/builtins/progressionIterators.kt similarity index 93% rename from generators/src/org/jetbrains/jet/generators/runtime/progressionIterators.kt rename to generators/src/org/jetbrains/jet/generators/builtins/progressionIterators.kt index 3a20fbf4813..b7cc8b2080b 100644 --- a/generators/src/org/jetbrains/jet/generators/runtime/progressionIterators.kt +++ b/generators/src/org/jetbrains/jet/generators/builtins/progressionIterators.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.generators.runtime.progressionIterators +package org.jetbrains.jet.generators.builtins.progressionIterators -import org.jetbrains.jet.generators.runtime.* -import org.jetbrains.jet.generators.runtime.ProgressionKind.* +import org.jetbrains.jet.generators.builtins.* +import org.jetbrains.jet.generators.builtins.ProgressionKind.* import java.io.PrintWriter fun integerProgressionIterator(kind: ProgressionKind): String { diff --git a/generators/src/org/jetbrains/jet/generators/runtime/progressions.kt b/generators/src/org/jetbrains/jet/generators/builtins/progressions.kt similarity index 95% rename from generators/src/org/jetbrains/jet/generators/runtime/progressions.kt rename to generators/src/org/jetbrains/jet/generators/builtins/progressions.kt index 98e1c319331..b8882b28b3e 100644 --- a/generators/src/org/jetbrains/jet/generators/runtime/progressions.kt +++ b/generators/src/org/jetbrains/jet/generators/builtins/progressions.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.generators.runtime.progressions +package org.jetbrains.jet.generators.builtins.progressions -import org.jetbrains.jet.generators.runtime.* -import org.jetbrains.jet.generators.runtime.ProgressionKind.* +import org.jetbrains.jet.generators.builtins.* +import org.jetbrains.jet.generators.builtins.ProgressionKind.* import java.io.PrintWriter class GenerateProgressions(val out: PrintWriter) { diff --git a/generators/src/org/jetbrains/jet/generators/runtime/ranges.kt b/generators/src/org/jetbrains/jet/generators/builtins/ranges.kt similarity index 94% rename from generators/src/org/jetbrains/jet/generators/runtime/ranges.kt rename to generators/src/org/jetbrains/jet/generators/builtins/ranges.kt index fccfd3016e5..09d69d6220c 100644 --- a/generators/src/org/jetbrains/jet/generators/runtime/ranges.kt +++ b/generators/src/org/jetbrains/jet/generators/builtins/ranges.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.generators.runtime.ranges +package org.jetbrains.jet.generators.builtins.ranges -import org.jetbrains.jet.generators.runtime.* -import org.jetbrains.jet.generators.runtime.ProgressionKind.* +import org.jetbrains.jet.generators.builtins.* +import org.jetbrains.jet.generators.builtins.ProgressionKind.* import java.io.PrintWriter class GenerateRanges(val out: PrintWriter) {