Libraries written in Kotlin are factored out into a separate project

.idea/artifacts/KotlinPlugin.xml

@@ -11,7 +11,7 @@
             <element id="module-output" name="frontend.java" />
             <element id="module-output" name="idea" />
             <element id="module-output" name="jet.as.java.psi" />
-            <element id="module-output" name="stdlib" />
+            <element id="module-output" name="runtime" />
             <element id="module-output" name="util" />
             <element id="module-output" name="j2k" />
             <element id="module-output" name="js.translator" />

.idea/modules.xml

@@ -7,8 +7,6 @@
       <module fileurl="file://$PROJECT_DIR$/build-tools/build-tools.iml" filepath="$PROJECT_DIR$/build-tools/build-tools.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/examples/example-vfs/example-vfs.iml" filepath="$PROJECT_DIR$/examples/example-vfs/example-vfs.iml" />
-      <module fileurl="file://$PROJECT_DIR$/examples/examples.iml" filepath="$PROJECT_DIR$/examples/examples.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" />
       <module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" />
@@ -19,7 +17,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.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$/stdlib/stdlib.iml" filepath="$PROJECT_DIR$/stdlib/stdlib.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>
   </component>

Jet.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="$MODULE_DIR$/libraries/out" />
       <excludeFolder url="file://$MODULE_DIR$/ideaSDK/config" />
       <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system" />
       <excludeFolder url="file://$MODULE_DIR$/ideaSDK/system-idea" />

build.xml

@@ -42,7 +42,7 @@
     <target name="compileRT" depends="init">
         <mkdir dir="${output}/classes/runtime"/>
         <javac destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
-            <src path="${basedir}/stdlib/src"/>
+            <src path="${basedir}/runtime/src"/>
             <classpath refid="classpath"/>
         </javac>
     </target>
@@ -55,12 +55,13 @@
                 <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
             </classpath>
             <arg value="-src"/>
-            <arg value="${basedir}/stdlib/ktSrc"/>
+            <arg value="${basedir}/libraries/stdlib/ktSrc"/>
             <arg value="-output"/>
             <arg value="${output}/classes/stdlib"/>
         </java>
     </target>
 
+    <!--
     <target name="compileKunit" depends="jarRT">
         <mkdir dir="${output}/classes/kunit"/>
         <java classname="org.jetbrains.jet.cli.KotlinCompiler" failonerror="true" fork="true">
@@ -102,8 +103,9 @@
             <fileset dir="${output}/classes/kdoc"/>
         </jar>
     </target>
+    -->
 
-
+<!--
     <target name="docStdlib" depends="compileKdoc">
         <mkdir dir="${output}/classes/stdlib"/>
         <mkdir dir="${output}/apidoc/stdlib"/>
@@ -112,7 +114,8 @@
                 <path refid="classpath"/>
                 <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
                 <pathelement location="${output}/classes/kdoc"/>
-                <!-- TODO Dirty Hack until kdoc jar has stdlib inside it -->
+                <!- - TODO Dirty Hack until kdoc jar has stdlib inside it -->
+<!--
                 <pathelement location="${output}/classes/stdlib"/>
             </classpath>
             <arg value="-output"/>
@@ -157,8 +160,8 @@
             <classpath>
                 <pathelement location="${kotlin-home}/lib/kotlin-runtime.jar"/>
                 <pathelement location="${kotlin-home}/lib/kotlin-test.jar"/>
-                <pathelement location="${basedir}/testlib/lib/junit-4.9.jar"/>
-                <fileset dir="${basedir}/testlib/lib">
+                <pathelement location="/libraries/testlib/lib/junit-4.9.jar"/>
+                <fileset dir="/libraries/testlib/lib">
                   <include name="**/*.jar"/>
                 </fileset>
               <pathelement path="${output}/classes/testlib"/>
@@ -173,8 +176,8 @@
           <classpath>
               <pathelement location="${kotlin-home}/lib/kotlin-runtime.jar"/>
               <pathelement location="${kotlin-home}/lib/kotlin-test.jar"/>
-              <pathelement location="${basedir}/testlib/lib/junit-4.9.jar"/>
-              <fileset dir="${basedir}/testlib/lib">
+              <pathelement location="/libraries/testlib/lib/junit-4.9.jar"/>
+              <fileset dir="/libraries/testlib/lib">
                 <include name="**/*.jar"/>
               </fileset>
             <pathelement path="${output}/classes/testlib"/>
@@ -182,12 +185,12 @@
 
           <formatter type="plain"/>
 
-<!--
+<!- -
           <test name="my.test.TestCase" haltonfailure="no" outfile="result">
             <formatter type="xml"/>
           </test>
 -->
-
+<!--
           <batchtest fork="yes" todir="${output}/test-reports" haltonerror="true">
             <fileset dir="${output}/classes/testlib">
               <include name="**/*Test.*"/>
@@ -195,6 +198,7 @@
           </batchtest>
         </junit>
     </target>
+    !-->
 
     <target name="compileJDKHeaders" depends="jar">
         <mkdir dir="${output}/classes/stdlib"/>
@@ -276,11 +280,13 @@
         <chmod dir="${kotlin-home}/bin" includes="*" perm="755"/>
     </target>
 
-    <target name="dist" depends="init,jarRT,copyKotlinJars,jarJDKHeaders,jarLang,jar,buildToolsJar,compileKunit,compileKdoc"/>
+    <target name="dist" depends="init,jarRT,copyKotlinJars,jarJDKHeaders,jarLang,jar,buildToolsJar"/>
 
-    <target name="doc" depends="dist,docStdlib"/>
+    <target name="doc" depends="dist"/>
 
