Commit Graph

43 Commits

Author SHA1 Message Date
Pavel V. Talanov
59f192ef90 Replace 'class object' with 'default object' in renderers and test data
Includes changes to decompiled text
Old syntax is used in builtins and project code for now
2015-03-06 19:36:54 +03:00
Andrey Breslav
da639039bd KT-6698 Bad class file when using a star-projection on a Java's recursive generic parameter
#KT-6698 Fixed
2015-02-02 19:52:00 +03:00
Michael Bogdanov
2cc9d8e29b Support platformStatic for properties
#KT-5766 Fixed
2014-11-20 10:20:31 +03:00
Michael Bogdanov
08e02f4176 Moving platformStatic annotation to kotlin.platform package 2014-09-10 17:35:59 +04:00
Michael Bogdanov
e26d635633 Initial implementation of platformStatic 2014-09-09 16:28:28 +04:00
Alexander Udalov
de0f751207 Replace object$ -> OBJECT$, instance$ -> INSTANCE$ in the project 2014-07-26 00:21:05 +04:00
Andrey Breslav
2351c53dce Test that Javac does not fail on two methods that differ only by return type 2014-06-19 22:11:56 +04:00
Andrey Breslav
705a081919 KT-5214 Annotation to provide platform name to avoid signature conflict
#KT-5214 Fixed
2014-06-10 18:21:36 +04:00
Alexander Udalov
ea31f372aa Check for syntax/diagnostic errors in some tests 2014-05-29 21:24:05 +04:00
Alexander Udalov
2b5bc6b63d Fix logic of forcing method return type to be wrapped
Return type must be wrapped if any super-method in the hierarchy, not just the
direct super-method, returns a reference type (as opposed to a primitive type)

Actually there was a test reflecting this, but it wasn't running because of an
unfixed diagnostic error
2014-05-29 21:24:02 +04:00
Evgeny Gerashchenko
dadc8351b6 Added tests for compiling Java against TraitImpl and extension members. 2014-03-31 22:39:58 +04:00
Evgeny Gerashchenko
829cd95469 KT-4770 Javac fails against Kotlin inner class
#KT-4770 fixed
2014-03-28 16:46:26 +04:00
Alexander Udalov
b6b1f2a94a Minor, package "test" in compileJavaAgainstKotlin testData 2014-03-19 23:24:27 +04:00
Alexander Udalov
8425f2e668 Copy type parameters for JVM function accessors
Otherwise generic signature wasn't correctly written to accessors, resulting in
classfiles not being valid and javac failing to compile Java sources against
them
2014-02-26 21:22:57 +04:00
Andrey Breslav
ab7d8a7734 Tests for abstract functions with default arguments 2014-01-23 17:59:18 +04:00
Andrey Breslav
4ab0b00bd3 Support [throws] annotation 2014-01-23 17:59:18 +04:00
Andrey Breslav
b66a76e7d2 xxx$default() function should be visible from Java 2014-01-23 17:59:17 +04:00
Andrey Breslav
39234b4d3e Delegated members should not be synthetic
Otherwise they are invisible to Java code
2014-01-23 17:59:17 +04:00
Alexander Udalov
713c6f13ae Fix primitive override problem in Kotlin-Java inheritance
See the comment in JetTypeMapper
2013-12-30 06:41:09 +04:00
Alexander Udalov
ace326f4cf Remove JetTypeMapper.map{G,S}etterSignature
Merge their logic with mapSignature()
2013-12-30 04:15:21 +04:00
Natalia Ukhorskaya
d63f6843c8 Merge ConstantExpressionEvaluator and CompileTimeConstantResolver 2013-12-05 15:21:50 +04:00
Evgeny Gerashchenko
9c38716829 Generating annotations in correct order for methods with synthetic parameters.
#KT-4050 fixed
2013-10-08 16:44:16 +04:00
Natalia.Ukhorskaya
33ddd713b7 Check annotation constructor parameter types 2013-07-04 14:37:29 +04:00
Mikhael Bogdanov
132d74200b Partial fix for KT-3698: properly write field initializer 2013-06-19 17:02:28 +04:00
Mikhael Bogdanov
76d4dcef7f Tests for renamed fields 2013-06-17 15:20:42 +04:00
Mikhael Bogdanov
4feb395dcc Test for static 2013-06-17 15:20:41 +04:00
Mikhael Bogdanov
e72b177adc KT-3561 Bad RuntimeInvisibleParameterAnnotations on attempt to annotate enum constructor hidden parametrs - name and ordinal 2013-04-30 18:46:07 +04:00
Mikhael Bogdanov
b3ec87f956 ClassObject instance field refactoring 2013-03-04 16:42:55 +04:00
Mikhael Bogdanov
1b2da6b558 Write proper enclosingMethod/enclosingClass information to bytecode 2013-02-19 17:56:55 +04:00
Natalia.Ukhorskaya
47abdcf565 Rename namespace class to {package.name}Package
Conflicts:

	compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
2013-01-15 19:45:06 +04:00
Natalia.Ukhorskaya
808c5abc0f Generate constructor without parameters if primary constructor has only parameters with default values
#KT-3085 Fixed
2012-12-27 12:29:06 +04:00
Andrey Breslav
889ea107f6 Reflect Kotlin's declaration-site variance in Java signatures 2012-11-24 15:59:15 +04:00
Svetlana Isakova
7d37df5f38 tests changes after collections mapping 2012-09-05 18:55:16 +04:00
Alex Tkachman
8b622f97f4 getting rid of TypeInfo 2012-02-21 14:54:00 +02:00
Andrey Breslav
3b0ca42e0b jet.typeinfo.TypeInfo -> jet.TypeInfo 2011-12-26 18:59:48 +04:00
Stepan Koltsov
b1cf0ffcee more class and method signatures, use writer wrapper
(not yet complete)

own writer will be used to write both java and kotlin signatures
2011-12-13 18:28:47 +04:00
Stepan Koltsov
1260ba7a5f writing class signature
P. S. I'm going to refactor/cleanup code after feature is implemented
2011-12-11 23:04:01 +04:00
Stepan Koltsov
ae6c8d6f78 move compileJavaAgainstKotlin tests 2011-12-11 22:27:55 +04:00
Stepan Koltsov
98511590f0 fix any in signature
reported by Alex Tkachman
2011-12-11 22:11:51 +04:00
Stepan Koltsov
b5bb8ef5d8 working on signature generation for arrays
* more tests
* fix signature generation for Array<Array<Int>>
2011-12-11 21:23:30 +04:00
Stepan Koltsov
8ec998810f varargs
* generate VARARGS flag in FunctionCodegen
* test in CompileJavaAgainstKotlinTest
2011-12-09 19:42:07 +04:00
Stepan Koltsov
0656f1f0e0 writing java method signatures
All tests pass, but it does not mean nothing is broken.
2011-12-08 04:31:44 +04:00
Stepan Koltsov
4cd02c983d CompileJavaAgainstKotlinTest
Test is:

1. find pairs of kotlin/java files in compiler/testData/compileJavaAgainstKotlin
and for each pair

2. compile kotlin file

3. compile java file with kotlin .class in classpath

4. check everything is OK
2011-12-07 20:32:58 +04:00