azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,209 Commits 1 Branch 0 Tags
c7d5f79ec8801f66ade91add6f9fa18efa34e960
Commit Graph

1907 Commits

Author SHA1 Message Date
pTalanov c7d5f79ec8 Finish merge. 2012-05-02 15:20:47 +04:00
pTalanov 7da1e31eca Merge remote-tracking branch 'origin/master' 
Conflicts:
	build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentConfiguration.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
	compiler/tests/org/jetbrains/jet/JetTestUtils.java
	compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java
 2012-05-02 13:39:36 +04:00
Evgeny Gerashchenko eeafd06cd8 Got rid of returning empty range list in position strategies (in places where they depend on syntax errors). 2012-05-02 00:11:04 +04:00
Evgeny Gerashchenko abdf34418a Got rid of returning empty range list in position strategies (in places where they don't depend on syntax errors). 2012-05-02 00:11:03 +04:00
Evgeny Gerashchenko 0fd34a455f Added assert in DefaultErrorMessages checking that all error factories have default renderer. 2012-05-02 00:11:02 +04:00
Stepan Koltsov 427afefce4 replace .sure with !! 2012-05-02 00:01:04 +04:00
Stepan Koltsov d5d05d76f3 explictly test codegen with jdk-headers 2012-05-01 23:49:25 +04:00
Stepan Koltsov 5e77ca553c make most codegen tests are indenendent from jdk-headers/stdlib now 2012-05-01 23:49:22 +04:00
Stepan Koltsov 518f50692f kotlin runtime must be added to classpath 
(not just to library root)
 2012-05-01 23:49:19 +04:00
Stepan Koltsov b109ac5ad4 store CompilerDependencies in JetCoreEnvironment 2012-05-01 22:59:42 +04:00
Stepan Koltsov ba7a94e17d reuse CodegenTestCase in CompileTextTest 2012-05-01 22:59:39 +04:00
Stepan Koltsov c23feab6d1 JetLiteFixture: assign to myEnvironment only once 2012-05-01 22:32:08 +04:00
Stepan Koltsov 0c7401c932 add java.nio.charset.Charset to mock JDK 2012-05-01 21:47:09 +04:00
Stepan Koltsov 58b706c12e Revert "kotlin runtime must be added to classpath" temporarily 
This reverts commit 90910cae34.
 2012-05-01 21:22:06 +04:00
Stepan Koltsov d71723131d Revert "enhance tests (mostly codegen)" temporarily 
This reverts commit 95f9bcbacb.
 2012-05-01 21:21:46 +04:00
Stepan Koltsov 67013cbaf5 fix one more error in error diagnostics 2012-05-01 19:21:44 +04:00
Stepan Koltsov 95f9bcbacb enhance tests (mostly codegen) 
* drop dependency on stdlib/alt-headers in the most tests
* assign to myEnvironment at most once in JetLiteFixture
* more tests do not compile runtime
 2012-05-01 19:11:48 +04:00
Stepan Koltsov 90910cae34 kotlin runtime must be added to classpath 
(not just to library root)
 2012-05-01 17:39:56 +04:00
Stepan Koltsov 8278ed8aa5 ImportPath.toString 2012-05-01 17:39:51 +04:00
Svetlana Isakova 2bd0be5638 reverted: 'A doubtful try to save compilation' (no more needed) 2012-05-01 14:56:34 +04:00
Svetlana Isakova 823b6733c2 A doubtful try to save compilation 2012-04-30 16:21:17 +04:00
Svetlana Isakova 9c0eb285e2 back end test for 'variable as function' call case 2012-04-30 15:44:23 +04:00
Svetlana Isakova 09c065b371 usage 'call.getCallElement' instead of 'call.getCalleeExpression' while 'invisible member' error reporting 2012-04-30 15:44:23 +04:00
Svetlana Isakova 36224dd32c ResolutionCandidate's small change 2012-04-30 15:44:23 +04:00
Svetlana Isakova c698f791c8 navigate to variable (not to 'invoke' function) while 'variable as function' call resolve 2012-04-30 15:44:22 +04:00
Svetlana Isakova 2654534ede ChainedTemporaryBindingTrace added 2012-04-30 15:44:22 +04:00
Svetlana Isakova a2e11821de resolvedCalls set instead of multiMap stored in ResolutionTask 2012-04-30 15:44:22 +04:00
Svetlana Isakova a8f959fee8 receiver for second ('invoke') call for 'variable as function' call case added to context 2012-04-30 15:44:22 +04:00
Svetlana Isakova 24082a67d7 correspondence between CallableDescriptorCollector and CallTransformer (special treatment only for function invocations) 2012-04-30 15:44:22 +04:00
Svetlana Isakova 2fa8fd50fc 'getNonMembersByName' instead of 'getExtensionsByName' not to throw out invocation of variables with members-extensions 2012-04-30 15:44:22 +04:00
Svetlana Isakova aeed586fba 'thisObject' is known in 'variable as function' call case, while constructing second 'invoke' call 2012-04-30 15:44:22 +04:00
Svetlana Isakova 5b49869cac changed CallTransformer responsible for resolving second call ('invoke') for 'variable as function' case 2012-04-30 15:44:22 +04:00
Svetlana Isakova e2c7267ecc added VariableAsFunctionResolvedCall containing two calls (for variable and for 'invoke' function) 2012-04-30 15:44:22 +04:00
Svetlana Isakova 28526afbde interface ResolvedCallWithTrace added 2012-04-30 15:44:22 +04:00
Svetlana Isakova 655ac949ba 'invoke' method added to standard function types 2012-04-30 15:44:22 +04:00
Leonid Shalupov c484e37b02 integration tests: .gold -> .expected 2012-04-29 15:54:39 +04:00
Andrey Breslav 08de6d8d07 KT-1863 Wrong nullability for class derived from java classes. 
#KT-1863 In progress
 2012-04-28 23:13:41 +04:00
Andrey Breslav dcc2728f0a @NotNull is needed in tests, bringing it back 
Reverting c9edaa6b4f
 2012-04-28 23:13:02 +04:00
pTalanov 3e8624b440 Add test which checks whether compiler messages are understood correctly by the plugin. 2012-04-28 23:03:55 +04:00
pTalanov 330532661b Merge with master. 2012-04-28 22:47:38 +04:00
pTalanov 063ece5ad5 Add js.translator dependency to cli. Draft K2JSCompiler (just a placeholder) 2012-04-28 22:47:37 +04:00
pTalanov e4e4fb256a Pull some code from K2JVMCompiler to CLICompiler. Also requires a hack due to compiler bug. 2012-04-28 22:47:36 +04:00
pTalanov 16cc4bc8d7 Add abstract methods to CompilerArguments. Add parameters to K2JSCompilerArguments. 2012-04-28 22:47:36 +04:00
pTalanov 66e10a18a3 JetCoreEnvironment for JS and JVM are separated. 2012-04-28 22:47:35 +04:00
pTalanov f9d87cbf4b Move doMain method to CLICompiler. 2012-04-28 22:47:34 +04:00
pTalanov cdfa0678cf Extract reusable functionality from K2JVMCompiler, K2JVMCompilerArguments, CompilerEnvironmentConfiguration. 2012-04-28 22:47:33 +04:00
Stepan Koltsov b24634eb99 actually compile should be on by default 
(it is safer)
 2012-04-28 20:34:33 +04:00
Stepan Koltsov 661b16359a resolve jdk classes 2012-04-28 17:43:53 +04:00
Stepan Koltsov 7352da34ef resolve type parameters that reference type variables declared after 
like

Aaa<B extends Bbb<C>, C>

#KT-1731 fixed
 2012-04-28 17:43:53 +04:00
Stepan Koltsov 615330ca75 identified can have last segment "namespace", for instance, javax.xml.namespace 2012-04-28 17:43:53 +04:00