Simple (not thread-safe) memoized functions supported

an exception gtom generateToText() used to mask the one from the original run

.idea/compiler.xml

@@ -4,20 +4,7 @@
     <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
-      <entry name="?*.properties" />
-      <entry name="?*.xml" />
-      <entry name="?*.gif" />
-      <entry name="?*.png" />
-      <entry name="?*.jpeg" />
-      <entry name="?*.jpg" />
-      <entry name="?*.html" />
-      <entry name="?*.dtd" />
-      <entry name="?*.tld" />
-      <entry name="?*.ftl" />
-      <entry name="?*.jet" />
-      <entry name="?*.ft" />
-      <entry name="?*.kt" />
-      <entry name="?*.template" />
+      <entry name="!*.java" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">

.idea/copyright/profiles_settings.xml

@@ -1,6 +1,8 @@
 <component name="CopyrightManager">
-  <settings default="apache">
-    <module2copyright />
+  <settings default="">
+    <module2copyright>
+      <element module="all except testData" copyright="apache" />
+    </module2copyright>
     <LanguageOptions name="Groovy">
       <option name="fileTypeOverride" value="1" />
     </LanguageOptions>

.idea/libraries/copyright_plugin.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="copyright-plugin">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/copyright/lib/copyright.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/copyright/src" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/idea_full.xml

@@ -190,6 +190,7 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/tools/lexer/jflex-1.4/examples/simple" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/tools/lexer/jflex-1.4/examples/java" />
       <root url="jar://$PROJECT_DIR$/dependencies/guava-12.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/jetbrains-asm-all-4.0-src.zip!/" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />
   </library>

.idea/libraries/jps.xml

@@ -0,0 +1,20 @@
+<component name="libraryTable">
+  <library name="jps">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/jps" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-api/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-serialization/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-serialization/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-impl/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-impl/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/antLayout/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/jps-builders/src" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/jps-builders/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/standalone-builder/src" />
+    </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps" recursive="false" />
+  </library>
+</component>

.idea/libraries/jps_test.xml

@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="jps-test">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/ideaSDK/jps/test" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/jps-builders/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-impl/testSrc" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/jps/model-serialization/testSrc" />
+    </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps/test" recursive="false" />
+  </library>
+</component>

.idea/misc.xml

@@ -43,28 +43,6 @@
       </set>
     </option>
   </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
-    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
-    <option name="myNullables">
-      <value>
-        <list size="3">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="3">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>

.idea/modules.xml

@@ -24,6 +24,7 @@
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" filepath="$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" />
       <module fileurl="file://$PROJECT_DIR$/runtime/runtime.iml" filepath="$PROJECT_DIR$/runtime/runtime.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
     </modules>

.idea/runConfigurations/All_Jvm_Backend_Tests.xml

@@ -19,7 +19,7 @@
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
+      <value defaultName="moduleWithDependencies" />
     </option>
     <envs />
     <patterns />
@@ -28,6 +28,9 @@
       <option name="TRANSPORT" value="0" />
       <option name="LOCAL" value="true" />
     </RunnerSettings>
+    <RunnerSettings RunnerId="Profile ">
+      <option name="myExternalizedOptions" value="&#10;additional-options2=onexit\=snapshot&#10;" />
+    </RunnerSettings>
     <RunnerSettings RunnerId="Run" />
     <ConfigurationWrapper RunnerId="Debug" />
     <ConfigurationWrapper RunnerId="Run" />

.idea/runConfigurations/IDEA.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="IDEA" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config -Dapple.laf.useScreenMenuBar=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

.idea/runConfigurations/KAnnotator_Jps_Plugin_Test.xml

@@ -0,0 +1,31 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="KAnnotator Jps Plugin Test" type="JUnit" factoryName="JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <module name="kannotator-jps-plugin-test" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="PACKAGE_NAME" value="org.jetbrains.jet.jps.build.kannotator" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="-ea" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="moduleWithDependencies" />
+    </option>
+    <envs />
+    <patterns />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method />
+  </configuration>
+</component>

.idea/scopes/all_except_testData.xml

@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="all except testData" pattern="!file[*]:*//testData//*&amp;&amp;!file[*]:testData//*" />
+</component>

Kotlin.iml

@@ -10,6 +10,25 @@
       <excludeFolder url="file://$MODULE_DIR$/ideaSDK/config" />
       <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system" />
       <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system-idea" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/docs/apidoc/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/docs/website/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/browser-example/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/js-example/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/examples/kotlin-java-example/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin-jdbc/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/kotlin-swing/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/kunit/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kdoc-maven-plugin/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kdoc/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-library/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-tests-junit/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-js-tests/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/local-repo" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-stdlib-gen/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/runtime/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

bin/kotlin

@@ -1,32 +0,0 @@
-#!/bin/sh -e
-
-die() {
-    echo "$@" >&2
-    exit 1
-}
-
-root=`cd $(dirname $0)/..; pwd`
-
-ideaRoot=
-for d in $root/ideaSDK /Applications/Nika-*.app; do
-    if [ -d "$d/lib" ]; then
-        ideaRoot="$d"
-        break
-    fi
-done
-
-test -n "$ideaRoot" || die "Idea root not found"
-
-classpath="$root/out/production/cli"
-classpath="$classpath:$root/out/production/backend:$root/out/production/frontend:$root/out/production/frontend.java:$root/out/production/jet.as.java.psi:$root/out/production/util"
-classpath="$classpath:$root/out/production/stdlib:$root/out/production/runtime"
-classpath="$classpath:$root/lib/*:$ideaRoot/lib/*:$ideaRoot/lib/rt/*"
-classpath="$classpath:$root/dependencies/jline-2.6.jar"
-
-exec java $JAVA_OPTS \
-    -ea \
-    -classpath "$classpath" \
-    org.jetbrains.jet.cli.jvm.K2JVMCompiler \
-    "$@"
-
-# vim: set ts=4 sw=4 et:

bin/publish-maven-artifacts

@@ -1,64 +0,0 @@
-#!/bin/bash
-
-DEPLOY_SETTINGS=~/.kotlin-deploy-settings.xml
-
-BUILD=$1
-[ -z "$BUILD" ] && {
-  echo "Usage: ./publish-maven-artifacts BUILD"
-  echo "  where BUILD is like 0.1.XXXX"
-  exit 1
-}
-
-[ ! -f "$DEPLOY_SETTINGS" ] && {
-  echo "Maven deploy settings are not found at $DEPLOY_SETTINGS"
-  exit 1
-}
-
-[ ! -f "update_dependencies.xml" -o ! -f "Kotlin.iml" ] && {
-  echo "Run this script from Kotlin checkout root"
-  exit 1
-}
-
-for cmd in java javac ant mvn git; do
-  command -v $cmd >/dev/null 2>&1 || {
-    echo "$cmd must available in \$PATH"
-    exit 1
-  }
-done
-
-(javac -version 2>&1 | fgrep -q 1.6.) || {
-  echo "javac must report report 1.6.X version"
-  exit 1
-}
-
-uncommitted=`git status --porcelain -uno`
-[ -n "$uncommitted" ] && {
-  echo "Uncommited changes detected, commit them and run this script again"
-  echo "$uncommitted"
-  exit 1
-}
-
-LOG=/tmp/kotlin-build-`date +%Y%m%d-%H%M%S`.log
-echo "*** Writing build log to $LOG"
-
-(
-export MAVEN_OPTS="-Xms512m -Xmx1024M -XX:PermSize=256m -XX:MaxPermSize=512m"
-export ANT_OPTS="-Xms512m -Xmx1024M -XX:PermSize=256m -XX:MaxPermSize=512m"
-
-set -x -e
-
-rm -rfv ~/.m2/repository/org/jetbrains/kotlin
-
-rm -rf /tmp/kotlin-dependencies
-git clean -f -d -x
-git reset --hard
-
-ant -f update_dependencies.xml
-ant -f build.xml -Dbuild.number=$BUILD dist
-cd libraries
-mvn versions:set -DnewVersion=$BUILD
-mvn package -PnoTest -DskipTests
-find . -name target -type d -prune -print -exec rm -rf {} \;
-mvn -s "$DEPLOY_SETTINGS" -PnoTest -DskipTests deploy
-echo "*** Successfully uploaded version $BUILD to maven repository"
-) 2>&1 | tee "$LOG"

bin/run-test

@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-cd $(dirname $0)/..
-
-exec java -classpath 'dist/classes/tests:compiler/frontend/src:dist/classes/runtime:dist/classes/compiler:lib/*:ideaSDL/core/*:ideaSDK/lib/*' "$@"
-
-# vim: set ts=4 sw=4 et ft=sh:

build-tools/ant/src/org/jetbrains/jet/buildtools/ant/BytecodeCompilerTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

build-tools/ant/src/org/jetbrains/jet/buildtools/ant/JavaScriptCompilerTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ import org.jetbrains.jet.cli.common.messages.MessageCollectorPlainTextToStream;
 import org.jetbrains.jet.cli.jvm.compiler.*;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
+import org.jetbrains.jet.utils.KotlinPaths;
+import org.jetbrains.jet.utils.KotlinPathsFromHomeDir;
 import org.jetbrains.jet.utils.PathUtil;
 
 import java.io.File;
