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

update main repository

Browse Source
This commit is contained in:
Pavel Talanov
2012-02-24 15:07:55 +04:00
parent 68e326922b
commit bfcdce4658
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jslib/src/core/core.kt
+1 -1
View File
@@ -18,7 +18,7 @@ fun print(s : Any?) {}
library("parseInt")
fun parseInt(s : String) : Int = 0
library
open class Exception() {}
open class Exception() : Throwable() {}
library
class NumberFormatException() : Exception() {}
jslib/src/core/javalang.kt
+2
View File
@@ -11,3 +11,5 @@ trait Iterable<T> {
library("splitString")
public fun String.split(regex : String) : Array<String> = js.noImpl
class Throwable() {}
translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+1 -6
View File
@@ -19,7 +19,6 @@ package org.jetbrains.k2js.facade;
import com.google.dart.compiler.backend.js.ast.JsProgram;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.plugin.JetMainDetector;
@@ -29,7 +28,6 @@ import org.jetbrains.k2js.config.IDEAConfig;
import org.jetbrains.k2js.config.TestConfig;
import org.jetbrains.k2js.generate.CodeGenerator;
import org.jetbrains.k2js.translate.general.Translation;
import org.jetbrains.k2js.translate.utils.BindingUtils;
import org.jetbrains.k2js.utils.GenerationUtils;
import org.jetbrains.k2js.utils.JetFileUtils;
@@ -126,10 +124,7 @@ public final class K2JSTranslator {
@NotNull
private JsProgram generateProgram(@NotNull List<JetFile> filesToTranslate) {
BindingContext bindingContext = Analyzer.analyzeFilesAndCheckErrors(filesToTranslate, config);
JetFile file = filesToTranslate.iterator().next();
NamespaceDescriptor namespaceDescriptor = BindingUtils.getNamespaceDescriptor(bindingContext, file);
return Translation.generateAst(bindingContext, namespaceDescriptor,
Analyzer.withJsLibAdded(filesToTranslate, config), getProject());
return Translation.generateAst(bindingContext, Analyzer.withJsLibAdded(filesToTranslate, config));
}
translator/src/org/jetbrains/k2js/translate/general/Translation.java
+2 -5
View File
@@ -20,7 +20,6 @@ import com.google.dart.compiler.backend.js.JsNamer;
import com.google.dart.compiler.backend.js.JsPrettyNamer;
import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.util.AstUtil;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.psi.*;
@@ -106,11 +105,9 @@ public final class Translation {
}
public static JsProgram generateAst(@NotNull BindingContext bindingContext,
@NotNull NamespaceDescriptor namespaceToTranslate,
@NotNull List<JetFile> files,
@NotNull Project project) {
@NotNull List<JetFile> files) {
//TODO: move some of the code somewhere
JetStandardLibrary standardLibrary = JetStandardLibrary.getJetStandardLibrary(project);
JetStandardLibrary standardLibrary = JetStandardLibrary.getInstance();
StaticContext staticContext = StaticContext.generateStaticContext(standardLibrary, bindingContext);
JsBlock block = staticContext.getProgram().getFragmentBlock(0);
TranslationContext context = TranslationContext.rootContext(staticContext);