Merge branch 'decompiler'

Conflicts:
	compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
	compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
	compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java

idea/testData/libraries/AbstractClass.kt

@@ -0,0 +1,7 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[abstract class AbstractClass {
+}]

idea/testData/libraries/ClassWithAbstractAndOpenMembers.kt

@@ -0,0 +1,22 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[abstract class ClassWithAbstractAndOpenMembers {
+    [abstract fun abstractFun() : Unit]
+
+    [open fun openFun() : Unit { /* compiled code */ }]
+
+    [abstract val abstractVal : jet.String]
+
+    [open val openVal : jet.String] /* compiled code */
+
+    [open val openValWithGetter : jet.String] /* compiled code */
+
+    [abstract var abstractVar : jet.String]
+
+    [open var openVar : jet.String] /* compiled code */
+
+    [open var openVarWithGetter : jet.String] /* compiled code */
+}]

idea/testData/libraries/Color.kt

@@ -0,0 +1,8 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[class Color {
+    [val rgb : jet.Int] /* compiled code */
+}]

idea/testData/libraries/SimpleClass.kt

@@ -0,0 +1,7 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[class SimpleClass {
+}]

idea/testData/libraries/SimpleTrait.kt

@@ -0,0 +1,7 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[trait SimpleTrait {
+}]

idea/testData/libraries/SimpleTraitImpl.kt

@@ -0,0 +1,7 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[class SimpleTraitImpl : testData.libraries.SimpleTrait {
+}]

idea/testData/libraries/WithInnerAndObject.kt

@@ -0,0 +1,16 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[class WithInnerAndObject {
+    class object {
+        [fun foo() : Unit { /* compiled code */ }]
+    }
+
+    [class MyInner {
+        [trait MyInnerInner {
+            [abstract fun innerInnerMethod() : Unit]
+        }]
+    }]
+}]

idea/testData/libraries/WithTraitClassObject.kt

@@ -0,0 +1,9 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[class WithTraitClassObject {
+    class object : testData.libraries.SimpleTrait {
+    }
+}]

idea/testData/libraries/library/library.kt

@@ -0,0 +1,68 @@
+package testData.libraries
+
+trait SimpleTrait {
+}
+
+class SimpleClass {
+}
+
+class SimpleTraitImpl : SimpleTrait {
+}
+
+class WithInnerAndObject {
+    class object {
+        fun foo() {
+        }
+    }
+
+    class MyInner {
+        trait MyInnerInner {
+            fun innerInnerMethod()
+        }
+    }
+}
+
+class WithTraitClassObject {
+    class object : SimpleTrait
+}
+
+abstract class AbstractClass {
+}
+
+enum class Color(val rgb : Int) {
+    RED : Color(0xFF0000)
+    GREEN : Color(0x00FF00)
+    BLUE : Color(0x0000FF)
+}
+
+abstract class ClassWithAbstractAndOpenMembers {
+    abstract fun abstractFun()
+    open fun openFun() {
+    }
+
+    abstract val abstractVal : String
+    open val openVal : String = ""
+    open val openValWithGetter : String
+    get() {
+        return "239"
+    }
+
+    abstract var abstractVar : String
+    open var openVar : String = ""
+    open var openVarWithGetter : String
+    get() {
+        return "239"
+    }
+    set(value) {
+    }
+}
+
+fun main(args : Array<String>) {
+}
+
+val globalVal : #(Int, String) = #(239, "239")
+
+val globalValWithGetter : Long
+get() {
+    return System.currentTimeMillis()
+}

idea/testData/libraries/namespace.kt

@@ -0,0 +1,10 @@
+// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+[fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
+
+[val globalVal : #(jet.Int, jet.String)] /* compiled code */
+
+[val globalValWithGetter : jet.Long] /* compiled code */