Commit Graph

376 Commits

Author SHA1 Message Date
pTalanov d327777821 Verbose parameter treated correctly
Fixes CompilerSmokeTest broken by previous commit
2012-05-04 18:14:11 +04:00
pTalanov 3e3a22a5c9 CLI refactoring.
Some steps towards nice K2JS cli.
2012-05-04 16:23:31 +04:00
pTalanov 359778906d Fix maven build. 2012-05-02 16:38:50 +04:00
pTalanov f3e2a94745 Rename K2JVMCompilerVersion -> CompilerVersion, move to common. 2012-05-02 15:28:46 +04:00
pTalanov 7e58e4d919 Add srcdir as K2JSCompiler parameter. 2012-05-02 15:24:25 +04:00
pTalanov ce929fab49 Rename CompileEnvironmentConfiguration. Drop ArgsUtil class. Add CompilerSpecialMode.JS. 2012-05-02 15:23:40 +04:00
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
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 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 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
pTalanov 3e8624b440 Add test which checks whether compiler messages are understood correctly by the plugin. 2012-04-28 23:03:55 +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
pTalanov 9f92b0b5d7 Refactor cli: all the jvm stuff goes under org.jetbrains.jet.cli.jvm, common stuff under org.jetbrains.jet.cli.common 2012-04-25 20:39:44 +04:00
pTalanov d0d5b147f2 Refactor cli: all the jvm stuff goes under org.jetbrains.jet.cli.jvm, common stuff under org.jetbrains.jet.cli.common 2012-04-25 20:19:15 +04:00
Stepan Koltsov 3b43f30824 add JDK to CompilerDependencies 2012-04-25 19:36:22 +04:00
Pavel V. Talanov 6e3d7cce61 Remove redundant analyzer wrapper. 2012-04-25 14:24:05 +04:00
Pavel V. Talanov 891dd9fc1c extract compiler error reporting functionality from KotlinToJVMBytecodeCompiler 2012-04-25 14:24:04 +04:00
Andrey Breslav d0bd5cf9c6 Properly positioning compilation exceptions in the IDE 2012-04-25 12:25:00 +04:00
Andrey Breslav 47e096026d Escape XML strings in the compiler output 2012-04-24 22:41:04 +04:00
Andrey Breslav b467edfa03 Don't compile module scripts in verbose mode 2012-04-24 21:22:46 +04:00
Andrey Breslav 0ab212b240 Module file is not needed when compiling modules 2012-04-24 21:22:45 +04:00
Andrey Breslav 8a40f943de Module script loading separated from module compilation 2012-04-24 21:22:45 +04:00
Andrey Breslav 419f8c7415 Print a root tag in the XML output mode
Now, the compiler output in the "-tags" mode is enclosed into <MESSAGES>...</MESSAGES>
2012-04-24 21:22:45 +04:00
Evgeny Gerashchenko 9bec7b5e9d Merge branch 'diagnostics'
Conflicts:
	compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
	compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
2012-04-20 21:58:05 +04:00
Stepan Koltsov 3b0c9244c9 di: @PreDestroy
I need in my private experiments
2012-04-20 21:33:18 +04:00
Andrey Breslav 13764c06c0 Compiler plugins moved to CompilerEnvironmentConfiguration 2012-04-20 14:58:14 +04:00
Andrey Breslav e33acbeebf Use CompileEnvironmentConfiguretion instead of its components 2012-04-20 14:33:49 +04:00
Andrey Breslav 4da91ee3d6 CompileEnvironment removed
What used to be CompileEnvironment, now is split into data (in CompileEnvironmentConfiguration) and utility methods (in CompileEnvironmentUtil).
CompilerDependencies should be removed later.
All the relevant stuff sits in the JetCoreEnvironment class
2012-04-20 11:52:02 +04:00
Stepan Koltsov b47d37094e properly report exception if analyze failed
#KT-1831 Fixed
2012-04-19 16:41:34 +04:00
Andrey Breslav d512d62c04 Remove unused method 2012-04-13 20:08:35 +04:00
Andrey Breslav e23cb0cb98 Fix comment text 2012-04-13 20:07:23 +04:00
Andrey Breslav e553a46294 Use common utility for retrieving FQNames 2012-04-13 20:07:02 +04:00
Andrey Breslav 4eb594024a Removed the exec(String...) method in KotlinCompiler
It's important to be aware of what stream the messages will be written to, so such a default implementation is harmful
2012-04-13 19:59:28 +04:00
Andrey Breslav 882412ea06 Proper handling of compiler messages
We used to have a triple (errorStream, messageRenderer, verbose) to represent the error reporting strategy.
 Now we have a single MessageCollector abstraction for this.
 As the MessageCollector abstraction was extracted, the need to CompilerMessageLocation and CompilerMessageSeverity arose, too.
2012-04-13 19:38:23 +04:00
Andrey Breslav 71bac57411 Got rid of CompileSession class: this class shouldn't have had any objects, now it is transformed into KotlinToJVMBytecodeCompiler 2012-04-13 19:38:22 +04:00
Evgeny Gerashchenko 370af95c87 Introduced DispatchingDiagnosticRenderer, which replaced DefaultDiagnosticRenderer. 2012-04-13 19:31:47 +04:00
Evgeny Gerashchenko a5d5eb53e2 Fixed rendering syntax error diagnostics in CompileSession. 2012-04-13 19:31:46 +04:00
Evgeny Gerashchenko b0e09319a9 Moved DefaultDiagnosticRenderer from cli back to frontend to avoid run-time dependencies on cli where rendering diagnostics is needed. 2012-04-13 19:31:46 +04:00
Evgeny Gerashchenko 8d599548ba Copied all diagnostic-rendering logic to DefaultDiagnosticRenderer. 2012-04-13 19:31:46 +04:00
Evgeny Gerashchenko cab1e00596 Replaced unnecessary "E" type parameter in DiagnosticWithParameters1 with wildcard. 2012-04-13 19:31:46 +04:00
Evgeny Gerashchenko 553ce9e5e0 Extracted DiagnosticWithParameters1Renderer, moved it along with DiagnosticRenderer to frontend module. 2012-04-13 19:31:45 +04:00