azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert 9f0fcc280b

Browse Source
This commit is contained in:
pTalanov
2012-06-01 19:14:00 +04:00
parent fd70848484
commit 39dc1a1cb8
19 changed files with 33 additions and 3963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+1 -1
View File
@@ -102,7 +102,7 @@ public abstract class BasicTest extends TestWithEnvironment {
@NotNull MainCallParameters mainCallParameters, @NotNull EnumSet<EcmaVersion> ecmaVersions)
throws Exception {
for (EcmaVersion version : ecmaVersions) {
TranslationUtils.translateFiles(getProject(), files, getOutputFilePath(testName, version), mainCallParameters, version, null);
TranslationUtils.translateFiles(getProject(), files, getOutputFilePath(testName, version), mainCallParameters, version);
}
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java
-44
View File
@@ -1,44 +0,0 @@
/*
* 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.k2js.test.semantics;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.ExitCode;
import org.jetbrains.jet.cli.js.K2JSCompiler;
import org.jetbrains.jet.cli.js.K2JSCompilerArguments;
import org.jetbrains.k2js.config.Config;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
import java.io.File;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
/**
*/
public class StdLibTestToJSTest extends StdLibToJSTest {
public void testCompileJavaScriptFiles() throws Exception {
generateJavaScriptFiles(EcmaVersion.all(),
"libraries/stdlib/test",
"js/SimpleTest.kt");
}
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
+13 -9
View File
@@ -24,6 +24,7 @@ import org.jetbrains.jet.cli.js.K2JSCompiler;
import org.jetbrains.jet.cli.js.K2JSCompilerArguments;
import org.jetbrains.k2js.config.Config;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
import java.io.File;
@@ -33,24 +34,27 @@ import java.util.Set;
/**
*/
public class StdLibToJSTest extends SingleFileTranslationTest {
public final class StdLibToJSTest extends SingleFileTranslationTest {
public StdLibToJSTest() {
super("stdlib/");
}
public void testCompileJavaScriptFiles() throws Exception {
public void testCompileStandardLibraryFiles() throws Exception {
generateJavaScriptFiles(EcmaVersion.all(),
"libraries/stdlib/src",
"kotlin/Preconditions.kt", "kotlin/dom/Dom.kt", "kotlin/support/AbstractIterator.kt");
generateJavaScriptFiles(MainCallParameters.noCall(), EcmaVersion.all(),
"kotlin/Preconditions.kt",
"kotlin/dom/Dom.kt",
"kotlin/support/AbstractIterator.kt"
);
}
protected void generateJavaScriptFiles(@NotNull EnumSet<EcmaVersion> ecmaVersions,
@NotNull String sourceDir, @NotNull String... stdLibFiles) throws Exception {
protected void generateJavaScriptFiles(@NotNull MainCallParameters mainCallParameters,
@NotNull EnumSet<EcmaVersion> ecmaVersions,
String... stdLibFiles) throws Exception {
List<String> files = Lists.newArrayList();
File stdlibDir = new File(sourceDir);
File stdlibDir = new File("libraries/stdlib/src");
assertTrue("Cannot find stdlib source: " + stdlibDir, stdlibDir.exists());
for (String file : stdLibFiles) {
files.add(new File(stdlibDir, file).getPath());
@@ -74,12 +78,12 @@ public class StdLibToJSTest extends SingleFileTranslationTest {
// now lets try invoke the compiler
for (EcmaVersion version : ecmaVersions) {
System.out.println("Compiling with version: " + version);
K2JSCompiler compiler = new K2JSCompiler();
K2JSCompilerArguments arguments = new K2JSCompilerArguments();
arguments.outputFile = getOutputFilePath(getTestName(false) + ".compiler.kt", version);
arguments.sourceFiles = files;
arguments.verbose = true;
System.out.println("Compiling with version: " + version + " to: " + arguments.outputFile);
ExitCode answer = compiler.exec(System.out, arguments);
assertEquals("Compile failed", ExitCode.OK, answer);
}
js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java
+4 -7
View File
@@ -48,20 +48,17 @@ public final class TranslationUtils {
public static void translateFile(@NotNull Project project, @NotNull String inputFile,
@NotNull String outputFile, @NotNull MainCallParameters mainCallParameters, @NotNull EcmaVersion version) throws Exception {
translateFiles(project, Collections.singletonList(inputFile), outputFile, mainCallParameters, version, null);
translateFiles(project, Collections.singletonList(inputFile), outputFile, mainCallParameters, version);
}
public static void translateFiles(@NotNull Project project, @NotNull List<String> inputFiles,
@NotNull String outputFile,
@NotNull MainCallParameters mainCallParameters,
@NotNull EcmaVersion version,
List<String> rawStatements) throws Exception {
@NotNull String outputFile, @NotNull MainCallParameters mainCallParameters, @NotNull EcmaVersion version) throws Exception {
List<JetFile> psiFiles = createPsiFileList(inputFiles, project);
JsProgram program = getTranslator(project, version).generateProgram(psiFiles, mainCallParameters, rawStatements);
JsProgram program = getTranslator(project, version).generateProgram(psiFiles, mainCallParameters);
FileWriter writer = new FileWriter(new File(outputFile));
try {
writer.write("\"use strict\";\n");
writer.write(CodeGenerator.toString(program, null));
writer.write(CodeGenerator.toString(program));
}
finally {
writer.close();