-    <target name="test" depends="dist,testlib" description="Creates the distribution and runs all the tests"/>
+<!--
+    <target name="test" depends="dist" description="Creates the distribution and runs all the tests"/>
+-->
 
     <target name="zip" depends="dist">
         <echo file="${kotlin-home}/build.txt" message="${build.number}"/>

compiler/backend/backend.iml

@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="runtime" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
   </component>
 </module>

compiler/cli/cli.iml

@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="runtime" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" name="asm" level="project" />

compiler/frontend.java/frontend.java.iml

@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="runtime" />
   </component>
 </module>
 

compiler/tests/compiler-tests.iml

@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="runtime" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="asm" level="project" />

examples/example-vfs/example-vfs.iml

@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="runtime" />
   </component>
 </module>
 

examples/examples.iml

@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="runtime" />
   </component>
 </module>
 

grammar/ReadMe.md

@@ -0,0 +1 @@
+This module contains a semi-formal description of Kotlin grammar along with some code that translates it into a confluence wiki format.

idea/idea.iml

@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="module" module-name="runtime" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
     <orderEntry type="library" name="idea-full" level="project" />

libraries/.idea/.name

@@ -0,0 +1 @@
+libraries

libraries/.idea/ant.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AntConfiguration">
+    <defaultAnt bundledAnt="true" />
+  </component>
+</project>
+

libraries/.idea/compiler.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <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" />
+    </wildcardResourcePatterns>
+    <annotationProcessing enabled="false" useClasspath="true" />
+  </component>
+</project>
+

libraries/.idea/encodings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+

libraries/.idea/libraries/kotlin_runtime.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="kotlin-runtime">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/../dist/classes/runtime" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

libraries/.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
+

libraries/.idea/modules.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kdoc/kdoc.iml" filepath="$PROJECT_DIR$/kdoc/kdoc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/kunit/kunit.iml" filepath="$PROJECT_DIR$/kunit/kunit.iml" />
+      <module fileurl="file://$PROJECT_DIR$/runtests/runtests.iml" filepath="$PROJECT_DIR$/runtests/runtests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/stdlib/stdlib.iml" filepath="$PROJECT_DIR$/stdlib/stdlib.iml" />
+      <module fileurl="file://$PROJECT_DIR$/testlib/testlib.iml" filepath="$PROJECT_DIR$/testlib/testlib.iml" />
+    </modules>
+  </component>
+</project>
+

libraries/.idea/scopes/scope_settings.xml

@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>

libraries/.idea/uiDesigner.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
+

libraries/.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+  </component>
+</project>
+

libraries/kdoc/kdoc.iml

@@ -21,7 +21,7 @@
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/intellij-core.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/intellij-core.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -30,7 +30,7 @@
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/kotlin-compiler.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/kotlin-compiler.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
@@ -41,7 +41,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/annotations.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/annotations.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -50,7 +50,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/asm-commons.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/asm-commons.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -59,7 +59,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/asm.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/asm.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -68,7 +68,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/cli-10.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/cli-10.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -77,7 +77,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/guava-11.0.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/guava-11.0.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -86,7 +86,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/picocontainer.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/picocontainer.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -95,7 +95,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../dist/kotlinc/lib/trove4j.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dist/kotlinc/lib/trove4j.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -104,7 +104,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/asm-util-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../lib/asm-util-3.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -113,7 +113,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/asm-tree-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../lib/asm-tree-3.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -122,7 +122,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/asm-analysis-3.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../lib/asm-analysis-3.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -131,7 +131,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/parboiled-core-1.0.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../lib/parboiled-core-1.0.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -140,7 +140,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/parboiled-java-1.0.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../lib/parboiled-java-1.0.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -149,7 +149,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/pegdown-1.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../lib/pegdown-1.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

libraries/kunit/kunit.iml

@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="KotlinRuntime" level="project" />
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
@@ -17,6 +16,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="stdlib" />
   </component>
 </module>
 

libraries/templatelib/src/TemplateCore.kt

@@ -46,7 +46,7 @@ abstract class TemplateSupport : Template {
  * by printing values to some underlying Printer which
  * will typically output to a String, File, stream etc.
  */
-abstract class TextTemplate() : TemplateSupport, Printer {
+abstract class TextTemplate() : TemplateSupport(), Printer {
   override var printer: Printer = NullPrinter()
 
   fun String.plus(): Unit {

libraries/templatelib/src/TemplateHtml.kt

@@ -17,13 +17,13 @@ abstract class Element {
 
 }
 
-class TextElement(val text : String) : Element {
+class TextElement(val text : String) : Element() {
   override fun appendTo(builder: StringBuilder) {
     builder.append(text)
   }
 }
 
-abstract class Tag(val name : String) : Element {
+abstract class Tag(val name : String) : Element() {
   val children = ArrayList<Element>()
   val attributes = HashMap<String, String>()
 
@@ -46,7 +46,7 @@ abstract class Tag(val name : String) : Element {
     if (!attributes.isEmpty()) {
       for (e in attributes.entrySet()) {
         if (e != null) {
-          builder.append(" ${e.key}=\"${e.value}\"")
+          builder.append(" ${e.getKey()}=\"${e.getValue()}\"")
         }
       }
     }
@@ -146,7 +146,7 @@ class A() : BodyTag("a") {
   }
 
   var href : String
-    get() = attributes["href"]
+    get() = attributes["href"] ?: ""
     set(value) {
       attributes["href"] = value
     }
@@ -168,7 +168,7 @@ fun html(init : HTML.()-> Unit) : HTML {
  * Base class for templates which generate markup (XML or HTML for example)
  * which have additional helper methods for escaping markup etc
  */
-abstract class MarkupTemplate() : TemplateSupport {
+abstract class MarkupTemplate() : TemplateSupport() {
 
   override fun render() {
     val markup = markup()