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

Merge remote-tracking branch 'origin/HEAD' into idea14

Browse Source 
Conflicts:
	idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java
	idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java
This commit is contained in:
Nikolay Krasko
2014-06-26 16:46:09 +04:00
parent a2fdfc714f e73ee4bbd6
commit efa60fc1a4
129 changed files with 1548 additions and 1110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TeamCityBuild.xml
+4 -3
View File
@@ -94,12 +94,13 @@
<delete dir="${version_substitute_dir}" quiet="true"/>
</target>
<target name="pre_build" depends="writeVersionToTemplateFiles, cleanupArtifacts">
</target>
<target name="pre_build" depends="writeVersionToTemplateFiles, cleanupArtifacts"/>
<target name="zipArtifact">
<zip destfile="${plugin.zip}">
<zipfileset prefix="Kotlin" dir="${artifact.output.path}/Kotlin"/>
<zipfileset prefix="Kotlin" dir="${artifact.output.path}/Kotlin" excludes="kotlinc/bin/*"/>
<zipfileset prefix="Kotlin/kotlinc/bin" dir="${artifact.output.path}/Kotlin/kotlinc/bin" includes="*.bat" filemode="644"/>
<zipfileset prefix="Kotlin/kotlinc/bin" dir="${artifact.output.path}/Kotlin/kotlinc/bin" excludes="*.bat" filemode="755"/>
</zip>
<delete dir="${artifact.output.path}/Kotlin" quiet="true"/>
</target>
build.xml
+3 -1
View File
@@ -636,7 +636,9 @@
<target name="zip" depends="dist">
<zip destfile="${output}/${output.name}.zip">
<zipfileset prefix="kotlinc" dir="${kotlin-home}"/>
<zipfileset prefix="kotlinc" dir="${kotlin-home}" excludes="bin/*"/>
<zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" includes="*.bat" filemode="644"/>
<zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" excludes="*.bat" filemode="755"/>
</zip>
<echo message="##teamcity[publishArtifacts '${output.relative}/${output.name}.zip']"/>
</target>
compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CommonCompilerArguments.java
+16 -3
View File
@@ -18,22 +18,30 @@ package org.jetbrains.jet.cli.common.arguments;
import com.intellij.util.SmartList;
import com.sampullara.cli.Argument;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import static org.jetbrains.jet.cli.common.arguments.CommonArgumentConstants.SUPPRESS_WARNINGS;
public abstract class CommonCompilerArguments {
@Argument(value = "tags", description = "Demarcate each compilation message (error, warning, etc) with an open and close tag")
public boolean tags;
@Argument(value = "verbose", description = "Enable verbose logging output")
public boolean verbose;
@Argument(value = "version", description = "Display compiler version")
public boolean version;
@Argument(value = "help", alias = "h", description = "Show help")
@Argument(value = "help", alias = "h", description = "Print a synopsis of standard options")
public boolean help;
@Argument(value = "suppress", description = "Suppress compiler messages by severity (" + SUPPRESS_WARNINGS + ")")
@Argument(value = "suppress", description = "Suppress all compiler warnings")
@ValueDescription(SUPPRESS_WARNINGS)
public String suppress;
@Argument(value = "printArgs", description = "Print commandline arguments")
@Argument(value = "printArgs", description = "Print command line arguments")
public boolean printArgs;
public List<String> freeArgs = new SmartList<String>();
@@ -42,6 +50,11 @@ public abstract class CommonCompilerArguments {
return SUPPRESS_WARNINGS.equalsIgnoreCase(suppress);
}
@NotNull
public String executableScriptFileName() {
return "kotlinc";
}
// Used only for serialize and deserialize settings. Don't use in other places!
public static final class DummyImpl extends CommonCompilerArguments {}
}
compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JSCompilerArguments.java
+19 -6
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.cli.common.arguments;
import com.sampullara.cli.Argument;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static org.jetbrains.jet.cli.common.arguments.K2JsArgumentConstants.CALL;
@@ -27,28 +28,40 @@ import static org.jetbrains.jet.cli.common.arguments.K2JsArgumentConstants.NO_CA
*/
public class K2JSCompilerArguments extends CommonCompilerArguments {
@Argument(value = "output", description = "Output file path")
@ValueDescription("<path>")
public String outputFile;
@Argument(value = "libraryFiles", description = "Path to zipped lib sources or kotlin files")
@Argument(value = "libraryFiles", description = "Path to zipped library sources or kotlin files separated by commas")
@ValueDescription("<path[,]>")
public String[] libraryFiles;
@Argument(value = "sourceFiles", description = "Source files (dir or file)")
@Argument(value = "sourceFiles", description = "Source files or directories separated by commas")
@ValueDescription("<path[,]>")
public String[] sourceFiles;
@Argument(value = "sourcemap", description = "Generate SourceMap")
public boolean sourcemap;
@Argument(value = "target", description = "Generate js files for specific ECMA version (now support only ECMA 5)")
@Argument(value = "target", description = "Generate JS files for specific ECMA version (only ECMA 5 is supported)")
@ValueDescription("<version>")
public String target;
@Nullable
@Argument(value = "main", description = "Whether a main function should be called; either '" + CALL +
"' or '" + NO_CALL + "', default '" + CALL + "' (main function will be auto detected)")
@Argument(value = "main", description = "Whether a main function should be called; default '" + CALL + "' (main function will be auto detected)")
@ValueDescription("{" + CALL + "," + NO_CALL + "}")
public String main;
@Argument(value = "outputPrefix", description = "Path to file which will be added to the begin of output file")
@Argument(value = "outputPrefix", description = "Path to file which will be added to the beginning of output file")
@ValueDescription("<path>")
public String outputPrefix;
@Argument(value = "outputPostfix", description = "Path to file which will be added to the end of output file")
@ValueDescription("<path>")
public String outputPostfix;
@Override
@NotNull
public String executableScriptFileName() {
return "kotlinc-js";
}
}
compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java
+48 -32
View File
@@ -15,57 +15,73 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.cli.common.arguments;
import com.sampullara.cli.Argument;
import org.jetbrains.annotations.NotNull;
/**
* Command line arguments for the {@link K2JVMCompiler}
* Command line arguments for K2JVMCompiler
*/
@SuppressWarnings("UnusedDeclaration")
public class K2JVMCompilerArguments extends CommonCompilerArguments {
@Argument(value = "jar", description = "jar file name")
public String jar;
@Argument(value = "src", description = "source file or directory (allows many paths separated by the system path separator)")
@Argument(value = "src", description = "Source file or directory (allows many paths separated by the system path separator)")
@ValueDescription("<path>")
public String src;
@Argument(value = "classpath", description = "classpath to use when compiling")
public String classpath;
@Argument(value = "jar", description = "Resulting .jar file path")
@ValueDescription("<path>")
public String jar;
@Argument(value = "annotations", description = "paths to external annotations")
public String annotations;
@Argument(value = "includeRuntime", description = "include Kotlin runtime in to resulting jar")
public boolean includeRuntime;
@Argument(value = "noJdk", description = "don't include Java runtime into classpath")
public boolean noJdk;
@Argument(value = "noStdlib", description = "don't include Kotlin runtime into classpath")
public boolean noStdlib;
@Argument(value = "noJdkAnnotations", description = "don't include JDK external annotations into classpath")
public boolean noJdkAnnotations;
@Argument(value = "notNullAssertions", description = "generate not-null assertion after each invocation of method returning not-null")
public boolean notNullAssertions;
@Argument(value = "notNullParamAssertions", description = "generate not-null assertions on parameters of methods accessible from Java")
public boolean notNullParamAssertions;
@Argument(value = "output", description = "output directory")
@Argument(value = "output", description = "Output directory path for .class files")
@ValueDescription("<path>")
public String outputDir;
@Argument(value = "module", description = "module to compile")
@Argument(value = "classpath", description = "Paths where to find user class files")
@ValueDescription("<path>")
public String classpath;
@Argument(value = "annotations", description = "Paths to external annotations")
@ValueDescription("<path>")
public String annotations;
@Argument(value = "includeRuntime", description = "Include Kotlin runtime in to resulting .jar")
public boolean includeRuntime;
@Argument(value = "noJdk", description = "Don't include Java runtime into classpath")
public boolean noJdk;
@Argument(value = "noStdlib", description = "Don't include Kotlin runtime into classpath")
public boolean noStdlib;
@Argument(value = "noJdkAnnotations", description = "Don't include JDK external annotations into classpath")
public boolean noJdkAnnotations;
@Argument(value = "notNullAssertions", description = "Generate not-null assertion after each invocation of method returning not-null")
public boolean notNullAssertions;
@Argument(value = "notNullParamAssertions", description = "Generate not-null assertions on parameters of methods accessible from Java")
public boolean notNullParamAssertions;
@Argument(value = "module", description = "Path to the module file to compile")
@ValueDescription("<path>")
public String module;
@Argument(value = "script", description = "evaluate script")
@Argument(value = "script", description = "Evaluate the script file")
public boolean script;
@Argument(value = "kotlinHome", description = "Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery")
@ValueDescription("<path>")
public String kotlinHome;
@Argument(value = "inline", description = "Inlining mode: on/off or true/false (default is on)")
@Argument(value = "inline", description = "Inlining mode (default is on)")
@ValueDescription("{on,off}")
public String inline;
@Override
@NotNull
public String executableScriptFileName() {
return "kotlinc-jvm";
}
}
compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/ValueDescription.java
+28
View File
@@ -0,0 +1,28 @@
/*
* Copyright 2010-2014 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.cli.common.arguments;
import org.jetbrains.annotations.NotNull;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME)
public @interface ValueDescription {
@NotNull
String value();
}
compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+2 -15
View File
@@ -85,20 +85,7 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
* Allow derived classes to add additional command line arguments
*/
protected void usage(@NotNull PrintStream target) {
// We should say something like
// Args.usage(target, K2JVMCompilerArguments.class);
// but currently cli-parser we are using does not support that
// a corresponding patch has been sent to the authors
// For now, we are using this:
PrintStream oldErr = System.err;
System.setErr(target);
try {
// TODO: use proper argv0
Args.usage(createArguments());
}
finally {
System.setErr(oldErr);
}
Usage.print(target, createArguments());
}
/**
@@ -200,7 +187,7 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
String argumentsAsString = StringUtil.join(argumentsAsList, " ");
String printArgsMessage = messageRenderer.render(CompilerMessageSeverity.INFO,
"Invoking compiler " + getClass().getName() +
"Invoking " + getClass().getSimpleName() +
" with arguments " + argumentsAsString + freeArgs,
CompilerMessageLocation.NO_LOCATION);
errStream.println(printArgsMessage);
compiler/cli/src/org/jetbrains/jet/cli/common/Usage.java
+77
View File
@@ -0,0 +1,77 @@
/*
* Copyright 2010-2014 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.cli.common;
import com.sampullara.cli.Argument;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
import org.jetbrains.jet.cli.common.arguments.ValueDescription;
import java.io.PrintStream;
import java.lang.reflect.Field;
class Usage {
// The magic number 29 corresponds to the similar padding width in javac and scalac command line compilers
private static final int OPTION_NAME_PADDING_WIDTH = 29;
public static void print(@NotNull PrintStream target, @NotNull CommonCompilerArguments arguments) {
target.println("Usage: " + arguments.executableScriptFileName() + " <options> <source files>");
target.println("where possible options include:");
for (Class<?> clazz = arguments.getClass(); clazz != null; clazz = clazz.getSuperclass()) {
for (Field field : clazz.getDeclaredFields()) {
String usage = fieldUsage(field);
if (usage != null) {
target.println(usage);
}
}
}
}
@Nullable
private static String fieldUsage(@NotNull Field field) {
Argument argument = field.getAnnotation(Argument.class);
if (argument == null) return null;
ValueDescription description = field.getAnnotation(ValueDescription.class);
String prefix = argument.prefix();
StringBuilder sb = new StringBuilder(" ");
sb.append(prefix);
if (argument.value().isEmpty()) {
sb.append(field.getName());
}
else {
sb.append(argument.value());
}
if (!argument.alias().isEmpty()) {
sb.append(" (");
sb.append(prefix);
sb.append(argument.alias());
sb.append(")");
}
if (description != null) {
sb.append(" ");
sb.append(description.value());
}
while (sb.length() < OPTION_NAME_PADDING_WIDTH) {
sb.append(" ");
}
sb.append(argument.description());
return sb.toString();
}
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+1 -4
View File
@@ -278,11 +278,8 @@ public class CompileEnvironmentUtil {
if (jar != null) {
writeToJar(jar, includeRuntime, mainClass, outputFiles);
}
else if (outputDir != null) {
OutputUtilsPackage.writeAll(outputFiles, outputDir, messageCollector);
}
else {
throw new CompileEnvironmentException("Output directory or jar file is not specified - no files will be saved to the disk");
OutputUtilsPackage.writeAll(outputFiles, outputDir == null ? new File(".") : outputDir, messageCollector);
}
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+8 -7
View File
@@ -22,6 +22,7 @@ import com.google.common.collect.Maps;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;
import com.intellij.psi.PsiFile;
import com.intellij.util.ArrayUtil;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.Unit;
@@ -91,12 +92,12 @@ public class KotlinToJVMBytecodeCompiler {
}
private static void writeOutput(
CompilerConfiguration configuration,
ClassFileFactory outputFiles,
File outputDir,
File jarPath,
@NotNull CompilerConfiguration configuration,
@NotNull ClassFileFactory outputFiles,
@Nullable File outputDir,
@Nullable File jarPath,
boolean jarRuntime,
FqName mainClass
@Nullable FqName mainClass
) {
MessageCollector messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE);
CompileEnvironmentUtil.writeOutputToDirOrJar(jarPath, outputDir, jarRuntime, mainClass, outputFiles, messageCollector);
@@ -192,7 +193,7 @@ public class KotlinToJVMBytecodeCompiler {
}
public static boolean compileBunchOfSources(
JetCoreEnvironment environment,
@NotNull JetCoreEnvironment environment,
@Nullable File jar,
@Nullable File outputDir,
boolean includeRuntime
@@ -223,7 +224,7 @@ public class KotlinToJVMBytecodeCompiler {
if (scriptClass == null) return;
try {
scriptClass.getConstructor(String[].class).newInstance(new Object[]{scriptArgs.toArray(new String[scriptArgs.size()])});
scriptClass.getConstructor(String[].class).newInstance(new Object[] {ArrayUtil.toStringArray(scriptArgs)});
}
catch (RuntimeException e) {
throw e;
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+11 -8
View File
@@ -295,7 +295,7 @@ public class JetControlFlowProcessor {
VariableAsFunctionResolvedCall variableAsFunctionResolvedCall = (VariableAsFunctionResolvedCall) resolvedCall;
generateCall(expression, variableAsFunctionResolvedCall.getVariableCall());
}
else if (!generateCall(expression, true) && !(expression.getParent() instanceof JetCallExpression)) {
else if (!generateCall(expression) && !(expression.getParent() instanceof JetCallExpression)) {
createNonSyntheticValue(expression, generateAndGetReceiverIfAny(expression));
}
}
@@ -353,7 +353,7 @@ public class JetControlFlowProcessor {
mergeValues(Arrays.asList(left, right), expression);
}
else {
if (!generateCall(operationReference, true)) {
if (!generateCall(operationReference)) {
generateBothArgumentsAndMark(expression);
}
}
@@ -535,7 +535,7 @@ public class JetControlFlowProcessor {
private void generateArrayAccess(JetArrayAccessExpression arrayAccessExpression, @Nullable ResolvedCall<?> resolvedCall) {
mark(arrayAccessExpression);
if (!checkAndGenerateCall(arrayAccessExpression, resolvedCall, true)) {
if (!checkAndGenerateCall(arrayAccessExpression, resolvedCall)) {
generateArrayAccessWithoutCall(arrayAccessExpression);
}
}
@@ -1070,7 +1070,7 @@ public class JetControlFlowProcessor {
@Override
public void visitCallExpression(@NotNull JetCallExpression expression) {
JetExpression calleeExpression = expression.getCalleeExpression();
if (!generateCall(calleeExpression, true)) {
if (!generateCall(calleeExpression)) {
List<JetExpression> inputExpressions = new ArrayList<JetExpression>();
for (ValueArgument argument : expression.getValueArguments()) {
JetExpression argumentExpression = argument.getArgumentExpression();
@@ -1197,7 +1197,7 @@ public class JetControlFlowProcessor {
public void visitArrayAccessExpression(@NotNull JetArrayAccessExpression expression) {
mark(expression);
ResolvedCall<FunctionDescriptor> getMethodResolvedCall = trace.get(BindingContext.INDEXED_LVALUE_GET, expression);
if (!checkAndGenerateCall(expression, getMethodResolvedCall, true)) {
if (!checkAndGenerateCall(expression, getMethodResolvedCall)) {
generateArrayAccess(expression, getMethodResolvedCall);
}
}
@@ -1378,12 +1378,15 @@ public class JetControlFlowProcessor {
return trace.get(BindingContext.RESOLVED_CALL, expression);
}
private boolean generateCall(@Nullable JetExpression calleeExpression, boolean bindResultValue) {
private boolean generateCall(@Nullable JetExpression calleeExpression) {
if (calleeExpression == null) return false;
return checkAndGenerateCall(calleeExpression, getResolvedCall(calleeExpression), bindResultValue);
return checkAndGenerateCall(calleeExpression, getResolvedCall(calleeExpression));
}
private boolean checkAndGenerateCall(JetExpression calleeExpression, @Nullable ResolvedCall<?> resolvedCall, boolean bindResultValue) {
private boolean checkAndGenerateCall(
JetExpression calleeExpression,
@Nullable ResolvedCall<?> resolvedCall
) {
if (resolvedCall == null) {
builder.compilationError(calleeExpression, "No resolved call");
return false;
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/TypePredicate.kt
+2 -2
View File
@@ -41,13 +41,13 @@ public data class AllSubtypes(val upperBound: JetType): TypePredicate {
public data class ForAllTypes(val typeSets: List<TypePredicate>): TypePredicate {
override fun invoke(typeToCheck: JetType): Boolean = typeSets.all { it(typeToCheck) }
override fun toString(): String = "AND{${typeSets.makeString(", ")}}"
override fun toString(): String = "AND{${typeSets.joinToString(", ")}}"
}
public data class ForSomeType(val typeSets: List<TypePredicate>): TypePredicate {
override fun invoke(typeToCheck: JetType): Boolean = typeSets.any { it(typeToCheck) }
override fun toString(): String = "OR{${typeSets.makeString(", ")}}"
override fun toString(): String = "OR{${typeSets.joinToString(", ")}}"
}
public object AllTypes : TypePredicate {
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/AccessValueInstruction.kt
-40
View File
@@ -1,40 +0,0 @@
/*
* Copyright 2010-2014 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.lang.cfg.pseudocode.instructions.eval
import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
import org.jetbrains.jet.lang.descriptors.VariableDescriptor
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind
import java.util.Collections
public trait AccessTarget {
public data class Declaration(val descriptor: VariableDescriptor): AccessTarget
public data class Call(val resolvedCall: ResolvedCall<*>): AccessTarget
public object BlackBox: AccessTarget
}
public abstract class AccessValueInstruction protected (
element: JetElement,
lexicalScope: LexicalScope,
public val target: AccessTarget,
public override val receiverValues: Map<PseudoValue, ReceiverValue>
) : InstructionWithNext(element, lexicalScope), InstructionWithReceivers
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/WriteValueInstruction.kt
-55
View File
@@ -1,55 +0,0 @@
/*
* Copyright 2010-2014 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.lang.cfg.pseudocode.instructions.eval
import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.lang.psi.JetNamedDeclaration
import java.util.Collections
import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
public class WriteValueInstruction(
assignment: JetElement,
lexicalScope: LexicalScope,
target: AccessTarget,
receiverValues: Map<PseudoValue, ReceiverValue>,
public val lValue: JetElement,
public val rValue: PseudoValue
) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) {
override val inputValues: List<PseudoValue>
get() = receiverValues.keySet() + rValue
override fun accept(visitor: InstructionVisitor) {
visitor.visitWriteValue(this)
}
override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R {
return visitor.visitWriteValue(this)
}
override fun toString(): String {
val lhs = (lValue as? JetNamedDeclaration)?.getName() ?: render(lValue)
return "w($lhs|${inputValues.makeString(", ")})"
}
override fun createCopy(): InstructionImpl =
WriteValueInstruction(element, lexicalScope, target, receiverValues, lValue, rValue)
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/ReadValueInstruction.kt → compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/accessInstructions.kt
+48 -3
View File
@@ -17,13 +17,30 @@
package org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval
import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValueFactory
import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionWithNext
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall
import org.jetbrains.jet.lang.descriptors.VariableDescriptor
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValueFactory
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.jet.lang.psi.JetNamedDeclaration
public trait AccessTarget {
public data class Declaration(val descriptor: VariableDescriptor): AccessTarget
public data class Call(val resolvedCall: ResolvedCall<*>): AccessTarget
public object BlackBox: AccessTarget
}
public abstract class AccessValueInstruction protected (
element: JetElement,
lexicalScope: LexicalScope,
public val target: AccessTarget,
public override val receiverValues: Map<PseudoValue, ReceiverValue>
) : InstructionWithNext(element, lexicalScope), InstructionWithReceivers
public class ReadValueInstruction private (
element: JetElement,
@@ -51,7 +68,7 @@ public class ReadValueInstruction private (
}
override fun toString(): String {
val inVal = if (receiverValues.empty) "" else "|${receiverValues.keySet().makeString()}"
val inVal = if (receiverValues.empty) "" else "|${receiverValues.keySet().joinToString()}"
return "r(${render(element)}$inVal) -> $outputValue"
}
@@ -74,3 +91,31 @@ public class ReadValueInstruction private (
}
}
}
public class WriteValueInstruction(
assignment: JetElement,
lexicalScope: LexicalScope,
target: AccessTarget,
receiverValues: Map<PseudoValue, ReceiverValue>,
public val lValue: JetElement,
public val rValue: PseudoValue
) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) {
override val inputValues: List<PseudoValue>
get() = receiverValues.keySet() + rValue
override fun accept(visitor: InstructionVisitor) {
visitor.visitWriteValue(this)
}
override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R {
return visitor.visitWriteValue(this)
}
override fun toString(): String {
val lhs = (lValue as? JetNamedDeclaration)?.getName() ?: render(lValue)
return "w($lhs|${inputValues.joinToString(", ")})"
}
override fun createCopy(): InstructionImpl =
WriteValueInstruction(element, lexicalScope, target, receiverValues, lValue, rValue)
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/eval/operationInstructions.kt
+1 -1
View File
@@ -40,7 +40,7 @@ public abstract class OperationInstruction protected(
protected fun renderInstruction(name: String, desc: String): String =
"$name($desc" +
(if (inputValues.notEmpty) "|${inputValues.makeString(", ")})" else ")") +
(if (inputValues.notEmpty) "|${inputValues.joinToString(", ")})" else ")") +
(if (resultValue != null) " -> $resultValue" else "")
protected fun setResult(value: PseudoValue?): OperationInstruction {
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
+1 -1
View File
@@ -72,7 +72,7 @@ public class NondeterministicJumpInstruction(
override fun toString(): String {
val inVal = if (inputValue != null) "|$inputValue" else ""
val labels = targetLabels.map { it.getName() }.makeString(", ")
val labels = targetLabels.map { it.getName() }.joinToString(", ")
return "jmp?($labels$inVal)"
}
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt
+5
View File
@@ -110,4 +110,9 @@ public class KotlinLightMethodForDeclaration(
}
override fun getUseScope(): SearchScope = origin.getUseScope()
override fun equals(other: Any?): Boolean =
other is KotlinLightMethodForDeclaration && getName() == other.getName() && origin == other.origin
override fun hashCode(): Int = getName().hashCode() * 31 + origin.hashCode()
}
compiler/testData/cfg-variables/basic/IfWithUninitialized.values
+11 -10
View File
@@ -9,18 +9,19 @@ fun foo() {
}
}
---------------------
1 <v0>: {<: Comparable<Int>} NEW()
2 <v1>: Int NEW()
1 < 2 <v2>: Boolean NEW(<v0>, <v1>)
b <v3>: {<: Any?} NEW()
use(b) <v4>: * NEW(<v3>)
{ use(b) } <v4>: * COPY
true <v5>: Boolean NEW()
if (1 < 2) { use(b) } else { b = true } <v4>: * COPY
{ val b: Boolean if (1 < 2) { use(b) } else { b = true } } <v4>: * COPY
1 <v0>: {<: Comparable<Int>} NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1 < 2 <v2>: Boolean NEW: call(<, compareTo|<v0>, <v1>) -> <v2>
b <v3>: {<: Any?} NEW: r(b) -> <v3>
use(b) <v4>: * NEW: call(use, use|<v3>) -> <v4>
{ use(b) } <v4>: * COPY
true <v5>: Boolean NEW: r(true) -> <v5>
if (1 < 2) { use(b) } else { b = true } <v4>: * COPY
{ val b: Boolean if (1 < 2) { use(b) } else { b = true } } <v4>: * COPY
=====================
== use ==
fun use(vararg a: Any?) = a
---------------------
a <v1>: {<: Array<Any?>} NEW()
<v0>: {<: Array<Any?>} NEW: magic(vararg a: Any?) -> <v0>
a <v1>: {<: Array<Any?>} NEW: r(a) -> <v1>
=====================
compiler/testData/cfg-variables/basic/InitializedNotDeclared.values
+2 -1
View File
@@ -6,5 +6,6 @@ class A {
val x: Int
}
---------------------
1 <v1>: Int NEW()
<v0>: A NEW: magic(x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
=====================
compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values
+11 -9
View File
@@ -7,8 +7,8 @@ fun foo() {
}
}
---------------------
1 <v0>: Int NEW()
{ (x: Int) -> val y = x + a use(a) } <v1>: {<: (Int) -> Array<Any?>} NEW()
1 <v0>: Int NEW: r(1) -> <v0>
{ (x: Int) -> val y = x + a use(a) } <v1>: {<: (Int) -> Array<Any?>} NEW: r({ (x: Int) -> val y = x + a use(a) }) -> <v1>
=====================
== anonymous_0 ==
{ (x: Int) ->
@@ -16,15 +16,17 @@ fun foo() {
use(a)
}
---------------------
x <v1>: Int NEW()
a <v2>: Int NEW()
x + a <v3>: Int NEW(<v1>, <v2>)
a <v4>: {<: Any?} NEW()
use(a) <v5>: {<: Array<Any?>} NEW(<v4>)
val y = x + a use(a) <v5>: {<: Array<Any?>} COPY
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
x + a <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
a <v4>: {<: Any?} NEW: r(a) -> <v4>
use(a) <v5>: {<: Array<Any?>} NEW: call(use, use|<v4>) -> <v5>
val y = x + a use(a) <v5>: {<: Array<Any?>} COPY
=====================
== use ==
fun use(vararg a: Any?) = a
---------------------
a <v1>: {<: Array<Any?>} NEW()
<v0>: {<: Array<Any?>} NEW: magic(vararg a: Any?) -> <v0>
a <v1>: {<: Array<Any?>} NEW: r(a) -> <v1>
=====================
compiler/testData/cfg-variables/basic/VariablesInitialization.values
+12 -11
View File
@@ -6,10 +6,10 @@ fun foo() {
42
}
---------------------
1 <v0>: Int NEW()
2 <v1>: Int NEW()
42 <v2>: * NEW()
{ val a = 1 val b: Int b = 2 42 } <v2>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
42 <v2>: * NEW: r(42) -> <v2>
{ val a = 1 val b: Int b = 2 42 } <v2>: * COPY
=====================
== bar ==
fun bar(foo: Foo) {
@@ -18,13 +18,14 @@ fun bar(foo: Foo) {
42
}
---------------------
foo <v1>: {<: Foo} NEW()
c <v2>: * NEW(<v1>)
foo.c <v2>: * COPY
foo <v3>: {<: Foo} NEW()
2 <v4>: Int NEW()
42 <v5>: * NEW()
{ foo.c foo.c = 2 42 } <v5>: * COPY
<v0>: {<: Foo} NEW: magic(foo: Foo) -> <v0>
foo <v1>: {<: Foo} NEW: r(foo) -> <v1>
c <v2>: * NEW: r(c|<v1>) -> <v2>
foo.c <v2>: * COPY
foo <v3>: {<: Foo} NEW: r(foo) -> <v3>
2 <v4>: Int NEW: r(2) -> <v4>
42 <v5>: * NEW: r(42) -> <v5>
{ foo.c foo.c = 2 42 } <v5>: * COPY
=====================
== Foo ==
trait Foo {
compiler/testData/cfg-variables/basic/VariablesUsage.values
+10 -9
View File
@@ -6,13 +6,13 @@ fun foo() {
use(a)
}
---------------------
1 <v0>: Int NEW()
a <v1>: Int NEW()
use(a) <v2>: * NEW(<v1>)
2 <v3>: Int NEW()
a <v4>: Int NEW()
use(a) <v5>: * NEW(<v4>)
{ var a = 1 use(a) a = 2 use(a) } <v5>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
a <v1>: Int NEW: r(a) -> <v1>
use(a) <v2>: * NEW: call(use, use|<v1>) -> <v2>
2 <v3>: Int NEW: r(2) -> <v3>
a <v4>: Int NEW: r(a) -> <v4>
use(a) <v5>: * NEW: call(use, use|<v4>) -> <v5>
{ var a = 1 use(a) a = 2 use(a) } <v5>: * COPY
=====================
== bar ==
fun bar() {
@@ -20,10 +20,11 @@ fun bar() {
b = 3
}
---------------------
3 <v0>: Int NEW()
3 <v0>: Int NEW: r(3) -> <v0>
=====================
== use ==
fun use(a: Int) = a
---------------------
a <v1>: Int NEW()
<v0>: Int NEW: magic(a: Int) -> <v0>
a <v1>: Int NEW: r(a) -> <v1>
=====================
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.values
+23 -16
View File
@@ -5,25 +5,28 @@ class TestFunctionLiteral {
}
}
---------------------
{ (x: Int) -> sum(x - 1) + x } <v0>: {<: (Int) -> Int} NEW()
{ (x: Int) -> sum(x - 1) + x } <v0>: {<: (Int) -> Int} NEW: r({ (x: Int) -> sum(x - 1) + x }) -> <v0>
=====================
== anonymous_0 ==
{ (x: Int) ->
sum(x - 1) + x
}
---------------------
sum <v2>: {<: (Int) -> Int} NEW(<v1>)
x <v3>: Int NEW()
1 <v4>: Int NEW()
x - 1 <v5>: Int NEW(<v3>, <v4>)
sum(x - 1) <v6>: Int NEW(<v2>, <v5>)
x <v7>: Int NEW()
sum(x - 1) + x <v8>: Int NEW(<v6>, <v7>)
sum(x - 1) + x <v8>: Int COPY
<v0>: Int NEW: magic(x: Int) -> <v0>
<v1>: TestFunctionLiteral NEW: magic(sum) -> <v1>
sum <v2>: {<: (Int) -> Int} NEW: r(sum|<v1>) -> <v2>
x <v3>: Int NEW: r(x) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
x - 1 <v5>: Int NEW: call(-, minus|<v3>, <v4>) -> <v5>
sum(x - 1) <v6>: Int NEW: call(sum, invoke|<v2>, <v5>) -> <v6>
x <v7>: Int NEW: r(x) -> <v7>
sum(x - 1) + x <v8>: Int NEW: call(+, plus|<v6>, <v7>) -> <v8>
sum(x - 1) + x <v8>: Int COPY
=====================
== A ==
open class A(val a: A)
---------------------
<v0>: {<: A} NEW: magic(val a: A) -> <v0>
=====================
== TestObjectLiteral ==
class TestObjectLiteral {
@@ -37,23 +40,27 @@ class TestObjectLiteral {
}
}
---------------------
obj <v1>: * NEW(<v0>)
obj <v3>: {<: A} NEW(<v2>)
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v4>: {<: A} NEW()
<v0>: TestObjectLiteral NEW: magic(obj) -> <v0>
<v2>: TestObjectLiteral NEW: magic(obj) -> <v2>
obj <v1>: * NEW: r(obj|<v0>) -> <v1>
obj <v3>: {<: A} NEW: r(obj|<v2>) -> <v3>
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v4>: {<: A} NEW: r(object: A(obj) { { val x = obj } fun foo() { val y = obj } }) -> <v4>
=====================
== foo ==
fun foo() {
val y = obj
}
---------------------
obj <v1>: {<: A} NEW(<v0>)
<v0>: TestObjectLiteral NEW: magic(obj) -> <v0>
obj <v1>: {<: A} NEW: r(obj|<v0>) -> <v1>
=====================
== TestOther ==
class TestOther {
val x: Int = x + 1
}
---------------------
x <v1>: Int NEW(<v0>)
1 <v2>: Int NEW()
x + 1 <v3>: Int NEW(<v1>, <v2>)
<v0>: TestOther NEW: magic(x) -> <v0>
x <v1>: Int NEW: r(x|<v0>) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
x + 1 <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIf.values
+8 -8
View File
@@ -10,12 +10,12 @@ fun foo() {
use(b)
}
---------------------
1 <v0>: {<: Comparable<Int>} NEW()
2 <v1>: Int NEW()
1 < 2 <v2>: Boolean NEW(<v0>, <v1>)
false <v3>: Boolean NEW()
true <v4>: Boolean NEW()
b <v5>: * NEW()
use(b) <v6>: * NEW(<v5>)
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v6>: * COPY
1 <v0>: {<: Comparable<Int>} NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1 < 2 <v2>: Boolean NEW: call(<, compareTo|<v0>, <v1>) -> <v2>
false <v3>: Boolean NEW: r(false) -> <v3>
true <v4>: Boolean NEW: r(true) -> <v4>
b <v5>: * NEW: r(b) -> <v5>
use(b) <v6>: * NEW: magic(use(b)|<v5>) -> <v6>
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v6>: * COPY
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values
+12 -9
View File
@@ -13,17 +13,20 @@ fun foo(numbers: Collection<Int>) {
}
}
---------------------
numbers <v1>: {<: Iterable<Int>} NEW()
1 <v3>: {<: Comparable<Int>} NEW()
2 <v4>: Int NEW()
1 < 2 <v5>: Boolean NEW(<v3>, <v4>)
false <v6>: Boolean NEW()
true <v7>: Boolean NEW()
b <v8>: {<: Any?} NEW()
use(b) <v9>: * NEW(<v8>)
<v0>: {<: Collection<Int>} NEW: magic(numbers: Collection<Int>) -> <v0>
<v2>: Int NEW: magic(numbers|<v1>) -> <v2>
numbers <v1>: {<: Iterable<Int>} NEW: r(numbers) -> <v1>
1 <v3>: {<: Comparable<Int>} NEW: r(1) -> <v3>
2 <v4>: Int NEW: r(2) -> <v4>
1 < 2 <v5>: Boolean NEW: call(<, compareTo|<v3>, <v4>) -> <v5>
false <v6>: Boolean NEW: r(false) -> <v6>
true <v7>: Boolean NEW: r(true) -> <v7>
b <v8>: {<: Any?} NEW: r(b) -> <v8>
use(b) <v9>: * NEW: call(use, use|<v8>) -> <v9>
=====================
== use ==
fun use(vararg a: Any?) = a
---------------------
a <v1>: {<: Array<Any?>} NEW()
<v0>: {<: Array<Any?>} NEW: magic(vararg a: Any?) -> <v0>
a <v1>: {<: Array<Any?>} NEW: r(a) -> <v1>
=====================
compiler/testData/cfg-variables/lexicalScopes/doWhileScope.values
+7 -7
View File
@@ -7,11 +7,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
2 <v1>: Int NEW()
a <v2>: {<: Comparable<Int>} NEW()
0 <v3>: Int NEW()
a > 0 <v4>: Boolean NEW(<v2>, <v3>)
"after" <v5>: * NEW()
{ "before" do { var a = 2 } while (a > 0) "after" } <v5>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
a <v2>: {<: Comparable<Int>} NEW: r(a) -> <v2>
0 <v3>: Int NEW: r(0) -> <v3>
a > 0 <v4>: Boolean NEW: call(>, compareTo|<v2>, <v3>) -> <v4>
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" do { var a = 2 } while (a > 0) "after" } <v5>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/forScope.values
+8 -7
View File
@@ -7,11 +7,12 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
1 <v1>: Int NEW()
10 <v2>: Int NEW()
1..10 <v3>: {<: Iterable<Int>} NEW(<v1>, <v2>)
i <v5>: Int NEW()
"after" <v6>: * NEW()
{ "before" for (i in 1..10) { val a = i } "after" } <v6>: * COPY
<v4>: Int NEW: magic(1..10|<v3>) -> <v4>
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
10 <v2>: Int NEW: r(10) -> <v2>
1..10 <v3>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v1>, <v2>) -> <v3>
i <v5>: Int NEW: r(i) -> <v5>
"after" <v6>: * NEW: r("after") -> <v6>
{ "before" for (i in 1..10) { val a = i } "after" } <v6>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.values
+9 -8
View File
@@ -8,18 +8,19 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
1 <v1>: Int NEW()
{ (x: Int) -> val a = x + b } <v2>: {<: (Int) -> Unit} NEW()
"after" <v3>: * NEW()
{ "before" val b = 1 val f = { (x: Int) -> val a = x + b } "after" } <v3>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
{ (x: Int) -> val a = x + b } <v2>: {<: (Int) -> Unit} NEW: r({ (x: Int) -> val a = x + b }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val b = 1 val f = { (x: Int) -> val a = x + b } "after" } <v3>: * COPY
=====================
== anonymous_0 ==
{ (x: Int) ->
val a = x + b
}
---------------------
x <v1>: Int NEW()
b <v2>: Int NEW()
x + b <v3>: Int NEW(<v1>, <v2>)
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/lexicalScopes/ifScope.values
+6 -6
View File
@@ -10,10 +10,10 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
true <v1>: Boolean NEW()
1 <v2>: Int NEW()
2 <v3>: Int NEW()
"after" <v4>: * NEW()
{ "before" if (true) { val a = 1 } else { val b = 2 } "after" } <v4>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
true <v1>: Boolean NEW: r(true) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
2 <v3>: Int NEW: r(2) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" if (true) { val a = 1 } else { val b = 2 } "after" } <v4>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/localClass.values
+8 -5
View File
@@ -12,15 +12,18 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
x <v3>: Int NEW(<v2>)
"after" <v4>: * NEW()
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
<v1>: Int NEW: magic(val x: Int) -> <v1>
<v2>: A NEW: magic(x) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
x <v3>: Int NEW: r(x|<v2>) -> <v3>
"after" <v4>: * NEW: r("after") -> <v4>
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
=====================
== foo ==
fun foo() {
val b = x
}
---------------------
x <v1>: Int NEW(<v0>)
<v0>: A NEW: magic(x) -> <v0>
x <v1>: Int NEW: r(x|<v0>) -> <v1>
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.values
+8 -7
View File
@@ -8,17 +8,18 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
1 <v1>: Int NEW()
"after" <v2>: * NEW()
{ "before" val b = 1 fun local(x: Int) { val a = x + b } "after" } <v2>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" val b = 1 fun local(x: Int) { val a = x + b } "after" } <v2>: * COPY
=====================
== local ==
fun local(x: Int) {
val a = x + b
}
---------------------
x <v1>: Int NEW()
b <v2>: Int NEW()
x + b <v3>: Int NEW(<v1>, <v2>)
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.values
+8 -7
View File
@@ -6,15 +6,16 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
1 <v1>: Int NEW()
"after" <v2>: * NEW()
{ "before" val b = 1 fun local(x: Int) = x + b "after" } <v2>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" val b = 1 fun local(x: Int) = x + b "after" } <v2>: * COPY
=====================
== local ==
fun local(x: Int) = x + b
---------------------
x <v1>: Int NEW()
b <v2>: Int NEW()
x + b <v3>: Int NEW(<v1>, <v2>)
<v0>: Int NEW: magic(x: Int) -> <v0>
x <v1>: Int NEW: r(x) -> <v1>
b <v2>: Int NEW: r(b) -> <v2>
x + b <v3>: Int NEW: call(+, plus|<v1>, <v2>) -> <v3>
=====================
compiler/testData/cfg-variables/lexicalScopes/localObject.values
+5 -5
View File
@@ -12,15 +12,15 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
1 <v1>: Int NEW()
"after" <v2>: * NEW()
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
=====================
== foo ==
fun foo() {
val b = 2
}
---------------------
2 <v0>: Int NEW()
2 <v0>: Int NEW: r(2) -> <v0>
=====================
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.values
+6 -6
View File
@@ -12,16 +12,16 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
1 <v1>: Int NEW()
object { { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW()
"after" <v3>: * NEW()
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
"before" <v0>: * NEW: r("before") -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW: r(object { { val x = 1 } fun foo() { val a = 2 } }) -> <v2>
"after" <v3>: * NEW: r("after") -> <v3>
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
=====================
== foo ==
fun foo() {
val a = 2
}
---------------------
2 <v0>: Int NEW()
2 <v0>: Int NEW: r(2) -> <v0>
=====================
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.values
+5 -2
View File
@@ -17,12 +17,15 @@ get() {
return $a
}
---------------------
$a <v1>: Int NEW(<v0>)
<v0>: A NEW: magic($a) -> <v0>
$a <v1>: Int NEW: r($a|<v0>) -> <v1>
=====================
== set_a ==
set(v: Int) {
$a = v
}
---------------------
v <v2>: Int NEW()
<v0>: Int NEW: magic(v: Int) -> <v0>
<v1>: A NEW: magic($a) -> <v1>
v <v2>: Int NEW: r(v) -> <v2>
=====================
compiler/testData/cfg-variables/lexicalScopes/tryScope.values
+9 -8
View File
@@ -13,12 +13,13 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
foo() <v1>: * NEW()
{ foo() } <v1>: * COPY
e <v3>: {<: Exception} NEW()
1 <v4>: Int NEW()
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v1>: * COPY
"after" <v5>: * NEW()
{ "before" try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } "after" } <v5>: * COPY
<v2>: {<: Exception} NEW: magic(e: Exception) -> <v2>
"before" <v0>: * NEW: r("before") -> <v0>
foo() <v1>: * NEW: call(foo, foo) -> <v1>
{ foo() } <v1>: * COPY
e <v3>: {<: Exception} NEW: r(e) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v1>: * COPY
"after" <v5>: * NEW: r("after") -> <v5>
{ "before" try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } "after" } <v5>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/whileScope.values
+3 -3
View File
@@ -7,8 +7,8 @@ fun foo() {
"after"
}
---------------------
"before" <v0>: * NEW()
true <v1>: * NEW()
"after" <v2>: * NEW()
"before" <v0>: * NEW: r("before") -> <v0>
true <v1>: * NEW: r(true) -> <v1>
"after" <v2>: * NEW: r("after") -> <v2>
{ "before" while (true) { val a: Int } "after" } <v2>: * COPY
=====================
compiler/testData/cfg/arrays/ArrayAccess.values
+17 -17
View File
@@ -9,21 +9,21 @@ fun foo() {
a[10] += 1
}
---------------------
Array<Int> <v0>: {<: Array<Int>} NEW()
3 <v1>: * NEW()
a <v2>: {<: Array<Int>} NEW()
10 <v3>: Int NEW()
4 <v4>: Int NEW()
a[10] = 4 <v5>: * NEW(<v2>, <v3>, <v4>)
2 <v6>: * NEW()
a <v7>: {<: Array<Int>} NEW()
10 <v8>: Int NEW()
a[10] <v9>: * NEW(<v7>, <v8>)
100 <v10>: * NEW()
a <v16>: {<: Array<Int>} NEW()
10 <v17>: Int NEW()
a[10] <v13>: Int NEW(<v11>, <v12>)
1 <v14>: Int NEW()
a[10] += 1 <v18>: * NEW(<v16>, <v17>, <v15>)
{ val a = Array<Int> 3 a[10] = 4 2 a[10] 100 a[10] += 1 } <v18>: * COPY
Array<Int> <v0>: {<: Array<Int>} NEW: call(Array, <init>) -> <v0>
3 <v1>: * NEW: r(3) -> <v1>
a <v2>: {<: Array<Int>} NEW: r(a) -> <v2>
10 <v3>: Int NEW: r(10) -> <v3>
4 <v4>: Int NEW: r(4) -> <v4>
a[10] = 4 <v5>: * NEW: call(a[10] = 4, set|<v2>, <v3>, <v4>) -> <v5>
2 <v6>: * NEW: r(2) -> <v6>
a <v7>: {<: Array<Int>} NEW: r(a) -> <v7>
10 <v8>: Int NEW: r(10) -> <v8>
a[10] <v9>: * NEW: call(a[10], get|<v7>, <v8>) -> <v9>
100 <v10>: * NEW: r(100) -> <v10>
a <v16>: {<: Array<Int>} NEW: r(a) -> <v16>
10 <v17>: Int NEW: r(10) -> <v17>
a[10] <v13>: Int NEW: call(a[10], get|<v11>, <v12>) -> <v13>
1 <v14>: Int NEW: r(1) -> <v14>
a[10] += 1 <v18>: * NEW: call(a[10] += 1, set|<v16>, <v17>, <v15>) -> <v18>
{ val a = Array<Int> 3 a[10] = 4 2 a[10] 100 a[10] += 1 } <v18>: * COPY
=====================
compiler/testData/cfg/arrays/ArrayOfFunctions.values
+6 -5
View File
@@ -3,10 +3,11 @@ fun test(array: Array<(Int)->Unit>) {
array[11](3)
}
---------------------
array <v1>: {<: Array<(Int) -> Unit>} NEW()
11 <v2>: Int NEW()
array[11] <v3>: {<: (Int) -> Unit} NEW(<v1>, <v2>)
3 <v4>: Int NEW()
array[11](3) <v5>: * NEW(<v3>, <v4>)
<v0>: {<: Array<(Int) -> Unit>} NEW: magic(array: Array<(Int)->Unit>) -> <v0>
array <v1>: {<: Array<(Int) -> Unit>} NEW: r(array) -> <v1>
11 <v2>: Int NEW: r(11) -> <v2>
array[11] <v3>: {<: (Int) -> Unit} NEW: call(array[11], get|<v1>, <v2>) -> <v3>
3 <v4>: Int NEW: r(3) -> <v4>
array[11](3) <v5>: * NEW: call(array[11], invoke|<v3>, <v4>) -> <v5>
{ array[11](3) } <v5>: * COPY
=====================
compiler/testData/cfg/arrays/arrayAccessExpression.values
+7 -6
View File
@@ -13,10 +13,11 @@ fun test(ab: Ab) {
ab.getArray()[1]
}
---------------------
ab <v1>: {<: Ab} NEW()
getArray() <v2>: {<: Array<Int>} NEW(<v1>)
ab.getArray() <v2>: {<: Array<Int>} COPY
1 <v3>: Int NEW()
ab.getArray()[1] <v4>: * NEW(<v2>, <v3>)
{ ab.getArray()[1] } <v4>: * COPY
<v0>: {<: Ab} NEW: magic(ab: Ab) -> <v0>
ab <v1>: {<: Ab} NEW: r(ab) -> <v1>
getArray() <v2>: {<: Array<Int>} NEW: call(getArray, getArray|<v1>) -> <v2>
ab.getArray() <v2>: {<: Array<Int>} COPY
1 <v3>: Int NEW: r(1) -> <v3>
ab.getArray()[1] <v4>: * NEW: call(ab.getArray()[1], get|<v2>, <v3>) -> <v4>
{ ab.getArray()[1] } <v4>: * COPY
=====================
compiler/testData/cfg/arrays/arrayInc.values
+4 -3
View File
@@ -3,9 +3,10 @@ fun foo(a: Array<Int>) {
a[0]++
}
---------------------
a <v5>: {<: Array<Int>} NEW()
0 <v6>: Int NEW()
a[0] <v3>: Int NEW(<v1>, <v2>)
<v0>: {<: Array<Int>} NEW: magic(a: Array<Int>) -> <v0>
a <v5>: {<: Array<Int>} NEW: r(a) -> <v5>
0 <v6>: Int NEW: r(0) -> <v6>
a[0] <v3>: Int NEW: call(a[0], get|<v1>, <v2>) -> <v3>
a[0]++ <v3>: Int COPY
{ a[0]++ } <v3>: Int COPY
=====================
compiler/testData/cfg/arrays/arraySet.values
+5 -4
View File
@@ -3,9 +3,10 @@ fun foo(a: Array<Int>) {
a[1] = 2
}
---------------------
a <v1>: {<: Array<Int>} NEW()
1 <v2>: Int NEW()
2 <v3>: Int NEW()
a[1] = 2 <v4>: * NEW(<v1>, <v2>, <v3>)
<v0>: {<: Array<Int>} NEW: magic(a: Array<Int>) -> <v0>
a <v1>: {<: Array<Int>} NEW: r(a) -> <v1>
1 <v2>: Int NEW: r(1) -> <v2>
2 <v3>: Int NEW: r(2) -> <v3>
a[1] = 2 <v4>: * NEW: call(a[1] = 2, set|<v1>, <v2>, <v3>) -> <v4>
{ a[1] = 2 } <v4>: * COPY
=====================
compiler/testData/cfg/arrays/arraySetPlusAssign.values
+6 -5
View File
@@ -3,10 +3,11 @@ fun foo(a: Array<Int>) {
a[0] += 1
}
---------------------
a <v6>: {<: Array<Int>} NEW()
0 <v7>: Int NEW()
a[0] <v3>: Int NEW(<v1>, <v2>)
1 <v4>: Int NEW()
a[0] += 1 <v8>: * NEW(<v6>, <v7>, <v5>)
<v0>: {<: Array<Int>} NEW: magic(a: Array<Int>) -> <v0>
a <v6>: {<: Array<Int>} NEW: r(a) -> <v6>
0 <v7>: Int NEW: r(0) -> <v7>
a[0] <v3>: Int NEW: call(a[0], get|<v1>, <v2>) -> <v3>
1 <v4>: Int NEW: r(1) -> <v4>
a[0] += 1 <v8>: * NEW: call(a[0] += 1, set|<v6>, <v7>, <v5>) -> <v8>
{ a[0] += 1 } <v8>: * COPY
=====================
compiler/testData/cfg/basic/Basic.values
+34 -30
View File
@@ -17,44 +17,47 @@ fun f(a : Boolean) : Unit {
}
---------------------
1 <v1>: * NEW()
a <v2>: * NEW()
2 <v3>: {<: Number} NEW()
toLong() <v4>: * NEW(<v3>)
2.toLong() <v4>: * COPY
a <v5>: Boolean NEW()
3 <v6>: Int NEW()
foo(a, 3) <v7>: * NEW(<v5>, <v6>)
genfun<Any>() <v8>: * NEW()
{1} <v9>: {<: () -> Any} NEW()
flfun {1} <v10>: * NEW(<v9>)
3 <v11>: OR{{<: Any}, {<: Any}} NEW()
4 <v12>: {<: Any?} NEW()
equals(4) <v13>: * NEW(<v11>, <v12>)
3.equals(4) <v13>: * COPY
3 <v14>: OR{{<: Any}, {<: Any}} NEW()
4 <v15>: {<: Any?} NEW()
3 equals 4 <v16>: * NEW(<v14>, <v15>)
1 <v17>: Int NEW()
2 <v18>: Int NEW()
1 + 2 <v19>: * NEW(<v17>, <v18>)
a <v20>: Boolean NEW()
true <v21>: Boolean NEW()
a && true <v22>: * NEW(<v20>, <v21>)
a <v23>: Boolean NEW()
false <v24>: Boolean NEW()
a || false <v25>: * NEW(<v23>, <v24>)
{ 1 a 2.toLong() foo(a, 3) genfun<Any>() flfun {1} 3.equals(4) 3 equals 4 1 + 2 a && true a || false } <v25>: * COPY
<v0>: Boolean NEW: magic(a : Boolean) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
a <v2>: * NEW: r(a) -> <v2>
2 <v3>: {<: Number} NEW: r(2) -> <v3>
toLong() <v4>: * NEW: call(toLong, toLong|<v3>) -> <v4>
2.toLong() <v4>: * COPY
a <v5>: Boolean NEW: r(a) -> <v5>
3 <v6>: Int NEW: r(3) -> <v6>
foo(a, 3) <v7>: * NEW: call(foo, foo|<v5>, <v6>) -> <v7>
genfun<Any>() <v8>: * NEW: call(genfun, genfun) -> <v8>
{1} <v9>: {<: () -> Any} NEW: r({1}) -> <v9>
flfun {1} <v10>: * NEW: call(flfun, flfun|<v9>) -> <v10>
3 <v11>: OR{{<: Any}, {<: Any}} NEW: r(3) -> <v11>
4 <v12>: {<: Any?} NEW: r(4) -> <v12>
equals(4) <v13>: * NEW: call(equals, equals|<v11>, <v12>) -> <v13>
3.equals(4) <v13>: * COPY
3 <v14>: OR{{<: Any}, {<: Any}} NEW: r(3) -> <v14>
4 <v15>: {<: Any?} NEW: r(4) -> <v15>
3 equals 4 <v16>: * NEW: call(equals, equals|<v14>, <v15>) -> <v16>
1 <v17>: Int NEW: r(1) -> <v17>
2 <v18>: Int NEW: r(2) -> <v18>
1 + 2 <v19>: * NEW: call(+, plus|<v17>, <v18>) -> <v19>
a <v20>: Boolean NEW: r(a) -> <v20>
true <v21>: Boolean NEW: r(true) -> <v21>
a && true <v22>: * NEW: magic(a && true|<v20>, <v21>) -> <v22>
a <v23>: Boolean NEW: r(a) -> <v23>
false <v24>: Boolean NEW: r(false) -> <v24>
a || false <v25>: * NEW: magic(a || false|<v23>, <v24>) -> <v25>
{ 1 a 2.toLong() foo(a, 3) genfun<Any>() flfun {1} 3.equals(4) 3 equals 4 1 + 2 a && true a || false } <v25>: * COPY
=====================
== anonymous_0 ==
{1}
---------------------
1 <v0>: Int NEW()
1 <v0>: Int COPY
1 <v0>: Int NEW: r(1) -> <v0>
1 <v0>: Int COPY
=====================
== foo ==
fun foo(a : Boolean, b : Int) : Unit {}
---------------------
<v0>: Boolean NEW: magic(a : Boolean) -> <v0>
<v1>: Int NEW: magic(b : Int) -> <v1>
=====================
== genfun ==
fun genfun<T>() : Unit {}
@@ -63,4 +66,5 @@ fun genfun<T>() : Unit {}
== flfun ==
fun flfun(f : () -> Any) : Unit {}
---------------------
<v0>: {<: () -> Any} NEW: magic(f : () -> Any) -> <v0>
=====================
compiler/testData/cfg/basic/ShortFunction.values
+1 -1
View File
@@ -1,5 +1,5 @@
== short ==
fun short() = 1
---------------------
1 <v0>: Int NEW()
1 <v0>: Int NEW: r(1) -> <v0>
=====================
compiler/testData/cfg/bugs/jumpToOuterScope.values
+5 -3
View File
@@ -7,9 +7,11 @@ fun foo(c: Collection<Int>) {
}
}
---------------------
c <v1>: {<: Iterable<Int>} NEW()
{ break } <v3>: * NEW()
{ { break } } <v3>: * COPY
<v0>: {<: Collection<Int>} NEW: magic(c: Collection<Int>) -> <v0>
<v2>: Int NEW: magic(c|<v1>) -> <v2>
c <v1>: {<: Iterable<Int>} NEW: r(c) -> <v1>
{ break } <v3>: * NEW: r({ break }) -> <v3>
{ { break } } <v3>: * COPY
=====================
== anonymous_0 ==
{
compiler/testData/cfg/controlStructures/Finally.values
+134 -123
View File
@@ -7,12 +7,12 @@ fun t1() {
}
}
---------------------
1 <v0>: * NEW()
{ 1 } <v0>: * COPY
2 <v1>: * NEW()
{ 2 } <v1>: * COPY
try { 1 } finally { 2 } <v0>: * COPY
{ try { 1 } finally { 2 } } <v0>: * COPY
1 <v0>: * NEW: r(1) -> <v0>
{ 1 } <v0>: * COPY
2 <v1>: * NEW: r(2) -> <v1>
{ 2 } <v1>: * COPY
try { 1 } finally { 2 } <v0>: * COPY
{ try { 1 } finally { 2 } } <v0>: * COPY
=====================
== t2 ==
fun t2() {
@@ -26,12 +26,12 @@ fun t2() {
}
}
---------------------
1 <v0>: * NEW()
2 <v1>: {<: Comparable<Int>} NEW()
3 <v2>: Int NEW()
2 > 3 <v3>: Boolean NEW(<v1>, <v2>)
2 <v4>: * NEW()
{ 2 } <v4>: * COPY
1 <v0>: * NEW: r(1) -> <v0>
2 <v1>: {<: Comparable<Int>} NEW: r(2) -> <v1>
3 <v2>: Int NEW: r(3) -> <v2>
2 > 3 <v3>: Boolean NEW: call(>, compareTo|<v1>, <v2>) -> <v3>
2 <v4>: * NEW: r(2) -> <v4>
{ 2 } <v4>: * COPY
=====================
== t3 ==
fun t3() {
@@ -47,14 +47,14 @@ fun t3() {
}
}
---------------------
1 <v0>: * NEW()
{ () -> if (2 > 3) { return@l } } <v1>: * NEW()
@l{ () -> if (2 > 3) { return@l } } <v1>: * COPY
{ 1 @l{ () -> if (2 > 3) { return@l } } } <v1>: * COPY
2 <v2>: * NEW()
{ 2 } <v2>: * COPY
try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1>: * COPY
{ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } } <v1>: * COPY
1 <v0>: * NEW: r(1) -> <v0>
{ () -> if (2 > 3) { return@l } } <v1>: * NEW: r({ () -> if (2 > 3) { return@l } }) -> <v1>
@l{ () -> if (2 > 3) { return@l } } <v1>: * COPY
{ 1 @l{ () -> if (2 > 3) { return@l } } } <v1>: * COPY
2 <v2>: * NEW: r(2) -> <v2>
{ 2 } <v2>: * COPY
try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1>: * COPY
{ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } } <v1>: * COPY
=====================
== anonymous_0 ==
{ () ->
@@ -63,9 +63,9 @@ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1>: * COPY
}
}
---------------------
2 <v0>: {<: Comparable<Int>} NEW()
3 <v1>: Int NEW()
2 > 3 <v2>: Boolean NEW(<v0>, <v1>)
2 <v0>: {<: Comparable<Int>} NEW: r(2) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
2 > 3 <v2>: Boolean NEW: call(>, compareTo|<v0>, <v1>) -> <v2>
=====================
== t4 ==
fun t4() {
@@ -81,9 +81,9 @@ fun t4() {
}
}
---------------------
{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * NEW()
@l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * COPY
{ @l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } } <v0>: * COPY
{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * NEW: r({ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } }) -> <v0>
@l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * COPY
{ @l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } } <v0>: * COPY
=====================
== anonymous_1 ==
{ () ->
@@ -97,12 +97,12 @@ fun t4() {
}
}
---------------------
1 <v0>: * NEW()
2 <v1>: {<: Comparable<Int>} NEW()
3 <v2>: Int NEW()
2 > 3 <v3>: Boolean NEW(<v1>, <v2>)
2 <v4>: * NEW()
{ 2 } <v4>: * COPY
1 <v0>: * NEW: r(1) -> <v0>
2 <v1>: {<: Comparable<Int>} NEW: r(2) -> <v1>
3 <v2>: Int NEW: r(3) -> <v2>
2 > 3 <v3>: Boolean NEW: call(>, compareTo|<v1>, <v2>) -> <v3>
2 <v4>: * NEW: r(2) -> <v4>
{ 2 } <v4>: * COPY
=====================
== t5 ==
fun t5() {
@@ -118,13 +118,13 @@ fun t5() {
}
}
---------------------
true <v0>: * NEW()
1 <v1>: * NEW()
2 <v2>: {<: Comparable<Int>} NEW()
3 <v3>: Int NEW()
2 > 3 <v4>: Boolean NEW(<v2>, <v3>)
2 <v5>: * NEW()
{ 2 } <v5>: * COPY
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(>, compareTo|<v2>, <v3>) -> <v4>
2 <v5>: * NEW: r(2) -> <v5>
{ 2 } <v5>: * COPY
=====================
== t6 ==
fun t6() {
@@ -141,17 +141,17 @@ fun t6() {
}
}
---------------------
true <v0>: * NEW()
1 <v1>: * NEW()
2 <v2>: {<: Comparable<Int>} NEW()
3 <v3>: Int NEW()
2 > 3 <v4>: Boolean NEW(<v2>, <v3>)
5 <v5>: * NEW()
{ @l while(true) { 1 if (2 > 3) { break @l } } 5 } <v5>: * COPY
2 <v6>: * NEW()
{ 2 } <v6>: * COPY
try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } <v5>: * COPY
{ try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } } <v5>: * COPY
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(>, compareTo|<v2>, <v3>) -> <v4>
5 <v5>: * NEW: r(5) -> <v5>
{ @l while(true) { 1 if (2 > 3) { break @l } } 5 } <v5>: * COPY
2 <v6>: * NEW: r(2) -> <v6>
{ 2 } <v6>: * COPY
try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } <v5>: * COPY
{ try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } } <v5>: * COPY
=====================
== t7 ==
fun t7() {
@@ -167,13 +167,13 @@ fun t7() {
}
}
---------------------
true <v0>: * NEW()
1 <v1>: * NEW()
2 <v2>: {<: Comparable<Int>} NEW()
3 <v3>: Int NEW()
2 > 3 <v4>: Boolean NEW(<v2>, <v3>)
2 <v5>: * NEW()
{ 2 } <v5>: * COPY
true <v0>: * NEW: r(true) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
2 <v2>: {<: Comparable<Int>} NEW: r(2) -> <v2>
3 <v3>: Int NEW: r(3) -> <v3>
2 > 3 <v4>: Boolean NEW: call(>, compareTo|<v2>, <v3>) -> <v4>
2 <v5>: * NEW: r(2) -> <v5>
{ 2 } <v5>: * COPY
=====================
== t8 ==
fun t8(a : Int) {
@@ -189,15 +189,17 @@ fun t8(a : Int) {
}
}
---------------------
1 <v1>: Int NEW()
a <v2>: Int NEW()
1..a <v3>: {<: Iterable<Int>} NEW(<v1>, <v2>)
1 <v5>: * NEW()
2 <v6>: {<: Comparable<Int>} NEW()
3 <v7>: Int NEW()
2 > 3 <v8>: Boolean NEW(<v6>, <v7>)
2 <v9>: * NEW()
{ 2 } <v9>: * COPY
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(>, compareTo|<v6>, <v7>) -> <v8>
2 <v9>: * NEW: r(2) -> <v9>
{ 2 } <v9>: * COPY
=====================
== t9 ==
fun t9(a : Int) {
@@ -214,19 +216,21 @@ fun t9(a : Int) {
}
}
---------------------
1 <v1>: Int NEW()
a <v2>: Int NEW()
1..a <v3>: {<: Iterable<Int>} NEW(<v1>, <v2>)
1 <v5>: * NEW()
2 <v6>: {<: Comparable<Int>} NEW()
3 <v7>: Int NEW()
2 > 3 <v8>: Boolean NEW(<v6>, <v7>)
5 <v9>: * NEW()
{ @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } <v9>: * COPY
2 <v10>: * NEW()
{ 2 } <v10>: * COPY
try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } <v9>: * COPY
{ try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } } <v9>: * COPY
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(>, compareTo|<v6>, <v7>) -> <v8>
5 <v9>: * NEW: r(5) -> <v9>
{ @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } <v9>: * COPY
2 <v10>: * NEW: r(2) -> <v10>
{ 2 } <v10>: * COPY
try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } <v9>: * COPY
{ try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } } <v9>: * COPY
=====================
== t10 ==
fun t10(a : Int) {
@@ -242,15 +246,17 @@ fun t10(a : Int) {
}
}
---------------------
1 <v1>: Int NEW()
a <v2>: Int NEW()
1..a <v3>: {<: Iterable<Int>} NEW(<v1>, <v2>)
1 <v5>: * NEW()
2 <v6>: {<: Comparable<Int>} NEW()
3 <v7>: Int NEW()
2 > 3 <v8>: Boolean NEW(<v6>, <v7>)
2 <v9>: * NEW()
{ 2 } <v9>: * COPY
<v0>: Int NEW: magic(a : Int) -> <v0>
<v4>: Int NEW: magic(1..a|<v3>) -> <v4>
1 <v1>: Int NEW: r(1) -> <v1>
a <v2>: Int NEW: r(a) -> <v2>
1..a <v3>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v1>, <v2>) -> <v3>
1 <v5>: * NEW: r(1) -> <v5>
2 <v6>: {<: Comparable<Int>} NEW: r(2) -> <v6>
3 <v7>: Int NEW: r(3) -> <v7>
2 > 3 <v8>: Boolean NEW: call(>, compareTo|<v6>, <v7>) -> <v8>
2 <v9>: * NEW: r(2) -> <v9>
{ 2 } <v9>: * COPY
=====================
== t11 ==
fun t11() {
@@ -262,8 +268,8 @@ fun t11() {
}
}
---------------------
1 <v0>: * NEW()
2 <v1>: Unit NEW()
1 <v0>: * NEW: r(1) -> <v0>
2 <v1>: Unit NEW: r(2) -> <v1>
=====================
== t12 ==
fun t12() : Int {
@@ -275,10 +281,10 @@ fun t12() : Int {
}
}
---------------------
1 <v0>: Int NEW()
3 <v1>: Int NEW()
doSmth(3) <v2>: * NEW(<v1>)
{ doSmth(3) } <v2>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth, doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
=====================
== t13 ==
fun t13() : Int {
@@ -293,15 +299,16 @@ fun t13() : Int {
}
}
---------------------
1 <v0>: Int NEW()
2 <v4>: Int NEW()
doSmth(2) <v5>: * NEW(<v4>)
{ doSmth(2) } <v5>: * COPY
3 <v1>: Int NEW()
doSmth(3) <v2>: * NEW(<v1>)
{ doSmth(3) } <v2>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } <v5>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } } <v5>: * COPY
<v3>: {<: UnsupportedOperationException} NEW: magic(e: UnsupportedOperationException) -> <v3>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v4>: Int NEW: r(2) -> <v4>
doSmth(2) <v5>: * NEW: call(doSmth, doSmth|<v4>) -> <v5>
{ doSmth(2) } <v5>: * COPY
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth, doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } <v5>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } } <v5>: * COPY
=====================
== t14 ==
fun t14() : Int {
@@ -313,12 +320,13 @@ fun t14() : Int {
}
}
---------------------
1 <v0>: Int NEW()
2 <v2>: Int NEW()
doSmth(2) <v3>: * NEW(<v2>)
{ doSmth(2) } <v3>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } <v3>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } } <v3>: * COPY
<v1>: {<: UnsupportedOperationException} NEW: magic(e: UnsupportedOperationException) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
doSmth(2) <v3>: * NEW: call(doSmth, doSmth|<v2>) -> <v3>
{ doSmth(2) } <v3>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } <v3>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } } <v3>: * COPY
=====================
== t15 ==
fun t15() : Int {
@@ -333,11 +341,12 @@ fun t15() : Int {
}
}
---------------------
1 <v0>: Int NEW()
2 <v4>: Int NEW()
3 <v1>: Int NEW()
doSmth(3) <v2>: * NEW(<v1>)
{ doSmth(3) } <v2>: * COPY
<v3>: {<: UnsupportedOperationException} NEW: magic(e: UnsupportedOperationException) -> <v3>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v4>: Int NEW: r(2) -> <v4>
3 <v1>: Int NEW: r(3) -> <v1>
doSmth(3) <v2>: * NEW: call(doSmth, doSmth|<v1>) -> <v2>
{ doSmth(3) } <v2>: * COPY
=====================
== t16 ==
fun t16() : Int {
@@ -352,18 +361,20 @@ fun t16() : Int {
}
}
---------------------
1 <v0>: Int NEW()
doSmth(1) <v1>: * NEW(<v0>)
{ doSmth(1) } <v1>: * COPY
2 <v3>: Int NEW()
3 <v4>: Int NEW()
doSmth(3) <v5>: * NEW(<v4>)
{ doSmth(3) } <v5>: * COPY
try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } <v1>: * COPY
{ try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } } <v1>: * COPY
<v2>: {<: UnsupportedOperationException} NEW: magic(e: UnsupportedOperationException) -> <v2>
1 <v0>: Int NEW: r(1) -> <v0>
doSmth(1) <v1>: * NEW: call(doSmth, doSmth|<v0>) -> <v1>
{ doSmth(1) } <v1>: * COPY
2 <v3>: Int NEW: r(2) -> <v3>
3 <v4>: Int NEW: r(3) -> <v4>
doSmth(3) <v5>: * NEW: call(doSmth, doSmth|<v4>) -> <v5>
{ doSmth(3) } <v5>: * COPY
try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } <v1>: * COPY
{ try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } } <v1>: * COPY
=====================
== doSmth ==
fun doSmth(i: Int) {
}
---------------------
<v0>: Int NEW: magic(i: Int) -> <v0>
=====================
compiler/testData/cfg/controlStructures/FinallyTestCopy.values
+42 -35
View File
@@ -30,15 +30,17 @@ fun testCopy1() : Int {
}
}
---------------------
doSmth() <v0>: * NEW()
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW()
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW()
{ doSmth2() } <v4>: * COPY
1 <v5>: Int NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } <v6>: * NEW(<v0>, <v2>, <v4>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } } <v6>: * COPY
<v1>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v1>
<v3>: {<: Exception} NEW: magic(e: Exception) -> <v3>
doSmth() <v0>: * NEW: call(doSmth, doSmth) -> <v0>
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW: call(doSmth1, doSmth1) -> <v2>
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW: call(doSmth2, doSmth2) -> <v4>
{ doSmth2() } <v4>: * COPY
1 <v5>: Int NEW: r(1) -> <v5>
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } <v6>: * NEW: merge(try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 }|<v0>, <v2>, <v4>) -> <v6>
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } } <v6>: * COPY
=====================
== testCopy2 ==
fun testCopy2() {
@@ -59,16 +61,18 @@ fun testCopy2() {
}
}
---------------------
cond() <v0>: Boolean NEW()
doSmth() <v1>: * NEW()
{ doSmth() } <v1>: * COPY
doSmth1() <v3>: * NEW()
{ doSmth1() } <v3>: * COPY
doSmth2() <v5>: * NEW()
{ doSmth2() } <v5>: * COPY
cond() <v6>: Boolean NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } <v7>: * NEW(<v1>, <v3>, <v5>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } } <v7>: * COPY
<v2>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v2>
<v4>: {<: Exception} NEW: magic(e: Exception) -> <v4>
cond() <v0>: Boolean NEW: call(cond, cond) -> <v0>
doSmth() <v1>: * NEW: call(doSmth, doSmth) -> <v1>
{ doSmth() } <v1>: * COPY
doSmth1() <v3>: * NEW: call(doSmth1, doSmth1) -> <v3>
{ doSmth1() } <v3>: * COPY
doSmth2() <v5>: * NEW: call(doSmth2, doSmth2) -> <v5>
{ doSmth2() } <v5>: * COPY
cond() <v6>: Boolean NEW: call(cond, cond) -> <v6>
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } <v7>: * NEW: merge(try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue }|<v1>, <v3>, <v5>) -> <v7>
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } } <v7>: * COPY
=====================
== testCopy3 ==
fun testCopy3() {
@@ -86,15 +90,17 @@ fun testCopy3() {
}
}
---------------------
doSmth() <v0>: * NEW()
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW()
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW()
{ doSmth2() } <v4>: * COPY
cond() <v5>: Boolean NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } <v6>: * NEW(<v0>, <v2>, <v4>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } } <v6>: * COPY
<v1>: {<: NullPointerException} NEW: magic(e: NullPointerException) -> <v1>
<v3>: {<: Exception} NEW: magic(e: Exception) -> <v3>
doSmth() <v0>: * NEW: call(doSmth, doSmth) -> <v0>
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW: call(doSmth1, doSmth1) -> <v2>
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW: call(doSmth2, doSmth2) -> <v4>
{ doSmth2() } <v4>: * COPY
cond() <v5>: Boolean NEW: call(cond, cond) -> <v5>
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } <v6>: * NEW: merge(try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); }|<v0>, <v2>, <v4>) -> <v6>
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } } <v6>: * COPY
=====================
== doTestCopy4 ==
fun doTestCopy4(list: List<String>?) : Int {
@@ -107,11 +113,12 @@ fun doTestCopy4(list: List<String>?) : Int {
}
}
---------------------
doSmth() <v1>: * NEW()
{ doSmth() } <v1>: * COPY
list <v2>: {<: Any?} NEW()
null <v3>: {<: Any?} NEW()
list != null <v4>: Boolean NEW(<v2>, <v3>)
try { doSmth() } finally { if(list != null) { } } <v1>: * COPY
{ try { doSmth() } finally { if(list != null) { } } } <v1>: * COPY
<v0>: {<: List<String>?} NEW: magic(list: List<String>?) -> <v0>
doSmth() <v1>: * NEW: call(doSmth, doSmth) -> <v1>
{ doSmth() } <v1>: * COPY
list <v2>: {<: Any?} NEW: r(list) -> <v2>
null <v3>: {<: Any?} NEW: r(null) -> <v3>
list != null <v4>: Boolean NEW: call(!=, equals|<v2>, <v3>) -> <v4>
try { doSmth() } finally { if(list != null) { } } <v1>: * COPY
{ try { doSmth() } finally { if(list != null) { } } } <v1>: * COPY
=====================
compiler/testData/cfg/controlStructures/For.values
+8 -6
View File
@@ -5,14 +5,16 @@ fun t1() {
}
}
---------------------
1 <v0>: Int NEW()
2 <v1>: Int NEW()
1..2 <v2>: {<: Iterable<Int>} NEW(<v0>, <v1>)
i <v4>: Int NEW()
doSmth(i) <v5>: * NEW(<v4>)
{ doSmth(i) } <v5>: * COPY
<v3>: Int NEW: magic(1..2|<v2>) -> <v3>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
1..2 <v2>: {<: Iterable<Int>} NEW: call(.., rangeTo|<v0>, <v1>) -> <v2>
i <v4>: Int NEW: r(i) -> <v4>
doSmth(i) <v5>: * NEW: call(doSmth, doSmth|<v4>) -> <v5>
{ doSmth(i) } <v5>: * COPY
=====================
== doSmth ==
fun doSmth(i: Int) {}
---------------------
<v0>: Int NEW: magic(i: Int) -> <v0>
=====================
compiler/testData/cfg/controlStructures/If.values
+19 -16
View File
@@ -16,16 +16,17 @@ fun t1(b: Boolean) {
doSmth(r)
}
---------------------
b <v1>: Boolean NEW()
"s" <v2>: String NEW()
u <v3>: String NEW()
doSmth(u) <v4>: * NEW(<v3>)
b <v5>: Boolean NEW()
"s" <v6>: String NEW()
"t" <v7>: String NEW()
r <v8>: String NEW()
doSmth(r) <v9>: * NEW(<v8>)
{ var u: String if (b) { u = "s" } doSmth(u) var r: String if (b) { r = "s" } else { r = "t" } doSmth(r) } <v9>: * COPY
<v0>: Boolean NEW: magic(b: Boolean) -> <v0>
b <v1>: Boolean NEW: r(b) -> <v1>
"s" <v2>: String NEW: r("s") -> <v2>
u <v3>: String NEW: r(u) -> <v3>
doSmth(u) <v4>: * NEW: call(doSmth, doSmth|<v3>) -> <v4>
b <v5>: Boolean NEW: r(b) -> <v5>
"s" <v6>: String NEW: r("s") -> <v6>
"t" <v7>: String NEW: r("t") -> <v7>
r <v8>: String NEW: r(r) -> <v8>
doSmth(r) <v9>: * NEW: call(doSmth, doSmth|<v8>) -> <v9>
{ var u: String if (b) { u = "s" } doSmth(u) var r: String if (b) { r = "s" } else { r = "t" } doSmth(r) } <v9>: * COPY
=====================
== t2 ==
fun t2(b: Boolean) {
@@ -39,14 +40,16 @@ fun t2(b: Boolean) {
}
}
---------------------
3 <v1>: Int NEW()
b <v2>: Boolean NEW()
i <v3>: String NEW()
doSmth(i) <v4>: * NEW(<v3>)
i <v5>: * NEW()
i is Int <v6>: Boolean NEW(<v5>)
<v0>: Boolean NEW: magic(b: Boolean) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
b <v2>: Boolean NEW: r(b) -> <v2>
i <v3>: String NEW: r(i) -> <v3>
doSmth(i) <v4>: * NEW: call(doSmth, doSmth|<v3>) -> <v4>
i <v5>: * NEW: r(i) -> <v5>
i is Int <v6>: Boolean NEW: magic(i is Int|<v5>) -> <v6>
=====================
== doSmth ==
fun doSmth(s: String) {}
---------------------
<v0>: String NEW: magic(s: String) -> <v0>
=====================
compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.values
+8 -8
View File
@@ -5,11 +5,11 @@ fun main() {
}
}
---------------------
0 <v0>: {<: Comparable<Int>} NEW()
1 <v1>: Int NEW()
0 > 1 <v2>: Boolean NEW(<v0>, <v1>)
2 <v3>: * NEW()
{ 2 } <v3>: * COPY
0 <v0>: {<: Comparable<Int>} NEW: r(0) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
0 > 1 <v2>: Boolean NEW: call(>, compareTo|<v0>, <v1>) -> <v2>
2 <v3>: * NEW: r(2) -> <v3>
{ 2 } <v3>: * COPY
=====================
== dowhile ==
fun dowhile() {
@@ -17,7 +17,7 @@ fun dowhile() {
while(0 > 1)
}
---------------------
0 <v0>: * NEW()
1 <v1>: * NEW()
0 > 1 <v2>: * NEW(<v0>, <v1>)
0 <v0>: * NEW: r(0) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
0 > 1 <v2>: * NEW: call(>, compareTo|<v0>, <v1>) -> <v2>
=====================
compiler/testData/cfg/controlStructures/returnsInWhen.values
+4 -2
View File
@@ -5,6 +5,8 @@ fun illegalWhenBlock(a: Any): Any {
}
}
---------------------
a <v1>: * NEW()
a <v3>: {<: Any} NEW()
<v0>: {<: Any} NEW: magic(a: Any) -> <v0>
<v2>: * NEW: magic(is Int|<v1>) -> <v2>
a <v1>: * NEW: r(a) -> <v1>
a <v3>: {<: Any} NEW: r(a) -> <v3>
=====================
compiler/testData/cfg/conventions/bothReceivers.values
+5 -4
View File
@@ -18,9 +18,10 @@ fun foobar(f: Foo) {
Bar().f()
}
---------------------
Bar() <v2>: Bar NEW()
f <v1>: Foo NEW()
f() <v3>: * NEW(<v1>, <v2>)
<v0>: Foo NEW: magic(f: Foo) -> <v0>
Bar() <v2>: Bar NEW: call(Bar, <init>) -> <v2>
f <v1>: Foo NEW: r(f) -> <v1>
f() <v3>: * NEW: call(f, invoke|<v1>, <v2>) -> <v3>
Bar().f() <v3>: * COPY
{ Bar().f() } <v3>: * COPY
=====================
=====================
compiler/testData/cfg/conventions/equals.values
+5 -3
View File
@@ -4,7 +4,9 @@ fun foo(a: Int, b: Int) {
}
}
---------------------
a <v2>: OR{{<: Any}, {<: Any}} NEW()
b <v3>: {<: Any?} NEW()
a == b <v4>: Boolean NEW(<v2>, <v3>)
<v0>: Int NEW: magic(a: Int) -> <v0>
<v1>: Int NEW: magic(b: Int) -> <v1>
a <v2>: OR{{<: Any}, {<: Any}} NEW: r(a) -> <v2>
b <v3>: {<: Any?} NEW: r(b) -> <v3>
a == b <v4>: Boolean NEW: call(==, equals|<v2>, <v3>) -> <v4>
=====================
compiler/testData/cfg/conventions/incrementAtTheEnd.values
+2 -2
View File
@@ -4,8 +4,8 @@ fun foo() {
i++
}
---------------------
1 <v0>: Int NEW()
i <v1>: Int NEW()
1 <v0>: Int NEW: r(1) -> <v0>
i <v1>: Int NEW: r(i) -> <v1>
i++ <v1>: Int COPY
{ var i = 1 i++ } <v1>: Int COPY
=====================
compiler/testData/cfg/conventions/invoke.values
+3 -2
View File
@@ -3,7 +3,8 @@ fun foo(f: () -> Unit) {
f()
}
---------------------
f <v1>: {<: () -> Unit} NEW()
f() <v2>: * NEW(<v1>)
<v0>: {<: () -> Unit} NEW: magic(f: () -> Unit) -> <v0>
f <v1>: {<: () -> Unit} NEW: r(f) -> <v1>
f() <v2>: * NEW: call(f, invoke|<v1>) -> <v2>
{ f() } <v2>: * COPY
=====================
compiler/testData/cfg/conventions/notEqual.values
+5 -3
View File
@@ -3,7 +3,9 @@ fun neq(a: Int, b: Int) {
if (a != b) {}
}
---------------------
a <v2>: OR{{<: Any}, {<: Any}} NEW()
b <v3>: {<: Any?} NEW()
a != b <v4>: Boolean NEW(<v2>, <v3>)
<v0>: Int NEW: magic(a: Int) -> <v0>
<v1>: Int NEW: magic(b: Int) -> <v1>
a <v2>: OR{{<: Any}, {<: Any}} NEW: r(a) -> <v2>
b <v3>: {<: Any?} NEW: r(b) -> <v3>
a != b <v4>: Boolean NEW: call(!=, equals|<v2>, <v3>) -> <v4>
=====================
compiler/testData/cfg/deadCode/DeadCode.values
+3 -3
View File
@@ -4,7 +4,7 @@ fun test() {
test()
}
---------------------
Exception() <v0>: {<: Throwable} NEW()
test() <v1>: * NEW()
{ throw Exception() test() } <v1>: * COPY
Exception() <v0>: {<: Throwable} NEW: call(Exception, <init>) -> <v0>
test() <v1>: * NEW: call(test, test) -> <v1>
{ throw Exception() test() } <v1>: * COPY
=====================
compiler/testData/cfg/deadCode/returnInElvis.values
+3 -3
View File
@@ -3,7 +3,7 @@ fun foo() {
return ?: null
}
---------------------
null <v0>: * NEW()
return ?: null <v0>: * COPY
{ return ?: null } <v0>: * COPY
null <v0>: * NEW: r(null) -> <v0>
return ?: null <v0>: * COPY
{ return ?: null } <v0>: * COPY
=====================
compiler/testData/cfg/deadCode/stringTemplate.values
+3 -3
View File
@@ -3,8 +3,8 @@ fun test() {
"${throw Exception()} ${1}"
}
---------------------
Exception() <v0>: {<: Throwable} NEW()
1 <v1>: * NEW()
"${throw Exception()} ${1}" <v2>: * NEW(<v1>)
Exception() <v0>: {<: Throwable} NEW: call(Exception, <init>) -> <v0>
1 <v1>: * NEW: r(1) -> <v1>
"${throw Exception()} ${1}" <v2>: * NEW: magic("${throw Exception()} ${1}"|<v1>) -> <v2>
{ "${throw Exception()} ${1}" } <v2>: * COPY
=====================
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.values
+5 -3
View File
@@ -15,7 +15,9 @@ class AnonymousInitializers() {
}
}
---------------------
34 <v0>: Int NEW()
12 <v2>: Int NEW()
13 <v4>: Int NEW()
<v1>: AnonymousInitializers NEW: magic($i) -> <v1>
<v3>: AnonymousInitializers NEW: magic($i) -> <v3>
34 <v0>: Int NEW: r(34) -> <v0>
12 <v2>: Int NEW: r(12) -> <v2>
13 <v4>: Int NEW: r(13) -> <v4>
=====================
compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.values
+1 -1
View File
@@ -3,7 +3,7 @@ fun foo() {
{}
}
---------------------
{} <v0>: * NEW()
{} <v0>: * NEW: r({}) -> <v0>
{ {} } <v0>: * COPY
=====================
== anonymous_0 ==
compiler/testData/cfg/declarations/functions/FailFunction.values
+1 -1
View File
@@ -3,6 +3,6 @@ fun fail() : Nothing {
throw java.lang.RuntimeException()
}
---------------------
RuntimeException() <v0>: {<: Throwable} NEW()
RuntimeException() <v0>: {<: Throwable} NEW: call(RuntimeException, <init>) -> <v0>
java.lang.RuntimeException() <v0>: {<: Throwable} COPY
=====================
compiler/testData/cfg/declarations/functions/typeParameter.values
+1 -1
View File
@@ -3,6 +3,6 @@ fun <T> foo() {
T
}
---------------------
T <v0>: * NEW()
T <v0>: * NEW: magic(T) -> <v0>
{ T } <v0>: * COPY
=====================
compiler/testData/cfg/declarations/local/LocalDeclarations.values
+26 -17
View File
@@ -17,11 +17,12 @@ class C() {
}
}
---------------------
1 <v0>: Int NEW()
1 <v0>: Int NEW: r(1) -> <v0>
=====================
== doSmth ==
fun doSmth(i: Int) {}
---------------------
<v0>: Int NEW: magic(i: Int) -> <v0>
=====================
== test1 ==
fun test1() {
@@ -33,8 +34,9 @@ fun test1() {
}
}
---------------------
1 <v1>: Int NEW()
object { val x : Int { $x = 1 } } <v2>: <no name provided> NEW()
<v0>: <no name provided> NEW: magic($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { val x : Int { $x = 1 } } <v2>: <no name provided> NEW: r(object { val x : Int { $x = 1 } }) -> <v2>
=====================
== O ==
object O {
@@ -44,7 +46,8 @@ object O {
}
}
---------------------
1 <v1>: Int NEW()
<v0>: O NEW: magic($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
=====================
== test2 ==
fun test2() {
@@ -54,9 +57,9 @@ fun test2() {
}
}
---------------------
1 <v0>: Int NEW()
b <v1>: Int NEW()
object { val x = b } <v2>: <no name provided> NEW()
1 <v0>: Int NEW: r(1) -> <v0>
b <v1>: Int NEW: r(b) -> <v1>
object { val x = b } <v2>: <no name provided> NEW: r(object { val x = b }) -> <v2>
=====================
== test3 ==
fun test3() {
@@ -68,14 +71,15 @@ fun test3() {
}
}
---------------------
object { val y : Int fun inner_bar() { y = 10 } } <v0>: <no name provided> NEW()
object { val y : Int fun inner_bar() { y = 10 } } <v0>: <no name provided> NEW: r(object { val y : Int fun inner_bar() { y = 10 } }) -> <v0>
=====================
== inner_bar ==
fun inner_bar() {
y = 10
}
---------------------
10 <v1>: Int NEW()
<v0>: <no name provided> NEW: magic(y) -> <v0>
10 <v1>: Int NEW: r(10) -> <v1>
=====================
== test4 ==
fun test4() {
@@ -91,15 +95,17 @@ fun test4() {
}
}
---------------------
1 <v1>: Int NEW()
object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } <v2>: <no name provided> NEW()
<v0>: <no name provided> NEW: magic($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } <v2>: <no name provided> NEW: r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v2>
=====================
== ggg ==
fun ggg() {
y = 10
}
---------------------
10 <v1>: Int NEW()
<v0>: <no name provided> NEW: magic(y) -> <v0>
10 <v1>: Int NEW: r(10) -> <v1>
=====================
== test5 ==
fun test5() {
@@ -117,21 +123,24 @@ fun test5() {
}
}
---------------------
1 <v0>: Int NEW()
2 <v2>: Int NEW()
object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v3>: <no name provided> NEW()
<v1>: <no name provided> NEW: magic($x) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v3>: <no name provided> NEW: r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v3>
=====================
== foo ==
fun foo() {
x = 3
}
---------------------
3 <v1>: Int NEW()
<v0>: <no name provided> NEW: magic(x) -> <v0>
3 <v1>: Int NEW: r(3) -> <v1>
=====================
== bar ==
fun bar() {
x = 4
}
---------------------
4 <v1>: Int NEW()
<v0>: <no name provided> NEW: magic(x) -> <v0>
4 <v1>: Int NEW: r(4) -> <v1>
=====================
compiler/testData/cfg/declarations/local/ObjectExpression.values
+7 -6
View File
@@ -17,7 +17,7 @@ class B : A {
== foo ==
override fun foo() = 10
---------------------
10 <v0>: Int NEW()
10 <v0>: Int NEW: r(10) -> <v0>
=====================
== foo ==
fun foo(b: B) : Int {
@@ -25,9 +25,10 @@ fun foo(b: B) : Int {
return o.foo()
}
---------------------
b <v1>: * NEW()
object : A by b {} <v2>: <no name provided> NEW()
o <v3>: {<: A} NEW()
foo() <v4>: Int NEW(<v3>)
o.foo() <v4>: Int COPY
<v0>: B NEW: magic(b: B) -> <v0>
b <v1>: * NEW: r(b) -> <v1>
object : A by b {} <v2>: <no name provided> NEW: r(object : A by b {}) -> <v2>
o <v3>: {<: A} NEW: r(o) -> <v3>
foo() <v4>: Int NEW: call(foo, foo|<v3>) -> <v4>
o.foo() <v4>: Int COPY
=====================
compiler/testData/cfg/declarations/local/localClass.values
+2 -2
View File
@@ -21,12 +21,12 @@ fun f() {
}
}
---------------------
"" <v0>: String NEW()
"" <v0>: String NEW: r("") -> <v0>
=====================
== loc ==
fun loc() {
val x3 = ""
}
---------------------
"" <v0>: String NEW()
"" <v0>: String NEW: r("") -> <v0>
=====================
compiler/testData/cfg/declarations/local/localProperty.values
+1 -1
View File
@@ -16,5 +16,5 @@ get() {
return b
}
---------------------
b <v0>: Int NEW()
b <v0>: Int NEW: r(b) -> <v0>
=====================
compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.values
+7 -6
View File
@@ -8,12 +8,12 @@ class C {
== component1 ==
fun component1() = 1
---------------------
1 <v0>: Int NEW()
1 <v0>: Int NEW: r(1) -> <v0>
=====================
== component2 ==
fun component2() = 2
---------------------
2 <v0>: Int NEW()
2 <v0>: Int NEW: r(2) -> <v0>
=====================
== test ==
fun test(c: C) {
@@ -21,8 +21,9 @@ fun test(c: C) {
val d = 1
}
---------------------
a <v2>: Int NEW(<v1>)
b <v3>: Int NEW(<v1>)
c <v1>: C NEW()
1 <v4>: Int NEW()
<v0>: C NEW: magic(c: C) -> <v0>
a <v2>: Int NEW: call(a, component1|<v1>) -> <v2>
b <v3>: Int NEW: call(b, component2|<v1>) -> <v3>
c <v1>: C NEW: r(c) -> <v1>
1 <v4>: Int NEW: r(1) -> <v4>
=====================
compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.values
+6 -3
View File
@@ -4,7 +4,10 @@ fun foo(x: Int) {
a
}
---------------------
x <v1>: * NEW()
a <v4>: * NEW()
{ val (a, b) = x a } <v4>: * COPY
<v0>: Int NEW: magic(x: Int) -> <v0>
<v2>: {<: [ERROR : component1() return type]} NEW: magic(a|<v1>) -> <v2>
<v3>: {<: [ERROR : component2() return type]} NEW: magic(b|<v1>) -> <v3>
x <v1>: * NEW: r(x) -> <v1>
a <v4>: * NEW: r(a) -> <v4>
{ val (a, b) = x a } <v4>: * COPY
=====================
compiler/testData/cfg/declarations/properties/DelegatedProperty.values
+5 -3
View File
@@ -7,15 +7,17 @@ class Delegate {
== get ==
fun get(_this: Any, p: PropertyMetadata): Int = 0
---------------------
0 <v2>: Int NEW()
<v0>: {<: Any} NEW: magic(_this: Any) -> <v0>
<v1>: {<: PropertyMetadata} NEW: magic(p: PropertyMetadata) -> <v1>
0 <v2>: Int NEW: r(0) -> <v2>
=====================
== a ==
val a = Delegate()
---------------------
Delegate() <v0>: Delegate NEW()
Delegate() <v0>: Delegate NEW: call(Delegate, <init>) -> <v0>
=====================
== b ==
val b by a
---------------------
a <v0>: * NEW()
a <v0>: * NEW: r(a) -> <v0>
=====================
compiler/testData/cfg/declarations/properties/backingFieldAccess.values
+3 -2
View File
@@ -8,6 +8,7 @@ class C {
}
}
---------------------
$a <v1>: * NEW(<v0>)
{ $a } <v1>: * COPY
<v0>: C NEW: magic($a) -> <v0>
$a <v1>: * NEW: r($a|<v0>) -> <v1>
{ $a } <v1>: * COPY
=====================
compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.values
+6 -6
View File
@@ -8,10 +8,10 @@ abstract class Bar {
== foo ==
fun foo() = "foo" + this.$bar
---------------------
"foo" <v0>: String NEW()
this <v1>: {<: Bar} COPY
this <v1>: {<: Bar} NEW()
$bar <v2>: {<: Any?} NEW(<v1>)
this.$bar <v2>: {<: Any?} COPY
"foo" + this.$bar <v3>: String NEW(<v0>, <v2>)
"foo" <v0>: String NEW: r("foo") -> <v0>
this <v1>: {<: Bar} COPY
this <v1>: {<: Bar} NEW: r(this) -> <v1>
$bar <v2>: {<: Any?} NEW: r($bar|<v1>) -> <v2>
this.$bar <v2>: {<: Any?} COPY
"foo" + this.$bar <v3>: String NEW: call(+, plus|<v0>, <v2>) -> <v3>
=====================
compiler/testData/cfg/expressions/Assignments.values
+24 -24
View File
@@ -20,28 +20,28 @@ fun assignments() : Unit {
t.x += 1
}
---------------------
1 <v0>: Int NEW()
2 <v1>: Int NEW()
x <v2>: Int NEW()
2 <v3>: Int NEW()
x += 2 <v4>: Int NEW(<v2>, <v3>)
true <v5>: Boolean NEW()
1 <v6>: Int NEW()
2 <v7>: Int NEW()
if (true) 1 else 2 <v8>: Int NEW(<v6>, <v7>)
true <v9>: Boolean NEW()
false <v10>: Boolean NEW()
true && false <v11>: Boolean NEW(<v9>, <v10>)
false <v12>: Boolean NEW()
true <v13>: Boolean NEW()
false && true <v14>: Boolean NEW(<v12>, <v13>)
Test() <v15>: Test NEW()
t <v16>: Test NEW()
1 <v17>: Int NEW()
t <v22>: Test NEW()
x <v19>: Int NEW(<v18>)
t.x <v19>: Int COPY
1 <v20>: Int NEW()
t.x += 1 <v21>: Int NEW(<v19>, <v20>)
{ var x = 1 x = 2 x += 2 x = if (true) 1 else 2 val y = true && false val z = false && true val t = Test(); t.x = 1 t.x += 1 } <v21>: Int COPY
1 <v0>: Int NEW: r(1) -> <v0>
2 <v1>: Int NEW: r(2) -> <v1>
x <v2>: Int NEW: r(x) -> <v2>
2 <v3>: Int NEW: r(2) -> <v3>
x += 2 <v4>: Int NEW: call(+=, plus|<v2>, <v3>) -> <v4>
true <v5>: Boolean NEW: r(true) -> <v5>
1 <v6>: Int NEW: r(1) -> <v6>
2 <v7>: Int NEW: r(2) -> <v7>
if (true) 1 else 2 <v8>: Int NEW: merge(if (true) 1 else 2|<v6>, <v7>) -> <v8>
true <v9>: Boolean NEW: r(true) -> <v9>
false <v10>: Boolean NEW: r(false) -> <v10>
true && false <v11>: Boolean NEW: magic(true && false|<v9>, <v10>) -> <v11>
false <v12>: Boolean NEW: r(false) -> <v12>
true <v13>: Boolean NEW: r(true) -> <v13>
false && true <v14>: Boolean NEW: magic(false && true|<v12>, <v13>) -> <v14>
Test() <v15>: Test NEW: call(Test, <init>) -> <v15>
t <v16>: Test NEW: r(t) -> <v16>
1 <v17>: Int NEW: r(1) -> <v17>
t <v22>: Test NEW: r(t) -> <v22>
x <v19>: Int NEW: r(x|<v18>) -> <v19>
t.x <v19>: Int COPY
1 <v20>: Int NEW: r(1) -> <v20>
t.x += 1 <v21>: Int NEW: call(+=, plus|<v19>, <v20>) -> <v21>
{ var x = 1 x = 2 x += 2 x = if (true) 1 else 2 val y = true && false val z = false && true val t = Test(); t.x = 1 t.x += 1 } <v21>: Int COPY
=====================
compiler/testData/cfg/expressions/LazyBooleans.values
+32 -30
View File
@@ -17,34 +17,36 @@ fun lazyBooleans(a : Boolean, b : Boolean) : Unit {
14
}
---------------------
a <v2>: Boolean NEW()
1 <v3>: * NEW()
{ 1 } <v3>: * COPY
2 <v4>: * NEW()
{ 2 } <v4>: * COPY
if (a) { 1 } else { 2 } <v5>: * NEW(<v3>, <v4>)
3 <v6>: * NEW()
a <v7>: Boolean NEW()
b <v8>: Boolean NEW()
a && b <v9>: Boolean NEW(<v7>, <v8>)
5 <v10>: * NEW()
6 <v11>: * NEW()
if (a && b) 5 else 6 <v12>: * NEW(<v10>, <v11>)
7 <v13>: * NEW()
a <v14>: Boolean NEW()
b <v15>: Boolean NEW()
a || b <v16>: Boolean NEW(<v14>, <v15>)
8 <v17>: * NEW()
9 <v18>: * NEW()
if (a || b) 8 else 9 <v19>: * NEW(<v17>, <v18>)
10 <v20>: * NEW()
a <v21>: Boolean NEW()
11 <v22>: * NEW()
if (a) 11 <v22>: * COPY
12 <v23>: * NEW()
a <v24>: Boolean NEW()
13 <v25>: * NEW()
if (a) else 13 <v25>: * COPY
14 <v26>: * NEW()
{ if (a) { 1 } else { 2 } 3 if (a && b) 5 else 6 7 if (a || b) 8 else 9 10 if (a) 11 12 if (a) else 13 14 } <v26>: * COPY
<v0>: Boolean NEW: magic(a : Boolean) -> <v0>
<v1>: Boolean NEW: magic(b : Boolean) -> <v1>
a <v2>: Boolean NEW: r(a) -> <v2>
1 <v3>: * NEW: r(1) -> <v3>
{ 1 } <v3>: * COPY
2 <v4>: * NEW: r(2) -> <v4>
{ 2 } <v4>: * COPY
if (a) { 1 } else { 2 } <v5>: * NEW: merge(if (a) { 1 } else { 2 }|<v3>, <v4>) -> <v5>
3 <v6>: * NEW: r(3) -> <v6>
a <v7>: Boolean NEW: r(a) -> <v7>
b <v8>: Boolean NEW: r(b) -> <v8>
a && b <v9>: Boolean NEW: magic(a && b|<v7>, <v8>) -> <v9>
5 <v10>: * NEW: r(5) -> <v10>
6 <v11>: * NEW: r(6) -> <v11>
if (a && b) 5 else 6 <v12>: * NEW: merge(if (a && b) 5 else 6|<v10>, <v11>) -> <v12>
7 <v13>: * NEW: r(7) -> <v13>
a <v14>: Boolean NEW: r(a) -> <v14>
b <v15>: Boolean NEW: r(b) -> <v15>
a || b <v16>: Boolean NEW: magic(a || b|<v14>, <v15>) -> <v16>
8 <v17>: * NEW: r(8) -> <v17>
9 <v18>: * NEW: r(9) -> <v18>
if (a || b) 8 else 9 <v19>: * NEW: merge(if (a || b) 8 else 9|<v17>, <v18>) -> <v19>
10 <v20>: * NEW: r(10) -> <v20>
a <v21>: Boolean NEW: r(a) -> <v21>
11 <v22>: * NEW: r(11) -> <v22>
if (a) 11 <v22>: * COPY
12 <v23>: * NEW: r(12) -> <v23>
a <v24>: Boolean NEW: r(a) -> <v24>
13 <v25>: * NEW: r(13) -> <v25>
if (a) else 13 <v25>: * COPY
14 <v26>: * NEW: r(14) -> <v26>
{ if (a) { 1 } else { 2 } 3 if (a && b) 5 else 6 7 if (a || b) 8 else 9 10 if (a) 11 12 if (a) else 13 14 } <v26>: * COPY
=====================
compiler/testData/cfg/expressions/ReturnFromExpression.values
+4 -4
View File
@@ -3,8 +3,8 @@ fun blockAndAndMismatch() : Boolean {
false || (return false)
}
---------------------
false <v0>: Boolean NEW()
false <v1>: Boolean NEW()
false || (return false) <v2>: * NEW(<v0>)
{ false || (return false) } <v2>: * COPY
false <v0>: Boolean NEW: r(false) -> <v0>
false <v1>: Boolean NEW: r(false) -> <v1>
false || (return false) <v2>: * NEW: magic(false || (return false)|<v0>) -> <v2>
{ false || (return false) } <v2>: * COPY
=====================
compiler/testData/cfg/expressions/assignmentToThis.values
+2 -1
View File
@@ -3,5 +3,6 @@ fun Int.bar(c: C) {
this = c
}
---------------------
c <v1>: * NEW()
<v0>: {<: [ERROR : C]} NEW: magic(c: C) -> <v0>
c <v1>: * NEW: r(c) -> <v1>
=====================
compiler/testData/cfg/expressions/chainedQualifiedExpression.values
+152 -151
View File
@@ -50,141 +50,142 @@ public open class JetKeywordCompletionContributor() {
}
}
---------------------
1.0 <v0>: Double NEW()
BunchKeywordRegister() <v2>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v1>)
ABSTRACT_KEYWORD <v3>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v4>: Double NEW()
inTopLevel <v5>: Double NEW()
inTopLevel <v6>: Double NEW()
add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v7>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v2>, <v3>, <v4>, <v5>, <v6>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v7>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
FINAL_KEYWORD <v8>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v9>: Double NEW()
inTopLevel <v10>: Double NEW()
inTopLevel <v11>: Double NEW()
add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v12>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v7>, <v8>, <v9>, <v10>, <v11>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v12>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
OPEN_KEYWORD <v13>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v14>: Double NEW()
inTopLevel <v15>: Double NEW()
inTopLevel <v16>: Double NEW()
add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v17>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v12>, <v13>, <v14>, <v15>, <v16>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v17>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
INTERNAL_KEYWORD <v18>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v19>: Double NEW()
inTopLevel <v20>: Double NEW()
inTopLevel <v21>: Double NEW()
inTopLevel <v22>: Double NEW()
add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v23>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v17>, <v18>, <v19>, <v20>, <v21>, <v22>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v23>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
PRIVATE_KEYWORD <v24>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v25>: Double NEW()
inTopLevel <v26>: Double NEW()
inTopLevel <v27>: Double NEW()
inTopLevel <v28>: Double NEW()
add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v29>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v23>, <v24>, <v25>, <v26>, <v27>, <v28>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v29>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
PROTECTED_KEYWORD <v30>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v31>: Double NEW()
inTopLevel <v32>: Double NEW()
inTopLevel <v33>: Double NEW()
inTopLevel <v34>: Double NEW()
add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v35>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v29>, <v30>, <v31>, <v32>, <v33>, <v34>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v35>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
PUBLIC_KEYWORD <v36>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v37>: Double NEW()
inTopLevel <v38>: Double NEW()
inTopLevel <v39>: Double NEW()
inTopLevel <v40>: Double NEW()
add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v41>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v35>, <v36>, <v37>, <v38>, <v39>, <v40>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v41>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
CLASS_KEYWORD <v42>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v43>: Double NEW()
inTopLevel <v44>: Double NEW()
inTopLevel <v45>: Double NEW()
add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v46>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v41>, <v42>, <v43>, <v44>, <v45>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v46>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
ENUM_KEYWORD <v47>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v48>: Double NEW()
inTopLevel <v49>: Double NEW()
inTopLevel <v50>: Double NEW()
add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v51>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v46>, <v47>, <v48>, <v49>, <v50>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v51>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
FUN_KEYWORD <v52>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v53>: Double NEW()
inTopLevel <v54>: Double NEW()
inTopLevel <v55>: Double NEW()
add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v56>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v51>, <v52>, <v53>, <v54>, <v55>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v56>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
GET_KEYWORD <v57>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v58>: Double NEW()
inTopLevel <v59>: Double NEW()
inTopLevel <v60>: Double NEW()
add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v61>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v56>, <v57>, <v58>, <v59>, <v60>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v61>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
SET_KEYWORD <v62>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v63>: Double NEW()
inTopLevel <v64>: Double NEW()
inTopLevel <v65>: Double NEW()
add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v66>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v61>, <v62>, <v63>, <v64>, <v65>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v66>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
TRAIT_KEYWORD <v67>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v68>: Double NEW()
inTopLevel <v69>: Double NEW()
inTopLevel <v70>: Double NEW()
add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v71>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v66>, <v67>, <v68>, <v69>, <v70>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v71>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
VAL_KEYWORD <v72>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v73>: Double NEW()
inTopLevel <v74>: Double NEW()
inTopLevel <v75>: Double NEW()
add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v76>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v71>, <v72>, <v73>, <v74>, <v75>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v76>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
VAR_KEYWORD <v77>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v78>: Double NEW()
inTopLevel <v79>: Double NEW()
inTopLevel <v80>: Double NEW()
add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v81>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v76>, <v77>, <v78>, <v79>, <v80>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v81>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
TYPE_KEYWORD <v82>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v83>: Double NEW()
inTopLevel <v84>: Double NEW()
inTopLevel <v85>: Double NEW()
add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v86>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v81>, <v82>, <v83>, <v84>, <v85>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v86>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
IMPORT_KEYWORD <v87>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v88>: Double NEW()
add(IMPORT_KEYWORD, inTopLevel) <v89>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v86>, <v87>, <v88>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) <v89>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
PACKAGE_KEYWORD <v90>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v91>: Double NEW()
add(PACKAGE_KEYWORD, inTopLevel) <v92>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v89>, <v90>, <v91>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) <v92>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
OVERRIDE_KEYWORD <v93>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v94>: Double NEW()
add(OVERRIDE_KEYWORD, inTopLevel) <v95>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v92>, <v93>, <v94>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) <v95>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
IN_KEYWORD <v96>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v97>: Double NEW()
inTopLevel <v98>: Double NEW()
add(IN_KEYWORD, inTopLevel, inTopLevel) <v99>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v95>, <v96>, <v97>, <v98>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) <v99>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
OUT_KEYWORD <v100>: {<: [ERROR : Type annotation was missing]} NEW()
inTopLevel <v101>: Double NEW()
add(OUT_KEYWORD, inTopLevel) <v102>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v99>, <v100>, <v101>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) .add(OUT_KEYWORD, inTopLevel) <v102>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
OBJECT_KEYWORD <v103>: {<: [ERROR : Type annotation was missing]} NEW()
unresolvedCode <v104>: Double NEW()
add(OBJECT_KEYWORD, unresolvedCode) <v105>: JetKeywordCompletionContributor.BunchKeywordRegister NEW(<v102>, <v103>, <v104>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) .add(OUT_KEYWORD, inTopLevel) .add(OBJECT_KEYWORD, unresolvedCode) <v105>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
registerAll() <v106>: * NEW(<v105>)
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) .add(OUT_KEYWORD, inTopLevel) .add(OBJECT_KEYWORD, unresolvedCode) .registerAll() <v106>: * COPY
{ val inTopLevel = 1.0 BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) .add(OUT_KEYWORD, inTopLevel) .add(OBJECT_KEYWORD, unresolvedCode) .registerAll() } <v106>: * COPY
<v1>: {<: JetKeywordCompletionContributor} NEW: magic(BunchKeywordRegister()) -> <v1>
1.0 <v0>: Double NEW: r(1.0) -> <v0>
BunchKeywordRegister() <v2>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(BunchKeywordRegister, <init>|<v1>) -> <v2>
ABSTRACT_KEYWORD <v3>: {<: [ERROR : Type annotation was missing]} NEW: r(ABSTRACT_KEYWORD) -> <v3>
inTopLevel <v4>: Double NEW: r(inTopLevel) -> <v4>
inTopLevel <v5>: Double NEW: r(inTopLevel) -> <v5>
inTopLevel <v6>: Double NEW: r(inTopLevel) -> <v6>
add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v7>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v2>, <v3>, <v4>, <v5>, <v6>) -> <v7>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v7>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
FINAL_KEYWORD <v8>: {<: [ERROR : Type annotation was missing]} NEW: r(FINAL_KEYWORD) -> <v8>
inTopLevel <v9>: Double NEW: r(inTopLevel) -> <v9>
inTopLevel <v10>: Double NEW: r(inTopLevel) -> <v10>
inTopLevel <v11>: Double NEW: r(inTopLevel) -> <v11>
add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v12>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v7>, <v8>, <v9>, <v10>, <v11>) -> <v12>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v12>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
OPEN_KEYWORD <v13>: {<: [ERROR : Type annotation was missing]} NEW: r(OPEN_KEYWORD) -> <v13>
inTopLevel <v14>: Double NEW: r(inTopLevel) -> <v14>
inTopLevel <v15>: Double NEW: r(inTopLevel) -> <v15>
inTopLevel <v16>: Double NEW: r(inTopLevel) -> <v16>
add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v17>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v12>, <v13>, <v14>, <v15>, <v16>) -> <v17>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v17>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
INTERNAL_KEYWORD <v18>: {<: [ERROR : Type annotation was missing]} NEW: r(INTERNAL_KEYWORD) -> <v18>
inTopLevel <v19>: Double NEW: r(inTopLevel) -> <v19>
inTopLevel <v20>: Double NEW: r(inTopLevel) -> <v20>
inTopLevel <v21>: Double NEW: r(inTopLevel) -> <v21>
inTopLevel <v22>: Double NEW: r(inTopLevel) -> <v22>
add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v23>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v17>, <v18>, <v19>, <v20>, <v21>, <v22>) -> <v23>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v23>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
PRIVATE_KEYWORD <v24>: {<: [ERROR : Type annotation was missing]} NEW: r(PRIVATE_KEYWORD) -> <v24>
inTopLevel <v25>: Double NEW: r(inTopLevel) -> <v25>
inTopLevel <v26>: Double NEW: r(inTopLevel) -> <v26>
inTopLevel <v27>: Double NEW: r(inTopLevel) -> <v27>
inTopLevel <v28>: Double NEW: r(inTopLevel) -> <v28>
add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v29>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v23>, <v24>, <v25>, <v26>, <v27>, <v28>) -> <v29>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v29>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
PROTECTED_KEYWORD <v30>: {<: [ERROR : Type annotation was missing]} NEW: r(PROTECTED_KEYWORD) -> <v30>
inTopLevel <v31>: Double NEW: r(inTopLevel) -> <v31>
inTopLevel <v32>: Double NEW: r(inTopLevel) -> <v32>
inTopLevel <v33>: Double NEW: r(inTopLevel) -> <v33>
inTopLevel <v34>: Double NEW: r(inTopLevel) -> <v34>
add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v35>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v29>, <v30>, <v31>, <v32>, <v33>, <v34>) -> <v35>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v35>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
PUBLIC_KEYWORD <v36>: {<: [ERROR : Type annotation was missing]} NEW: r(PUBLIC_KEYWORD) -> <v36>
inTopLevel <v37>: Double NEW: r(inTopLevel) -> <v37>
inTopLevel <v38>: Double NEW: r(inTopLevel) -> <v38>
inTopLevel <v39>: Double NEW: r(inTopLevel) -> <v39>
inTopLevel <v40>: Double NEW: r(inTopLevel) -> <v40>
add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v41>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v35>, <v36>, <v37>, <v38>, <v39>, <v40>) -> <v41>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) <v41>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
CLASS_KEYWORD <v42>: {<: [ERROR : Type annotation was missing]} NEW: r(CLASS_KEYWORD) -> <v42>
inTopLevel <v43>: Double NEW: r(inTopLevel) -> <v43>
inTopLevel <v44>: Double NEW: r(inTopLevel) -> <v44>
inTopLevel <v45>: Double NEW: r(inTopLevel) -> <v45>
add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v46>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v41>, <v42>, <v43>, <v44>, <v45>) -> <v46>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v46>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
ENUM_KEYWORD <v47>: {<: [ERROR : Type annotation was missing]} NEW: r(ENUM_KEYWORD) -> <v47>
inTopLevel <v48>: Double NEW: r(inTopLevel) -> <v48>
inTopLevel <v49>: Double NEW: r(inTopLevel) -> <v49>
inTopLevel <v50>: Double NEW: r(inTopLevel) -> <v50>
add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v51>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v46>, <v47>, <v48>, <v49>, <v50>) -> <v51>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v51>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
FUN_KEYWORD <v52>: {<: [ERROR : Type annotation was missing]} NEW: r(FUN_KEYWORD) -> <v52>
inTopLevel <v53>: Double NEW: r(inTopLevel) -> <v53>
inTopLevel <v54>: Double NEW: r(inTopLevel) -> <v54>
inTopLevel <v55>: Double NEW: r(inTopLevel) -> <v55>
add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v56>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v51>, <v52>, <v53>, <v54>, <v55>) -> <v56>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v56>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
GET_KEYWORD <v57>: {<: [ERROR : Type annotation was missing]} NEW: r(GET_KEYWORD) -> <v57>
inTopLevel <v58>: Double NEW: r(inTopLevel) -> <v58>
inTopLevel <v59>: Double NEW: r(inTopLevel) -> <v59>
inTopLevel <v60>: Double NEW: r(inTopLevel) -> <v60>
add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v61>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v56>, <v57>, <v58>, <v59>, <v60>) -> <v61>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v61>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
SET_KEYWORD <v62>: {<: [ERROR : Type annotation was missing]} NEW: r(SET_KEYWORD) -> <v62>
inTopLevel <v63>: Double NEW: r(inTopLevel) -> <v63>
inTopLevel <v64>: Double NEW: r(inTopLevel) -> <v64>
inTopLevel <v65>: Double NEW: r(inTopLevel) -> <v65>
add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v66>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v61>, <v62>, <v63>, <v64>, <v65>) -> <v66>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v66>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
TRAIT_KEYWORD <v67>: {<: [ERROR : Type annotation was missing]} NEW: r(TRAIT_KEYWORD) -> <v67>
inTopLevel <v68>: Double NEW: r(inTopLevel) -> <v68>
inTopLevel <v69>: Double NEW: r(inTopLevel) -> <v69>
inTopLevel <v70>: Double NEW: r(inTopLevel) -> <v70>
add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v71>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v66>, <v67>, <v68>, <v69>, <v70>) -> <v71>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v71>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
VAL_KEYWORD <v72>: {<: [ERROR : Type annotation was missing]} NEW: r(VAL_KEYWORD) -> <v72>
inTopLevel <v73>: Double NEW: r(inTopLevel) -> <v73>
inTopLevel <v74>: Double NEW: r(inTopLevel) -> <v74>
inTopLevel <v75>: Double NEW: r(inTopLevel) -> <v75>
add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v76>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v71>, <v72>, <v73>, <v74>, <v75>) -> <v76>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v76>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
VAR_KEYWORD <v77>: {<: [ERROR : Type annotation was missing]} NEW: r(VAR_KEYWORD) -> <v77>
inTopLevel <v78>: Double NEW: r(inTopLevel) -> <v78>
inTopLevel <v79>: Double NEW: r(inTopLevel) -> <v79>
inTopLevel <v80>: Double NEW: r(inTopLevel) -> <v80>
add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v81>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v76>, <v77>, <v78>, <v79>, <v80>) -> <v81>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v81>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
TYPE_KEYWORD <v82>: {<: [ERROR : Type annotation was missing]} NEW: r(TYPE_KEYWORD) -> <v82>
inTopLevel <v83>: Double NEW: r(inTopLevel) -> <v83>
inTopLevel <v84>: Double NEW: r(inTopLevel) -> <v84>
inTopLevel <v85>: Double NEW: r(inTopLevel) -> <v85>
add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v86>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v81>, <v82>, <v83>, <v84>, <v85>) -> <v86>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) <v86>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
IMPORT_KEYWORD <v87>: {<: [ERROR : Type annotation was missing]} NEW: r(IMPORT_KEYWORD) -> <v87>
inTopLevel <v88>: Double NEW: r(inTopLevel) -> <v88>
add(IMPORT_KEYWORD, inTopLevel) <v89>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v86>, <v87>, <v88>) -> <v89>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) <v89>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
PACKAGE_KEYWORD <v90>: {<: [ERROR : Type annotation was missing]} NEW: r(PACKAGE_KEYWORD) -> <v90>
inTopLevel <v91>: Double NEW: r(inTopLevel) -> <v91>
add(PACKAGE_KEYWORD, inTopLevel) <v92>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v89>, <v90>, <v91>) -> <v92>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) <v92>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
OVERRIDE_KEYWORD <v93>: {<: [ERROR : Type annotation was missing]} NEW: r(OVERRIDE_KEYWORD) -> <v93>
inTopLevel <v94>: Double NEW: r(inTopLevel) -> <v94>
add(OVERRIDE_KEYWORD, inTopLevel) <v95>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v92>, <v93>, <v94>) -> <v95>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) <v95>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
IN_KEYWORD <v96>: {<: [ERROR : Type annotation was missing]} NEW: r(IN_KEYWORD) -> <v96>
inTopLevel <v97>: Double NEW: r(inTopLevel) -> <v97>
inTopLevel <v98>: Double NEW: r(inTopLevel) -> <v98>
add(IN_KEYWORD, inTopLevel, inTopLevel) <v99>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v95>, <v96>, <v97>, <v98>) -> <v99>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) <v99>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
OUT_KEYWORD <v100>: {<: [ERROR : Type annotation was missing]} NEW: r(OUT_KEYWORD) -> <v100>
inTopLevel <v101>: Double NEW: r(inTopLevel) -> <v101>
add(OUT_KEYWORD, inTopLevel) <v102>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v99>, <v100>, <v101>) -> <v102>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) .add(OUT_KEYWORD, inTopLevel) <v102>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
OBJECT_KEYWORD <v103>: {<: [ERROR : Type annotation was missing]} NEW: r(OBJECT_KEYWORD) -> <v103>
unresolvedCode <v104>: Double NEW: magic(unresolvedCode) -> <v104>
add(OBJECT_KEYWORD, unresolvedCode) <v105>: JetKeywordCompletionContributor.BunchKeywordRegister NEW: call(add, add|<v102>, <v103>, <v104>) -> <v105>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) .add(OUT_KEYWORD, inTopLevel) .add(OBJECT_KEYWORD, unresolvedCode) <v105>: JetKeywordCompletionContributor.BunchKeywordRegister COPY
registerAll() <v106>: * NEW: call(registerAll, registerAll|<v105>) -> <v106>
BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) .add(OUT_KEYWORD, inTopLevel) .add(OBJECT_KEYWORD, unresolvedCode) .registerAll() <v106>: * COPY
{ val inTopLevel = 1.0 BunchKeywordRegister() .add(ABSTRACT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FINAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(OPEN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(INTERNAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PRIVATE_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PROTECTED_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(PUBLIC_KEYWORD, inTopLevel, inTopLevel, inTopLevel, inTopLevel) .add(CLASS_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(ENUM_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(FUN_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(GET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(SET_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TRAIT_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAL_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(VAR_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(TYPE_KEYWORD, inTopLevel, inTopLevel, inTopLevel) .add(IMPORT_KEYWORD, inTopLevel) .add(PACKAGE_KEYWORD, inTopLevel) .add(OVERRIDE_KEYWORD, inTopLevel) .add(IN_KEYWORD, inTopLevel, inTopLevel) .add(OUT_KEYWORD, inTopLevel) .add(OBJECT_KEYWORD, unresolvedCode) .registerAll() } <v106>: * COPY
=====================
== ABSTRACT_KEYWORD ==
val ABSTRACT_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== FINAL_KEYWORD ==
val FINAL_KEYWORD OPEN_KEYWORD = JetToken()
@@ -193,100 +194,100 @@ val FINAL_KEYWORD OPEN_KEYWORD = JetToken()
== OPEN_KEYWORD ==
val OPEN_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== INTERNAL_KEYWORD ==
val INTERNAL_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== PRIVATE_KEYWORD ==
val PRIVATE_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== PROTECTED_KEYWORD ==
val PROTECTED_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== PUBLIC_KEYWORD ==
val PUBLIC_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== CLASS_KEYWORD ==
val CLASS_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== ENUM_KEYWORD ==
val ENUM_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== FUN_KEYWORD ==
val FUN_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== GET_KEYWORD ==
val GET_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== SET_KEYWORD ==
val SET_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== TRAIT_KEYWORD ==
val TRAIT_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== VAL_KEYWORD ==
val VAL_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== VAR_KEYWORD ==
val VAR_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== TYPE_KEYWORD ==
val TYPE_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== IMPORT_KEYWORD ==
val IMPORT_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== PACKAGE_KEYWORD ==
val PACKAGE_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== OVERRIDE_KEYWORD ==
val OVERRIDE_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== IN_KEYWORD ==
val IN_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== OUT_KEYWORD ==
val OUT_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
== OBJECT_KEYWORD ==
val OBJECT_KEYWORD = JetToken()
---------------------
JetToken() <v0>: JetToken NEW()
JetToken() <v0>: JetToken NEW: call(JetToken, <init>) -> <v0>
=====================
compiler/testData/cfg/expressions/expressionAsFunction.values
+5 -4
View File
@@ -3,8 +3,9 @@ fun invoke(f: () -> Unit) {
(f)()
}
---------------------
f <v1>: {<: () -> Unit} NEW()
(f) <v1>: {<: () -> Unit} COPY
(f)() <v2>: * NEW(<v1>)
{ (f)() } <v2>: * COPY
<v0>: {<: () -> Unit} NEW: magic(f: () -> Unit) -> <v0>
f <v1>: {<: () -> Unit} NEW: r(f) -> <v1>
(f) <v1>: {<: () -> Unit} COPY
(f)() <v2>: * NEW: call((f), invoke|<v1>) -> <v2>
{ (f)() } <v2>: * COPY
=====================
compiler/testData/cfg/expressions/incdec.values
+15 -14
View File
@@ -3,6 +3,7 @@ fun bar(n: Int) {
}
---------------------
<v0>: Int NEW: magic(n: Int) -> <v0>
=====================
== foo ==
fun foo() {
@@ -13,18 +14,18 @@ fun foo() {
bar(--a)
}
---------------------
1 <v0>: Int NEW()
a <v1>: Int NEW()
a++ <v1>: Int COPY
bar(a++) <v3>: * NEW(<v1>)
a <v4>: Int NEW()
a-- <v4>: Int COPY
bar(a--) <v6>: * NEW(<v4>)
a <v7>: Int NEW()
++a <v8>: Int NEW(<v7>)
bar(++a) <v9>: * NEW(<v8>)
a <v10>: Int NEW()
--a <v11>: Int NEW(<v10>)
bar(--a) <v12>: * NEW(<v11>)
{ var a = 1 bar(a++) bar(a--) bar(++a) bar(--a) } <v12>: * COPY
1 <v0>: Int NEW: r(1) -> <v0>
a <v1>: Int NEW: r(a) -> <v1>
a++ <v1>: Int COPY
bar(a++) <v3>: * NEW: call(bar, bar|<v1>) -> <v3>
a <v4>: Int NEW: r(a) -> <v4>
a-- <v4>: Int COPY
bar(a--) <v6>: * NEW: call(bar, bar|<v4>) -> <v6>
a <v7>: Int NEW: r(a) -> <v7>
++a <v8>: Int NEW: call(++, inc|<v7>) -> <v8>
bar(++a) <v9>: * NEW: call(bar, bar|<v8>) -> <v9>
a <v10>: Int NEW: r(a) -> <v10>
--a <v11>: Int NEW: call(--, dec|<v10>) -> <v11>
bar(--a) <v12>: * NEW: call(bar, bar|<v11>) -> <v12>
{ var a = 1 bar(a++) bar(a--) bar(++a) bar(--a) } <v12>: * COPY
=====================
compiler/testData/cfg/expressions/nothingExpr.values
+8 -8
View File
@@ -5,7 +5,7 @@ fun Any?.doSomething() {}
== bar ==
fun bar(): Nothing = throw Exception()
---------------------
Exception() <v0>: {<: Throwable} NEW()
Exception() <v0>: {<: Throwable} NEW: call(Exception, <init>) -> <v0>
=====================
== foo ==
fun foo() {
@@ -13,11 +13,11 @@ fun foo() {
bar().doSomething
}
---------------------
null <v0>: * NEW()
null!! <v1>: * NEW(<v0>)
doSomething() <v2>: * NEW(<v1>)
null!!.doSomething() <v2>: * COPY
doSomething <v3>: * NEW()
bar().doSomething <v3>: * COPY
{ null!!.doSomething() bar().doSomething } <v3>: * COPY
null <v0>: * NEW: r(null) -> <v0>
null!! <v1>: * NEW: magic(null!!|<v0>) -> <v1>
doSomething() <v2>: * NEW: call(doSomething, doSomething|<v1>) -> <v2>
null!!.doSomething() <v2>: * COPY
doSomething <v3>: * NEW: call(doSomething, doSomething) -> <v3>
bar().doSomething <v3>: * COPY
{ null!!.doSomething() bar().doSomething } <v3>: * COPY
=====================
compiler/testData/cfg/expressions/propertySafeCall.values
+5 -4
View File
@@ -3,8 +3,9 @@ fun test(s: String?) {
s?.length
}
---------------------
s <v1>: {<: CharSequence?} NEW()
length <v2>: * NEW(<v1>)
s?.length <v2>: * COPY
{ s?.length } <v2>: * COPY
<v0>: {<: String?} NEW: magic(s: String?) -> <v0>
s <v1>: {<: CharSequence?} NEW: r(s) -> <v1>
length <v2>: * NEW: r(length|<v1>) -> <v2>
s?.length <v2>: * COPY
{ s?.length } <v2>: * COPY
=====================
compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.values
+4 -3
View File
@@ -3,7 +3,8 @@ fun foo(s: String) {
s.
}
---------------------
s <v1>: * NEW()
s. <v2>: * NEW(<v1>)
{ s. } <v2>: * COPY
<v0>: String NEW: magic(s: String) -> <v0>
s <v1>: * NEW: r(s) -> <v1>
s. <v2>: * NEW: magic(s.|<v1>) -> <v2>
{ s. } <v2>: * COPY
=====================
compiler/testData/cfg/expressions/thisExpression.values
+1 -1
View File
@@ -3,6 +3,6 @@ fun Function0<Unit>.foo() {
this()
}
---------------------
this() <v0>: * NEW()
this() <v0>: * NEW: call(this, invoke) -> <v0>
{ this() } <v0>: * COPY
=====================
compiler/testData/cfg/expressions/unresolvedCall.values
+5 -4
View File
@@ -3,8 +3,9 @@ fun test(a: Any) {
a.foo()
}
---------------------
a <v1>: * NEW()
foo() <v2>: * NEW(<v1>)
a.foo() <v2>: * COPY
{ a.foo() } <v2>: * COPY
<v0>: {<: Any} NEW: magic(a: Any) -> <v0>
a <v1>: * NEW: r(a) -> <v1>
foo() <v2>: * NEW: magic(foo()|<v1>) -> <v2>
a.foo() <v2>: * COPY
{ a.foo() } <v2>: * COPY
=====================
compiler/testData/cfg/expressions/unresolvedProperty.values
+5 -4
View File
@@ -3,8 +3,9 @@ fun test(a: Any) {
a.foo
}
---------------------
a <v1>: * NEW()
foo <v2>: * NEW(<v1>)
a.foo <v2>: * COPY
{ a.foo } <v2>: * COPY
<v0>: {<: Any} NEW: magic(a: Any) -> <v0>
a <v1>: * NEW: r(a) -> <v1>
foo <v2>: * NEW: magic(foo|<v1>) -> <v2>
a.foo <v2>: * COPY
{ a.foo } <v2>: * COPY
=====================
compiler/testData/cfg/expressions/unusedExpressionSimpleName.values
+3 -2
View File
@@ -3,6 +3,7 @@ fun main(arg : Array<String>) {
a
}
---------------------
a <v1>: * NEW()
{ a } <v1>: * COPY
<v0>: {<: Array<String>} NEW: magic(arg : Array<String>) -> <v0>
a <v1>: * NEW: magic(a) -> <v1>
{ a } <v1>: * COPY
=====================
compiler/testData/cfg/functions/DefaultValuesForArguments.values
+7 -5
View File
@@ -1,9 +1,11 @@
== foo ==
fun foo(i: Int = 1, j: Int) = i + j
---------------------
1 <v0>: Int NEW()
i: Int = 1 <v2>: Int NEW(<v0>, <v1>)
i <v4>: Int NEW()
j <v5>: Int NEW()
i + j <v6>: Int NEW(<v4>, <v5>)
<v1>: Int NEW: magic(i: Int = 1) -> <v1>
<v3>: Int NEW: magic(j: Int) -> <v3>
1 <v0>: Int NEW: r(1) -> <v0>
i: Int = 1 <v2>: Int NEW: merge(i: Int = 1|<v0>, <v1>) -> <v2>
i <v4>: Int NEW: r(i) -> <v4>
j <v5>: Int NEW: r(j) -> <v5>
i + j <v6>: Int NEW: call(+, plus|<v4>, <v5>) -> <v6>
=====================
compiler/testData/cfg/tailCalls/finally.values
+1 -1
View File
@@ -7,6 +7,6 @@ tailRecursive fun test() : Int {
}
}
---------------------
test() <v0>: * NEW()
test() <v0>: * NEW: call(test, test) -> <v0>
{ test() } <v0>: * COPY
=====================
compiler/testData/cfg/tailCalls/finallyWithReturn.values
+1 -1
View File
@@ -7,5 +7,5 @@ tailRecursive fun test() : Int {
}
}
---------------------
test() <v0>: Int NEW()
test() <v0>: Int NEW: call(test, test) -> <v0>
=====================
compiler/testData/cfg/tailCalls/sum.values
+15 -13
View File
@@ -4,17 +4,19 @@ tailRecursive fun sum(x: Long, sum: Long): Long {
return sum(x - 1, sum + x)
}
---------------------
x <v2>: OR{{<: Any}, {<: Any}} NEW()
0 <v3>: {<: Number} NEW()
toLong() <v4>: {<: Any?} NEW(<v3>)
0.toLong() <v4>: {<: Any?} COPY
x == 0.toLong() <v5>: Boolean NEW(<v2>, <v4>)
sum <v6>: Long NEW()
x <v7>: Long NEW()
1 <v8>: Int NEW()
x - 1 <v9>: Long NEW(<v7>, <v8>)
sum <v10>: Long NEW()
x <v11>: Long NEW()
sum + x <v12>: Long NEW(<v10>, <v11>)
sum(x - 1, sum + x) <v13>: Long NEW(<v9>, <v12>)
<v0>: Long NEW: magic(x: Long) -> <v0>
<v1>: Long NEW: magic(sum: Long) -> <v1>
x <v2>: OR{{<: Any}, {<: Any}} NEW: r(x) -> <v2>
0 <v3>: {<: Number} NEW: r(0) -> <v3>
toLong() <v4>: {<: Any?} NEW: call(toLong, toLong|<v3>) -> <v4>
0.toLong() <v4>: {<: Any?} COPY
x == 0.toLong() <v5>: Boolean NEW: call(==, equals|<v2>, <v4>) -> <v5>
sum <v6>: Long NEW: r(sum) -> <v6>
x <v7>: Long NEW: r(x) -> <v7>
1 <v8>: Int NEW: r(1) -> <v8>
x - 1 <v9>: Long NEW: call(-, minus|<v7>, <v8>) -> <v9>
sum <v10>: Long NEW: r(sum) -> <v10>
x <v11>: Long NEW: r(x) -> <v11>
sum + x <v12>: Long NEW: call(+, plus|<v10>, <v11>) -> <v12>
sum(x - 1, sum + x) <v13>: Long NEW: call(sum, sum|<v9>, <v12>) -> <v13>
=====================
compiler/testData/cfg/tailCalls/try.values
+2 -1
View File
@@ -7,5 +7,6 @@ tailRecursive fun foo() {
}
}
---------------------
foo() <v0>: Unit NEW()
<v1>: {<: Throwable} NEW: magic(e: Throwable) -> <v1>
foo() <v0>: Unit NEW: call(foo, foo) -> <v0>
=====================
compiler/testData/cfg/tailCalls/tryCatchFinally.values
+9 -8
View File
@@ -9,12 +9,13 @@ fun test() : Unit {
}
}
---------------------
test() <v0>: * NEW()
{ test() } <v0>: * COPY
test() <v2>: * NEW()
{ test() } <v2>: * COPY
test() <v3>: * NEW()
{ test() } <v3>: * COPY
try { test() } catch (any : Exception) { test() } finally { test() } <v4>: * NEW(<v0>, <v2>)
{ try { test() } catch (any : Exception) { test() } finally { test() } } <v4>: * COPY
<v1>: {<: Exception} NEW: magic(any : Exception) -> <v1>
test() <v0>: * NEW: call(test, test) -> <v0>
{ test() } <v0>: * COPY
test() <v2>: * NEW: call(test, test) -> <v2>
{ test() } <v2>: * COPY
test() <v3>: * NEW: call(test, test) -> <v3>
{ test() } <v3>: * COPY
try { test() } catch (any : Exception) { test() } finally { test() } <v4>: * NEW: merge(try { test() } catch (any : Exception) { test() } finally { test() }|<v0>, <v2>) -> <v4>
{ try { test() } catch (any : Exception) { test() } finally { test() } } <v4>: * COPY
=====================
compiler/testData/cli/js/jsHelp.args
+1
View File
@@ -0,0 +1 @@
-help
compiler/testData/cli/js/jsHelp.out
+17
View File
@@ -0,0 +1,17 @@
Usage: kotlinc-js <options> <source files>
where possible options include:
-output <path> Output file path
-libraryFiles <path[,]> Path to zipped library sources or kotlin files separated by commas
-sourceFiles <path[,]> Source files or directories separated by commas
-sourcemap Generate SourceMap
-target <version> Generate JS files for specific ECMA version (only ECMA 5 is supported)
-main {call,noCall} Whether a main function should be called; default 'call' (main function will be auto detected)
-outputPrefix <path> Path to file which will be added to the beginning of output file
-outputPostfix <path> Path to file which will be added to the end of output file
-tags Demarcate each compilation message (error, warning, etc) with an open and close tag
-verbose Enable verbose logging output
-version Display compiler version
-help (-h) Print a synopsis of standard options
-suppress warnings Suppress all compiler warnings
-printArgs Print command line arguments
OK
compiler/testData/cli/js/printArgumentsWithManyValue.out
+1 -1
View File
@@ -1,3 +1,3 @@
INFO: Invoking compiler org.jetbrains.jet.cli.js.K2JSCompiler with arguments -suppress warnings -printArgs -sourceFiles compiler/testData/cli/js/simple2js.kt,compiler/testData/cli/js/../warnings.kt
INFO: Invoking K2JSCompiler with arguments -suppress warnings -printArgs -sourceFiles compiler/testData/cli/js/simple2js.kt,compiler/testData/cli/js/../warnings.kt
ERROR: Specify output file via -output
COMPILATION_ERROR
compiler/testData/cli/jvm/help.out
+23 -22
View File
@@ -1,23 +1,24 @@
Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments
-jar [String] jar file name
-src [String] source file or directory (allows many paths separated by the system path separator)
-classpath [String] classpath to use when compiling
-annotations [String] paths to external annotations
-includeRuntime [flag] include Kotlin runtime in to resulting jar
-noJdk [flag] don't include Java runtime into classpath
-noStdlib [flag] don't include Kotlin runtime into classpath
-noJdkAnnotations [flag] don't include JDK external annotations into classpath
-notNullAssertions [flag] generate not-null assertion after each invocation of method returning not-null
-notNullParamAssertions [flag] generate not-null assertions on parameters of methods accessible from Java
-output [String] output directory
-module [String] module to compile
-script [flag] evaluate script
-kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-inline [String] Inlining mode: on/off or true/false (default is on)
-tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-verbose [flag] Enable verbose logging output
-version [flag] Display compiler version
-help (-h) [flag] Show help
-suppress [String] Suppress compiler messages by severity (warnings)
-printArgs [flag] Print commandline arguments
Usage: kotlinc-jvm <options> <source files>
where possible options include:
-src <path> Source file or directory (allows many paths separated by the system path separator)
-jar <path> Resulting .jar file path
-output <path> Output directory path for .class files
-classpath <path> Paths where to find user class files
-annotations <path> Paths to external annotations
-includeRuntime Include Kotlin runtime in to resulting .jar
-noJdk Don't include Java runtime into classpath
-noStdlib Don't include Kotlin runtime into classpath
-noJdkAnnotations Don't include JDK external annotations into classpath
-notNullAssertions Generate not-null assertion after each invocation of method returning not-null
-notNullParamAssertions Generate not-null assertions on parameters of methods accessible from Java
-module <path> Path to the module file to compile
-script Evaluate the script file
-kotlinHome <path> Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-inline {on,off} Inlining mode (default is on)
-tags Demarcate each compilation message (error, warning, etc) with an open and close tag
-verbose Enable verbose logging output
-version Display compiler version
-help (-h) Print a synopsis of standard options
-suppress warnings Suppress all compiler warnings
-printArgs Print command line arguments
OK
compiler/testData/cli/jvm/inline/off.out
+23 -22
View File
@@ -1,23 +1,24 @@
Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments
-jar [String] jar file name
-src [String] source file or directory (allows many paths separated by the system path separator)
-classpath [String] classpath to use when compiling
-annotations [String] paths to external annotations
-includeRuntime [flag] include Kotlin runtime in to resulting jar
-noJdk [flag] don't include Java runtime into classpath
-noStdlib [flag] don't include Kotlin runtime into classpath
-noJdkAnnotations [flag] don't include JDK external annotations into classpath
-notNullAssertions [flag] generate not-null assertion after each invocation of method returning not-null
-notNullParamAssertions [flag] generate not-null assertions on parameters of methods accessible from Java
-output [String] output directory
-module [String] module to compile
-script [flag] evaluate script
-kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-inline [String] Inlining mode: on/off or true/false (default is on)
-tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-verbose [flag] Enable verbose logging output
-version [flag] Display compiler version
-help (-h) [flag] Show help
-suppress [String] Suppress compiler messages by severity (warnings)
-printArgs [flag] Print commandline arguments
Usage: kotlinc-jvm <options> <source files>
where possible options include:
-src <path> Source file or directory (allows many paths separated by the system path separator)
-jar <path> Resulting .jar file path
-output <path> Output directory path for .class files
-classpath <path> Paths where to find user class files
-annotations <path> Paths to external annotations
-includeRuntime Include Kotlin runtime in to resulting .jar
-noJdk Don't include Java runtime into classpath
-noStdlib Don't include Kotlin runtime into classpath
-noJdkAnnotations Don't include JDK external annotations into classpath
-notNullAssertions Generate not-null assertion after each invocation of method returning not-null
-notNullParamAssertions Generate not-null assertions on parameters of methods accessible from Java
-module <path> Path to the module file to compile
-script Evaluate the script file
-kotlinHome <path> Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-inline {on,off} Inlining mode (default is on)
-tags Demarcate each compilation message (error, warning, etc) with an open and close tag
-verbose Enable verbose logging output
-version Display compiler version
-help (-h) Print a synopsis of standard options
-suppress warnings Suppress all compiler warnings
-printArgs Print command line arguments
OK
compiler/testData/cli/jvm/inline/on.out
+23 -22
View File
@@ -1,23 +1,24 @@
Usage: org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments
-jar [String] jar file name
-src [String] source file or directory (allows many paths separated by the system path separator)
-classpath [String] classpath to use when compiling
-annotations [String] paths to external annotations
-includeRuntime [flag] include Kotlin runtime in to resulting jar
-noJdk [flag] don't include Java runtime into classpath
-noStdlib [flag] don't include Kotlin runtime into classpath
-noJdkAnnotations [flag] don't include JDK external annotations into classpath
-notNullAssertions [flag] generate not-null assertion after each invocation of method returning not-null
-notNullParamAssertions [flag] generate not-null assertions on parameters of methods accessible from Java
-output [String] output directory
-module [String] module to compile
-script [flag] evaluate script
-kotlinHome [String] Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-inline [String] Inlining mode: on/off or true/false (default is on)
-tags [flag] Demarcate each compilation message (error, warning, etc) with an open and close tag
-verbose [flag] Enable verbose logging output
-version [flag] Display compiler version
-help (-h) [flag] Show help
-suppress [String] Suppress compiler messages by severity (warnings)
-printArgs [flag] Print commandline arguments
Usage: kotlinc-jvm <options> <source files>
where possible options include:
-src <path> Source file or directory (allows many paths separated by the system path separator)
-jar <path> Resulting .jar file path
-output <path> Output directory path for .class files
-classpath <path> Paths where to find user class files
-annotations <path> Paths to external annotations
-includeRuntime Include Kotlin runtime in to resulting .jar
-noJdk Don't include Java runtime into classpath
-noStdlib Don't include Kotlin runtime into classpath
-noJdkAnnotations Don't include JDK external annotations into classpath
-notNullAssertions Generate not-null assertion after each invocation of method returning not-null
-notNullParamAssertions Generate not-null assertions on parameters of methods accessible from Java
-module <path> Path to the module file to compile
-script Evaluate the script file
-kotlinHome <path> Path to Kotlin compiler home directory, used for annotations and runtime libraries discovery
-inline {on,off} Inlining mode (default is on)
-tags Demarcate each compilation message (error, warning, etc) with an open and close tag
-verbose Enable verbose logging output
-version Display compiler version
-help (-h) Print a synopsis of standard options
-suppress warnings Suppress all compiler warnings
-printArgs Print command line arguments
OK

Some files were not shown because too many files have changed in this diff Show More