Object's constructor is private from frontend point of view.

Test data changed. Js-backend test objectInObject turned off. Public constructors for objects hard-coded in jvm-backend.
2012-08-28 18:29:38 +04:00
parent a28d78974b
commit e6e6f7e598
7 changed files with 16 additions and 13 deletions
@@ -996,8 +996,13 @@ public class JetTypeMapper {
            if (isClassObject(containingDeclaration)) {
                return defaultFlags;
            }
-            if (p instanceof ConstructorDescriptor && isEnumEntry(containingDeclaration)) {
-                return 0;
+            if (p instanceof ConstructorDescriptor) {
+                ClassKind kind = ((ClassDescriptor) containingDeclaration).getKind();
+                if (kind == ClassKind.OBJECT) {
+                    return ACC_PUBLIC;
+                } else if (kind == ClassKind.ENUM_ENTRY) {
+                    return 0;
+                }
            }
            if (containingDeclaration instanceof NamespaceDescriptor) {
                return 0;