Merged LoadCompiledKotlin test int LoadJavaTest.

Browse Source

...

This commit is contained in:

Evgeny Gerashchenko

2013-12-06 16:48:03 +04:00

parent 62f44f7ed0

commit b7cfd676bf

491 changed files with 2032 additions and 2103 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyField.kt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt

compiler/testData/loadKotlin/annotations/classMembers/ClassObjectPropertyField.txt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt

compiler/testData/loadKotlin/annotations/classMembers/DelegatedProperty.kt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt

compiler/testData/loadKotlin/annotations/classMembers/DelegatedProperty.txt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.txt

compiler/testData/loadKotlin/annotations/classMembers/EnumArgument.kt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt

compiler/testData/loadKotlin/annotations/classMembers/EnumArgument.txt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt

compiler/testData/loadKotlin/annotations/classMembers/Function.kt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt

compiler/testData/loadKotlin/annotations/classMembers/Function.txt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.txt

compiler/testData/loadKotlin/annotations/classMembers/Getter.kt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt

compiler/testData/loadKotlin/annotations/classMembers/Getter.txt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.txt

compiler/testData/loadKotlin/annotations/classMembers/PropertyField.kt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt

compiler/testData/loadKotlin/annotations/classMembers/PropertyField.txt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.txt

compiler/testData/loadKotlin/annotations/classMembers/Setter.kt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt

compiler/testData/loadKotlin/annotations/classMembers/Setter.txt → compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.txt

compiler/testData/loadKotlin/annotations/classes/ClassInClassObject.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt

compiler/testData/loadKotlin/annotations/classes/ClassInClassObject.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt

compiler/testData/loadKotlin/annotations/classes/ClassObject.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt

compiler/testData/loadKotlin/annotations/classes/ClassObject.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt

compiler/testData/loadKotlin/annotations/classes/Deprecated.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt

compiler/testData/loadKotlin/annotations/classes/Deprecated.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt

compiler/testData/loadKotlin/annotations/classes/EnumArgument.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt

compiler/testData/loadKotlin/annotations/classes/EnumArgument.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt

compiler/testData/loadKotlin/annotations/classes/MultipleAnnotations.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt

compiler/testData/loadKotlin/annotations/classes/MultipleAnnotations.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.txt

compiler/testData/loadKotlin/annotations/classes/NestedClass.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt

compiler/testData/loadKotlin/annotations/classes/NestedClass.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.txt

compiler/testData/loadKotlin/annotations/classes/Retention.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt

compiler/testData/loadKotlin/annotations/classes/Retention.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.txt

compiler/testData/loadKotlin/annotations/classes/Simple.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt

compiler/testData/loadKotlin/annotations/classes/Simple.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.txt

compiler/testData/loadKotlin/annotations/classes/WithArgument.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt

compiler/testData/loadKotlin/annotations/classes/WithArgument.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt

compiler/testData/loadKotlin/annotations/classes/WithMultipleArguments.kt → compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt

compiler/testData/loadKotlin/annotations/classes/WithMultipleArguments.txt → compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt

compiler/testData/loadKotlin/annotations/packageMembers/DelegatedProperty.kt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt

compiler/testData/loadKotlin/annotations/packageMembers/DelegatedProperty.txt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.txt

compiler/testData/loadKotlin/annotations/packageMembers/EnumArgument.kt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt

compiler/testData/loadKotlin/annotations/packageMembers/EnumArgument.txt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt

compiler/testData/loadKotlin/annotations/packageMembers/Function.kt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt

compiler/testData/loadKotlin/annotations/packageMembers/Function.txt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.txt

compiler/testData/loadKotlin/annotations/packageMembers/Getter.kt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt

compiler/testData/loadKotlin/annotations/packageMembers/Getter.txt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.txt

compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.kt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt

compiler/testData/loadKotlin/annotations/packageMembers/PropertyField.txt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.txt

compiler/testData/loadKotlin/annotations/packageMembers/Setter.kt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt

compiler/testData/loadKotlin/annotations/packageMembers/Setter.txt → compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.txt

compiler/testData/loadKotlin/annotations/parameters/Constructor.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt

compiler/testData/loadKotlin/annotations/parameters/Constructor.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.txt

compiler/testData/loadKotlin/annotations/parameters/EnumConstructor.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt

compiler/testData/loadKotlin/annotations/parameters/EnumConstructor.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt

compiler/testData/loadKotlin/annotations/parameters/ExtensionFunction.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt

compiler/testData/loadKotlin/annotations/parameters/ExtensionFunction.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.txt

compiler/testData/loadKotlin/annotations/parameters/ExtensionFunctionInClass.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt

compiler/testData/loadKotlin/annotations/parameters/ExtensionFunctionInClass.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt

compiler/testData/loadKotlin/annotations/parameters/ExtensionPropertySetter.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt

compiler/testData/loadKotlin/annotations/parameters/ExtensionPropertySetter.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.txt

compiler/testData/loadKotlin/annotations/parameters/FunctionInClass.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt

compiler/testData/loadKotlin/annotations/parameters/FunctionInClass.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.txt

compiler/testData/loadKotlin/annotations/parameters/FunctionInTrait.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt

compiler/testData/loadKotlin/annotations/parameters/FunctionInTrait.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.txt

compiler/testData/loadKotlin/annotations/parameters/ManyAnnotations.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt

compiler/testData/loadKotlin/annotations/parameters/ManyAnnotations.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.txt

compiler/testData/loadKotlin/annotations/parameters/PropertySetterInClass.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt

compiler/testData/loadKotlin/annotations/parameters/PropertySetterInClass.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.txt

compiler/testData/loadKotlin/annotations/parameters/TopLevelFunction.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt

compiler/testData/loadKotlin/annotations/parameters/TopLevelFunction.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.txt

compiler/testData/loadKotlin/annotations/parameters/TopLevelPropertySetter.kt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt

compiler/testData/loadKotlin/annotations/parameters/TopLevelPropertySetter.txt → compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.txt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Class.kt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Class.txt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Trait.kt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/Trait.txt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt

compiler/testData/loadKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt → compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt

compiler/testData/loadKotlin/class/Class.kt → compiler/testData/loadJava/compiledKotlin/class/Class.kt

compiler/testData/loadKotlin/class/Class.txt → compiler/testData/loadJava/compiledKotlin/class/Class.txt

compiler/testData/loadKotlin/class/ClassInParam.kt → compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt

compiler/testData/loadKotlin/class/ClassInParam.txt → compiler/testData/loadJava/compiledKotlin/class/ClassInParam.txt

compiler/testData/loadKotlin/class/ClassInnerClass.kt → compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt

compiler/testData/loadKotlin/class/ClassInnerClass.txt → compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.txt

compiler/testData/loadKotlin/class/ClassMemberConflict.kt → compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt

compiler/testData/loadKotlin/class/ClassMemberConflict.txt → compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt

compiler/testData/loadKotlin/class/ClassOutParam.kt → compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt

compiler/testData/loadKotlin/class/ClassOutParam.txt → compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.txt

compiler/testData/loadKotlin/class/ClassParam.kt → compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt

compiler/testData/loadKotlin/class/ClassParam.txt → compiler/testData/loadJava/compiledKotlin/class/ClassParam.txt

compiler/testData/loadKotlin/class/ClassParamReferencesParam.kt → compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt

compiler/testData/loadKotlin/class/ClassParamReferencesParam.txt → compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.txt

compiler/testData/loadKotlin/class/ClassParamReferencesParam2.kt → compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt

compiler/testData/loadKotlin/class/ClassParamReferencesParam2.txt → compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.txt

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