From ed1f22111b59c7d008fc45fae9973f32117d93db Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 20 Aug 2012 22:49:22 +0400 Subject: [PATCH] line number codegen tests --- .../testData/lineNumber/anonymousFunction.kt | 5 + compiler/testData/lineNumber/base.kt | 3 + compiler/testData/lineNumber/class.kt | 7 + compiler/testData/lineNumber/classObject.kt | 9 + .../testData/lineNumber/defaultParameter.kt | 2 + compiler/testData/lineNumber/enum.kt | 9 + compiler/testData/lineNumber/for.kt | 5 + compiler/testData/lineNumber/if.kt | 15 ++ compiler/testData/lineNumber/localFunction.kt | 9 + compiler/testData/lineNumber/object.kt | 5 + .../testData/lineNumber/propertyAccessor.kt | 6 + compiler/testData/lineNumber/psvm.kt | 3 + compiler/testData/lineNumber/topLevel.kt | 3 + compiler/testData/lineNumber/trait.kt | 7 + compiler/testData/lineNumber/tryCatch.kt | 7 + compiler/testData/lineNumber/while.kt | 9 + .../jet/codegen/GenerationUtils.java | 2 +- .../jetbrains/jet/codegen/LineNumberTest.java | 224 ++++++++++++++++++ 18 files changed, 329 insertions(+), 1 deletion(-) create mode 100644 compiler/testData/lineNumber/anonymousFunction.kt create mode 100644 compiler/testData/lineNumber/base.kt create mode 100644 compiler/testData/lineNumber/class.kt create mode 100644 compiler/testData/lineNumber/classObject.kt create mode 100644 compiler/testData/lineNumber/defaultParameter.kt create mode 100644 compiler/testData/lineNumber/enum.kt create mode 100644 compiler/testData/lineNumber/for.kt create mode 100644 compiler/testData/lineNumber/if.kt create mode 100644 compiler/testData/lineNumber/localFunction.kt create mode 100644 compiler/testData/lineNumber/object.kt create mode 100644 compiler/testData/lineNumber/propertyAccessor.kt create mode 100644 compiler/testData/lineNumber/psvm.kt create mode 100644 compiler/testData/lineNumber/topLevel.kt create mode 100644 compiler/testData/lineNumber/trait.kt create mode 100644 compiler/testData/lineNumber/tryCatch.kt create mode 100644 compiler/testData/lineNumber/while.kt create mode 100644 compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java diff --git a/compiler/testData/lineNumber/anonymousFunction.kt b/compiler/testData/lineNumber/anonymousFunction.kt new file mode 100644 index 00000000000..da9e96e9059 --- /dev/null +++ b/compiler/testData/lineNumber/anonymousFunction.kt @@ -0,0 +1,5 @@ +fun foo() { + { + test.lineNumber() + }() +} diff --git a/compiler/testData/lineNumber/base.kt b/compiler/testData/lineNumber/base.kt new file mode 100644 index 00000000000..32117a5fce1 --- /dev/null +++ b/compiler/testData/lineNumber/base.kt @@ -0,0 +1,3 @@ +package test + +public fun lineNumber(): Int = 0 diff --git a/compiler/testData/lineNumber/class.kt b/compiler/testData/lineNumber/class.kt new file mode 100644 index 00000000000..29ff84749e3 --- /dev/null +++ b/compiler/testData/lineNumber/class.kt @@ -0,0 +1,7 @@ +class A { + val prop = test.lineNumber() + + fun foo() { + test.lineNumber() + } +} diff --git a/compiler/testData/lineNumber/classObject.kt b/compiler/testData/lineNumber/classObject.kt new file mode 100644 index 00000000000..ec42ee5dbf2 --- /dev/null +++ b/compiler/testData/lineNumber/classObject.kt @@ -0,0 +1,9 @@ +class A { + class object { + val prop = test.lineNumber() + + fun foo(): Int { + return test.lineNumber() + } + } +} diff --git a/compiler/testData/lineNumber/defaultParameter.kt b/compiler/testData/lineNumber/defaultParameter.kt new file mode 100644 index 00000000000..445a73bec73 --- /dev/null +++ b/compiler/testData/lineNumber/defaultParameter.kt @@ -0,0 +1,2 @@ +fun foo(param: Int = test.lineNumber()) { +} diff --git a/compiler/testData/lineNumber/enum.kt b/compiler/testData/lineNumber/enum.kt new file mode 100644 index 00000000000..f544c80f4bc --- /dev/null +++ b/compiler/testData/lineNumber/enum.kt @@ -0,0 +1,9 @@ +enum class E { + E1 + + fun foo() = { + test.lineNumber() + } + + val prop = test.lineNumber() +} diff --git a/compiler/testData/lineNumber/for.kt b/compiler/testData/lineNumber/for.kt new file mode 100644 index 00000000000..de98bcc95d1 --- /dev/null +++ b/compiler/testData/lineNumber/for.kt @@ -0,0 +1,5 @@ +fun foo() { + for (i in 0..test.lineNumber()) { + test.lineNumber() + } +} diff --git a/compiler/testData/lineNumber/if.kt b/compiler/testData/lineNumber/if.kt new file mode 100644 index 00000000000..ffa49a338fd --- /dev/null +++ b/compiler/testData/lineNumber/if.kt @@ -0,0 +1,15 @@ +fun foo() { + if (test.lineNumber() > 0) { + test.lineNumber() + } + + if (test.lineNumber() > 0) else { + test.lineNumber() + } + + if (test.lineNumber() > 0) { + test.lineNumber() + } else { + test.lineNumber() + } +} diff --git a/compiler/testData/lineNumber/localFunction.kt b/compiler/testData/lineNumber/localFunction.kt new file mode 100644 index 00000000000..73961fb5f05 --- /dev/null +++ b/compiler/testData/lineNumber/localFunction.kt @@ -0,0 +1,9 @@ +fun foo() { + test.lineNumber() + fun bar() { + test.lineNumber() + } + test.lineNumber() + bar() + test.lineNumber() +} diff --git a/compiler/testData/lineNumber/object.kt b/compiler/testData/lineNumber/object.kt new file mode 100644 index 00000000000..a6f9f7c8552 --- /dev/null +++ b/compiler/testData/lineNumber/object.kt @@ -0,0 +1,5 @@ +object A { + fun foo() = test.lineNumber() + + val prop = test.lineNumber() +} diff --git a/compiler/testData/lineNumber/propertyAccessor.kt b/compiler/testData/lineNumber/propertyAccessor.kt new file mode 100644 index 00000000000..5d6516807ee --- /dev/null +++ b/compiler/testData/lineNumber/propertyAccessor.kt @@ -0,0 +1,6 @@ +class A { + val prop : Int + get() { + return test.lineNumber() + } +} diff --git a/compiler/testData/lineNumber/psvm.kt b/compiler/testData/lineNumber/psvm.kt new file mode 100644 index 00000000000..2aed5b9892a --- /dev/null +++ b/compiler/testData/lineNumber/psvm.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + test.lineNumber() +} diff --git a/compiler/testData/lineNumber/topLevel.kt b/compiler/testData/lineNumber/topLevel.kt new file mode 100644 index 00000000000..66bcbc61ba9 --- /dev/null +++ b/compiler/testData/lineNumber/topLevel.kt @@ -0,0 +1,3 @@ +fun foo() = test.lineNumber() + +val prop = test.lineNumber() diff --git a/compiler/testData/lineNumber/trait.kt b/compiler/testData/lineNumber/trait.kt new file mode 100644 index 00000000000..935f56ab7ed --- /dev/null +++ b/compiler/testData/lineNumber/trait.kt @@ -0,0 +1,7 @@ +trait A { + fun foo() = test.lineNumber() + + fun bar(): Int { + return test.lineNumber() + } +} diff --git a/compiler/testData/lineNumber/tryCatch.kt b/compiler/testData/lineNumber/tryCatch.kt new file mode 100644 index 00000000000..def75533c0b --- /dev/null +++ b/compiler/testData/lineNumber/tryCatch.kt @@ -0,0 +1,7 @@ +fun foo() { + try { + test.lineNumber() + } catch (e: Exception) { + test.lineNumber() + } +} diff --git a/compiler/testData/lineNumber/while.kt b/compiler/testData/lineNumber/while.kt new file mode 100644 index 00000000000..60f07db646b --- /dev/null +++ b/compiler/testData/lineNumber/while.kt @@ -0,0 +1,9 @@ +fun foo() { + while (test.lineNumber() > 0) { + test.lineNumber() + } + + do { + test.lineNumber() + } while (test.lineNumber() > 0) +} diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java index 8fa025db0e4..321cdd86fec 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java +++ b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java @@ -60,7 +60,7 @@ public class GenerationUtils { @NotNull private static GenerationState compileFilesGetGenerationState(@NotNull AnalyzeExhaust analyzeExhaust, @NotNull List files) { analyzeExhaust.throwIfError(); - GenerationState state = new GenerationState(ClassBuilderFactories.binaries(false), analyzeExhaust, files); + GenerationState state = new GenerationState(ClassBuilderFactories.TEST, analyzeExhaust, files); state.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION); return state; } diff --git a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java new file mode 100644 index 00000000000..5e5269c39de --- /dev/null +++ b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java @@ -0,0 +1,224 @@ +/* + * 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.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; +import org.jetbrains.asm4.*; +import org.jetbrains.jet.CompileCompilerDependenciesTest; +import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.TestJdkKind; +import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.jet.parsing.JetParsingTest; +import org.jetbrains.jet.test.TestCaseWithTmpdir; +import org.jetbrains.jet.utils.ExceptionUtils; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @author udalov + */ +public class LineNumberTest extends TestCaseWithTmpdir { + + private final String LINE_NUMBER_FUN = "lineNumber"; + private final Pattern TEST_LINE_NUMBER_PATTERN = Pattern.compile("^.*test." + LINE_NUMBER_FUN + "\\(\\).*$"); + + private String getTestDataPath() { + return JetParsingTest.getTestDataDir() + "/lineNumber"; + } + + @Override + public void setUp() throws Exception { + super.setUp(); + + JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_ONLY); + File base = new File(getTestDataPath(), "base.kt"); + String text = FileUtil.loadFile(base); + + JetFile psiFile = JetTestUtils.createFile(base.getName(), text, jetCoreEnvironment.getProject()); + ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); + CompileEnvironmentUtil.writeToOutputDirectory(classFileFactory, tmpdir); + } + + private void doTest(File file) { + JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(myTestRootDisposable, CompileCompilerDependenciesTest + .compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), tmpdir)); + + String text; + try { + text = FileUtil.loadFile(file); + } + catch (IOException e) { + throw ExceptionUtils.rethrow(e); + } + + JetFile psiFile = JetTestUtils.createFile(file.getName(), text, jetCoreEnvironment.getProject()); + assert psiFile != null; + + List expectedLineNumbers = extractSelectedLineNumbers(text); + + GenerationState state = GenerationUtils.compileFileGetGenerationStateForTest(psiFile); + ClassFileFactory factory = state.getFactory(); + + List actualLineNumbers = Lists.newArrayList(); + for (String filename : factory.files()) { + ClassReader cr = new ClassReader(factory.asBytes(filename)); + try { + actualLineNumbers.addAll(readLineNumbers(cr)); + } + catch (Throwable e) { + System.out.println(state.createText()); + throw ExceptionUtils.rethrow(e); + } + } + assertSameElements(actualLineNumbers, expectedLineNumbers); + } + + private void doTest() { + doTest(new File(getTestDataPath() + "/" + getTestName(true) + ".kt")); + } + + private List extractSelectedLineNumbers(String fileContent) { + List lineNumbers = Lists.newArrayList(); + String[] lines = StringUtil.convertLineSeparators(fileContent).split("\n"); + + for (int i = 0; i < lines.length; i++) { + Matcher matcher = TEST_LINE_NUMBER_PATTERN.matcher(lines[i]); + if (matcher.matches()) { + lineNumbers.add(i + 1); + } + } + + return lineNumbers; + } + + private List readLineNumbers(ClassReader cr) { + final List