@@ -62,14 +64,15 @@ public class BytecodeCompiler {
     }
 
     private CompilerConfiguration createConfiguration(String stdlib, String[] classpath, String[] sourceRoots) {
+        KotlinPaths paths = getKotlinPathsForAntTask();
         CompilerConfiguration configuration = new CompilerConfiguration();
         configuration.add(CLASSPATH_KEY, PathUtil.findRtJar());
         if ((stdlib != null) && (stdlib.trim().length() > 0)) {
             configuration.add(CLASSPATH_KEY, new File(stdlib));
         }
         else {
-            File path = PathUtil.getDefaultRuntimePath();
-            if (path != null) {
+            File path = paths.getRuntimePath();
+            if (path.exists()) {
                 configuration.add(CLASSPATH_KEY, path);
             }
         }
@@ -78,8 +81,8 @@ public class BytecodeCompiler {
                 configuration.add(CLASSPATH_KEY, new File(path));
             }
         }
-        File jdkAnnotationsPath = PathUtil.getJdkAnnotationsPath();
-        if (jdkAnnotationsPath != null) {
+        File jdkAnnotationsPath = paths.getJdkAnnotationsPath();
+        if (jdkAnnotationsPath.exists()) {
             configuration.add(ANNOTATIONS_PATH_KEY, jdkAnnotationsPath);
         }
 
@@ -91,7 +94,6 @@ public class BytecodeCompiler {
         return configuration;
     }
 
-
     /**
      * Retrieves compilation error message.
      *
@@ -172,7 +174,7 @@ public class BytecodeCompiler {
             @Nullable String stdlib,
             @Nullable String[] classpath) {
         try {
-            List<Module> modules = CompileEnvironmentUtil.loadModuleScript(module, MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR);
+            List<Module> modules = CompileEnvironmentUtil.loadModuleScript(getKotlinPathsForAntTask(), module, MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR);
             List<String> sourcesRoots = new ArrayList<String>();
             for (Module m : modules) {
                 sourcesRoots.addAll(m.getSourceFiles());
@@ -196,4 +198,9 @@ public class BytecodeCompiler {
     public void setCompilerPlugins(List<CompilerPlugin> compilerPlugins) {
         this.compilerPlugins = compilerPlugins;
     }
+
+    private static KotlinPaths getKotlinPathsForAntTask() {
+        return new KotlinPathsFromHomeDir(PathUtil.getJarPathForClass(BytecodeCompiler.class).getParentFile().getParentFile());
+    }
+
 }

build-tools/core/src/org/jetbrains/jet/buildtools/core/JavaScriptCompiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

build-tools/core/src/org/jetbrains/jet/buildtools/core/Util.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

build.xml

@@ -9,18 +9,12 @@
     <property name="output" value="${basedir}/${output.relative}"/>
     <property name="kotlin-home" value="${output}/kotlinc"/>
     <property name="build.number" value="snapshot"/>
-    <property name="output.name" value="kotlin-${build.number}"/>
+    <property name="output.name" value="kotlin-compiler-${build.number}"/>
     <property name="idea.sdk" value="${basedir}/ideaSDK"/>
 
     <path id="classpath">
         <fileset dir="${idea.sdk}" includes="core/*.jar"/>
 
-        <!--
-            Work around this problem: https://gist.github.com/1c4a7d51b61ec81d581b
-            Somebody please fix it properly or delete this comment if this is OK
-        -->
-        <pathelement path="${idea.sdk}/lib/resources_en.jar"/>
-
         <fileset dir="${basedir}/lib" includes="**/*.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jline.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jansi.jar"/>
@@ -35,7 +29,7 @@
         <include name="compiler/cli/src"/>
         <include name="compiler/cli/cli-common/src"/>
         <include name="compiler/util/src"/>
-        <include name="j2k/src"/>
+        <!--<include name="j2k/src"/>-->
         <include name="compiler/jet.as.java.psi/src"/>
 
         <include name="runtime/src"/>
@@ -64,13 +58,14 @@
     <target name="init" depends="clean">
         <mkdir dir="${kotlin-home}"/>
         <mkdir dir="${kotlin-home}/lib"/>
-        <mkdir dir="${kotlin-home}/lib/alt"/>
+        <mkdir dir="${kotlin-home}/lib/tools"/>
     </target>
 
     <target name="prepareDist">
         <copy todir="${kotlin-home}/bin">
             <fileset dir="${basedir}/compiler/cli/bin"/>
         </copy>
+        <fixcrlf srcdir="${kotlin-home}/bin" excludes="**/*.bat" eol="unix"/>
 
         <copy todir="${kotlin-home}/license">
             <fileset dir="${basedir}/license"/>
@@ -81,51 +76,59 @@
         <chmod dir="${kotlin-home}/bin" includes="*" perm="755"/>
     </target>
 
-    <target name="injectorsGenerator">
-        <cleandir dir="${output}/classes/injectorsGenerator"/>
-        <javac destdir="${output}/classes/injectorsGenerator" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
+    <target name="compileGenerators">
+        <cleandir dir="${output}/classes/generators"/>
+        <javac destdir="${output}/classes/generators" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
             <src path="injector-generator/src"/>
             <src path="generators/org/jetbrains/jet/generators/injectors"/>
+            <src path="generators/org/jetbrains/jet/generators/jvm"/>
             <src refid="compilerSources.path"/>
             <classpath refid="classpath"/>
         </javac>
+        <copy todir="${output}/classes/generators">
+            <fileset dir="compiler/frontend/src" includes="**/*.jet"/>
+        </copy>
     </target>
 
-    <target name="generateInjectors" depends="injectorsGenerator">
+    <target name="invokeGenerators" depends="compileGenerators">
         <java classname="org.jetbrains.jet.generators.injectors.GenerateInjectors" failonerror="true">
             <classpath refid="classpath"/>
-            <classpath path="${output}/classes/injectorsGenerator"/>
+            <classpath path="${output}/classes/generators"/>
+        </java>
+        <java classname="org.jetbrains.jet.generators.jvm.GenerateJavaToKotlinMethodMap" failonerror="true">
+            <classpath refid="classpath"/>
+            <classpath path="${output}/classes/generators"/>
         </java>
     </target>
 
     <target name="compilerSources">
+        <jar jarfile="${output}/kotlin-compiler-sources.jar">
+            <!-- TODO How to convert it from pathset or dirset ? -->
+            <fileset dir="compiler/frontend/src"/>
+            <fileset dir="compiler/frontend.java/src"/>
+            <fileset dir="compiler/backend/src"/>
+            <fileset dir="compiler/cli/src"/>
+            <fileset dir="j2k/src"/>
+            <fileset dir="compiler/util/src"/>
+            <fileset dir="compiler/jet.as.java.psi/src"/>
+            <fileset dir="runtime/src"/>
+            <fileset dir="js/js.translator/src"/>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+
+            <manifest>
+                <attribute name="Built-By" value="JetBrains"/>
+
+                <attribute name="Implementation-Vendor" value="JetBrains"/>
+                <attribute name="Implementation-Title" value="Kotlin Compiler Sources"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
+
         <if>
             <istrue value="${generate.javadoc}"/>
 
             <then>
-                <jar jarfile="${output}/kotlin-compiler-sources.jar">
-                    <!-- TODO How to convert it from pathset or dirset ? -->
-                    <fileset dir="compiler/frontend/src"/>
-                    <fileset dir="compiler/frontend.java/src"/>
-                    <fileset dir="compiler/backend/src"/>
-                    <fileset dir="compiler/cli/src"/>
-                    <fileset dir="j2k/src"/>
-                    <fileset dir="compiler/util/src"/>
-                    <fileset dir="compiler/jet.as.java.psi/src"/>
-                    <fileset dir="runtime/src"/>
-                    <fileset dir="js/js.translator/src"/>
-                    <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-
-                    <manifest>
-                        <attribute name="Built-By" value="JetBrains"/>
-
-                        <attribute name="Implementation-Vendor" value="JetBrains"/>
-                        <attribute name="Implementation-Title" value="Kotlin Compiler Sources"/>
-                        <attribute name="Implementation-Version" value="${build.number}"/>
-                    </manifest>
-                </jar>
-
-                <delete dir="${output}/kotlin-compiler-javadoc" failonerror="false" />
+                <delete dir="${output}/kotlin-compiler-javadoc" failonerror="false"/>
                 <javadoc destdir="${output}/kotlin-compiler-javadoc"
                          sourcepathref="compilerSources.path"
                          classpathref="classpath"
@@ -144,62 +147,73 @@
                     </manifest>
                 </jar>
             </then>
+
+            <else>
+                <jar jarfile="${output}/kotlin-compiler-javadoc.jar">
+                    <manifest>
+                        <attribute name="Built-By" value="JetBrains"/>
+
+                        <attribute name="Implementation-Vendor" value="JetBrains"/>
+                        <attribute name="Implementation-Title" value="Kotlin Compiler Javadoc"/>
+                        <attribute name="Implementation-Version" value="${build.number}"/>
+                    </manifest>
+                </jar>
+            </else>
         </if>
     </target>
 
-  <target name="jslib">
-    <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar">
-      <fileset dir="${basedir}/js/js.libraries/src">
-        <include name="core/**"/>
-        <include name="jquery/**"/>
-        <include name="dom/**"/>
-        <include name="html5/**"/>
-        <include name="stdlib/TuplesCode.kt"/>
-      </fileset>
-      <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-    </jar>
-    <java classname="com.google.javascript.jscomp.CommandLineRunner" failonerror="true">
-      <classpath>
-        <pathelement location="${basedir}\js\js.tests\testLib\closure-compiler.jar"/>
-      </classpath>
-      <arg value="--formatting"/>
-      <arg value="PRETTY_PRINT"/>
-      <arg value="--language_in"/>
-      <arg value="ECMASCRIPT5_STRICT"/>
-      <arg value="--compilation_level"/>
-      <arg value="SIMPLE_OPTIMIZATIONS"/>
-      <arg value="--js"/>
-      <arg value="${basedir}/js/js.translator/testFiles/kotlin_lib_ecma5.js"/>
-      <arg value="--js"/>
-      <arg value="${basedir}/js/js.translator/testFiles/kotlin_lib.js"/>
-      <arg value="--js"/>
-      <arg value="${basedir}/js/js.translator/testFiles/maps.js"/>
-      <arg value="--js_output_file"/>
-      <arg value="${kotlin-home}/lib/kotlinEcma5.js"/>
-    </java>
-    <java classname="com.google.javascript.jscomp.CommandLineRunner" failonerror="true">
-      <classpath>
-        <pathelement location="${basedir}/js/js.tests/testLib/closure-compiler.jar"/>
-      </classpath>
-      <arg value="--formatting"/>
-      <arg value="PRETTY_PRINT"/>
-      <arg value="--language_in"/>
-      <arg value="ECMASCRIPT3"/>
-      <arg value="--compilation_level"/>
-      <arg value="SIMPLE_OPTIMIZATIONS"/>
-      <arg value="--js"/>
-      <arg value="${basedir}/js/js.translator/testFiles/kotlin_lib_ecma3.js"/>
-      <arg value="--js"/>
-      <arg value="${basedir}/js/js.translator/testFiles/kotlin_lib.js"/>
-      <arg value="--js"/>
-      <arg value="${basedir}/js/js.translator/testFiles/maps.js"/>
-      <arg value="--js_output_file"/>
-      <arg value="${kotlin-home}/lib/kotlinEcma3.js"/>
-    </java>
-  </target>
+    <target name="jslib">
+        <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar">
+            <fileset dir="${basedir}/js/js.libraries/src">
+                <include name="core/**"/>
+                <include name="jquery/**"/>
+                <include name="dom/**"/>
+                <include name="html5/**"/>
+                <include name="stdlib/TuplesCode.kt"/>
+            </fileset>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+        </jar>
+        <java classname="com.google.javascript.jscomp.CommandLineRunner" failonerror="true">
+            <classpath>
+                <pathelement location="${basedir}\js\js.tests\testLib\closure-compiler.jar"/>
+            </classpath>
+            <arg value="--formatting"/>
+            <arg value="PRETTY_PRINT"/>
+            <arg value="--language_in"/>
+            <arg value="ECMASCRIPT5_STRICT"/>
+            <arg value="--compilation_level"/>
+            <arg value="SIMPLE_OPTIMIZATIONS"/>
+            <arg value="--js"/>
+            <arg value="${basedir}/js/js.translator/testFiles/kotlin_lib_ecma5.js"/>
+            <arg value="--js"/>
+            <arg value="${basedir}/js/js.translator/testFiles/kotlin_lib.js"/>
+            <arg value="--js"/>
+            <arg value="${basedir}/js/js.translator/testFiles/maps.js"/>
+            <arg value="--js_output_file"/>
+            <arg value="${kotlin-home}/lib/kotlinEcma5.js"/>
+        </java>
+        <java classname="com.google.javascript.jscomp.CommandLineRunner" failonerror="true">
+            <classpath>
+                <pathelement location="${basedir}/js/js.tests/testLib/closure-compiler.jar"/>
+            </classpath>
+            <arg value="--formatting"/>
+            <arg value="PRETTY_PRINT"/>
+            <arg value="--language_in"/>
+            <arg value="ECMASCRIPT3"/>
+            <arg value="--compilation_level"/>
+            <arg value="SIMPLE_OPTIMIZATIONS"/>
+            <arg value="--js"/>
+            <arg value="${basedir}/js/js.translator/testFiles/kotlin_lib_ecma3.js"/>
+            <arg value="--js"/>
+            <arg value="${basedir}/js/js.translator/testFiles/kotlin_lib.js"/>
+            <arg value="--js"/>
+            <arg value="${basedir}/js/js.translator/testFiles/maps.js"/>
+            <arg value="--js_output_file"/>
+            <arg value="${kotlin-home}/lib/kotlinEcma3.js"/>
+        </java>
+    </target>
 
     <target name="compiler">
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
         <taskdef resource="proguard/ant/task.properties" classpath="${basedir}/dependencies/proguard.jar"/>
         <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
 
@@ -209,54 +223,18 @@
             <classpath refid="classpath"/>
         </javac>
 
-        <!-- JarJar Kotlin compiler & dependencies -->
-        <jarjar jarfile="${output}/kotlin-compiler-jarjar.jar">
+        <jar jarfile="${output}/kotlin-compiler-before-shrink.jar">
             <fileset dir="${output}/classes/compiler"/>
             <fileset dir="${basedir}/compiler/frontend/src" includes="jet/**"/>
 
             <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
-            <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar"/>
+            <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
             <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="jna-utils.jar"/>
             <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="oromatcher.jar"/>
             <zipgroupfileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
             <zipgroupfileset dir="${basedir}/dependencies" includes="jline.jar"/>
-            <zipgroupfileset dir="${basedir}/dependencies" includes="jansi.jar"/>
-            <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-util-4.0.jar"/>
             <zipgroupfileset dir="${basedir}/dependencies" includes="jetbrains-asm-analysis-4.0.jar"/>
 
-            <zap pattern="com.thoughtworks.xstream.converters.extended.ISO8601*"/>
-            <zap pattern="com.thoughtworks.xstream.converters.reflection.CGLIBEnhancedConverter*"/>
-            <zap pattern="com.thoughtworks.xstream.io.xml.Dom4J*"/>
-            <zap pattern="com.thoughtworks.xstream.io.xml.Xom*"/>
-            <zap pattern="com.thoughtworks.xstream.mapper.CGLIBMapper*"/>
-
-            <zap pattern="org.apache.log4j.jmx.Agent"/>
-            <zap pattern="org.apache.log4j.net.JMS*"/>
-            <zap pattern="org.apache.log4j.net.SMTP*"/>
-            <zap pattern="org.apache.log4j.or.jms.MessageRenderer"/>
-
-            <zap pattern="org.jdom.xpath.Jaxen*"/>
-
-            <zap pattern="org.mozilla.javascript.xml.impl.xmlbeans.**"/>
-
-            <rule pattern="com.intellij.**" result="org.jetbrains.jet.internal.com.intellij.@1"/>
-            <rule pattern="com.sun.jna.**" result="org.jetbrains.jet.internal.com.sun.jna.@1"/>
-            <rule pattern="org.apache.log4j.**" result="org.jetbrains.jet.internal.org.apache.log4j.@1"/>
-            <rule pattern="org.jdom.**" result="org.jetbrains.jet.internal.org.jdom.@1"/>
-            <rule pattern="JDOMAbout**" result="org.jetbrains.jet.internal.org.jdom.JDOMAbout@1"/>
-            <rule pattern="org.intellij.lang.annotations.**" result="org.jetbrains.jet.internal.org.intellij.lang.annotations.@1"/>
-            <rule pattern="com.google.**" result="org.jetbrains.jet.internal.com.google.@1"/>
-            <rule pattern="org.objectweb.asm.**" result="org.jetbrains.jet.internal.org.objectweb.asm.@1"/>
-            <rule pattern="com.sampullara.cli.**" result="org.jetbrains.jet.internal.com.sampullara.cli.@1"/>
-            <rule pattern="org.picocontainer.**" result="org.jetbrains.jet.internal.org.picocontainer.@1"/>
-            <rule pattern="gnu.trove.**" result="org.jetbrains.jet.internal.gnu.trove.@1"/>
-            <rule pattern="javax.inject.**" result="org.jetbrains.jet.internal.javax.inject.@1"/>
-            <rule pattern="com.thoughtworks.xstream.**" result="org.jetbrains.jet.internal.com.thoughtworks.xstream.@1"/>
-            <rule pattern="org.json.**" result="org.jetbrains.jet.internal.org.json.@1"/>
-            <rule pattern="org.mozilla.**" result="org.jetbrains.jet.internal.org.mozilla.@1"/>
-            <rule pattern="org.xmlpull.**" result="org.jetbrains.jet.internal.org.xmlpull.@1"/>
-            <rule pattern="org.kohsuke.args4j.**" result="org.jetbrains.jet.internal.org.kohsuke.args4j.@1"/>
-
             <manifest>
                 <attribute name="Built-By" value="JetBrains"/>
 
@@ -266,7 +244,7 @@
 
                 <attribute name="Main-Class" value="org.jetbrains.jet.cli.jvm.K2JVMCompiler"/>
             </manifest>
-        </jarjar>
+        </jar>
 
         <delete file="${kotlin-home}/lib/kotlin-compiler.jar" failonerror="false"/>
 
@@ -274,39 +252,41 @@
             <isfalse value="${shrink}"/>
 
             <then>
-                <copy file="${output}/kotlin-compiler-jarjar.jar"
+                <copy file="${output}/kotlin-compiler-before-shrink.jar"
                       tofile="${kotlin-home}/lib/kotlin-compiler.jar"/>
             </then>
 
             <else>
-                <cleandir dir="${output}/kotlin-compiler.exploded"/>
-                <unzip src="${output}/kotlin-compiler-jarjar.jar" dest="${output}/kotlin-compiler.exploded"/>
-
-                <!-- Clean JarJar result -->
-                <jar jarfile="${output}/kotlin-compiler-before-proguard.jar"
-                     manifest="${output}/kotlin-compiler.exploded/META-INF/MANIFEST.MF">
-
-                    <fileset dir="${output}/kotlin-compiler.exploded">
-                        <include name="**/*.class"/>
-                        <include name="**/*.jet"/>
-                        <include name="**/*.kt"/>
-                        <include name="META-INF/services/**"/>
-                        <include name="messages/**"/>
-                    </fileset>
-                    <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-                </jar>
-                <delete dir="${output}/kotlin-compiler.exploded"/>
-
                 <available property="rtjar" value="${java.home}/lib/rt.jar" file="${java.home}/lib/rt.jar"/>
                 <available property="rtjar" value="${java.home}/../Classes/classes.jar" file="${java.home}/../Classes/classes.jar"/>
 
                 <proguard><![CDATA[
-                    -injars '${output}/kotlin-compiler-before-proguard.jar'
+                    -injars '${output}/kotlin-compiler-before-shrink.jar'(
+                    !com/thoughtworks/xstream/converters/extended/ISO8601**,
+                    !com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter**,
+                    !com/thoughtworks/xstream/io/xml/Dom4J**,
+                    !com/thoughtworks/xstream/io/xml/Xom**,
+                    !com/thoughtworks/xstream/io/xml/Wstx**,
+                    !com/thoughtworks/xstream/io/xml/KXml2**,
+                    !com/thoughtworks/xstream/io/xml/BEAStax**,
+                    !com/thoughtworks/xstream/io/json/Jettison**,
+                    !com/thoughtworks/xstream/mapper/CGLIBMapper**,
+                    !org/apache/log4j/jmx/Agent*,
+                    !org/apache/log4j/net/JMS*,
+                    !org/apache/log4j/net/SMTP*,
+                    !org/apache/log4j/or/jms/MessageRenderer*,
+                    !org/jdom/xpath/Jaxen*,
+                    !org/mozilla/javascript/xml/impl/xmlbeans/**,
+                    !META-INF/maven**,
+                    **.class,**.properties,**.jet,**.kt,
+                    META-INF/services/**,META-INF/native/**,META-INF/MANIFEST.MF,
+                    messages/**)
+
                     -outjars '${kotlin-home}/lib/kotlin-compiler.jar'
 
-                    -dontwarn org.jetbrains.jet.internal.com.intellij.util.**
-                    -dontwarn org.jetbrains.jet.internal.com.intellij.codeInsight.**
-                    -dontwarn org.jetbrains.jet.internal.com.thoughtworks.xstream.**
+                    -dontwarn com.intellij.util.ui.IsRetina*
+                    -dontwarn com.intellij.util.RetinaImage*
+                    -dontwarn org.fusesource.**
 
                     -libraryjars '${rtjar}'
 
@@ -314,9 +294,8 @@
                     -dontoptimize
                     -dontobfuscate
 
-                    -keepclasseswithmembers public class * {
-                        public static void main(java.lang.String[]);
-                    }
+                    -keep class org.fusesource.** { *; }
+                    -keep class org.jdom.input.JAXPParserFactory { *; }
 
                     -keep class org.jetbrains.annotations.** {
                         public protected *;
@@ -334,27 +313,12 @@
                         public protected *;
                     }
 
-                    -keepclasseswithmembers class * { void start(); }
+                    -keep class com.intellij.psi.** {
+                        public protected *;
+                    }
 
-                    -keepclasseswithmembers class * { void stop(); }
-                    -keepclasseswithmembers class * { void dispose(); }
-
-                    -keepclasseswithmembers class * { ** getFileSystem(); }
-                    -keepclasseswithmembers class * { ** isVarArgs(); }
-                    -keepclasseswithmembers class * { ** getApplication(); }
-                    -keepclasseswithmembers class * { ** finalizeReferent(); }
-                    -keepclasseswithmembers class * { ** newBuilder(); }
-                    -keepclasseswithmembers class * { ** startFinalizer(java.lang.Class,java.lang.Object); }
-                    -keepclasseswithmembers class * { ** executeOnPooledThread(java.lang.Runnable); }
-                    -keepclasseswithmembers class * { ** getUserData(java.lang.String); }
-                    -keepclasseswithmembers class * { int getBooleanAttributes(java.io.File); }
-
-                    -keepclasseswithmembers class * { ** project(); }
-
-                    -keepclasseswithmembers class * { ** TYPE; }
-                    -keepclasseswithmembers class * { ** ourInstance; }
-
-                    -keepclasseswithmembers class * { <init>(kotlinc.internal.com.intellij.lang.ASTNode); }
+                    # for kdoc
+                    -keep class com.intellij.openapi.util.TextRange { *; }
 
                     -keepclassmembers enum * {
                         public static **[] values();
@@ -364,6 +328,9 @@
                     -keepclassmembers class * {
                         ** toString();
                         ** hashCode();
+                        void start();
+                        void stop();
+                        void dispose();
                     }
                 ]]></proguard>
             </else>
@@ -458,30 +425,33 @@
         </jar>
     </target>
 
-    <target name="lang">
-        <cleandir dir="${output}/classes/lang"/>
-        <java classname="org.jetbrains.jet.cli.jvm.K2JVMCompiler" failonerror="true">
-            <classpath>
-                <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
-            </classpath>
-            <arg value="-src"/>
-            <arg value="${basedir}/compiler/frontend/src"/>
-            <arg value="-output"/>
-            <arg value="${output}/classes/lang"/>
-            <arg value="-noStdlib"/>
-            <arg value="-builtins"/>
-        </java>
+    <target name="j2kConverter">
+        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
 
-        <!-- Not used yet -->
-        <!--
-        <jar destfile="${kotlin-home}/lib/lang.jar">
-            <fileset dir="${output}/classes/lang"/>
+        <cleandir dir="${output}/classes/j2k"/>
+
+        <javac destdir="${output}/classes/j2k" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
+            <src path="${basedir}/j2k/src"/>
+            <classpath path="${kotlin-home}/lib/kotlin-compiler.jar"/>
+        </javac>
+
+        <jar jarfile="${kotlin-home}/lib/tools/j2k.jar">
+            <fileset dir="${output}/classes/j2k" includes="org/jetbrains/jet/j2k/**"/>
+
+            <manifest>
+                <attribute name="Built-By" value="JetBrains"/>
+
+                <attribute name="Implementation-Vendor" value="JetBrains"/>
+                <attribute name="Implementation-Title" value="Java to Kotlin Converter"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+
+                <attribute name="Main-Class" value="org.jetbrains.jet.j2k.JavaToKotlinTranslator"/>
+            </manifest>
         </jar>
-        -->
     </target>
 
     <target name="dist"
-            depends="init,prepareDist,injectorsGenerator,generateInjectors,compiler,compilerSources,antTools,jdkAnnotations,runtime,lang,jslib"/>
+            depends="init,prepareDist,compileGenerators,invokeGenerators,compiler,compilerSources,antTools,jdkAnnotations,runtime,jslib,j2kConverter"/>
 
     <target name="zip" depends="dist">
         <zip destfile="${output}/${output.name}.zip">
@@ -491,4 +461,4 @@
     </target>
 </project>
 
-<!-- vim: set ts=4 sw=4 et nowrap: -->
+    <!-- vim: set ts=4 sw=4 et nowrap: -->

compiler/android-tests/android-module/android-module.iml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
+        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
+        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
+        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
+        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
+        <option name="APK_PATH" value="" />
+        <option name="LIBRARY_PROJECT" value="false" />
+        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
+        <option name="GENERATE_UNSIGNED_APK" value="false" />
+        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
+        <option name="PACK_TEST_CODE" value="false" />
+        <option name="RUN_PROGUARD" value="false" />
+        <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
+        <resOverlayFolders>
+          <path>/res-overlay</path>
+        </resOverlayFolders>
+        <includeSystemProguardFile>true</includeSystemProguardFile>
+        <includeAssetsFromLibraries>false</includeAssetsFromLibraries>
+        <additionalNativeLibs />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android 2.3.3 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

compiler/android-tests/android-module/android-module.ipr

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
+    </excludeFromCompile>
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/android-module.iml" filepath="$PROJECT_DIR$/android_module.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android_SDK" project-jdk-type="Android SDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
+

compiler/android-tests/android-module/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-10
+target=android-16

compiler/android-tests/android-module/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">android1</string>
+</resources>

compiler/android-tests/android-module/src/org/jetbrains/jet/compiler/android/AbstractCodegenTestCaseOnAndroid.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,16 +21,14 @@ import junit.framework.TestCase;
 import java.lang.String;
 import java.lang.reflect.Method;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class AbstractCodegenTestCaseOnAndroid extends TestCase {
 
     protected void invokeBoxMethod(String filePath, String expectedResult) throws Exception {
         try {
             Class clazz;
-            clazz = Class.forName(filePath.replaceAll("\\\\|-|\\.|/", "_") + ".namespace");
+            String packageName = filePath.replaceAll("\\\\|-|\\.|/", "_");
+            clazz = Class.forName(packageName + "." + getPackageClassName(packageName));
             Method method;
             method = clazz.getMethod("box");
             assertEquals(expectedResult, method.invoke(null));
@@ -39,4 +37,8 @@ public class AbstractCodegenTestCaseOnAndroid extends TestCase {
             throw new RuntimeException("File: " + filePath, e);
         }
     }
+
+    public static String getPackageClassName(String packageName) {
+        return Character.toUpperCase(packageName.charAt(0)) + packageName.substring(1, packageName.length()) + "Package";
+    }
 }

compiler/android-tests/android-module/src/org/jetbrains/jet/compiler/android/MyActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package test;
+package org.jetbrains.jet.compiler.android;
 
-import awt.Frame;
+import android.app.Activity;
+import android.os.Bundle;
 
-public class JFrame extends Frame {
-    public JFrame() {
+public class MyActivity extends Activity {
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        System.out.println(R.string.app_name);
     }
-
-    protected String accessibleContext = null;
-}
-
+}

compiler/android-tests/android-tests.iml

@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="backend" />
+    <orderEntry type="library" name="jps-test" level="project" />
   </component>
 </module>
 

compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.*;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.compiler.ant.AntRunner;
 import org.jetbrains.jet.compiler.download.SDKDownloader;
@@ -32,9 +33,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class CodegenTestsOnAndroidRunner {
     private static final Pattern ERROR_IN_TEST_OUTPUT_PATTERN =
@@ -56,20 +54,19 @@ public class CodegenTestsOnAndroidRunner {
         TestSuite suite = new TestSuite("MySuite");
 
         String resultOutput = runTests();
+        if (resultOutput == null) return suite;
+
         // Test name -> stackTrace
         final Map<String, String> resultMap = parseOutputForFailedTests(resultOutput);
         final Statistics statistics;
 
         // If map is empty => there are no failed tests
         if (resultMap.isEmpty()) {
-            // Clear tmp folder where we run android tests
-            FileUtil.delete(new File(pathManager.getTmpFolder()));
-
             statistics = parseOutputForTestsNumberIfTestsPassed(resultOutput);
         }
         else {
             statistics = parseOutputForTestsNumberIfThereIsFailedTests(resultOutput);
-            
+
             for (final Map.Entry<String, String> entry : resultMap.entrySet()) {
 
                 suite.addTest(new TestCase("run") {
@@ -85,7 +82,7 @@ public class CodegenTestsOnAndroidRunner {
                 });
             }
         }
-        
+
         Assert.assertNotNull("Cannot parse number of failed tests from final line", statistics);
         Assert.assertEquals("Number of stackTraces != failed tests on the final line", resultMap.size(),
                             statistics.failed + statistics.errors);
@@ -125,7 +122,7 @@ public class CodegenTestsOnAndroidRunner {
     [exec] ...............
     [exec] Error in testKt529:
     */
-    private Map<String, String> parseOutputForFailedTests(String output) {
+    private Map<String, String> parseOutputForFailedTests(@NotNull String output) {
         Map<String, String> result = new HashMap<String, String>();
         StringBuilder builder = new StringBuilder();
         String failedTestNamePrefix = " Error in ";
@@ -171,6 +168,7 @@ public class CodegenTestsOnAndroidRunner {
     }
 
 
+    @Nullable
     public String runTests() {
         ApplicationManager.setApplication(null, new Disposable() {
             @Override
@@ -193,23 +191,31 @@ public class CodegenTestsOnAndroidRunner {
 
         antRunner.packLibraries();
 
-        emulator.createEmulator();
-        emulator.startEmulator();
         try {
-            emulator.waitEmulatorStart();
-            antRunner.cleanOutput();
-            antRunner.compileSources();
-            antRunner.installApplicationOnEmulator();
-            return antRunner.runTestsOnEmulator();
-        }
-        finally {
+            emulator.createEmulator();
+            emulator.startEmulator();
+
             try {
+                emulator.waitEmulatorStart();
+                antRunner.cleanOutput();
+                antRunner.compileSources();
+                antRunner.installApplicationOnEmulator();
+                return antRunner.runTestsOnEmulator();
+            }
+            catch (RuntimeException e) {
+                e.printStackTrace();
+                throw e;
+            }
+            finally {
                 emulator.stopEmulator();
             }
-            catch (Throwable t) {
-                System.err.println("Exception during stopping emulator:");
-                t.printStackTrace();
-            }
+        }
+        catch (RuntimeException e) {
+            e.printStackTrace();
+            throw e;
+        }
+        finally {
+            emulator.finishEmulatorProcesses();
         }
     }
 

compiler/android-tests/src/org/jetbrains/jet/compiler/OutputUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,6 @@ import org.jetbrains.jet.compiler.run.result.RunResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class OutputUtils {
 

compiler/android-tests/src/org/jetbrains/jet/compiler/PathManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@ package org.jetbrains.jet.compiler;
 
 import java.io.File;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class PathManager {
 

compiler/android-tests/src/org/jetbrains/jet/compiler/ThreadUtils.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.compiler;
+
+import java.lang.InterruptedException;
+import java.lang.RuntimeException;
+import java.lang.Thread;
+
+public class ThreadUtils {
+    public static void wait(Thread thread, int seconds) {
+        try {
+            thread.wait(seconds * 1000);
+        }
+        catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void sleep(int seconds) {
+        try {
+            Thread.sleep(seconds * 1000);
+        }
+        catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

compiler/android-tests/src/org/jetbrains/jet/compiler/ant/AntRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,15 +20,13 @@ import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.util.SystemInfo;
 import org.jetbrains.jet.compiler.OutputUtils;
 import org.jetbrains.jet.compiler.PathManager;
+import org.jetbrains.jet.compiler.ThreadUtils;
 import org.jetbrains.jet.compiler.run.RunUtils;
 import org.jetbrains.jet.compiler.run.result.RunResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class AntRunner {
     private final List<String> listOfAntCommands;
@@ -71,7 +69,9 @@ public class AntRunner {
             return;
         }
         else {
-            System.out.println(resultOutput);
+            if (result.getStatus()) {
+                System.out.println(resultOutput);
+            }
         }
         OutputUtils.checkResult(result);
     }
@@ -86,14 +86,9 @@ public class AntRunner {
 
     private static boolean isInstallSuccessful(String output) {
         if (output.contains("Is the system running?")) {
-            try {
-                System.out.println("Device not ready. Waiting for 20 sec.");
-                Thread.sleep(20000);
-                return false;
-            }
-            catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
+            System.out.println("Device not ready. Waiting for 20 sec.");
+            ThreadUtils.sleep(20);
+            return false;
         }
         return true;
     }

compiler/android-tests/src/org/jetbrains/jet/compiler/download/SDKDownloader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,12 +27,10 @@ import java.net.URLConnection;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class SDKDownloader {
     private final String platformZipPath;
+    private final String systemImages;
     private final String platformToolsZipPath;
     private final String toolsZipPath;
     private final String antZipPath;
@@ -42,25 +40,30 @@ public class SDKDownloader {
     public SDKDownloader(PathManager pathManager) {
         this.pathManager = pathManager;
         platformZipPath = pathManager.getRootForDownload() + "/platforms.zip";
+        systemImages = pathManager.getRootForDownload() + "/system-images.zip";
         platformToolsZipPath = pathManager.getRootForDownload() + "/platform-tools.zip";
         toolsZipPath = pathManager.getRootForDownload() + "/tools.zip";
         antZipPath = pathManager.getRootForDownload() + "/apache-ant-1.8.0.zip";
     }
 
     public void downloadPlatform() {
-        download("https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip", platformZipPath);  //Same for all platforms
+        download("http://dl-ssl.google.com/android/repository/android-16_r04.zip", platformZipPath);  //Same for all platforms
+    }
+
+    private void downloadAbi() {
+        download("http://dl.google.com/android/repository/sysimg_armv7a-16_r03.zip", systemImages);  //Same for all platforms
     }
 
     public void downloadPlatformTools() {
         String downloadURL;
         if (SystemInfo.isWindows) {
-            downloadURL = "http://dl-ssl.google.com/android/repository/platform-tools_r11-windows.zip";
+            downloadURL = "http://dl-ssl.google.com/android/repository/platform-tools_r16-windows.zip";
         }
         else if (SystemInfo.isMac) {
-            downloadURL = "http://dl-ssl.google.com/android/repository/platform-tools_r11-macosx.zip";
+            downloadURL = "http://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip";
         }
         else if (SystemInfo.isUnix) {
-            downloadURL = "http://dl-ssl.google.com/android/repository/platform-tools_r11-linux.zip";
+            downloadURL = "http://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip";
         }
         else {
             throw new IllegalStateException("Your operating system doesn't supported yet.");
@@ -71,13 +74,13 @@ public class SDKDownloader {
     public void downloadTools() {
         String downloadURL;
         if (SystemInfo.isWindows) {
-            downloadURL = "http://dl.google.com/android/repository/tools_r19-windows.zip";
+            downloadURL = "http://dl.google.com/android/repository/tools_r16-windows.zip";
         }
         else if (SystemInfo.isMac) {
-            downloadURL = "http://dl.google.com/android/repository/tools_r19-macosx.zip";
+            downloadURL = "http://dl.google.com/android/repository/tools_r16-macosx.zip";
         }
         else if (SystemInfo.isUnix) {
-            downloadURL = "http://dl.google.com/android/repository/tools_r19-linux.zip";
+            downloadURL = "http://dl.google.com/android/repository/tools_r16-linux.zip";
         }
         else {
             throw new IllegalStateException("Your operating system doesn't supported yet.");
@@ -91,13 +94,16 @@ public class SDKDownloader {
 
     public void downloadAll() {
         downloadTools();
+        downloadAbi();
         downloadPlatform();
         downloadPlatformTools();
         downloadAnt();
     }
 
+
     public void unzipAll() {
         unzip(platformZipPath, pathManager.getPlatformFolderInAndroidSdk());
+        unzip(systemImages, pathManager.getAndroidSdkRoot() + "/system-images/android-16/");
         unzip(platformToolsZipPath, pathManager.getAndroidSdkRoot());
         unzip(toolsZipPath, pathManager.getAndroidSdkRoot());
         unzip(antZipPath, pathManager.getDependenciesRoot());

compiler/android-tests/src/org/jetbrains/jet/compiler/emulator/Emulator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,10 @@ package org.jetbrains.jet.compiler.emulator;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.compiler.OutputUtils;
 import org.jetbrains.jet.compiler.PathManager;
+import org.jetbrains.jet.compiler.ThreadUtils;
 import org.jetbrains.jet.compiler.run.RunUtils;
 import org.jetbrains.jet.compiler.run.result.RunResult;
 
@@ -28,15 +30,11 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class Emulator {
 
     private final static Pattern EMULATOR_PATTERN = Pattern.compile("emulator-([0-9])*");
-    
-    
+
     private final PathManager pathManager;
 
     public Emulator(PathManager pathManager) {
@@ -86,34 +84,50 @@ public class Emulator {
         return commandLine;
     }
 
+    @Nullable
     private GeneralCommandLine getStopCommand() {
-        GeneralCommandLine commandLine = new GeneralCommandLine();
         if (SystemInfo.isWindows) {
+            GeneralCommandLine commandLine = new GeneralCommandLine();
             commandLine.setExePath("taskkill");
             commandLine.addParameter("/F");
             commandLine.addParameter("/IM");
             commandLine.addParameter("emulator-arm.exe");
+            return commandLine;
         }
-        else {
-            commandLine.setExePath(pathManager.getPlatformToolsFolderInAndroidSdk() + "/adb");
-            commandLine.addParameter("emu");
-            commandLine.addParameter("kill");
-        }
-        return commandLine;
+        return null;
     }
 
     public void createEmulator() {
         System.out.println("Creating emulator...");
-        OutputUtils.checkResult(RunUtils.execute(getCreateCommand(), "no"));
+        OutputUtils.checkResult(RunUtils.execute(new RunUtils.RunSettings(getCreateCommand(), "no", true, null, false)));
     }
 
+    public void startServer() {
+        GeneralCommandLine commandLine = new GeneralCommandLine();
+        String adbCmdName = SystemInfo.isWindows ? "adb.exe" : "adb";
+        commandLine.setExePath(pathManager.getPlatformToolsFolderInAndroidSdk() + "/" + adbCmdName);
+        commandLine.addParameter("start-server");
+        System.out.println("Start adb server...");
+        OutputUtils.checkResult(RunUtils.execute(commandLine));
+    }
 
     public void startEmulator() {
+        startServer();
         System.out.println("Starting emulator...");
-        stopRedundantEmulators(pathManager);
-        OutputUtils.checkResult(RunUtils.executeOnSeparateThread(getStartCommand(), false));
+        RunUtils.executeOnSeparateThread(new RunUtils.RunSettings(getStartCommand(), null, false, "START: ", true));
+        printLog();
     }
 
+    public void printLog() {
+        GeneralCommandLine commandLine = new GeneralCommandLine();
+        String adbCmdName = SystemInfo.isWindows ? "adb.exe" : "adb";
+        commandLine.setExePath(pathManager.getPlatformToolsFolderInAndroidSdk() + "/" + adbCmdName);
+        commandLine.addParameter("logcat");
+        commandLine.addParameter("-v");
+        commandLine.addParameter("time");
+        commandLine.addParameter("*:I");
+        RunUtils.executeOnSeparateThread(new RunUtils.RunSettings(commandLine, null, false, "LOGCAT: ", true));
+    }
 
     public void waitEmulatorStart() {
         System.out.println("Waiting for emulator start...");
@@ -122,46 +136,53 @@ public class Emulator {
 
     public void stopEmulator() {
         System.out.println("Stopping emulator...");
-        OutputUtils.checkResult(RunUtils.execute(getStopCommand()));
-        System.out.println("Stopping adb...");
-        OutputUtils.checkResult(RunUtils.execute(getStopCommandForAdb()));
-        if (SystemInfo.isUnix) {
-            finishProcess("emulator-arm");
-            finishProcess("adb");
-            stopDdmsProcess();
+        if (SystemInfo.isWindows) {
+            OutputUtils.checkResult(RunUtils.execute(getStopCommand()));
         }
+        finishProcess("emulator-arm");
     }
 
     //Only for Unix
     private void stopDdmsProcess() {
-        GeneralCommandLine listOfEmulatorProcess = new GeneralCommandLine();
-        listOfEmulatorProcess.setExePath("sh");
-        listOfEmulatorProcess.addParameter("-c");
-        listOfEmulatorProcess.addParameter("ps aux | grep emulator");
-        RunResult runResult = RunUtils.execute(listOfEmulatorProcess);
-        OutputUtils.checkResult(runResult);
-        String pidFromPsCommand = OutputUtils.getPidFromPsCommand(runResult.getOutput());
-        if (pidFromPsCommand != null) {
-            GeneralCommandLine killCommand = new GeneralCommandLine();
-            killCommand.setExePath("kill");
-            killCommand.addParameter(pidFromPsCommand);
-            OutputUtils.checkResult(RunUtils.execute(killCommand));
+        if (SystemInfo.isUnix) {
+            GeneralCommandLine listOfEmulatorProcess = new GeneralCommandLine();
+            listOfEmulatorProcess.setExePath("sh");
+            listOfEmulatorProcess.addParameter("-c");
+            listOfEmulatorProcess.addParameter("ps aux | grep emulator");
+            RunResult runResult = RunUtils.execute(listOfEmulatorProcess);
+            OutputUtils.checkResult(runResult);
+            String pidFromPsCommand = OutputUtils.getPidFromPsCommand(runResult.getOutput());
+            if (pidFromPsCommand != null) {
+                GeneralCommandLine killCommand = new GeneralCommandLine();
+                killCommand.setExePath("kill");
+                killCommand.addParameter(pidFromPsCommand);
+                RunUtils.execute(killCommand);
+            }
         }
     }
 
+    public void finishEmulatorProcesses() {
+        System.out.println("Stopping adb...");
+        OutputUtils.checkResult(RunUtils.execute(getStopCommandForAdb()));
+        finishProcess("adb");
+        stopDdmsProcess();
+    }
+
     //Only for Unix
     private void finishProcess(String processName) {
-        GeneralCommandLine pidOfProcess = new GeneralCommandLine();
-        pidOfProcess.setExePath("pidof");
-        pidOfProcess.addParameter(processName);
-        RunResult runResult = RunUtils.execute(pidOfProcess);
-        String processIdsStr = runResult.getOutput().substring(("pidof " + processName).length());
-        List<String> processIds = StringUtil.getWordsIn(processIdsStr);
-        for (String pid : processIds) {
-            GeneralCommandLine killCommand = new GeneralCommandLine();
-            killCommand.setExePath("kill");
-            killCommand.addParameter(pid);
-            OutputUtils.checkResult(RunUtils.execute(killCommand));
+        if (SystemInfo.isUnix) {
+            GeneralCommandLine pidOfProcess = new GeneralCommandLine();
+            pidOfProcess.setExePath("pidof");
+            pidOfProcess.addParameter(processName);
+            RunResult runResult = RunUtils.execute(pidOfProcess);
+            String processIdsStr = runResult.getOutput().substring(("pidof " + processName).length());
+            List<String> processIds = StringUtil.getWordsIn(processIdsStr);
+            for (String pid : processIds) {
+                GeneralCommandLine killCommand = new GeneralCommandLine();
+                killCommand.setExePath("kill");
+                killCommand.addParameter(pid);
+                RunUtils.execute(killCommand);
+            }
         }
     }
 
@@ -202,5 +223,4 @@ public class Emulator {
         }
         OutputUtils.checkResult(RunUtils.execute(commandLineForListOfDevices));
     }
-   
 }

compiler/android-tests/src/org/jetbrains/jet/compiler/run/PermissionManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,6 @@ import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.openapi.util.SystemInfo;
 import org.jetbrains.jet.compiler.PathManager;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class PermissionManager {
     private PermissionManager() {

compiler/android-tests/src/org/jetbrains/jet/compiler/run/RunUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,13 @@ import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.process.ProcessOutputTypes;
-import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.util.text.StringUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.compiler.OutputUtils;
+import org.jetbrains.jet.compiler.ThreadUtils;
 import org.jetbrains.jet.compiler.run.result.RunResult;
 
 import java.io.Closeable;
@@ -35,60 +37,81 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class RunUtils {
     private RunUtils() {
     }
 
-    public static RunResult execute(final GeneralCommandLine commandLine) {
-        return run(commandLine, null);
+    public static class RunSettings {
+        public final GeneralCommandLine commandLine;
+        public final String input;
+        public final boolean waitForEnd;
+        public final String outputPrefix;
+        public final boolean printOutputAtAppearance;
+
+        public RunSettings(
+                GeneralCommandLine commandLine,
+                @Nullable String input,
+                boolean waitForEnd,
+                @Nullable String outputPrefix,
+                boolean printOutputAtAppearance
+        ) {
+            this.commandLine = commandLine;
+            this.input = input;
+            this.waitForEnd = waitForEnd;
+            this.outputPrefix = outputPrefix;
+            this.printOutputAtAppearance = printOutputAtAppearance;
+        }
+
+        public RunSettings(GeneralCommandLine commandLine) {
+            this.commandLine = commandLine;
+            this.input = null;
+            this.waitForEnd = true;
+            this.outputPrefix = null;
+            this.printOutputAtAppearance = false;
+        }
+
+        @Override
+        public String toString() {
+            return "commandLine=" + commandLine.getCommandLineString() + " " +
+                   "input=" + input + " " +
+                   "waitForEnd=" + waitForEnd + " " +
+                   "outputPrefix=" + outputPrefix + " " +
+                   "printOutputAtAppearance=" + printOutputAtAppearance + " ";
+        }
     }
 
-    public static RunResult execute(final GeneralCommandLine commandLine, @Nullable String input) {
-        return run(commandLine, input);
+    public static RunResult execute(@NotNull GeneralCommandLine commandLine) {
+        return run(new RunSettings(commandLine));
     }
 
-    public static RunResult executeOnSeparateThread(final GeneralCommandLine commandLine, boolean waitForEnd) {
-        return executeOnSeparateThread(commandLine, waitForEnd, null);
+    public static RunResult execute(@NotNull RunSettings settings) {
+        assert settings.waitForEnd == true : "Use executeOnSeparateThread() instead";
+        return run(settings);
     }
 
-    public static RunResult executeOnSeparateThread(final GeneralCommandLine commandLine,
-            boolean waitForEnd,
-            @Nullable final String input) {
-        final Ref<RunResult> resultRef = new Ref<RunResult>();
+    public static void executeOnSeparateThread(@NotNull final RunSettings settings) {
+        assert settings.waitForEnd == false : "Use execute() instead";
         Thread t = new Thread(new Runnable() {
             @Override
             public void run() {
-                resultRef.set(RunUtils.run(commandLine, input));
+                RunUtils.run(settings);
             }
         });
 
         t.start();
-
-        if (waitForEnd) {
-            try {
-                t.wait(300000);
-                return resultRef.get();
-            }
-            catch (InterruptedException e) {
-                new RunResult(false, getStackTrace(e));
-            }
-        }
-        return new RunResult(true, "OK");
     }
 
-    private static RunResult run(final GeneralCommandLine commandLine, @Nullable final String input) {
+    private static RunResult run(final RunSettings settings) {
+        System.out.println("RUN COMMAND: " + settings);
         final StringBuilder stdOut = new StringBuilder();
         final StringBuilder stdErr = new StringBuilder();
 
         final OSProcessHandler handler;
         try {
-            handler = new OSProcessHandler(commandLine.createProcess(), commandLine.getCommandLineString(), Charsets.UTF_8);
-            if (input != null) {
-                handler.getProcessInput().write(input.getBytes());
+            handler = new OSProcessHandler(settings.commandLine.createProcess(), settings.commandLine.getCommandLineString(), Charsets.UTF_8);
+            if (settings.input != null) {
+                handler.getProcessInput().write(settings.input.getBytes());
             }
             close(handler.getProcessInput());
         }
@@ -99,38 +122,56 @@ public class RunUtils {
             return new RunResult(false, getStackTrace(e));
         }
 
-        final ProcessAdapter listener = new ProcessAdapter() {
+        handler.addProcessListener(new ProcessAdapter() {
             @Override
-            public void onTextAvailable(final ProcessEvent event, final Key outputType) {
+            public void processTerminated(ProcessEvent event) {
+                System.out.println("TERMINATED: " + settings.commandLine);
+                super.processTerminated(event);
+            }
+
+            @Override
+            public void onTextAvailable(ProcessEvent event, Key outputType) {
                 String str = event.getText();
                 if (outputType == ProcessOutputTypes.STDOUT || outputType == ProcessOutputTypes.SYSTEM) {
-                    stdOut.append(str);
-                    if (!commandLine.getCommandLineString().contains("install")) {
-                        System.out.print(str);
-                    }
+                    appendToContent(stdOut, str);
                 }
                 else if (outputType == ProcessOutputTypes.STDERR) {
-                    stdErr.append(str);
-                    System.err.print(str);
+                    appendToContent(stdErr, str);
                 }
             }
-        };
 
-        handler.addProcessListener(listener);
+            private synchronized void appendToContent(StringBuilder content, String line) {
+                if (settings.printOutputAtAppearance) {
+                    System.out.println(getPrefixString() + StringUtil.trimTrailing(line));
+                    System.out.flush();
+                }
+                else {
+                    content.append(getPrefixString());
+                    content.append(StringUtil.trimTrailing(line));
+                    content.append("\n");
+                }
+            }
+
+            private String getPrefixString() {
+                return (settings.outputPrefix != null) ? settings.outputPrefix + " " : "";
+            }
+        });
+
         handler.startNotify();
 
-        try {
-            handler.waitFor(300000);
-        }
-        catch (ProcessCanceledException e) {
-            return new RunResult(false, getStackTrace(e));
-        }
+        if (settings.waitForEnd) {
+            handler.waitFor(400000);
 
-        if (!handler.isProcessTerminated()) {
-            return new RunResult(false, "Timeout exception: execution was terminated after 5 min.");
+            if (!handler.isProcessTerminated()) {
+                System.out.println("Output before handler.isProcessTerminated() " + settings.commandLine);
+                System.out.println(stdOut);
+                System.err.println(stdErr);
+                return new RunResult(false, "Timeout exception: execution was terminated after ~7 min.");
+            }
+        }
+        else {
+            handler.waitFor();
         }
-
-        handler.removeProcessListener(listener);
 
         int exitCode = handler.getProcess().exitValue();
 
@@ -142,6 +183,9 @@ public class RunUtils {
             if (OutputUtils.isBuildFailed(output)) {
                 return new RunResult(false, output);
             }
+            if (!settings.commandLine.getCommandLineString().contains("install")) {
+                System.out.print(output);
+            }
             return new RunResult(true, output);
         }
     }
@@ -174,5 +218,5 @@ public class RunUtils {
         }
         return writer.toString();
     }
-    
+
 }

compiler/android-tests/src/org/jetbrains/jet/compiler/run/result/RunResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.jetbrains.jet.compiler.run.result;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class RunResult {
     private final boolean status;

compiler/android-tests/tests/org/jetbrains/jet/compiler/android/AndroidJpsBuildTestCase.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.compiler.android;
+
+import org.jetbrains.jps.builders.JpsBuildTestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+public class AndroidJpsBuildTestCase extends JpsBuildTestCase {
+    private static final String PROJECT_NAME = "android-module";
+    private static final String SDK_NAME = "Android_SDK";
+
+    private final File workDir = new File(AndroidRunner.getPathManager().getTmpFolder());
+
+    public void doTest() {
+        initProject();
+        rebuildAll();
+        makeAll().assertSuccessful();
+    }
+
+    @Override
+    protected String getProjectName() {
+        return "android-module";
+    }
+
+    @Override
+    protected void runTest() throws Throwable {
+        doTest();
+    }
+
+    @Override
+    public String getName() {
+        return "AndroidJpsTest";
+    }
+
+    @Override
+    protected File doGetProjectDir() throws IOException {
+        return workDir;
+    }
+
+    private void initProject() {
+        addJdk(SDK_NAME, AndroidRunner.getPathManager().getPlatformFolderInAndroidSdk() + "/android.jar");
+        loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr");
+    }
+}

compiler/android-tests/tests/org/jetbrains/jet/compiler/android/AndroidRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,35 +19,43 @@ package org.jetbrains.jet.compiler.android;
 import com.google.common.io.Files;
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.TestSuite;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.compiler.CodegenTestsOnAndroidRunner;
 import org.jetbrains.jet.compiler.PathManager;
 
 import java.io.File;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class AndroidRunner extends TestSuite {
 
+    private static PathManager pathManager;
+
+    @NotNull
+    public static PathManager getPathManager() {
+        if (pathManager == null) {
+            File tmpFolder = Files.createTempDir();
+            System.out.println("Created temporary folder for running android tests: " + tmpFolder.getAbsolutePath());
+            File rootFolder = new File("");
+            pathManager = new PathManager(rootFolder.getAbsolutePath(), tmpFolder.getAbsolutePath());
+        }
+        return pathManager;
+    }
+
     public static TestSuite suite() throws Throwable {
-        File tmpFolder = Files.createTempDir();
-        System.out.println("Created temporary folder for running android tests: " + tmpFolder.getAbsolutePath());
-        File rootFolder = new File("");
-        PathManager pathManager = new PathManager(rootFolder.getAbsolutePath(), tmpFolder.getAbsolutePath());
+        PathManager pathManager = getPathManager();
 
         FileUtil.copyDir(new File(pathManager.getAndroidModuleRoot()), new File(pathManager.getTmpFolder()));
         
-        try {
-            CodegenTestsOnAndroidGenerator.generate(pathManager);
-        } 
-        catch(Throwable e) {
-            FileUtil.delete(new File(pathManager.getTmpFolder()));
-            throw new RuntimeException(e);
-        }
-        
+        CodegenTestsOnAndroidGenerator.generate(pathManager);
+
         System.out.println("Run tests on android...");
-        return CodegenTestsOnAndroidRunner.getTestSuite(pathManager);
+        TestSuite suite = CodegenTestsOnAndroidRunner.getTestSuite(pathManager);
+        suite.addTest(new AndroidJpsBuildTestCase());
+        return suite;
+    }
+
+    public void tearDown() throws Exception {
+        // Clear tmp folder where we run android tests
+        FileUtil.delete(new File(pathManager.getTmpFolder()));
     }
-    
 }

compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.UsefulTestCase;
 import junit.framework.Assert;
-import org.jetbrains.jet.CompileCompilerDependenciesTest;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.TestJdkKind;
@@ -37,14 +36,10 @@ import org.jetbrains.jet.utils.Printer;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
 
@@ -57,8 +52,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
 
     private JetCoreEnvironment environmentWithMockJdk = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS);
     private JetCoreEnvironment environmentWithFullJdk = JetTestUtils.createEnvironmentWithFullJdk(myTestRootDisposable);
-    private JetCoreEnvironment environmentWithFullJdkAndJUnit;
-    
+
     private final Pattern packagePattern = Pattern.compile("package (.*)");
 
     private final List<String> generatedTestNames = Lists.newArrayList();
@@ -69,16 +63,6 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
 
     private CodegenTestsOnAndroidGenerator(PathManager pathManager) {
         this.pathManager = pathManager;
-
-        File junitJar = new File("libraries/lib/junit-4.9.jar");
-
-        if (!junitJar.exists()) {
-            throw new AssertionError();
-        }
-
-        environmentWithFullJdkAndJUnit = new JetCoreEnvironment(myTestRootDisposable, CompileCompilerDependenciesTest.compilerConfigurationForTests(
-                ConfigurationKind.ALL, TestJdkKind.FULL_JDK, JetTestUtils.getAnnotationsJar(), junitJar));
-
     }
 
     private void generateOutputFiles() throws Throwable {
@@ -135,8 +119,6 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
         Assert.assertNotNull("Folder with testData is empty: " + dir.getAbsolutePath(), files);
         Set<String> excludedFiles = SpecialFiles.getExcludedFiles();
         Set<String> filesCompiledWithoutStdLib = SpecialFiles.getFilesCompiledWithoutStdLib();
-        Set<String> filesCompiledWithJUnit = SpecialFiles.getFilesCompiledWithJUnit();
-        Map<String, String> filesWithSpecialResult = SpecialFiles.getFilesWithSpecialResult();
         for (File file : files) {
             if (excludedFiles.contains(file.getName())) {
                 continue;
@@ -155,21 +137,11 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
                     if (filesCompiledWithoutStdLib.contains(file.getName())) {
                         factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithMockJdk);
                     }
-                    else if (filesCompiledWithJUnit.contains(file.getName())) {
-                        factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithFullJdkAndJUnit);
-                    }
                     else {
                         factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithFullJdk);
                     }
 
-                    String specialResult = filesWithSpecialResult.get(file.getName());
-                    if (specialResult != null) {
-                        generateTestMethodWithExpectedResult(p, generatedTestName, StringUtil.escapeStringCharacters(file.getPath()),
-                                                             specialResult);
-                    }
-                    else {
-                        generateTestMethod(p, generatedTestName, StringUtil.escapeStringCharacters(file.getPath()));
-                    }
+                    generateTestMethod(p, generatedTestName, StringUtil.escapeStringCharacters(file.getPath()));
                     File outputDir = new File(pathManager.getOutputForCompiledFiles());
                     if (!outputDir.exists()) {
                         outputDir.mkdirs();
@@ -208,19 +180,15 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
         }
     }
 
-    private static void generateTestMethodWithExpectedResult(Printer p, String testName, String namespace, String expectedResult) {
+    private static void generateTestMethod(Printer p, String testName, String namespace) {
         p.println("public void test" + testName + "() throws Exception {");
         p.pushIndent();
-        p.println("invokeBoxMethod(\"" + namespace + "\", \"" + expectedResult + "\");");
+        p.println("invokeBoxMethod(\"" + namespace + "\", \"OK\");");
         p.popIndent();
         p.println("}");
         p.println();
     }
 
-    private static void generateTestMethod(Printer p, String testName, String namespace) {
-        generateTestMethodWithExpectedResult(p, testName, namespace, "OK");
-    }
-
     private String generateTestName(String fileName) {
         String result = FileUtil.getNameWithoutExtension(StringUtil.capitalize(fileName));
 

compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +16,21 @@
 
 package org.jetbrains.jet.compiler.android;
 
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import java.util.Map;
 import java.util.Set;
 
-/**
- * @author Natalia.Ukhorskaya
- */
 
 public class SpecialFiles {
     private static final Set<String> excludedFiles = Sets.newHashSet();
     private static final Set<String> filesCompiledWithoutStdLib = Sets.newHashSet();
-    private static final Set<String> filesCompiledWithJUnit = Sets.newHashSet();
-    private static final Map<String, String> filesWithSpecialResult = Maps.newHashMap();
 
     static {
         fillExcludedFiles();
         fillFilesCompiledWithoutStdLib();
-        fillFilesCompiledWithJUnit();
-        fillFilesWithSpecialResult();
     }
 
 
-    public static Set<String> getFilesCompiledWithJUnit() {
-        return filesCompiledWithJUnit;
-    }
-
     public static Set<String> getExcludedFiles() {
         return excludedFiles;
     }
@@ -52,82 +39,39 @@ public class SpecialFiles {
         return filesCompiledWithoutStdLib;
     }
 
-    public static Map<String, String> getFilesWithSpecialResult() {
-        return filesWithSpecialResult;
-    }
-
-    private static void fillFilesWithSpecialResult() {
-        filesWithSpecialResult.put("kt2398.kt", "OKKO");
-    }
-
-    private static void fillFilesCompiledWithJUnit() {
-        filesCompiledWithJUnit.add("kt2334.kt");
-    }
-
     private static void fillFilesCompiledWithoutStdLib() {
         filesCompiledWithoutStdLib.add("kt1980.kt");
         filesCompiledWithoutStdLib.add("kt1953_class.kt"); // Exception in code
-        filesCompiledWithoutStdLib.add("basicmethodSuperClass.jet"); // Exception in code
-        filesCompiledWithoutStdLib.add("kt503.jet"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt504.jet"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt772.jet"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt773.jet"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt796_797.jet"); // OVERLOAD_RESOLUTION_AMBIGUITY
-        filesCompiledWithoutStdLib.add("kt950.jet"); // OVERLOAD_RESOLUTION_AMBIGUITY
+        filesCompiledWithoutStdLib.add("basicmethodSuperClass.kt"); // Exception in code
+        filesCompiledWithoutStdLib.add("kt503.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
+        filesCompiledWithoutStdLib.add("kt504.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
+        filesCompiledWithoutStdLib.add("kt772.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
+        filesCompiledWithoutStdLib.add("kt773.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
+        filesCompiledWithoutStdLib.add("kt796_797.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
+        filesCompiledWithoutStdLib.add("kt950.kt"); // OVERLOAD_RESOLUTION_AMBIGUITY
         filesCompiledWithoutStdLib.add("kt2395.kt"); // With MOCK_JDK
     }
 
     private static void fillExcludedFiles() {
-        excludedFiles.add("kt2781.kt"); // Must compile Java files before
-        excludedFiles.add("simpleJavaInnerEnum.kt"); // Must compile Java files before
-        excludedFiles.add("referencesStaticInnerClassMethod.kt"); // Must compile Java files before
-        excludedFiles.add("referencesStaticInnerClassMethodL2.kt"); // Must compile Java files before
-        excludedFiles.add("simpleJavaEnum.kt"); // Must compile Java files before
-        excludedFiles.add("simpleJavaEnumWithFunction.kt"); // Must compile Java files before
-        excludedFiles.add("simpleJavaEnumWithStaticImport.kt"); // Must compile Java files before
-        excludedFiles.add("removeInIterator.kt"); // Must compile Java files before
-        excludedFiles.add("namespaceQualifiedMethod.jet"); // Cannot change package name
-        excludedFiles.add("kt1482_2279.kt"); // Cannot change package name
-        excludedFiles.add("kt1482.kt"); // Cannot change package name
-        excludedFiles.add("importFromClassObject.jet"); // Cannot find usages in Codegen tests
-        excludedFiles.add("withtypeparams.jet"); // Cannot find usages in Codegen tests
-        excludedFiles.add("kt1113.kt"); // Commented
-        excludedFiles.add("kt326.jet"); // Commented
-        excludedFiles.add("kt694.jet"); // Commented
-        excludedFiles.add("kt285.jet"); // Commented
-        excludedFiles.add("kt857.jet"); // Commented
-        excludedFiles.add("kt1120.kt"); // Commented
+        excludedFiles.add("boxWithJava");  // Must compile Java files before
+        excludedFiles.add("boxMultiFile"); // MultiFileTest not supported yet
+
+        excludedFiles.add("kt3238.kt"); // Reflection
+        excludedFiles.add("kt1482_2279.kt"); // Reflection
+
+        excludedFiles.add("nestedInPackage.kt"); // Cannot change package name
+        excludedFiles.add("importNestedClass.kt"); // Cannot change package name
+        excludedFiles.add("namespaceQualifiedMethod.kt"); // Cannot change package name
+
+        excludedFiles.add("kt326.kt"); // Commented
         excludedFiles.add("kt1213.kt"); // Commented
-        excludedFiles.add("kt882.jet"); // Commented
-        excludedFiles.add("kt789.jet"); // Commented
-        excludedFiles.add("enum.kt"); // Commented
-        excludedFiles.add("withclosure.kt"); // Commented
-        excludedFiles.add("isTypeParameter.jet"); // Commented
-        excludedFiles.add("nullability.jet"); // Commented
-        excludedFiles.add("genericFunction.jet"); // Commented
-        excludedFiles.add("forwardTypeParameter.jet"); // Commented
-        excludedFiles.add("kt259.jet"); // Commented
-        excludedFiles.add("classObjectMethod.jet"); // Commented
-        
-        excludedFiles.add("inRangeConditionsInWhen.jet"); // Commented
-        excludedFiles.add("kt1592.kt"); // Codegen don't execute blackBoxFile() on it
 
-        excludedFiles.add("box.kt");      // MultiFileTest not supported yet
-        excludedFiles.add("kt2060_1.kt"); // MultiFileTest not supported yet
-        excludedFiles.add("kt2257_1.kt"); // MultiFileTest not supported yet
-        excludedFiles.add("kt1528_1.kt"); // MultiFileTest not supported yet
-        excludedFiles.add("thisPackage.kt"); // MultiFileTest not supported yet
+        excludedFiles.add("kt684.kt"); // StackOverflow with StringBuilder (escape())
 
-        excludedFiles.add("kt684.jet"); // StackOverflow with StringBuilder (escape())
-
-        excludedFiles.add("kt344.jet"); // Bug KT-2251
         excludedFiles.add("kt529.kt");  // Bug
+        excludedFiles.add("kt344.kt");  // Bug
 
-        excludedFiles.add("noClassObjectForJavaClass.kt");
-
-        excludedFiles.add("doGenerateAssertions.kt"); // Multi-file + Java
-        excludedFiles.add("doNotGenerateAssertions.kt"); // Multi-file + Java
-        excludedFiles.add("doGenerateParamAssertions.kt"); // Java
+        excludedFiles.add("comparisonWithNullCallsFun.kt"); // java.lang.NoClassDefFoundError: jet.Nothing
     }
 
     private SpecialFiles() {

compiler/backend/src/org/jetbrains/jet/codegen/AccessorForFunctionDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jetbrains.jet.codegen;
 
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
@@ -25,9 +26,6 @@ import java.util.Collections;
 
 import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER;
 
-/**
- * @author alex.tkachman
- */
 public class AccessorForFunctionDescriptor extends SimpleFunctionDescriptorImpl {
     public AccessorForFunctionDescriptor(DeclarationDescriptor descriptor, DeclarationDescriptor containingDeclaration, int index) {
         super(containingDeclaration, Collections.<AnnotationDescriptor>emptyList(),

compiler/backend/src/org/jetbrains/jet/codegen/AccessorForPropertyDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,17 @@ package org.jetbrains.jet.codegen;
 
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl;
+import org.jetbrains.jet.lang.descriptors.impl.PropertyGetterDescriptorImpl;
+import org.jetbrains.jet.lang.descriptors.impl.PropertySetterDescriptorImpl;
+import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
 
 import java.util.Collections;
 
-/**
- * @author alex.tkachman
- */
-public class AccessorForPropertyDescriptor extends PropertyDescriptor {
+public class AccessorForPropertyDescriptor extends PropertyDescriptorImpl {
     public AccessorForPropertyDescriptor(PropertyDescriptor pd, DeclarationDescriptor containingDeclaration, int index) {
         super(containingDeclaration, Collections.<AnnotationDescriptor>emptyList(), Modality.FINAL, Visibilities.PUBLIC,
               pd.isVar(), Name.identifier(pd.getName() + "$b$" + index),
@@ -38,7 +39,7 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptor {
         initialize(new Getter(this), new Setter(this));
     }
 
-    public static class Getter extends PropertyGetterDescriptor {
+    public static class Getter extends PropertyGetterDescriptorImpl {
         public Getter(AccessorForPropertyDescriptor property) {
             super(property, Collections.<AnnotationDescriptor>emptyList(), Modality.FINAL, Visibilities.PUBLIC,
                   false,
@@ -47,7 +48,7 @@ public class AccessorForPropertyDescriptor extends PropertyDescriptor {
         }
     }
 
-    public static class Setter extends PropertySetterDescriptor {
+    public static class Setter extends PropertySetterDescriptorImpl {
         public Setter(AccessorForPropertyDescriptor property) {
             super(property, Collections.<AnnotationDescriptor>emptyList(), Modality.FINAL, Visibilities.PUBLIC,
                   false,

compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,9 +43,6 @@ import java.util.Map;
 
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.descriptorToDeclaration;
 
-/**
- * @author alex.tkachman
- */
 public abstract class AnnotationCodegen {
     private final JetTypeMapper typeMapper;
     private final BindingContext bindingContext;

compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
@@ -46,12 +47,10 @@ import java.util.Set;
 
 import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.CodegenUtil.isInterface;
+import static org.jetbrains.jet.codegen.CodegenUtil.isNullableType;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JAVA_STRING_TYPE;
 
-/**
- * @author alex.tkachman
- */
 public class AsmUtil {
     private static final Set<ClassDescriptor> PRIMITIVE_NUMBER_CLASSES = Sets.newHashSet(
             KotlinBuiltIns.getInstance().getByte(),
@@ -70,6 +69,8 @@ public class AsmUtil {
     private static final Map<Visibility, Integer> visibilityToAccessFlag = ImmutableMap.<Visibility, Integer>builder()
             .put(Visibilities.PRIVATE, ACC_PRIVATE)
             .put(Visibilities.PROTECTED, ACC_PROTECTED)
+            .put(JavaDescriptorResolver.PROTECTED_STATIC_VISIBILITY, ACC_PROTECTED)
+            .put(JavaDescriptorResolver.PROTECTED_AND_PACKAGE, ACC_PROTECTED)
             .put(Visibilities.PUBLIC, ACC_PUBLIC)
             .put(Visibilities.INTERNAL, ACC_PUBLIC)
             .put(Visibilities.LOCAL, NO_FLAG_LOCAL)
@@ -130,6 +131,51 @@ public class AsmUtil {
         }
     }
 
+    public static boolean isAbstract(FunctionDescriptor functionDescriptor, OwnerKind kind) {
+        return (functionDescriptor.getModality() == Modality.ABSTRACT
+                || isInterface(functionDescriptor.getContainingDeclaration()))
+               && !isStatic(kind)
+               && kind != OwnerKind.TRAIT_IMPL;
+    }
+
+    public static boolean isStatic(OwnerKind kind) {
+        return kind == OwnerKind.NAMESPACE || kind instanceof OwnerKind.StaticDelegateKind;
+    }
+
+    public static int getMethodAsmFlags(FunctionDescriptor functionDescriptor, OwnerKind kind) {
+        boolean isStatic = isStatic(kind);
+        boolean isAbstract = isAbstract(functionDescriptor, kind);
+
+        int flags = getCommonCallableFlags(functionDescriptor);
+
+        if (functionDescriptor.getModality() == Modality.FINAL) {
+            DeclarationDescriptor containingDeclaration = functionDescriptor.getContainingDeclaration();
+            if (!(containingDeclaration instanceof ClassDescriptor) ||
+                ((ClassDescriptor) containingDeclaration).getKind() != ClassKind.TRAIT) {
+                flags |= ACC_FINAL;
+            }
+        }
+
+        if (isStatic || kind == OwnerKind.TRAIT_IMPL) {
+            flags |= ACC_STATIC;
+        }
+
+        if (isAbstract) flags |= ACC_ABSTRACT;
+
+        return flags;
+    }
+
+    public static int getConstructorAsmFlags(FunctionDescriptor functionDescriptor) {
+        return getCommonCallableFlags(functionDescriptor);
+    }
+
+    private static int getCommonCallableFlags(FunctionDescriptor functionDescriptor) {
+        int flags = getVisibilityAccessFlag(functionDescriptor);
+        flags |= getVarargsFlag(functionDescriptor);
+        flags |= getDeprecatedAccessFlag(functionDescriptor);
+        return flags;
+    }
+
     //TODO: move mapping logic to front-end java
     public static int getVisibilityAccessFlag(@NotNull MemberDescriptor descriptor) {
         Integer specialCase = specialCaseVisibility(descriptor);
@@ -143,6 +189,20 @@ public class AsmUtil {
         return defaultMapping;
     }
 
+    /*
+        Use this method to get visibility flag for class to define it in byte code (v.defineClass method).
+        For other cases use getVisibilityAccessFlag(MemberDescriptor descriptor)
+        Classes in byte code should be public or package private
+     */
+    public static int getVisibilityAccessFlagForClass(ClassDescriptor descriptor) {
+        if (DescriptorUtils.isTopLevelDeclaration(descriptor) ||
+            descriptor.getVisibility() == Visibilities.PUBLIC ||
+            descriptor.getVisibility() == Visibilities.INTERNAL) {
+            return ACC_PUBLIC;
+        }
+        return NO_FLAG_PACKAGE_PRIVATE;
+    }
+
     public static int getModalityAccessFlag(@NotNull MemberDescriptor descriptor) {
         switch (descriptor.getModality()) {
             case ABSTRACT: return ACC_ABSTRACT;
@@ -164,6 +224,15 @@ public class AsmUtil {
         return 0;
     }
 
+    private static int getVarargsFlag(FunctionDescriptor functionDescriptor) {
+        if (!functionDescriptor.getValueParameters().isEmpty()
+            && functionDescriptor.getValueParameters().get(functionDescriptor.getValueParameters().size() - 1)
+                       .getVarargElementType() != null) {
+            return ACC_VARARGS;
+        }
+        return 0;
+    }
+
     @Nullable
     private static Integer specialCaseVisibility(@NotNull MemberDescriptor memberDescriptor) {
         DeclarationDescriptor containingDeclaration = memberDescriptor.getContainingDeclaration();
@@ -193,7 +262,7 @@ public class AsmUtil {
                 return ACC_PROTECTED;
             }
         }
-        if (containingDeclaration instanceof NamespaceDescriptor) {
+        if (DescriptorUtils.isTopLevelDeclaration(memberDescriptor)) {
             return ACC_PUBLIC;
         }
         return null;
@@ -224,7 +293,7 @@ public class AsmUtil {
 
     public static void genClosureFields(CalculatedClosure closure, ClassBuilder v, JetTypeMapper typeMapper) {
         final ClassifierDescriptor captureThis = closure.getCaptureThis();
-        final int access = ACC_PUBLIC | ACC_SYNTHETIC | ACC_FINAL;
+        final int access = NO_FLAG_PACKAGE_PRIVATE | ACC_SYNTHETIC | ACC_FINAL;
         if (captureThis != null) {
             v.newField(null, access, CAPTURED_THIS_FIELD, typeMapper.mapType(captureThis).getDescriptor(), null,
                        null);
@@ -243,10 +312,18 @@ public class AsmUtil {
     }
 
     public static void genInitSingletonField(Type classAsmType, InstructionAdapter iv) {
-        iv.anew(classAsmType);
+        genInitSingletonField(classAsmType, JvmAbi.INSTANCE_FIELD, classAsmType, iv);
+    }
+
+    public static void genInitSingletonField(FieldInfo info, InstructionAdapter iv) {
+        genInitSingletonField(info.getOwnerType(), info.getFieldName(), info.getFieldType(), iv);
+    }
+
+    public static void genInitSingletonField(Type fieldOwnerType, String fieldName, Type fieldAsmType, InstructionAdapter iv) {
+        iv.anew(fieldAsmType);
         iv.dup();
-        iv.invokespecial(classAsmType.getInternalName(), "<init>", "()V");
-        iv.putstatic(classAsmType.getInternalName(), JvmAbi.INSTANCE_FIELD, classAsmType.getDescriptor());
+        iv.invokespecial(fieldAsmType.getInternalName(), "<init>", "()V");
+        iv.putstatic(fieldOwnerType.getInternalName(), fieldName, fieldAsmType.getDescriptor());
     }
 
     public static void genStringBuilderConstructor(InstructionAdapter v) {
@@ -311,75 +388,6 @@ public class AsmUtil {
         mv.visitInsn(L2I);
     }
 
-    static StackValue compareExpressionsOnStack(InstructionAdapter v, IElementType opToken, Type operandType) {
-        if (operandType.getSort() == Type.OBJECT) {
-            v.invokeinterface("java/lang/Comparable", "compareTo", "(Ljava/lang/Object;)I");
-            v.iconst(0);
-            operandType = Type.INT_TYPE;
-        }
-        return StackValue.cmp(opToken, operandType);
-    }
-
-    static StackValue genNullSafeEquals(
-            InstructionAdapter v,
-            IElementType opToken,
-            boolean leftNullable,
-            boolean rightNullable
-    ) {
-        if (!leftNullable) {
-            v.invokevirtual("java/lang/Object", "equals", "(Ljava/lang/Object;)Z");
-            if (opToken == JetTokens.EXCLEQ) {
-                genInvertBoolean(v);
-            }
-        }
-        else {
-            if (rightNullable) {
-                v.dup2();   // left right left right
-                Label rightNull = new Label();
-                v.ifnull(rightNull);
-                Label leftNull = new Label();
-                v.ifnull(leftNull);
-                v.invokevirtual("java/lang/Object", "equals", "(Ljava/lang/Object;)Z");
-                if (opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ) {
-                    genInvertBoolean(v);
-                }
-                Label end = new Label();
-                v.goTo(end);
-                v.mark(rightNull);
-                // left right left
-                Label bothNull = new Label();
-                v.ifnull(bothNull);
-                v.mark(leftNull);
-                v.pop2();
-                v.iconst(opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ ? 1 : 0);
-                v.goTo(end);
-                v.mark(bothNull);
-                v.pop2();
-                v.iconst(opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ ? 0 : 1);
-                v.mark(end);
-            }
-            else {
-                v.dup2();   // left right left right
-                v.pop();
-                Label leftNull = new Label();
-                v.ifnull(leftNull);
-                v.invokevirtual("java/lang/Object", "equals", "(Ljava/lang/Object;)Z");
-                if (opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ) {
-                    genInvertBoolean(v);
-                }
-                Label end = new Label();
-                v.goTo(end);
-                // left right
-                v.mark(leftNull);
-                v.pop2();
-                v.iconst(opToken == JetTokens.EXCLEQ ? 1 : 0);
-                v.mark(end);
-            }
-        }
-
-        return StackValue.onStack(Type.BOOLEAN_TYPE);
-    }
-
     static void genInvertBoolean(InstructionAdapter v) {
         v.iconst(1);
         v.xor(Type.INT_TYPE);
@@ -389,19 +397,23 @@ public class AsmUtil {
             InstructionAdapter v,
             IElementType opToken,
             Type leftType,
-            Type rightType,
-            boolean leftNullable,
-            boolean rightNullable
+            Type rightType
     ) {
         if ((isNumberPrimitive(leftType) || leftType.getSort() == Type.BOOLEAN) && leftType == rightType) {
-            return compareExpressionsOnStack(v, opToken, leftType);
+            return StackValue.cmp(opToken, leftType);
         }
         else {
             if (opToken == JetTokens.EQEQEQ || opToken == JetTokens.EXCLEQEQEQ) {
                 return StackValue.cmp(opToken, leftType);
             }
             else {
-                return genNullSafeEquals(v, opToken, leftNullable, rightNullable);
+                v.invokestatic("jet/runtime/Intrinsics", "areEqual", "(Ljava/lang/Object;Ljava/lang/Object;)Z");
+
+                if (opToken == JetTokens.EXCLEQ || opToken == JetTokens.EXCLEQEQEQ) {
+                    genInvertBoolean(v);
+                }
+
+                return StackValue.onStack(Type.BOOLEAN_TYPE);
             }
         }
     }
@@ -443,6 +455,24 @@ public class AsmUtil {
         genMethodThrow(mv, STUB_EXCEPTION, STUB_EXCEPTION_MESSAGE);
     }
 
+    public static void swap(InstructionAdapter v, Type stackTop, Type afterTop) {
+        if (stackTop.getSize() == 1) {
+            if (afterTop.getSize() == 1) {
+                v.swap();
+            } else {
+                v.dupX2();
+                v.pop();
+            }
+        } else {
+            if (afterTop.getSize() == 1) {
+                v.dup2X1();
+            } else {
+                v.dup2X2();
+            }
+            v.pop2();
+        }
+    }
+
     public static void genNotNullAssertionsForParameters(
             @NotNull InstructionAdapter v,
             @NotNull GenerationState state,
@@ -456,7 +486,7 @@ public class AsmUtil {
 
         for (ValueParameterDescriptor parameter : descriptor.getValueParameters()) {
             JetType type = parameter.getReturnType();
-            if (type == null || type.isNullable()) continue;
+            if (type == null || isNullableType(type)) continue;
 
             int index = frameMap.getIndex(parameter);
             Type asmType = state.getTypeMapper().mapReturnType(type);
@@ -495,10 +525,10 @@ public class AsmUtil {
     ) {
         if (!state.isGenerateNotNullAssertions()) return;
 
-        if (!Boolean.TRUE.equals(state.getBindingContext().get(BindingContext.IS_DECLARED_IN_JAVA, descriptor))) return;
+        if (!isDeclaredInJava(descriptor, state.getBindingContext())) return;
 
         JetType type = descriptor.getReturnType();
-        if (type == null || type.isNullable()) return;
+        if (type == null || isNullableType(type)) return;
 
         Type asmType = state.getTypeMapper().mapReturnType(type);
         if (asmType.getSort() == Type.OBJECT || asmType.getSort() == Type.ARRAY) {
@@ -508,4 +538,48 @@ public class AsmUtil {
             v.invokestatic("jet/runtime/Intrinsics", assertMethodToCall, "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;)V");
         }
     }
+
+    private static boolean isDeclaredInJava(@NotNull CallableDescriptor callableDescriptor, @NotNull BindingContext context) {
+        CallableDescriptor descriptor = callableDescriptor;
+        while (true) {
+            if (Boolean.TRUE.equals(context.get(BindingContext.IS_DECLARED_IN_JAVA, descriptor))) {
+                return true;
+            }
+            CallableDescriptor original = descriptor.getOriginal();
+            if (descriptor == original) break;
+            descriptor = original;
+        }
+        return false;
+    }
+
+    public static void pushDefaultValueOnStack(@NotNull Type type, @NotNull InstructionAdapter v) {
+        if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
+            v.aconst(null);
+        }
+        else {
+            pushDefaultPrimitiveValueOnStack(type, v);
+        }
+    }
+
+    public static void pushDefaultPrimitiveValueOnStack(@NotNull Type type, @NotNull InstructionAdapter v) {
+        if (type.getSort() == Type.FLOAT) {
+            v.fconst(0);
+        }
+        else if (type.getSort() == Type.DOUBLE) {
+            v.dconst(0);
+        }
+        else if (type.getSort() == Type.LONG) {
+            v.lconst(0);
+        }
+        else {
+            v.iconst(0);
+        }
+    }
+
+    public static Type comparisonOperandType(Type left, Type right) {
+        if (left == Type.DOUBLE_TYPE || right == Type.DOUBLE_TYPE) return Type.DOUBLE_TYPE;
+        if (left == Type.FLOAT_TYPE || right == Type.FLOAT_TYPE) return Type.FLOAT_TYPE;
+        if (left == Type.LONG_TYPE || right == Type.LONG_TYPE) return Type.LONG_TYPE;
+        return Type.INT_TYPE;
+    }
 }

compiler/backend/src/org/jetbrains/jet/codegen/BuiltinToJavaTypesMapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,6 @@ package org.jetbrains.jet.codegen;
  * Marks if backend's JetTypeMapper should map built-in types to Java types (e.g., jet.String into java.lang.String).
  * Disabling is needed for compiling builtins: we want types to be jet.* instead of java.util* to make it possible to load
  * builtins without JDK.
- *
- * @author Evgeny Gerashchenko
- * @since 7/5/12
  */
 public enum BuiltinToJavaTypesMapping {
     ENABLED,

compiler/backend/src/org/jetbrains/jet/codegen/Callable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,5 @@
 
 package org.jetbrains.jet.codegen;
 
-/**
- * @author yole
- */
 public interface Callable {
 }

compiler/backend/src/org/jetbrains/jet/codegen/CallableMethod.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,10 +32,6 @@ import java.util.List;
 import static org.jetbrains.asm4.Opcodes.INVOKESPECIAL;
 import static org.jetbrains.asm4.Opcodes.INVOKESTATIC;
 
-/**
- * @author yole
- * @author alex.tkacman
- */
 public class CallableMethod implements Callable {
     @NotNull
     private final JvmClassName owner;

compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@ import java.util.List;
 import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.AsmUtil.*;
 
-/**
- * @author max
- * @author yole
- */
 public abstract class ClassBodyCodegen extends MemberCodegen {
     protected final JetClassOrObject myClass;
     protected final OwnerKind kind;

compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * @author max
- */
 package org.jetbrains.jet.codegen;
 
 import com.intellij.psi.PsiElement;
@@ -81,7 +78,7 @@ public abstract class ClassBuilder {
             String superName,
             String[] interfaces
     ) {
-        getVisitor().visit(version, access & ~Opcodes.ACC_STATIC, name, signature, superName, interfaces);
+        getVisitor().visit(version, access, name, signature, superName, interfaces);
     }
 
     public void visitSource(String name, @Nullable String debug) {

compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactories.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,6 @@ import org.jetbrains.asm4.util.TraceClassVisitor;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-/**
- * @author Stepan Koltsov
- */
 @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
 public class ClassBuilderFactories {
 

compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@ package org.jetbrains.jet.codegen;
 
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author max
- */
 public interface ClassBuilderFactory {
     @NotNull
     ClassBuilderMode getClassBuilderMode();

compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.jetbrains.jet.codegen;
 
-/**
- * @author Stepan Koltsov
- */
 public enum ClassBuilderMode {
     /**
      * Full function bodies

compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderOnDemand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,6 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-/**
- * @author Stepan Koltsov
- */
 public abstract class ClassBuilderOnDemand {
 
     private ClassBuilder classBuilder;

compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.GenerationStateAware;
 import org.jetbrains.jet.codegen.state.JetTypeMapperMode;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.SubModuleDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 
@@ -34,10 +35,6 @@ import java.util.*;
 
 import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
 
-/**
- * @author max
- * @author alex.tkachman
- */
 public final class ClassFileFactory extends GenerationStateAware {
     @NotNull private ClassBuilderFactory builderFactory;
 
@@ -118,13 +115,25 @@ public final class ClassFileFactory extends GenerationStateAware {
                     );
                 }
             };
-            codegen = new NamespaceCodegen(onDemand, fqName, state, files);
+            codegen = new NamespaceCodegen(onDemand, getSubModule(files), fqName, state, files);
             ns2codegen.put(fqName, codegen);
         }
 
         return codegen;
     }
 
+    private SubModuleDescriptor getSubModule(Collection<JetFile> files) {
+        assert !files.isEmpty() : "Don't generate namespaces from no files";
+        SubModuleDescriptor subModule = state.getModuleSourcesManager().getSubModuleForFile(files.iterator().next());
+        for (JetFile file : files) {
+            SubModuleDescriptor fileSubModule = state.getModuleSourcesManager().getSubModuleForFile(file);
+            assert fileSubModule.equals(subModule)
+                    : "Attempt to generate namespace from files originating from different sub-modules: " +
+                        fileSubModule + " != " + subModule;
+        }
+        return subModule;
+    }
+
     public ClassBuilder forClassImplementation(ClassDescriptor aClass, PsiFile sourceFile) {
         Type type = state.getTypeMapper().mapType(aClass.getDefaultType(), JetTypeMapperMode.IMPL);
         if (isPrimitive(type)) {

compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * @author max
- * @author alex.tkachman
- */
 package org.jetbrains.jet.codegen;
 
 import com.intellij.openapi.util.Pair;

compiler/backend/src/org/jetbrains/jet/codegen/CodeChunk.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@ package org.jetbrains.jet.codegen;
 
 import org.jetbrains.asm4.commons.InstructionAdapter;
 
-/**
- * @author yole
- */
 public interface CodeChunk {
     void generate(InstructionAdapter v);
 }

compiler/backend/src/org/jetbrains/jet/codegen/CodegenStatementVisitor.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.codegen;
+
+import org.jetbrains.jet.lang.psi.*;
+
+public class CodegenStatementVisitor extends JetVisitor<StackValue, StackValue> {
+    private final ExpressionCodegen codegen;
+
+    public CodegenStatementVisitor(ExpressionCodegen codegen) {
+        this.codegen = codegen;
+    }
+
+    @Override
+    public StackValue visitJetElement(JetElement element, StackValue receiver) {
+        return element.accept(codegen, receiver);
+    }
+
+    @Override
+    public StackValue visitIfExpression(JetIfExpression expression, StackValue receiver) {
+        return codegen.generateIfExpression(expression, true);
+    }
+
+    @Override
+    public StackValue visitTryExpression(JetTryExpression expression, StackValue data) {
+        return codegen.generateTryExpression(expression, true);
+    }
+
+    @Override
+    public StackValue visitWhenExpression(JetWhenExpression expression, StackValue data) {
+        return codegen.generateWhenExpression(expression, true);
+    }
+}

compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,9 @@
 package org.jetbrains.jet.codegen;
 
 import com.google.common.collect.ImmutableList;
+import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Stack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,6 +31,8 @@ import org.jetbrains.jet.codegen.signature.JvmMethodParameterKind;
 import org.jetbrains.jet.codegen.signature.JvmMethodSignature;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
+import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl;
 import org.jetbrains.jet.lang.psi.JetClassObject;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetObjectDeclaration;
@@ -39,16 +43,14 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.JetType;
+import org.jetbrains.jet.lang.types.TypeUtils;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 
 import java.util.*;
 
+import static org.jetbrains.jet.lang.descriptors.Modality.ABSTRACT;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
 
-/**
- * @author abreslav
- * @author alex.tkachman
- */
 public class CodegenUtil {
 
     private CodegenUtil() {
@@ -267,4 +269,31 @@ public class CodegenUtil {
                  (context.getParentContext() instanceof NamespaceContext && context.getParentContext().getContextDescriptor() == containingDeclaration))
                 && context.getContextKind() != OwnerKind.TRAIT_IMPL);
     }
+
+    public static boolean hasAbstractMembers(@NotNull ClassDescriptor classDescriptor) {
+        return ContainerUtil.exists(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors(),
+                new Condition<DeclarationDescriptor>() {
+                    @Override
+                    public boolean value(DeclarationDescriptor declaration) {
+                        if (!(declaration instanceof MemberDescriptor)) {
+                            return false;
+                        }
+                        return ((MemberDescriptor) declaration).getModality() == ABSTRACT;
+                    }
+                });
+    }
+
+    /**
+     * A work-around of the generic nullability problem in the type checker
+     * @return true if a value of this type can be null
+     */
+    public static boolean isNullableType(@NotNull JetType type) {
+        if (type.isNullable()) {
+            return true;
+        }
+        if (type.getConstructor().getDeclarationDescriptor() instanceof TypeParameterDescriptor) {
+            return TypeUtils.hasNullableSuperType(type);
+        }
+        return false;
+    }
 }

compiler/backend/src/org/jetbrains/jet/codegen/CompilationErrorHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.jetbrains.jet.codegen;
 
-/**
- * @author abreslav
- */
 public interface CompilationErrorHandler {
 
     CompilationErrorHandler THROW_EXCEPTION = new CompilationErrorHandler() {

compiler/backend/src/org/jetbrains/jet/codegen/CompilationException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
 
-/**
- * @author alex.tkachman
- * @author abreslav
- */
 public class CompilationException extends RuntimeException {
     private final PsiElement element;
 
@@ -64,6 +60,7 @@ public class CompilationException extends RuntimeException {
                     message.append("Cause: ").append(causeMessage == null ? cause.toString() : causeMessage).append("\n");
                 }
                 message.append("File being compiled and position: ").append(DiagnosticUtils.atLocation(element)).append("\n");
+                message.append("PsiElement: ").append(element.getText()).append("\n");
                 message.append("The root cause was thrown at: ").append(where());
 
                 return message.toString();

compiler/backend/src/org/jetbrains/jet/codegen/ConstructorFrameMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,6 @@ import java.util.List;
 
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
 
-/**
- * @author yole
- * @author alex.tkachman
- */
 public class ConstructorFrameMap extends FrameMap {
     private int myOuterThisIndex = -1;
 

compiler/backend/src/org/jetbrains/jet/codegen/DefaultParameterValueLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/backend/src/org/jetbrains/jet/codegen/FieldInfo.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.codegen;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.asm4.Type;
+import org.jetbrains.jet.codegen.state.JetTypeMapper;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassKind;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.java.JvmAbi;
+
+public class FieldInfo {
+
+    private final Type fieldType;
+
+    private final Type ownerType;
+
+    private final String fieldName;
+
+    private FieldInfo(@NotNull Type ownerType, @NotNull Type fieldType, @NotNull String fieldName) {
+        this.ownerType = ownerType;
+        this.fieldType = fieldType;
+        this.fieldName = fieldName;
+    }
+
+    @NotNull
+    public Type getFieldType() {
+        return fieldType;
+    }
+
+    @NotNull
+    public Type getOwnerType() {
+        return ownerType;
+    }
+
+    @NotNull
+    public String getOwnerInternalName() {
+        return ownerType.getInternalName();
+    }
+
+    @NotNull
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    @NotNull
+    public static FieldInfo createForSingleton(@NotNull ClassDescriptor fieldClassDescriptor, @NotNull JetTypeMapper typeMapper) {
+        ClassKind kind = fieldClassDescriptor.getKind();
+        if (kind != ClassKind.OBJECT && kind != ClassKind.CLASS_OBJECT && kind != ClassKind.ENUM_ENTRY) {
+            throw new UnsupportedOperationException();
+        }
+
+        Type fieldType = typeMapper.mapType(fieldClassDescriptor.getDefaultType());
+
+        ClassDescriptor ownerDescriptor = kind == ClassKind.OBJECT
+                                          ? fieldClassDescriptor: DescriptorUtils.getParentOfType(fieldClassDescriptor, ClassDescriptor.class);
+        assert ownerDescriptor != null;
+        Type ownerType = typeMapper.mapType(ownerDescriptor.getDefaultType());
+
+        String fieldName = kind == ClassKind.ENUM_ENTRY
+                           ? fieldClassDescriptor.getName().getName()
+                           : fieldClassDescriptor.getKind() == ClassKind.CLASS_OBJECT ? JvmAbi.CLASS_OBJECT_FIELD : JvmAbi.INSTANCE_FIELD;
+        return new FieldInfo(ownerType, fieldType, fieldName);
+    }
+
+}

compiler/backend/src/org/jetbrains/jet/codegen/FrameMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-/**
- * @author max
- */
 public class FrameMap {
     private final TObjectIntHashMap<DeclarationDescriptor> myVarIndex = new TObjectIntHashMap<DeclarationDescriptor>();
     private final TObjectIntHashMap<DeclarationDescriptor> myVarSizes = new TObjectIntHashMap<DeclarationDescriptor>();

compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.jetbrains.asm4.MethodVisitor;
 import org.jetbrains.asm4.Type;
 import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.asm4.commons.Method;
+import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.codegen.context.CodegenContext;
 import org.jetbrains.jet.codegen.context.MethodContext;
 import org.jetbrains.jet.codegen.signature.JvmMethodParameterSignature;
@@ -46,7 +47,6 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
 import org.jetbrains.jet.lang.resolve.name.Name;
-import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 
 import java.util.*;
 
@@ -58,11 +58,6 @@ import static org.jetbrains.jet.lang.resolve.BindingContextUtils.callableDescrip
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.descriptorToDeclaration;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
 
-/**
- * @author max
- * @author yole
- * @author alex.tkachman
- */
 public class FunctionCodegen extends GenerationStateAware {
     private final CodegenContext owner;
     private final ClassBuilder v;
@@ -342,50 +337,6 @@ public class FunctionCodegen extends GenerationStateAware {
         iv.areturn(asmMethod.getReturnType());
     }
 
-    private static boolean isAbstract(FunctionDescriptor functionDescriptor, OwnerKind kind) {
-        return (functionDescriptor.getModality() == Modality.ABSTRACT
-                 || isInterface(functionDescriptor.getContainingDeclaration())
-               )
-               && !isStatic(kind)
-               && kind != OwnerKind.TRAIT_IMPL;
-    }
-
-    public static int getMethodAsmFlags(FunctionDescriptor functionDescriptor, OwnerKind kind) {
-        boolean isStatic = isStatic(kind);
-        boolean isAbstract = isAbstract(functionDescriptor, kind);
-
-        int flags = getVisibilityAccessFlag(functionDescriptor);
-
-        if (!functionDescriptor.getValueParameters().isEmpty()
-            && functionDescriptor.getValueParameters().get(functionDescriptor.getValueParameters().size() - 1)
-                       .getVarargElementType() != null) {
-            flags |= ACC_VARARGS;
-        }
-
-        if (functionDescriptor.getModality() == Modality.FINAL) {
-            DeclarationDescriptor containingDeclaration = functionDescriptor.getContainingDeclaration();
-            if (!(containingDeclaration instanceof ClassDescriptor) ||
-                ((ClassDescriptor) containingDeclaration).getKind() != ClassKind.TRAIT) {
-                flags |= ACC_FINAL;
-            }
-        }
-
-        if (isStatic || kind == OwnerKind.TRAIT_IMPL) {
-            flags |= ACC_STATIC;
-        }
-
-        if (isAbstract) flags |= ACC_ABSTRACT;
-
-        if (KotlinBuiltIns.getInstance().isDeprecated(functionDescriptor)) {
-            flags |= ACC_DEPRECATED;
-        }
-        return flags;
-    }
-
-    private static boolean isStatic(OwnerKind kind) {
-        return kind == OwnerKind.NAMESPACE || kind instanceof OwnerKind.StaticDelegateKind;
-    }
-
     public static void genJetAnnotations(
             @NotNull GenerationState state,
             @NotNull FunctionDescriptor functionDescriptor,
@@ -449,6 +400,7 @@ public class FunctionCodegen extends GenerationStateAware {
             JetValueParameterAnnotationWriter av = JetValueParameterAnnotationWriter.visitParameterAnnotation(mv, i + start);
             av.writeName(parameterDescriptor.getName().getName());
             av.writeHasDefaultValue(parameterDescriptor.declaresDefaultValue());
+            av.writeVararg(parameterDescriptor.getVarargElementType() != null);
             if (kotlinParameterTypes.get(i) != null) {
                 av.writeType(kotlinParameterTypes.get(i + start).getKotlinSignature());
             }
@@ -528,6 +480,46 @@ public class FunctionCodegen extends GenerationStateAware {
         }
     }
 
+    static void generateConstructorWithoutParametersIfNeeded(
+            @NotNull GenerationState state,
+            @NotNull CallableMethod method,
+            @NotNull ConstructorDescriptor constructorDescriptor,
+            @NotNull ClassBuilder classBuilder
+    ) {
+        if (!isDefaultConstructorNeeded(state.getBindingContext(), constructorDescriptor)) {
+            return;
+        }
+        int flags = getVisibilityAccessFlag(constructorDescriptor);
+        MethodVisitor mv = classBuilder.newMethod(null, flags, "<init>", "()V", null, null);
+
+        if (state.getClassBuilderMode() == ClassBuilderMode.SIGNATURES) {
+            return;
+        }
+        else if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) {
+            genStubCode(mv);
+        }
+        else if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
+            InstructionAdapter v = new InstructionAdapter(mv);
+            mv.visitCode();
+
+            JvmClassName ownerInternalName = method.getOwner();
+            Method jvmSignature = method.getSignature().getAsmMethod();
+            v.load(0, ownerInternalName.getAsmType()); // Load this on stack
+
+            int mask = 0;
+            for (ValueParameterDescriptor parameterDescriptor : constructorDescriptor.getValueParameters()) {
+                Type paramType = state.getTypeMapper().mapType(parameterDescriptor.getType());
+                pushDefaultValueOnStack(paramType, v);
+                mask |= (1 << parameterDescriptor.getIndex());
+            }
+            v.iconst(mask);
+            String desc = jvmSignature.getDescriptor().replace(")", "I)");
+            v.invokespecial(ownerInternalName.getInternalName(), "<init>", desc);
+            v.areturn(Type.VOID_TYPE);
+            endVisit(mv, "default constructor for " + ownerInternalName.getInternalName(), null);
+        }
+    }
+
     static void generateDefaultIfNeeded(
             MethodContext owner,
             GenerationState state,
@@ -551,6 +543,10 @@ public class FunctionCodegen extends GenerationStateAware {
 
         ReceiverParameterDescriptor receiverParameter = functionDescriptor.getReceiverParameter();
         boolean hasReceiver = receiverParameter != null;
+
+        // Has outer in local variables (constructor for inner class)
+        boolean hasOuter = functionDescriptor instanceof ConstructorDescriptor &&
+                           CodegenBinding.canHaveOuter(state.getBindingContext(), ((ConstructorDescriptor) functionDescriptor).getContainingDeclaration());
         boolean isStatic = isStatic(kind);
 
         if (kind == OwnerKind.TRAIT_IMPL) {
@@ -561,7 +557,7 @@ public class FunctionCodegen extends GenerationStateAware {
         int flags = ACC_PUBLIC | ACC_SYNTHETIC; // TODO.
 
         JvmClassName ownerInternalName;
-        if (contextClass instanceof NamespaceDescriptor) {
+        if (DescriptorUtils.isTopLevelDeclaration(owner.getContextDescriptor())) {
             ownerInternalName = NamespaceCodegen.getJVMClassNameForKotlinNs(DescriptorUtils.getFQName(contextClass).toSafe());
         }
         else {
@@ -583,7 +579,7 @@ public class FunctionCodegen extends GenerationStateAware {
             genStubCode(mv);
         }
         else if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
-            generateDefaultImpl(owner, state, jvmSignature, functionDescriptor, kind, receiverParameter, hasReceiver, isStatic,
+            generateDefaultImpl(owner, state, jvmSignature, functionDescriptor, kind, receiverParameter, hasReceiver, hasOuter, isStatic,
                                 ownerInternalName,
                                 isConstructor, mv, iv, loadStrategy);
         }
@@ -596,7 +592,7 @@ public class FunctionCodegen extends GenerationStateAware {
             FunctionDescriptor functionDescriptor,
             OwnerKind kind,
             ReceiverParameterDescriptor receiverParameter,
-            boolean hasReceiver,
+            boolean hasReceiver, boolean hasOuter,
             boolean aStatic,
             JvmClassName ownerInternalName,
             boolean constructor,
@@ -606,55 +602,53 @@ public class FunctionCodegen extends GenerationStateAware {
     ) {
         mv.visitCode();
 
+        boolean isEnumConstructor = functionDescriptor instanceof ConstructorDescriptor &&
+                                    DescriptorUtils.isEnumClass(functionDescriptor.getContainingDeclaration());
+
         FrameMap frameMap = owner.prepareFrame(state.getTypeMapper());
 
         if (kind instanceof OwnerKind.StaticDelegateKind) {
             frameMap.leaveTemp(OBJECT_TYPE);
         }
 
+        if (hasOuter) {
+            frameMap.enterTemp(OBJECT_TYPE);
+        }
+
+        if (isEnumConstructor) {
+            frameMap.enterTemp(OBJECT_TYPE);
+            frameMap.enterTemp(Type.INT_TYPE);
+        }
+
         ExpressionCodegen codegen = new ExpressionCodegen(mv, frameMap, jvmSignature.getReturnType(), owner, state);
 
-        int var = 0;
-        if (!aStatic) {
-            var++;
-        }
-
-        Type receiverType;
+        Type receiverType = null;
         if (hasReceiver) {
             receiverType = state.getTypeMapper().mapType(receiverParameter.getType());
-            var += receiverType.getSize();
-        }
-        else {
-            receiverType = Type.DOUBLE_TYPE;
         }
 
+        final int extraInLocalVariablesTable = getSizeOfExplicitArgumentsInLocalVariablesTable(aStatic, hasOuter, isEnumConstructor, receiverType);
+        final int countOfExtraVarsInMethodArgs = getCountOfExplicitArgumentsInMethodArguments(hasOuter, hasReceiver, isEnumConstructor);
+
         Type[] argTypes = jvmSignature.getArgumentTypes();
         List<ValueParameterDescriptor> paramDescrs = functionDescriptor.getValueParameters();
+        int paramSizeInLocalVariablesTable = 0;
         for (int i = 0; i < paramDescrs.size(); i++) {
-            Type argType = argTypes[i + (hasReceiver ? 1 : 0)];
+            Type argType = argTypes[i + countOfExtraVarsInMethodArgs];
             int size = argType.getSize();
             frameMap.enter(paramDescrs.get(i), argType);
-            var += size;
+            paramSizeInLocalVariablesTable += size;
         }
 
-        int maskIndex = var;
+        final int maskIndex = extraInLocalVariablesTable + paramSizeInLocalVariablesTable;
 
-        var = 0;
-        if (!aStatic) {
-            mv.visitVarInsn(ALOAD, var++);
-        }
-
-        if (hasReceiver) {
-            iv.load(var, receiverType);
-            var += receiverType.getSize();
-        }
-
-        int extra = hasReceiver ? 1 : 0;
+        loadExplicitArgumentsOnStack(iv, OBJECT_TYPE, receiverType, ownerInternalName.getAsmType(), aStatic, hasOuter, isEnumConstructor);
 
+        int indexInLocalVariablesTable = extraInLocalVariablesTable;
         for (int index = 0; index < paramDescrs.size(); index++) {
             ValueParameterDescriptor parameterDescriptor = paramDescrs.get(index);
 
-            Type t = argTypes[extra + index];
+            Type t = argTypes[countOfExtraVarsInMethodArgs + index];
 
             if (frameMap.getIndex(parameterDescriptor) < 0) {
                 frameMap.enter(parameterDescriptor, t);
@@ -675,8 +669,8 @@ public class FunctionCodegen extends GenerationStateAware {
                 iv.mark(loadArg);
             }
 
-            iv.load(var, t);
-            var += t.getSize();
+            iv.load(indexInLocalVariablesTable, t);
+            indexInLocalVariablesTable += t.getSize();
         }
 
         final String internalName = ownerInternalName.getInternalName();
@@ -687,7 +681,7 @@ public class FunctionCodegen extends GenerationStateAware {
                 iv.invokeinterface(internalName, jvmSignatureName, jvmSignatureDescriptor);
             }
             else {
-                if (!constructor) {
+                if (!constructor && functionDescriptor.getVisibility() != Visibilities.PRIVATE) {
                     iv.invokevirtual(internalName, jvmSignatureName, jvmSignatureDescriptor);
                 }
                 else {
@@ -705,6 +699,54 @@ public class FunctionCodegen extends GenerationStateAware {
         mv.visitEnd();
     }
 
+    private static int getSizeOfExplicitArgumentsInLocalVariablesTable(
+            boolean isStatic,
+            boolean hasOuter,
+            boolean isEnumConstructor,
+            @Nullable Type receiverType
+    ) {
+        int result = 0;
+        if (!isStatic) result++;
+        if (receiverType != null) result += receiverType.getSize();
+        if (hasOuter) result++;
+        if (isEnumConstructor) result += 2;
+        return result;
+    }
+
+    private static int getCountOfExplicitArgumentsInMethodArguments(
+            boolean hasOuter,
+            boolean hasReceiver,
+            boolean isEnumConstructor
+    ) {
+        int result = 0;
+        if (hasReceiver) result++;
+        if (hasOuter) result++;
+        if (isEnumConstructor) result += 2;
+        return result;
+    }
+
+    private static void loadExplicitArgumentsOnStack(@NotNull InstructionAdapter iv,
+            @NotNull Type ownerType, @Nullable Type receiverType, @NotNull Type outerType,
+            boolean isStatic, boolean hasOuter, boolean isEnumConstructor) {
+        int var = 0;
+        if (!isStatic) {
+            iv.load(var++, ownerType);
+        }
+
+        if (hasOuter) {
+            iv.load(var++, outerType);
+        }
+
+        if (isEnumConstructor) {
+            iv.load(var++, OBJECT_TYPE);
+            iv.load(var++, Type.INT_TYPE);
+        }
+
+        if (receiverType != null) {
+            iv.load(var, receiverType);
+        }
+    }
+
     private static boolean isDefaultNeeded(FunctionDescriptor functionDescriptor) {
         boolean needed = false;
         if (functionDescriptor != null) {
@@ -718,6 +760,24 @@ public class FunctionCodegen extends GenerationStateAware {
         return needed;
     }
 
+    private static boolean isDefaultConstructorNeeded(@NotNull BindingContext context, @NotNull ConstructorDescriptor constructorDescriptor) {
+        ClassDescriptor classDescriptor = constructorDescriptor.getContainingDeclaration();
+
+        if (CodegenBinding.canHaveOuter(context, classDescriptor)) return false;
+
+        if (classDescriptor.getVisibility() == Visibilities.PRIVATE ||
+            constructorDescriptor.getVisibility() == Visibilities.PRIVATE) return false;
+
+        if (constructorDescriptor.getValueParameters().isEmpty()) return false;
+
+        for (ValueParameterDescriptor parameterDescriptor : constructorDescriptor.getValueParameters()) {
+            if (!parameterDescriptor.declaresDefaultValue()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     private static boolean differentMethods(Method method, Method overridden) {
         if (!method.getReturnType().equals(overridden.getReturnType())) {
             return true;
@@ -743,7 +803,7 @@ public class FunctionCodegen extends GenerationStateAware {
             FunctionDescriptor functionDescriptor,
             Method overridden
     ) {
-        int flags = ACC_PUBLIC | ACC_BRIDGE; // TODO.
+        int flags = ACC_PUBLIC | ACC_BRIDGE | ACC_SYNTHETIC; // TODO.
 
         final MethodVisitor mv = v.newMethod(null, flags, jvmSignature.getName(), overridden.getDescriptor(), null, null);
         if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) {

compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,6 @@ import org.jetbrains.annotations.NotNull;
 import java.net.URL;
 import java.net.URLClassLoader;
 
-/**
- * @author yole
- * @author alex.tkachman
- */
 public class GeneratedClassLoader extends URLClassLoader {
     private ClassFileFactory state;
 
@@ -33,8 +29,9 @@ public class GeneratedClassLoader extends URLClassLoader {
         this.state = state;
     }
 
+    @NotNull
     @Override
-    protected Class<?> findClass(String name) throws ClassNotFoundException {
+    protected Class<?> findClass(@NotNull String name) throws ClassNotFoundException {
         String file = name.replace('.', '/') + ".class";
         if (state.files().contains(file)) {
             byte[] bytes = state.asBytes(file);

compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.asm4.AnnotationVisitor;
-import org.jetbrains.asm4.Label;
-import org.jetbrains.asm4.MethodVisitor;
-import org.jetbrains.asm4.Type;
+import org.jetbrains.asm4.*;
 import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.asm4.commons.Method;
 import org.jetbrains.jet.codegen.binding.CalculatedClosure;
@@ -41,16 +38,12 @@ import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.codegen.state.JetTypeMapperMode;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
-import org.jetbrains.jet.lang.resolve.OverridingUtil;
+import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
-import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
-import org.jetbrains.jet.lang.resolve.java.JvmAbi;
-import org.jetbrains.jet.lang.resolve.java.JvmClassName;
-import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
+import org.jetbrains.jet.lang.resolve.java.*;
 import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
@@ -66,11 +59,6 @@ import static org.jetbrains.jet.lang.resolve.BindingContextUtils.callableDescrip
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JAVA_STRING_TYPE;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
 
-/**
- * @author max
- * @author yole
- * @author alex.tkachman
- */
 public class ImplementationBodyCodegen extends ClassBodyCodegen {
     private static final String VALUES = "$VALUES";
     private JetDelegationSpecifier superCall;
@@ -112,7 +100,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                 isAnnotation = true;
                 signature.getInterfaces().add("java/lang/annotation/Annotation");
             }
-            else if (jetClass.hasModifier(JetTokens.ENUM_KEYWORD)) {
+            else if (jetClass.isEnum()) {
+                isAbstract = hasAbstractMembers(descriptor);
                 isEnum = true;
             }
 
@@ -123,6 +112,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
             if (!jetClass.hasModifier(JetTokens.OPEN_KEYWORD) && !isAbstract) {
                 isFinal = true;
             }
+            isStatic = !jetClass.isInner();
         }
         else {
             isStatic = myClass.getParent() instanceof JetClassObject;
@@ -130,7 +120,21 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         }
 
         int access = 0;
-        access |= ACC_PUBLIC;
+
+        if (state.getClassBuilderMode() == ClassBuilderMode.SIGNATURES && !DescriptorUtils.isTopLevelDeclaration(descriptor)) {
+            // ClassBuilderMode.SIGNATURES means we are generating light classes & looking at a nested or inner class
+            // Light class generation is implemented so that Cls-classes only read bare code of classes,
+            // without knowing whether these classes are inner or not (see ClassStubBuilder.EMPTY_STRATEGY)
+            // Thus we must write full accessibility flags on inner classes in this mode
+            access |= getVisibilityAccessFlag(descriptor);
+            // Same for STATIC
+            if (isStatic) {
+                access |= ACC_STATIC;
+            }
+        }
+        else {
+            access |= getVisibilityAccessFlagForClass(descriptor);
+        }
         if (isAbstract) {
             access |= ACC_ABSTRACT;
         }
@@ -143,9 +147,6 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         if (isFinal) {
             access |= ACC_FINAL;
         }
-        if (isStatic) {
-            access |= ACC_STATIC;
-        }
         if (isAnnotation) {
             access |= ACC_ANNOTATION;
         }
@@ -182,43 +183,74 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
     }
 
     private void writeOuterClass() {
-        ClassDescriptor container = getContainingClassDescriptor(descriptor);
+        //JVMS7: A class must have an EnclosingMethod attribute if and only if it is a local class or an anonymous class.
+        DeclarationDescriptor parentDescriptor = descriptor.getContainingDeclaration();
+
+        boolean isObjectLiteral = descriptor.getName().isSpecial() && descriptor.getKind() == ClassKind.OBJECT;
+
+        boolean isLocalOrAnonymousClass = isObjectLiteral ||
+                                          !(DescriptorUtils.isTopLevelDeclaration(descriptor) || parentDescriptor instanceof ClassDescriptor);
+        if (isLocalOrAnonymousClass) {
+            String outerClassName = getOuterClassName(descriptor, typeMapper, bindingContext, state);
+            FunctionDescriptor function = DescriptorUtils.getParentOfType(descriptor, FunctionDescriptor.class);
+
+            //Function descriptor could be null only for object literal in package namespace
+            assert (!isObjectLiteral && function != null) || isObjectLiteral:
+                    "Function descriptor should be present: " + descriptor.getName();
+
+            Name functionName = function != null ? function.getName() : null;
+
+            v.visitOuterClass(outerClassName,
+                              functionName != null ? functionName.getName() : null,
+                              functionName != null ? typeMapper.mapSignature(functionName, function).getAsmMethod().getDescriptor() : null);
+
+        }
+    }
+
+    @NotNull
+    public static String getOuterClassName(
+            @NotNull ClassDescriptor classDescriptor,
+            @NotNull JetTypeMapper typeMapper,
+            @NotNull BindingContext bindingContext,
+            @NotNull GenerationState state
+    ) {
+        ClassDescriptor container = DescriptorUtils.getParentOfType(classDescriptor, ClassDescriptor.class);
         if (container != null) {
-            v.visitOuterClass(typeMapper.mapType(container.getDefaultType(), JetTypeMapperMode.IMPL).getInternalName(), null, null);
+            return typeMapper.mapType(container.getDefaultType(), JetTypeMapperMode.IMPL).getInternalName();
+        }
+        else {
+            PackageFragmentDescriptor packageFragmentDescriptor = DescriptorUtils.getParentOfType(classDescriptor, PackageFragmentDescriptor.class);
+            assert packageFragmentDescriptor != null : "Namespace descriptor should be present: " + classDescriptor.getName();
+            FqName namespaceQN = packageFragmentDescriptor.getFqName();
+
+            JetFile containingFile = BindingContextUtils.getContainingFile(bindingContext, classDescriptor);
+            ModuleSourcesManager sourcesManager = state.getModuleSourcesManager();
+            ModuleDescriptor module = sourcesManager.getSubModuleForFile(containingFile).getContainingDeclaration();
+
+            boolean isMultiFile = CodegenBinding.isMultiFileNamespace(sourcesManager, module, namespaceQN);
+            return isMultiFile
+                   ? NamespaceCodegen.getNamespacePartInternalName(containingFile)
+                   : NamespaceCodegen.getJVMClassNameForKotlinNs(namespaceQN).getInternalName();
         }
     }
 
     private void writeInnerClasses() {
-        // Inner enums are moved by frontend to a class object of outer class, but we want them to be inner for the outer class itself
-        // (to avoid publicly visible names like A$ClassObject$$B), so they are handled specially in this method
-
         for (ClassDescriptor innerClass : getInnerClassesAndObjects(descriptor)) {
-            // If it's an inner enum inside a class object, don't write it
-            // (instead write it to inner classes of this class object's containing class)
-            if (!isEnumMovedToClassObject(innerClass)) {
-                writeInnerClass(innerClass, false);
-            }
+            writeInnerClass(innerClass);
         }
 
         ClassDescriptor classObjectDescriptor = descriptor.getClassObjectDescriptor();
         if (classObjectDescriptor != null) {
-            // Process all enums here which were moved to our class object
-            for (ClassDescriptor innerClass : getInnerClassesAndObjects(classObjectDescriptor)) {
-                if (isEnumMovedToClassObject(innerClass)) {
-                    writeInnerClass(innerClass, true);
-                }
-            }
-
-            int innerClassAccess = ACC_PUBLIC | ACC_FINAL | ACC_STATIC;
+            int innerClassAccess = getVisibilityAccessFlag(classObjectDescriptor) | ACC_FINAL | ACC_STATIC;
             v.visitInnerClass(classAsmType.getInternalName() + JvmAbi.CLASS_OBJECT_SUFFIX, classAsmType.getInternalName(),
                               JvmAbi.CLASS_OBJECT_CLASS_NAME,
                               innerClassAccess);
         }
     }
 
-    private void writeInnerClass(ClassDescriptor innerClass, boolean isStatic) {
+    private void writeInnerClass(ClassDescriptor innerClass) {
         // TODO: proper access
-        int innerClassAccess = ACC_PUBLIC;
+        int innerClassAccess = getVisibilityAccessFlag(innerClass);
         if (innerClass.getModality() == Modality.FINAL) {
             innerClassAccess |= ACC_FINAL;
         }
@@ -233,7 +265,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
             innerClassAccess |= ACC_ENUM;
         }
 
-        if (isStatic) {
+        if (!innerClass.isInner()) {
             innerClassAccess |= ACC_STATIC;
         }
 
@@ -243,32 +275,20 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         v.visitInnerClass(innerClassInternalName, outerClassInternalName, innerClass.getName().getName(), innerClassAccess);
     }
 
-    private boolean isEnumMovedToClassObject(ClassDescriptor innerClass) {
-        // Checks if this is enum, moved to class object by frontend
-
-        return Boolean.TRUE.equals(bindingContext.get(BindingContext.IS_ENUM_MOVED_TO_CLASS_OBJECT, innerClass));
-    }
-
     private void writeClassSignatureIfNeeded(JvmClassSignature signature) {
-        if (signature.getKotlinGenericSignature() != null || descriptor.getVisibility() != Visibilities.PUBLIC) {
-            AnnotationVisitor annotationVisitor = v.newAnnotation(JvmStdlibNames.JET_CLASS.getDescriptor(), true);
-            annotationVisitor.visit(JvmStdlibNames.JET_CLASS_SIGNATURE, signature.getKotlinGenericSignature());
-            int flags = getFlagsForVisibility(descriptor.getVisibility()) | getFlagsForClassKind(descriptor);
-            if (JvmStdlibNames.FLAGS_DEFAULT_VALUE != flags) {
-                annotationVisitor.visit(JvmStdlibNames.JET_FLAGS_FIELD, flags);
-            }
-            annotationVisitor.visitEnd();
+        AnnotationVisitor annotationVisitor = v.newAnnotation(JvmStdlibNames.JET_CLASS.getDescriptor(), true);
+        annotationVisitor.visit(JvmStdlibNames.JET_CLASS_SIGNATURE, signature.getKotlinGenericSignature());
+        int flags = getFlagsForVisibility(descriptor.getVisibility()) | getFlagsForClassKind(descriptor);
+        if (JvmStdlibNames.FLAGS_DEFAULT_VALUE != flags) {
+            annotationVisitor.visit(JvmStdlibNames.JET_FLAGS_FIELD, flags);
         }
-    }
+        annotationVisitor.visit(JvmStdlibNames.ABI_VERSION_NAME, JvmAbi.VERSION);
+        annotationVisitor.visitEnd();
 
-    @Nullable
-    private static ClassDescriptor getContainingClassDescriptor(ClassDescriptor decl) {
-        DeclarationDescriptor container = decl.getContainingDeclaration();
-        while (container != null && !(container instanceof NamespaceDescriptor)) {
-            if (container instanceof ClassDescriptor) return (ClassDescriptor) container;
-            container = container.getContainingDeclaration();
+        if (descriptor.getKind() == ClassKind.CLASS_OBJECT) {
+            AnnotationVisitor classObjectVisitor = v.newAnnotation(JvmStdlibNames.JET_CLASS_OBJECT.getDescriptor(), true);
+            classObjectVisitor.visitEnd();
         }
-        return null;
     }
 
     private JvmClassSignature signature() {
@@ -320,7 +340,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
         signatureVisitor.writeSupersEnd();
 
-        return new JvmClassSignature(jvmName(), superClassAsmType.getInternalName(), superInterfaces, signatureVisitor.makeJavaString(),
+        return new JvmClassSignature(jvmName(), superClassAsmType.getInternalName(), superInterfaces, signatureVisitor.makeJavaGenericSignature(),
                                      signatureVisitor.makeKotlinClassSignature());
     }
 
@@ -477,8 +497,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         iv.store(2, AsmTypeConstants.OBJECT_TYPE);
 
         for (PropertyDescriptor propertyDescriptor : properties) {
-            final JetType type = propertyDescriptor.getType();
-            final Type asmType = typeMapper.mapType(type);
+            Type asmType = typeMapper.mapType(propertyDescriptor.getType());
 
             genPropertyOnStack(iv, propertyDescriptor, 0);
             genPropertyOnStack(iv, propertyDescriptor, 2);
@@ -493,8 +512,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                 }
             }
             else {
-                final StackValue value =
-                        genEqualsForExpressionsOnStack(iv, JetTokens.EQEQ, asmType, asmType, type.isNullable(), type.isNullable());
+                StackValue value = genEqualsForExpressionsOnStack(iv, JetTokens.EQEQ, asmType, asmType);
                 value.put(Type.BOOLEAN_TYPE, iv);
             }
 
@@ -527,14 +545,14 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
             genPropertyOnStack(iv, propertyDescriptor, 0);
 
             Label ifNull = null;
-            if (propertyDescriptor.getType().isNullable()) {
+            Type asmType = typeMapper.mapType(propertyDescriptor.getType());
+            if (!isPrimitive(asmType)) {
                 ifNull = new Label();
-
                 iv.dup();
                 iv.ifnull(ifNull);
             }
 
-            genHashCode(mv, iv, typeMapper.mapType(propertyDescriptor.getType()));
+            genHashCode(mv, iv, asmType);
 
             if (ifNull != null) {
                 Label end = new Label();
@@ -632,7 +650,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
         final String desc = "()" + componentType.getDescriptor();
         MethodVisitor mv = v.newMethod(myClass,
-                                       FunctionCodegen.getMethodAsmFlags(function, OwnerKind.IMPLEMENTATION),
+                                       AsmUtil.getMethodAsmFlags(function, OwnerKind.IMPLEMENTATION),
                                        function.getName().getName(),
                                        desc,
                                        null, null);
@@ -657,7 +675,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         JvmMethodSignature methodSignature = typeMapper.mapSignature(function.getName(), function);
         final String methodDesc = methodSignature.getAsmMethod().getDescriptor();
 
-        MethodVisitor mv = v.newMethod(myClass, FunctionCodegen.getMethodAsmFlags(function, OwnerKind.IMPLEMENTATION),
+        MethodVisitor mv = v.newMethod(myClass, AsmUtil.getMethodAsmFlags(function, OwnerKind.IMPLEMENTATION),
                                        function.getName().getName(), methodDesc,
                                        null, null);
 
@@ -900,14 +918,22 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
     }
 
     private void generateFieldForSingleton() {
-        if (!(isNonLiteralObject(myClass) || descriptor.getKind() == ClassKind.CLASS_OBJECT)) return;
+        boolean hasClassObject = descriptor.getClassObjectDescriptor() != null;
+        boolean isEnumClass = DescriptorUtils.isEnumClass(descriptor);
 
-        v.newField(myClass, ACC_PUBLIC | ACC_STATIC | ACC_FINAL, JvmAbi.INSTANCE_FIELD, classAsmType.getDescriptor(), null, null);
+        if (!(isNonLiteralObject(myClass) || hasClassObject) || isEnumClass) return;
+
+        ClassDescriptor fieldTypeDescriptor = hasClassObject ? descriptor.getClassObjectDescriptor() : descriptor;
+        assert fieldTypeDescriptor != null;
+        final FieldInfo info = FieldInfo.createForSingleton(fieldTypeDescriptor, typeMapper);
+        JetClassOrObject original = hasClassObject ? ((JetClass)myClass).getClassObject().getObjectDeclaration() : myClass;
+
+        v.newField(original, ACC_PUBLIC | ACC_STATIC | ACC_FINAL, info.getFieldName(), info.getFieldType().getDescriptor(), null, null);
 
         staticInitializerChunks.add(new CodeChunk() {
             @Override
             public void generate(InstructionAdapter iv) {
-                genInitSingletonField(classAsmType, iv);
+                genInitSingletonField(info, iv);
             }
         });
     }
@@ -934,30 +960,34 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         final JvmMethodSignature constructorMethod = callableMethod.getSignature();
 
         assert constructorDescriptor != null;
-        int flags = getVisibilityAccessFlag(constructorDescriptor);
+        int flags = getConstructorAsmFlags(constructorDescriptor);
         final MethodVisitor mv = v.newMethod(myClass, flags, constructorMethod.getName(), constructorMethod.getAsmMethod().getDescriptor(),
                                              constructorMethod.getGenericsSignature(), null);
-        if (state.getClassBuilderMode() == ClassBuilderMode.SIGNATURES) return;
+        if (state.getClassBuilderMode() != ClassBuilderMode.SIGNATURES) {
 
-        AnnotationVisitor jetConstructorVisitor = mv.visitAnnotation(JvmStdlibNames.JET_CONSTRUCTOR.getDescriptor(), true);
+            AnnotationVisitor jetConstructorVisitor = mv.visitAnnotation(JvmStdlibNames.JET_CONSTRUCTOR.getDescriptor(), true);
 
-        int flagsValue = getFlagsForVisibility(constructorDescriptor.getVisibility());
-        if (JvmStdlibNames.FLAGS_DEFAULT_VALUE != flagsValue) {
-            jetConstructorVisitor.visit(JvmStdlibNames.JET_FLAGS_FIELD, flagsValue);
+            int flagsValue = getFlagsForVisibility(constructorDescriptor.getVisibility());
+            if (JvmStdlibNames.FLAGS_DEFAULT_VALUE != flagsValue) {
+                jetConstructorVisitor.visit(JvmStdlibNames.JET_FLAGS_FIELD, flagsValue);
+            }
+
+            jetConstructorVisitor.visitEnd();
+
+            AnnotationCodegen.forMethod(mv, typeMapper).genAnnotations(constructorDescriptor);
+
+            writeParameterAnnotations(constructorDescriptor, constructorMethod, hasCapturedThis, mv);
+
+            if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) {
+                genStubCode(mv);
+                return;
+            }
+
+            generatePrimaryConstructorImpl(constructorDescriptor, constructorContext, constructorMethod, callableMethod, hasCapturedThis,
+                                           closure, mv);
         }
 
-        jetConstructorVisitor.visitEnd();
-
-        AnnotationCodegen.forMethod(mv, typeMapper).genAnnotations(constructorDescriptor);
-
-        writeParameterAnnotations(constructorDescriptor, constructorMethod, hasCapturedThis, mv);
-
-        if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) {
-            genStubCode(mv);
-            return;
-        }
-
-        generatePrimaryConstructorImpl(constructorDescriptor, constructorContext, constructorMethod, callableMethod, hasCapturedThis, closure, mv);
+        FunctionCodegen.generateConstructorWithoutParametersIfNeeded(state, callableMethod, constructorDescriptor, v);
     }
 
     private void generatePrimaryConstructorImpl(
@@ -1008,7 +1038,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
             if (captureReceiver != null) {
                 iv.load(0, OBJECT_TYPE);
                 final Type asmType = typeMapper.mapType(captureReceiver.getDefaultType(), JetTypeMapperMode.IMPL);
-                iv.load(1, asmType);
+                iv.load(k, asmType);
                 iv.putfield(internalName, CAPTURED_RECEIVER_FIELD, asmType.getDescriptor());
                 k += asmType.getSize();
             }
@@ -1114,6 +1144,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                         JetValueParameterAnnotationWriter.visitParameterAnnotation(mv, i);
                 jetValueParameterAnnotation.writeName(valueParameter.getName().getName());
                 jetValueParameterAnnotation.writeHasDefaultValue(valueParameter.declaresDefaultValue());
+                jetValueParameterAnnotation.writeVararg(valueParameter.getVarargElementType() != null);
                 jetValueParameterAnnotation.writeType(constructorMethod.getKotlinParameterType(i));
                 jetValueParameterAnnotation.visitEnd();
                 ++i;

compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.codegen.state;
+package org.jetbrains.jet.codegen;
 
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.CompilationErrorHandler;
-import org.jetbrains.jet.codegen.NamespaceCodegen;
+import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
@@ -35,25 +34,11 @@ import java.util.Map;
 
 import static org.jetbrains.jet.codegen.binding.CodegenBinding.registerClassNameForScript;
 
-/**
- * @author alex.tkachman
- */
-public class GenerationStrategy {
-    public static final GenerationStrategy STANDARD = new GenerationStrategy();
-
-    protected GenerationStrategy () {
-    }
-
-    public void generateNamespace(GenerationState state,
-            FqName fqName,
-            Collection<JetFile> jetFiles,
-            CompilationErrorHandler errorHandler
+public class KotlinCodegenFacade {
+    public static void compileCorrectFiles(
+            @NotNull GenerationState state,
+            @NotNull CompilationErrorHandler errorHandler
     ) {
-        NamespaceCodegen codegen = state.getFactory().forNamespace(fqName, jetFiles);
-        codegen.generate(errorHandler, state.getProgress());
-    }
-
-    public final void compileCorrectFiles(GenerationState state, @NotNull CompilationErrorHandler errorHandler) {
         for (JetFile file : state.getFiles()) {
             if (file.isScript()) {
                 String name = ScriptNameUtil.classNameForScript(file);
@@ -77,4 +62,16 @@ public class GenerationStrategy {
             generateNamespace(state, entry.getKey(), entry.getValue(), errorHandler);
         }
     }
+
+    public static void generateNamespace(
+            @NotNull GenerationState state,
+            @NotNull FqName fqName,
+            @NotNull Collection<JetFile> jetFiles,
+            @NotNull CompilationErrorHandler errorHandler
+    ) {
+            NamespaceCodegen codegen = state.getFactory().forNamespace(fqName, jetFiles);
+            codegen.generate(errorHandler);
+    }
+
+    private KotlinCodegenFacade() {}
 }

compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,6 @@ import java.util.Map;
 
 import static org.jetbrains.jet.codegen.binding.CodegenBinding.enumEntryNeedSubclass;
 
-/**
- * @author alex.tkachman
- */
 public class MemberCodegen extends GenerationStateAware {
     public MemberCodegen(@NotNull GenerationState state) {
         super(state);

compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,39 +22,41 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.asm4.AnnotationVisitor;
 import org.jetbrains.asm4.MethodVisitor;
 import org.jetbrains.asm4.Type;
 import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.codegen.context.CodegenContext;
 import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
+import org.jetbrains.jet.lang.descriptors.SubModuleDescriptor;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
+import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
+import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
-import org.jetbrains.jet.codegen.state.Progress;
 
 import java.io.File;
 import java.util.Collection;
 
 import static org.jetbrains.asm4.Opcodes.*;
 
-/**
- * @author max
- */
 public class NamespaceCodegen extends MemberCodegen {
     @NotNull
     private final ClassBuilderOnDemand v;
     @NotNull private final FqName name;
+    private final SubModuleDescriptor subModule;
     private final Collection<JetFile> files;
 
     public NamespaceCodegen(
             @NotNull ClassBuilderOnDemand v,
+            @NotNull SubModuleDescriptor subModule,
             @NotNull final FqName fqName,
             GenerationState state,
             Collection<JetFile> namespaceFiles
@@ -63,35 +65,43 @@ public class NamespaceCodegen extends MemberCodegen {
         checkAllFilesHaveSameNamespace(namespaceFiles);
 
         this.v = v;
+        this.subModule = subModule;
         name = fqName;
         this.files = namespaceFiles;
 
-        final PsiFile sourceFile = namespaceFiles.iterator().next().getContainingFile();
+        final PsiFile sourceFile = namespaceFiles.size() == 1 ? namespaceFiles.iterator().next().getContainingFile() : null;
 
         v.addOptionalDeclaration(new ClassBuilderOnDemand.ClassBuilderCallback() {
             @Override
             public void doSomething(@NotNull ClassBuilder v) {
                 v.defineClass(sourceFile, V1_6,
-                              ACC_PUBLIC/*|ACC_SUPER*/,
+                              ACC_PUBLIC | ACC_FINAL,
                               getJVMClassNameForKotlinNs(fqName).getInternalName(),
                               null,
                               //"jet/lang/Namespace",
                               "java/lang/Object",
                               new String[0]
                 );
-                // TODO figure something out for a namespace that spans multiple files
-                v.visitSource(sourceFile.getName(), null);
+                //We don't generate any source information for namespace with multiple files
+                if (sourceFile != null) {
+                    v.visitSource(sourceFile.getName(), null);
+                }
             }
         });
     }
 
-    public void generate(CompilationErrorHandler errorHandler, final Progress progress) {
-        boolean multiFile = CodegenBinding.isMultiFileNamespace(state.getBindingContext(), name);
+    public void generate(CompilationErrorHandler errorHandler) {
+        boolean multiFile = CodegenBinding.isMultiFileNamespace(state.getModuleSourcesManager(), subModule.getContainingDeclaration(), name);
+
+        if (shouldGenerateNSClass(files)) {
+            AnnotationVisitor packageClassAnnotation = v.getClassBuilder().newAnnotation(JvmStdlibNames.JET_PACKAGE_CLASS.getDescriptor(), true);
+            packageClassAnnotation.visit(JvmStdlibNames.ABI_VERSION_NAME, JvmAbi.VERSION);
+            packageClassAnnotation.visitEnd();
+        }
 
         for (JetFile file : files) {
             VirtualFile vFile = file.getVirtualFile();
             try {
-                final String path = vFile != null ? vFile.getPath() : "no_virtual_file/" + file.getName();
                 generate(file, multiFile);
             }
             catch (ProcessCanceledException e) {
@@ -115,7 +125,8 @@ public class NamespaceCodegen extends MemberCodegen {
     }
 
     private void generate(JetFile file, boolean multiFile) {
-        NamespaceDescriptor descriptor = state.getBindingContext().get(BindingContext.FILE_TO_NAMESPACE, file);
+        PackageViewDescriptor descriptor = subModule.getPackageView(JetPsiUtil.getFQName(file));
+        assert descriptor != null : "No namespace found for file " + file + " declared package: " + file.getPackageName();
         for (JetDeclaration declaration : file.getDeclarations()) {
             if (declaration instanceof JetProperty) {
                 final CodegenContext context = CodegenContext.STATIC.intoNamespace(descriptor);
@@ -128,8 +139,9 @@ public class NamespaceCodegen extends MemberCodegen {
                 }
             }
             else if (declaration instanceof JetClassOrObject) {
-                final CodegenContext context = CodegenContext.STATIC.intoNamespace(descriptor);
-                genClassOrObject(context, (JetClassOrObject) declaration);
+                if (state.isGenerateDeclaredClasses()) {
+                    generateClassOrObject(descriptor, (JetClassOrObject) declaration);
+                }
             }
             else if (declaration instanceof JetScript) {
                 state.getScriptCodegen().generate((JetScript) declaration);
@@ -145,12 +157,13 @@ public class NamespaceCodegen extends MemberCodegen {
             }
 
             if (k > 0) {
-                String namespaceInternalName = JvmClassName.byFqNameWithoutInnerClasses(name.child(Name.identifier(JvmAbi.PACKAGE_CLASS))).getInternalName();
+                String namespaceInternalName = JvmClassName.byFqNameWithoutInnerClasses(
+                                                    PackageClassUtils.getPackageClassFqName(name)).getInternalName();
                 String className = getMultiFileNamespaceInternalName(namespaceInternalName, file);
                 ClassBuilder builder = state.getFactory().forNamespacepart(className, file);
 
                 builder.defineClass(file, V1_6,
-                                    ACC_PUBLIC/*|ACC_SUPER*/,
+                                    ACC_PUBLIC | ACC_FINAL,
                                     className,
                                     null,
                                     //"jet/lang/Namespace",
@@ -179,6 +192,11 @@ public class NamespaceCodegen extends MemberCodegen {
         }
     }
 
+    public void generateClassOrObject(@NotNull PackageViewDescriptor descriptor, @NotNull JetClassOrObject classOrObject) {
+        CodegenContext context = CodegenContext.STATIC.intoNamespace(descriptor);
+        genClassOrObject(context, classOrObject);
+    }
+
     /**
      * @param namespaceFiles all files should have same package name
      * @return
@@ -269,11 +287,12 @@ public class NamespaceCodegen extends MemberCodegen {
 
     @NotNull
     public static JvmClassName getJVMClassNameForKotlinNs(@NotNull FqName fqName) {
+        String packageClassName = PackageClassUtils.getPackageClassName(fqName);
         if (fqName.isRoot()) {
-            return JvmClassName.byInternalName(JvmAbi.PACKAGE_CLASS);
+            return JvmClassName.byInternalName(packageClassName);
         }
 
-        return JvmClassName.byFqNameWithoutInnerClasses(fqName.child(Name.identifier(JvmAbi.PACKAGE_CLASS)));
+        return JvmClassName.byFqNameWithoutInnerClasses(fqName.child(Name.identifier(packageClassName)));
     }
 
     @NotNull

compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.jetbrains.jet.codegen;
 
-/**
- * @author max
- */
 public class OwnerKind {
     private final String name;
 

compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,10 +46,6 @@ import static org.jetbrains.jet.lang.resolve.BindingContextUtils.descriptorToDec
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isExternallyAccessible;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
 
-/**
- * @author max
- * @author alex.tkachman
- */
 public class PropertyCodegen extends GenerationStateAware {
     private final FunctionCodegen functionCodegen;
     private final ClassBuilder v;

compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,32 +22,39 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.jetbrains.jet.lang.types.lang.PrimitiveType;
 
 import java.util.List;
 
 import static org.jetbrains.jet.codegen.AsmUtil.isPrimitiveNumberClassDescriptor;
 
-/**
- * @author abreslav
- */
 public class RangeCodegenUtil {
-    private static final ImmutableMap<String, JetType> RANGE_TO_ELEMENT_TYPE = ImmutableMap.<String, JetType>builder()
-            .put("ByteRange", KotlinBuiltIns.getInstance().getByteType())
-            .put("ShortRange", KotlinBuiltIns.getInstance().getShortType())
-            .put("IntRange", KotlinBuiltIns.getInstance().getIntType())
-            .put("LongRange", KotlinBuiltIns.getInstance().getLongType())
-            .put("FloatRange", KotlinBuiltIns.getInstance().getFloatType())
-            .put("DoubleRange", KotlinBuiltIns.getInstance().getDoubleType())
-            .put("CharRange", KotlinBuiltIns.getInstance().getCharType())
-            .build();
+    private static final ImmutableMap<FqName, PrimitiveType> RANGE_TO_ELEMENT_TYPE;
+    private static final ImmutableMap<FqName, PrimitiveType> PROGRESSION_TO_ELEMENT_TYPE;
+
+    static {
+        ImmutableMap.Builder<FqName, PrimitiveType> rangeBuilder = ImmutableMap.builder();
+        ImmutableMap.Builder<FqName, PrimitiveType> progressionBuilder = ImmutableMap.builder();
+        for (PrimitiveType primitiveType : PrimitiveType.values()) {
+            rangeBuilder.put(primitiveType.getRangeClassName(), primitiveType);
+            progressionBuilder.put(primitiveType.getProgressionClassName(), primitiveType);
+        }
+        RANGE_TO_ELEMENT_TYPE = rangeBuilder.build();
+        PROGRESSION_TO_ELEMENT_TYPE = progressionBuilder.build();
+    }
 
     private RangeCodegenUtil() {}
 
-    public static boolean isIntRange(JetType rangeType) {
-        return !rangeType.isNullable()
-               && KotlinBuiltIns.getInstance().getIntType().equals(getPrimitiveRangeElementType(rangeType));
+    public static boolean isRange(JetType rangeType) {
+        return !rangeType.isNullable() && getPrimitiveRangeElementType(rangeType) != null;
+    }
+
+    public static boolean isProgression(JetType rangeType) {
+        return !rangeType.isNullable() && getPrimitiveProgressionElementType(rangeType) != null;
     }
 
     @Nullable
@@ -81,14 +88,27 @@ public class RangeCodegenUtil {
     }
 
     @Nullable
-    public static JetType getPrimitiveRangeElementType(JetType rangeType) {
-        ClassifierDescriptor declarationDescriptor = rangeType.getConstructor().getDeclarationDescriptor();
+    private static PrimitiveType getPrimitiveRangeElementType(JetType rangeType) {
+        return getPrimitiveRangeOrProgressionElementType(rangeType, RANGE_TO_ELEMENT_TYPE);
+    }
+
+    @Nullable
+    private static PrimitiveType getPrimitiveProgressionElementType(JetType rangeType) {
+        return getPrimitiveRangeOrProgressionElementType(rangeType, PROGRESSION_TO_ELEMENT_TYPE);
+    }
+
+    @Nullable
+    private static PrimitiveType getPrimitiveRangeOrProgressionElementType(
+            @NotNull JetType rangeOrProgression,
+            @NotNull ImmutableMap<FqName, PrimitiveType> map
+    ) {
+        ClassifierDescriptor declarationDescriptor = rangeOrProgression.getConstructor().getDeclarationDescriptor();
         assert declarationDescriptor != null;
         if (declarationDescriptor != KotlinBuiltIns.getInstance().getBuiltInsScope().getClassifier(declarationDescriptor.getName())) {
             // Must be a standard library class
             return null;
         }
-        return RANGE_TO_ELEMENT_TYPE.get(declarationDescriptor.getName().getName());
+        return map.get(DescriptorUtils.getFQName(declarationDescriptor).toSafe());
     }
 
     public static boolean isOptimizableRangeTo(CallableDescriptor rangeTo) {

compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.jetbrains.jet.codegen.context.CodegenContext;
 import org.jetbrains.jet.codegen.context.ScriptContext;
 import org.jetbrains.jet.codegen.signature.JvmMethodSignature;
 import org.jetbrains.jet.codegen.state.GenerationState;
-import org.jetbrains.jet.codegen.state.GenerationStrategy;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
@@ -44,9 +43,6 @@ import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
 
-/**
- * @author Stepan Koltsov
- */
 public class ScriptCodegen extends MemberCodegen {
 
     @NotNull
@@ -254,7 +250,7 @@ public class ScriptCodegen extends MemberCodegen {
         registerClassNameForScript(state.getBindingTrace(), script, className);
 
         state.beforeCompile();
-        GenerationStrategy.STANDARD.generateNamespace(
+        KotlinCodegenFacade.generateNamespace(
                 state,
                 JetPsiUtil.getFQName((JetFile) script.getContainingFile()),
                 Collections.singleton((JetFile) script.getContainingFile()),

compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,14 +23,12 @@ import org.jetbrains.asm4.Label;
 import org.jetbrains.asm4.Type;
 import org.jetbrains.asm4.commons.InstructionAdapter;
 import org.jetbrains.asm4.commons.Method;
-import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethod;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
-import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
@@ -42,10 +40,6 @@ import static org.jetbrains.asm4.Opcodes.*;
 import static org.jetbrains.jet.codegen.AsmUtil.*;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.*;
 
-/**
- * @author yole
- * @author alex.tkachman
- */
 public abstract class StackValue {
     @NotNull
     public final Type type;
@@ -134,7 +128,8 @@ public abstract class StackValue {
         return new CollectionElement(type, getter, setter, codegen, state);
     }
 
-    public static StackValue field(Type type, JvmClassName owner, String name, boolean isStatic) {
+    @NotNull
+    public static StackValue field(@NotNull Type type, @NotNull JvmClassName owner, @NotNull String name, boolean isStatic) {
         return new Field(type, owner, name, isStatic);
     }
 
@@ -235,42 +230,35 @@ public abstract class StackValue {
     public static void coerce(Type fromType, Type toType, InstructionAdapter v) {
         if (toType.equals(fromType)) return;
 
-        if (toType.getSort() == Type.VOID && fromType.getSort() != Type.VOID) {
+        if (toType.getSort() == Type.VOID) {
             pop(fromType, v);
         }
-        else if (toType.getSort() != Type.VOID && fromType.getSort() == Type.VOID) {
+        else if (fromType.getSort() == Type.VOID) {
             if (toType.getSort() == Type.OBJECT) {
                 putTuple0Instance(v);
             }
-            else if (toType == Type.LONG_TYPE) {
-                v.lconst(0);
-            }
-            else if (toType == Type.FLOAT_TYPE) {
-                v.fconst(0);
-            }
-            else if (toType == Type.DOUBLE_TYPE) {
-                v.dconst(0);
-            }
             else {
-                v.iconst(0);
+                pushDefaultPrimitiveValueOnStack(toType, v);
             }
         }
-        else if (toType.equals(JET_TUPLE0_TYPE) && !fromType.equals(JET_TUPLE0_TYPE)) {
+        else if (toType.equals(JET_TUPLE0_TYPE)) {
             pop(fromType, v);
             putTuple0Instance(v);
         }
-        else if (toType.getSort() == Type.OBJECT && fromType.equals(OBJECT_TYPE) || toType.getSort() == Type.ARRAY) {
+        else if (toType.getSort() == Type.ARRAY) {
             v.checkcast(toType);
         }
         else if (toType.getSort() == Type.OBJECT) {
-            if (fromType.getSort() == Type.OBJECT && !toType.equals(OBJECT_TYPE)) {
-                v.checkcast(toType);
+            if (fromType.getSort() == Type.OBJECT || fromType.getSort() == Type.ARRAY) {
+                if (!toType.equals(OBJECT_TYPE)) {
+                    v.checkcast(toType);
+                }
             }
             else {
                 box(fromType, toType, v);
             }
         }
-        else if (fromType.getSort() == Type.OBJECT && toType.getSort() <= Type.DOUBLE) {
+        else if (fromType.getSort() == Type.OBJECT) {
             if (toType.getSort() == Type.BOOLEAN) {
                 coerce(fromType, JvmPrimitiveType.BOOLEAN.getWrapper().getAsmType(), v);
             }
@@ -351,20 +339,8 @@ public abstract class StackValue {
     }
 
     public static StackValue singleton(ClassDescriptor classDescriptor, JetTypeMapper typeMapper) {
-        final Type type = typeMapper.mapType(classDescriptor.getDefaultType());
-
-        final ClassKind kind = classDescriptor.getKind();
-        if (kind == ClassKind.CLASS_OBJECT || kind == ClassKind.OBJECT) {
-            return field(type, JvmClassName.byInternalName(type.getInternalName()), JvmAbi.INSTANCE_FIELD, true);
-        }
-        else if (kind == ClassKind.ENUM_ENTRY) {
-            final JvmClassName owner = typeMapper.getBindingContext()
-                    .get(CodegenBinding.FQN, classDescriptor.getContainingDeclaration().getContainingDeclaration());
-            return field(type, owner, classDescriptor.getName().getName(), true);
-        }
-        else {
-            throw new UnsupportedOperationException();
-        }
+        FieldInfo info = FieldInfo.createForSingleton(classDescriptor, typeMapper);
+        return field(info.getFieldType(), JvmClassName.byInternalName(info.getOwnerInternalName()), info.getFieldName(), true);
     }
 
     private static class None extends StackValue {
@@ -488,20 +464,8 @@ public abstract class StackValue {
 
         @Override
         public void put(Type type, InstructionAdapter v) {
-            if (type == Type.VOID_TYPE) {
-                return;
-            }
-            if (type.equals(JET_TUPLE0_TYPE)) {
-                putTuple0Instance(v);
-                return;
-            }
-            if (type != Type.BOOLEAN_TYPE && !type.equals(OBJECT_TYPE) && !type.equals(getType(Boolean.class))) {
-                throw new UnsupportedOperationException("don't know how to put a compare as a non-boolean type " + type);
-            }
             putAsBoolean(v);
-            if (type != Type.BOOLEAN_TYPE) {
-                box(Type.BOOLEAN_TYPE, type, v);
-            }
+            coerceTo(type, v);
         }
 
         @Override
@@ -580,17 +544,8 @@ public abstract class StackValue {
 
         @Override
         public void put(Type type, InstructionAdapter v) {
-            if (type == Type.VOID_TYPE) {
-                myOperand.put(type, v);    // the operand will remove itself from the stack if needed
-                return;
-            }
-            if (type != Type.BOOLEAN_TYPE && !type.equals(OBJECT_TYPE) && !type.equals(getType(Boolean.class))) {
-                throw new UnsupportedOperationException("don't know how to put a compare as a non-boolean type");
-            }
             putAsBoolean(v);
-            if (type != Type.BOOLEAN_TYPE) {
-                box(Type.BOOLEAN_TYPE, type, v);
-            }
+            coerceTo(type, v);
         }
 
         @Override
@@ -1062,7 +1017,7 @@ public abstract class StackValue {
         public void store(Type topOfStackType, InstructionAdapter v) {
             coerceFrom(topOfStackType, v);
             v.load(index, OBJECT_TYPE);
-            v.swap();
+            AsmUtil.swap(v, sharedTypeForType(this.type), topOfStackType);
             Type refType = refType(this.type);
             Type sharedType = sharedTypeForType(this.type);
             v.visitFieldInsn(PUTFIELD, sharedType.getInternalName(), "ref", refType.getDescriptor());

compiler/backend/src/org/jetbrains/jet/codegen/TraitImplBodyCodegen.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/backend/src/org/jetbrains/jet/codegen/binding/BindingContextAware.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,6 @@ package org.jetbrains.jet.codegen.binding;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 
-/**
- * @author alex.tkachman
- */
 public class BindingContextAware {
     @NotNull protected final BindingContext bindingContext;
 

compiler/backend/src/org/jetbrains/jet/codegen/binding/BindingTraceAware.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,6 @@ package org.jetbrains.jet.codegen.binding;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 
-/**
- * @author alex.tkachman
- */
 public class BindingTraceAware extends BindingContextAware {
     @NotNull protected final BindingTrace bindingTrace;
 

compiler/backend/src/org/jetbrains/jet/codegen/binding/CalculatedClosure.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,9 +29,6 @@ import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author alex.tkachman
- */
 public interface CalculatedClosure {
 
     @Nullable

compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,15 @@ package org.jetbrains.jet.codegen.binding;
 import com.intellij.util.containers.Stack;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
+import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
@@ -36,9 +40,6 @@ import static org.jetbrains.jet.codegen.CodegenUtil.peekFromStack;
 import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 
-/**
- * @author alex.tkachman
-*/
 class CodegenAnnotatingVisitor extends JetVisitorVoid {
     private final Map<String, Integer> anonymousSubclassesCount = new HashMap<String, Integer>();
 
@@ -67,7 +68,9 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
                 Collections.singleton((funDescriptor.getReceiverParameter() != null
                                        ? KotlinBuiltIns.getInstance().getExtensionFunction(arity)
                                        : KotlinBuiltIns.getInstance().getFunction(arity)).getDefaultType()), JetScope.EMPTY,
-                Collections.<ConstructorDescriptor>emptySet(), null);
+                Collections.<ConstructorDescriptor>emptySet(),
+                null,
+                false);
 
         assert PsiCodegenPredictor.checkPredictedClassNameForFun(bindingContext, funDescriptor, classDescriptor);
         bindingTrace.record(CLASS_FOR_FUNCTION, funDescriptor, classDescriptor);
@@ -195,8 +198,8 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
 
     private String getName(ClassDescriptor classDescriptor) {
         String base = peekFromStack(nameStack);
-        return classDescriptor.getContainingDeclaration() instanceof NamespaceDescriptor ? base.isEmpty() ? classDescriptor.getName()
-                .getName() : base + '/' + classDescriptor.getName() : base + '$' + classDescriptor.getName();
+        return DescriptorUtils.isTopLevelDeclaration(classDescriptor) ? base.isEmpty() ? classDescriptor.getName()
+                        .getName() : base + '/' + classDescriptor.getName() : base + '$' + classDescriptor.getName();
     }
 
     @Override
@@ -256,13 +259,15 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
             super.visitNamedFunction(function);
             nameStack.pop();
         }
-        else if (containingDeclaration instanceof NamespaceDescriptor) {
+        else if (DescriptorUtils.isTopLevelDeclaration(functionDescriptor)) {
             String peek = peekFromStack(nameStack);
+            FqName qualifiedName = ((PackageFragmentDescriptor) containingDeclaration).getFqName();
+            String packageClassName = PackageClassUtils.getPackageClassName(qualifiedName);
             if (peek.isEmpty()) {
-                peek = JvmAbi.PACKAGE_CLASS;
+                peek = packageClassName;
             }
             else {
-                peek += "/" + JvmAbi.PACKAGE_CLASS;
+                peek += "/" + packageClassName;
             }
             nameStack.push(peek + '$' + function.getName());
             super.visitNamedFunction(function);

compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,19 @@
 
 package org.jetbrains.jet.codegen.binding;
 
+import com.google.common.collect.Lists;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.ModuleSourcesManager;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -41,9 +45,6 @@ import static org.jetbrains.jet.codegen.CodegenUtil.isInterface;
 import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.descriptorToDeclaration;
 
-/**
- * @author alex.tkachman
- */
 public class CodegenBinding {
     public static final WritableSlice<ClassDescriptor, MutableClosure> CLOSURE = Slices.createSimpleSlice();
 
@@ -58,9 +59,9 @@ public class CodegenBinding {
     private CodegenBinding() {
     }
 
-    public static void initTrace(BindingTrace bindingTrace, Collection<JetFile> files) {
+    public static void initTrace(@NotNull ModuleSourcesManager moduleManager, @NotNull BindingTrace bindingTrace, @NotNull Collection<JetFile> files) {
         CodegenAnnotatingVisitor visitor = new CodegenAnnotatingVisitor(bindingTrace);
-        for (JetFile file : allFilesInNamespaces(bindingTrace.getBindingContext(), files)) {
+        for (JetFile file : allFilesInNamespaces(moduleManager, files)) {
             file.accept(visitor);
         }
     }
@@ -127,7 +128,8 @@ public class CodegenBinding {
                 Collections.singletonList(KotlinBuiltIns.getInstance().getAnyType()),
                 JetScope.EMPTY,
                 Collections.<ConstructorDescriptor>emptySet(),
-                null);
+                null,
+                false);
 
         recordClosure(bindingTrace, null, classDescriptor, null, className, false);
 
@@ -135,18 +137,26 @@ public class CodegenBinding {
         bindingTrace.record(CLASS_FOR_FUNCTION, scriptDescriptor, classDescriptor);
     }
 
-    private static boolean canHaveOuter(BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) {
-        final ClassKind kind = classDescriptor.getKind();
+    public static boolean canHaveOuter(BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) {
         if (isSingleton(bindingContext, classDescriptor)) {
             return false;
         }
 
-        if (kind == ClassKind.ENUM_CLASS) {
+        ClassDescriptor enclosing = enclosingClassDescriptor(bindingContext, classDescriptor);
+        if (enclosing == null) {
             return false;
         }
 
-        final ClassDescriptor enclosing = enclosingClassDescriptor(bindingContext, classDescriptor);
-        return enclosing != null && !isSingleton(bindingContext, enclosing);
+        ClassKind kind = classDescriptor.getKind();
+        if (kind == ClassKind.CLASS) {
+            return classDescriptor.isInner() || !(classDescriptor.getContainingDeclaration() instanceof ClassDescriptor);
+        }
+        else if (kind == ClassKind.OBJECT) {
+            return !isSingleton(bindingContext, enclosing);
+        }
+        else {
+            return false;
+        }
     }
 
     public static boolean isSingleton(BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) {
@@ -208,25 +218,27 @@ public class CodegenBinding {
         registerClassNameForScript(bindingTrace, descriptor, className);
     }
 
-    @NotNull public static Collection<JetFile> allFilesInNamespaces(BindingContext bindingContext, Collection<JetFile> files) {
+    @NotNull
+    public static Collection<JetFile> allFilesInNamespaces(@NotNull ModuleSourcesManager moduleManager, @NotNull Collection<JetFile> files) {
         // todo: we use Set and add given files but ignoring other scripts because something non-clear kept in binding
         // for scripts especially in case of REPL
 
-        final HashSet<FqName> names = new HashSet<FqName>();
-        for (JetFile file : files) {
-            if (!file.isScript()) {
-                names.add(JetPsiUtil.getFQName(file));
-            }
-        }
-
-        final HashSet<JetFile> answer = new HashSet<JetFile>();
+        Set<JetFile> answer = new HashSet<JetFile>();
         answer.addAll(files);
 
-        for (FqName name : names) {
-            final NamespaceDescriptor namespaceDescriptor = bindingContext.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, name);
-            final Collection<JetFile> jetFiles = bindingContext.get(NAMESPACE_TO_FILES, namespaceDescriptor);
-            if (jetFiles != null)
-                answer.addAll(jetFiles);
+        for (JetFile file : files) {
+            if (file.isScript()) continue;
+
+            FqName fqName = JetPsiUtil.getFQName(file);
+            ModuleDescriptor module = moduleManager.getSubModuleForFile(file).getContainingDeclaration();
+            Collection<JetFile> filesByPackage = getPackageFragmentSources(moduleManager, module, fqName);
+
+            assert filesByPackage.contains(file) : "Inconsistent behavior of module manager: " +
+                                                   "file " + file + " does not belong to " +
+                                                   "its package " + fqName + " in " +
+                                                   "its module " + module;
+
+            answer.addAll(filesByPackage);
         }
 
         List<JetFile> sortedAnswer = new ArrayList<JetFile>(answer);
@@ -247,10 +259,27 @@ public class CodegenBinding {
         return sortedAnswer;
     }
 
-    public static boolean isMultiFileNamespace(BindingContext bindingContext, FqName fqName) {
-        final NamespaceDescriptor namespaceDescriptor = bindingContext.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, fqName);
-        final Collection<JetFile> jetFiles = bindingContext.get(NAMESPACE_TO_FILES, namespaceDescriptor);
-        return jetFiles != null && jetFiles.size() > 1;
+    @NotNull
+    private static Collection<JetFile> getPackageFragmentSources(
+            @NotNull ModuleSourcesManager moduleManager,
+            @NotNull ModuleDescriptor module,
+            @NotNull FqName packageFqName
+    ) {
+        Collection<JetFile> result = Lists.newArrayList();
+
+        for (SubModuleDescriptor subModule : module.getSubModules()) {
+            Collection<PackageFragmentDescriptor> fragments = subModule.getPackageFragmentProvider().getPackageFragments(packageFqName);
+
+            for (PackageFragmentDescriptor fragment : fragments) {
+                result.addAll(moduleManager.getPackageFragmentSources(fragment));
+            }
+        }
+
+        return result;
+    }
+
+    public static boolean isMultiFileNamespace(@NotNull ModuleSourcesManager moduleSourcesManager, @NotNull ModuleDescriptor module, @NotNull FqName fqName) {
+        return getPackageFragmentSources(moduleSourcesManager, module, fqName).size() > 1;
     }
 
     public static boolean isObjectLiteral(BindingContext bindingContext, ClassDescriptor declaration) {
@@ -334,17 +363,17 @@ public class CodegenBinding {
             }
         }
 
-        DeclarationDescriptor container = descriptor.getContainingDeclaration();
-
-        if (container == null) {
-            throw new IllegalStateException("descriptor has no container: " + descriptor);
-        }
+        DeclarationDescriptor container = DescriptorUtils.getParentInPackageViewHierarchy(descriptor);
 
         Name name = descriptor.getName();
 
+        if (container instanceof PackageViewDescriptor && DescriptorUtils.isRootNamespace((PackageViewDescriptor) container)) {
+            return name.getIdentifier();
+        }
+
         String baseName = getJvmInternalName(bindingTrace, container).getInternalName();
         if (!baseName.isEmpty()) {
-            return baseName + (container instanceof NamespaceDescriptor ? "/" : "$") + name.getIdentifier();
+            return baseName + (DescriptorUtils.isTopLevelDeclaration(descriptor) ? "/" : "$") + name.getIdentifier();
         }
 
         return name.getIdentifier();

compiler/backend/src/org/jetbrains/jet/codegen/binding/MutableClosure.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,9 +29,6 @@ import org.jetbrains.jet.lang.psi.JetDelegatorToSuperCall;
 
 import java.util.*;
 
-/**
- * @author alex.tkachman
- */
 public final class MutableClosure implements CalculatedClosure {
     private final JetDelegatorToSuperCall superCall;
 

compiler/backend/src/org/jetbrains/jet/codegen/binding/PsiCodegenPredictor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,10 @@ import org.jetbrains.jet.codegen.NamespaceCodegen;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.resolve.BindingContextUtils;
-import org.jetbrains.jet.lang.resolve.BindingTrace;
-import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace;
+import org.jetbrains.jet.lang.resolve.*;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
+import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.util.slicedmap.WritableSlice;
@@ -79,6 +77,11 @@ public final class PsiCodegenPredictor {
         // TODO: Method won't give correct class name for traits implementations
 
         JetDeclaration parentDeclaration = PsiTreeUtil.getParentOfType(declaration, JetDeclaration.class);
+        if (parentDeclaration instanceof JetClassObject) {
+            assert declaration instanceof JetObjectDeclaration : "Only object declarations can be children of JetClassObject: " + declaration;
+            return getPredefinedJvmClassName(parentDeclaration);
+        }
+
         JvmClassName parentClassName = parentDeclaration != null ?
                                        getPredefinedJvmClassName(parentDeclaration) :
                                        getPredefinedJvmClassName((JetFile) declaration.getContainingFile(), false);
@@ -139,9 +142,10 @@ public final class PsiCodegenPredictor {
 
     private static JvmClassName addPackageClass(JvmClassName packageName) {
         FqName name = packageName.getFqName();
+        String packageClassName = PackageClassUtils.getPackageClassName(name);
         return name.isRoot() ?
-               JvmClassName.byFqNameWithoutInnerClasses(JvmAbi.PACKAGE_CLASS) :
-               JvmClassName.byInternalName(packageName.getInternalName() + "/" + JvmAbi.PACKAGE_CLASS);
+               JvmClassName.byFqNameWithoutInnerClasses(packageClassName) :
+               JvmClassName.byInternalName(packageName.getInternalName() + "/" + packageClassName);
     }
 
     public static boolean checkPredictedClassNameForFun(
@@ -200,6 +204,7 @@ public final class PsiCodegenPredictor {
     @Nullable
     public static JetFile getFileForCodegenNamedClass(
             @NotNull BindingContext context,
+            @NotNull ModuleSourcesManager moduleSourcesManager,
             @NotNull List<JetFile> allNamespaceFiles,
             @NotNull final JvmClassName className
     ) {
@@ -217,7 +222,7 @@ public final class PsiCodegenPredictor {
             }
         };
 
-        CodegenBinding.initTrace(trace, allNamespaceFiles);
+        CodegenBinding.initTrace(moduleSourcesManager, trace, allNamespaceFiles);
 
         return resultingDescriptor.isNull() ? null
                : BindingContextUtils.getContainingFile(trace.getBindingContext(), resultingDescriptor.get());

compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
 import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
 
-/**
- * @author alex.tkachman
-*/
 public class AnonymousClassContext extends CodegenContext {
     public AnonymousClassContext(
             JetTypeMapper typeMapper,

compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
 import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
 
-/**
- * @author alex.tkachman
-*/
 public class ClassContext extends CodegenContext {
     public ClassContext(
             JetTypeMapper typeMapper,

compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,6 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 
 import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
 
-/**
- * @author alex.tkachman
-*/
 class ClosureContext extends CodegenContext {
     private final ClassDescriptor classDescriptor;
 

compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,20 +26,16 @@ import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.jetbrains.jet.codegen.AsmUtil.CAPTURED_THIS_FIELD;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLASS_FOR_FUNCTION;
-import static org.jetbrains.jet.codegen.binding.CodegenBinding.FQN;
+import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
 
-/*
- * @author max
- * @author alex.tkachman
- */
 public abstract class CodegenContext {
 
     public static final CodegenContext STATIC = new RootContext();
@@ -94,7 +90,7 @@ public abstract class CodegenContext {
         while (true) {
             assert c != null;
             DeclarationDescriptor contextDescriptor = c.getContextDescriptor();
-            if (!(contextDescriptor instanceof ClassDescriptor) && !(contextDescriptor instanceof NamespaceDescriptor)) {
+            if (!(contextDescriptor instanceof ClassDescriptor) && !(contextDescriptor instanceof PackageViewDescriptor)) {
                 c = c.getParentContext();
             }
             else {
@@ -139,11 +135,11 @@ public abstract class CodegenContext {
         return contextKind;
     }
 
-    public CodegenContext intoNamespace(NamespaceDescriptor descriptor) {
+    public CodegenContext intoNamespace(@NotNull PackageViewDescriptor descriptor) {
         return new NamespaceContext(descriptor, this, OwnerKind.NAMESPACE);
     }
 
-    public CodegenContext intoNamespacePart(String delegateTo, NamespaceDescriptor descriptor) {
+    public CodegenContext intoNamespacePart(String delegateTo, PackageViewDescriptor descriptor) {
         return new NamespaceContext(descriptor, this, new OwnerKind.StaticDelegateKind(delegateTo));
     }
 
@@ -269,12 +265,12 @@ public abstract class CodegenContext {
     }
 
     protected void initOuterExpression(JetTypeMapper typeMapper, ClassDescriptor classDescriptor) {
-        final ClassDescriptor enclosingClass = getEnclosingClass();
-        outerExpression = enclosingClass != null
-                          ? StackValue
-                .field(typeMapper.mapType(enclosingClass), CodegenBinding.getJvmInternalName(typeMapper.getBindingTrace(), classDescriptor),
-                       CAPTURED_THIS_FIELD,
-                       false)
+        ClassDescriptor enclosingClass = getEnclosingClass();
+        outerExpression = enclosingClass != null && canHaveOuter(typeMapper.getBindingContext(), classDescriptor)
+                          ? StackValue.field(typeMapper.mapType(enclosingClass),
+                                             CodegenBinding.getJvmInternalName(typeMapper.getBindingTrace(), classDescriptor),
+                                             CAPTURED_THIS_FIELD,
+                                             false)
                           : null;
     }
 

compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,6 @@ import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
 
 import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
 
-/**
- * @author alex.tkachman
-*/
 public class ConstructorContext extends MethodContext {
     private static final StackValue local1 = StackValue.local(1, OBJECT_TYPE);
 

compiler/backend/src/org/jetbrains/jet/codegen/context/EnclosedValueDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * @author max
- */
 package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.asm4.Type;

compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,9 +31,6 @@ import static org.jetbrains.jet.codegen.binding.CodegenBinding.classNameForAnony
 import static org.jetbrains.jet.codegen.binding.CodegenBinding.isLocalNamedFun;
 import static org.jetbrains.jet.lang.resolve.BindingContextUtils.callableDescriptorToDeclaration;
 
-/**
- * @author alex.tkachman
- */
 public interface LocalLookup {
     boolean lookupLocal(DeclarationDescriptor descriptor);
 

compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,6 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor;
 
-/**
- * @author alex.tkachman
-*/
 public class MethodContext extends CodegenContext {
     public MethodContext(
             @NotNull FunctionDescriptor contextType,
@@ -44,7 +41,7 @@ public class MethodContext extends CodegenContext {
     @Override
     public StackValue lookupInContext(DeclarationDescriptor d, @Nullable StackValue result, GenerationState state, boolean ignoreNoOuter) {
         if (getContextDescriptor() == d) {
-            return StackValue.local(0, AsmTypeConstants.OBJECT_TYPE);
+            return result != null ? result : StackValue.local(0, AsmTypeConstants.OBJECT_TYPE);
         }
 
         //noinspection ConstantConditions

compiler/backend/src/org/jetbrains/jet/codegen/context/NamespaceContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,10 @@ package org.jetbrains.jet.codegen.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.codegen.OwnerKind;
-import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
 
-/**
- * @author alex.tkachman
-*/
 public class NamespaceContext extends CodegenContext {
-    public NamespaceContext(NamespaceDescriptor contextDescriptor, CodegenContext parent, @NotNull OwnerKind kind) {
+    public NamespaceContext(@NotNull PackageViewDescriptor contextDescriptor, CodegenContext parent, @NotNull OwnerKind kind) {
         super(contextDescriptor, kind, parent, null, null, null);
     }
 

compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,6 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor;
 
 import java.util.List;
 
-/**
- * @author alex.tkachman
-*/
 class RootContext extends CodegenContext {
     public RootContext() {
         super(new FakeDescriptor(), OwnerKind.NAMESPACE, null, null, null, null);
@@ -57,7 +54,7 @@ class RootContext extends CodegenContext {
         }
 
         @Override
-        public DeclarationDescriptor substitute(TypeSubstitutor substitutor) {
+        public DeclarationDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
             throw new IllegalStateException();
         }
 

compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,6 @@ import org.jetbrains.jet.codegen.binding.MutableClosure;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
 
-/**
- * @author alex.tkachman
-*/
 public class ScriptContext extends CodegenContext {
     @NotNull
     private final ScriptDescriptor scriptDescriptor;

compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayGet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 JetBrains s.r.o.
+ * Copyright 2010-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,6 @@ import java.util.List;
 
 import static org.jetbrains.jet.codegen.AsmUtil.correctElementType;
 
-/**
- * @author alex.tkachman
- */
 public class ArrayGet implements IntrinsicMethod {
     @Override
     public StackValue generate(