From bfcdce46586deb66c57a7b235432172145059722 Mon Sep 17 00:00:00 2001
From: Pavel Talanov <Pavel.Talanov@jetbrains.com>
Date: Fri, 24 Feb 2012 15:07:55 +0400
Subject: [PATCH] update main repository

---
 jslib/src/core/core.kt                                     | 2 +-
 jslib/src/core/javalang.kt                                 | 2 ++
 .../src/org/jetbrains/k2js/facade/K2JSTranslator.java      | 7 +------
 .../org/jetbrains/k2js/translate/general/Translation.java  | 7 ++-----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/jslib/src/core/core.kt b/jslib/src/core/core.kt
index 1edf565e29d..580f0fb5d7c 100644
--- a/jslib/src/core/core.kt
+++ b/jslib/src/core/core.kt
@@ -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() {}
 
diff --git a/jslib/src/core/javalang.kt b/jslib/src/core/javalang.kt
index abd3beca109..8cc2124f41c 100644
--- a/jslib/src/core/javalang.kt
+++ b/jslib/src/core/javalang.kt
@@ -11,3 +11,5 @@ trait Iterable<T> {
 library("splitString")
 public fun String.split(regex : String) : Array<String> = js.noImpl
 
+class Throwable() {}
+
diff --git a/translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java b/translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
index 954d972d368..c506295cb00 100644
--- a/translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+++ b/translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
@@ -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));
     }
 
 
diff --git a/translator/src/org/jetbrains/k2js/translate/general/Translation.java b/translator/src/org/jetbrains/k2js/translate/general/Translation.java
index c80c7772be0..dc69b2e67d9 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/Translation.java
+++ b/translator/src/org/jetbrains/k2js/translate/general/Translation.java
@@ -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);