JET-61 Support class objects

JET-83 Interpret Java static methods as class objects' members

idea/src/org/jetbrains/jet/lang/resolve/java/JavaClassDescriptor.java

@@ -6,6 +6,7 @@ import org.jetbrains.jet.lang.resolve.JetScope;
 import org.jetbrains.jet.lang.resolve.SubstitutingScope;
 import org.jetbrains.jet.lang.types.*;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -16,6 +17,7 @@ public class JavaClassDescriptor extends MutableDeclarationDescriptor implements
 
     private TypeConstructor typeConstructor;
     private JavaClassMembersScope unsubstitutedMemberScope;
+    private JetType classObjectType;
     private final WritableFunctionGroup constructors = new WritableFunctionGroup("<init>");
 
     public JavaClassDescriptor(DeclarationDescriptor containingDeclaration) {
@@ -30,6 +32,20 @@ public class JavaClassDescriptor extends MutableDeclarationDescriptor implements
         this.unsubstitutedMemberScope = memberScope;
     }
 
+    public void setClassObjectMemberScope(JavaClassMembersScope memberScope) {
+        classObjectType = new JetTypeImpl(
+                new TypeConstructorImpl(
+                        JavaDescriptorResolver.JAVA_CLASS_OBJECT,
+                        Collections.<Annotation>emptyList(),
+                        true,
+                        "Class object emulation for " + getName(),
+                        Collections.<TypeParameterDescriptor>emptyList(),
+                        Collections.<JetType>emptyList()
+                ),
+                memberScope
+        );
+    }
+
     public void addConstructor(ConstructorDescriptor constructorDescriptor) {
         this.constructors.addFunction(constructorDescriptor);
     }
@@ -89,7 +105,7 @@ public class JavaClassDescriptor extends MutableDeclarationDescriptor implements
 
     @Override
     public JetType getClassObjectType() {
-        return null; // TODO : static members as class object members
+        return classObjectType;
     }
 
     @Override

idea/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java

@@ -30,6 +30,19 @@ public class JavaDescriptorResolver {
         }
     };
 
+    /*package*/ static final DeclarationDescriptor JAVA_CLASS_OBJECT = new DeclarationDescriptorImpl(null, Collections.<Annotation>emptyList(), "<java_class_object_emulation>") {
+        @NotNull
+        @Override
+        public DeclarationDescriptor substitute(TypeSubstitutor substitutor) {
+            throw new UnsupportedOperationException(); // TODO
+        }
+
+        @Override
+        public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
+            return visitor.visitDeclarationDescriptor(this, data);
+        }
+    };
+
     protected final Map<String, ClassDescriptor> classDescriptorCache = new HashMap<String, ClassDescriptor>();
     protected final Map<PsiTypeParameter, TypeParameterDescriptor> typeParameterDescriptorCache = Maps.newHashMap();
     protected final Map<PsiMethod, FunctionDescriptor> methodDescriptorCache = Maps.newHashMap();
@@ -91,6 +104,7 @@ public class JavaDescriptorResolver {
         ));
         classDescriptorCache.put(psiClass.getQualifiedName(), classDescriptor);
         classDescriptor.setUnsubstitutedMemberScope(new JavaClassMembersScope(classDescriptor, psiClass, semanticServices, false));
+        classDescriptor.setClassObjectMemberScope(new JavaClassMembersScope(classDescriptor, psiClass, semanticServices, true));
         // UGLY HACK
         supertypes.addAll(getSupertypes(psiClass));
 

idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java

@@ -713,7 +713,7 @@ public class JetTypeInferrer {
                                 result = classObjectType;
                             }
                             else {
-                                trace.getErrorHandler().genericError(expression.getNode(), "This class does not have a class object");
+                                trace.getErrorHandler().genericError(expression.getNode(), "Classifier " + classifier.getName() +  " does not have a class object");
                             }
                             trace.recordReferenceResolution(expression, classifier);
                             return;

idea/testData/psi/examples/PolymorphicClassObjects.txt

@@ -134,65 +134,64 @@ JetFile: PolymorphicClassObjects.jet
         CLASS_OBJECT
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
-          OBJECT_LITERAL
-            OBJECT_DECLARATION
-              PsiElement(object)('object')
-              PsiWhiteSpace(' ')
-              PsiElement(COLON)(':')
-              PsiWhiteSpace(' ')
-              DELEGATION_SPECIFIER_LIST
-                DELEGATOR_SUPER_CLASS
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('Buildable')
-              PsiWhiteSpace(' ')
-              CLASS_BODY
-                PsiElement(LBRACE)('{')
-                PsiWhiteSpace('\n    ')
-                FUN
-                  MODIFIER_LIST
-                    PsiElement(override)('override')
-                  PsiWhiteSpace(' ')
-                  PsiElement(fun)('fun')
-                  PsiWhiteSpace(' ')
-                  PsiElement(IDENTIFIER)('newBuilder')
-                  TYPE_PARAMETER_LIST
-                    PsiElement(LT)('<')
-                    TYPE_PARAMETER
-                      PsiElement(IDENTIFIER)('E')
-                    PsiElement(COMMA)(',')
-                    PsiWhiteSpace(' ')
-                    TYPE_PARAMETER
-                      PsiElement(IDENTIFIER)('R')
-                    PsiElement(GT)('>')
-                  VALUE_PARAMETER_LIST
-                    PsiElement(LPAR)('(')
-                    PsiElement(RPAR)(')')
-                  PsiWhiteSpace(' ')
-                  PsiElement(COLON)(':')
+          OBJECT_DECLARATION
+            PsiElement(object)('object')
+            PsiWhiteSpace(' ')
+            PsiElement(COLON)(':')
+            PsiWhiteSpace(' ')
+            DELEGATION_SPECIFIER_LIST
+              DELEGATOR_SUPER_CLASS
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('Buildable')
+            PsiWhiteSpace(' ')
+            CLASS_BODY
+              PsiElement(LBRACE)('{')
+              PsiWhiteSpace('\n    ')
+              FUN
+                MODIFIER_LIST
+                  PsiElement(override)('override')
+                PsiWhiteSpace(' ')
+                PsiElement(fun)('fun')
+                PsiWhiteSpace(' ')
+                PsiElement(IDENTIFIER)('newBuilder')
+                TYPE_PARAMETER_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PARAMETER
+                    PsiElement(IDENTIFIER)('E')
+                  PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('Builder')
-                      TYPE_ARGUMENT_LIST
-                        PsiElement(LT)('<')
-                        TYPE_PROJECTION
-                          TYPE_REFERENCE
-                            USER_TYPE
-                              REFERENCE_EXPRESSION
-                                PsiElement(IDENTIFIER)('E')
-                        PsiElement(COMMA)(',')
-                        PsiWhiteSpace(' ')
-                        TYPE_PROJECTION
-                          TYPE_REFERENCE
-                            USER_TYPE
-                              REFERENCE_EXPRESSION
-                                PsiElement(IDENTIFIER)('R')
-                        PsiElement(GT)('>')
-                PsiWhiteSpace('\n\n  ')
-                PsiElement(RBRACE)('}')
+                  TYPE_PARAMETER
+                    PsiElement(IDENTIFIER)('R')
+                  PsiElement(GT)('>')
+                VALUE_PARAMETER_LIST
+                  PsiElement(LPAR)('(')
+                  PsiElement(RPAR)(')')
+                PsiWhiteSpace(' ')
+                PsiElement(COLON)(':')
+                PsiWhiteSpace(' ')
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('Builder')
+                    TYPE_ARGUMENT_LIST
+                      PsiElement(LT)('<')
+                      TYPE_PROJECTION
+                        TYPE_REFERENCE
+                          USER_TYPE
+                            REFERENCE_EXPRESSION
+                              PsiElement(IDENTIFIER)('E')
+                      PsiElement(COMMA)(',')
+                      PsiWhiteSpace(' ')
+                      TYPE_PROJECTION
+                        TYPE_REFERENCE
+                          USER_TYPE
+                            REFERENCE_EXPRESSION
+                              PsiElement(IDENTIFIER)('R')
+                      PsiElement(GT)('>')
+              PsiWhiteSpace('\n\n  ')
+              PsiElement(RBRACE)('}')
         PsiWhiteSpace('\n\n')
         PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n\n')

idea/testData/psi/examples/UpdateOperation.txt

@@ -36,92 +36,91 @@ JetFile: UpdateOperation.jet
         CLASS_OBJECT
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
-          OBJECT_LITERAL
-            OBJECT_DECLARATION
-              PsiElement(object)('object')
-              PsiWhiteSpace(' ')
-              CLASS_BODY
-                PsiElement(LBRACE)('{')
-                PsiWhiteSpace('\n    ')
-                FUN
-                  PsiElement(fun)('fun')
-                  PsiWhiteSpace(' ')
-                  PsiElement(IDENTIFIER)('copy')
-                  VALUE_PARAMETER_LIST
-                    PsiElement(LPAR)('(')
-                    VALUE_PARAMETER
-                      PsiElement(IDENTIFIER)('from')
-                      PsiWhiteSpace(' ')
-                      PsiElement(COLON)(':')
-                      PsiWhiteSpace(' ')
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('Pair')
-                    PsiElement(COMMA)(',')
+          OBJECT_DECLARATION
+            PsiElement(object)('object')
+            PsiWhiteSpace(' ')
+            CLASS_BODY
+              PsiElement(LBRACE)('{')
+              PsiWhiteSpace('\n    ')
+              FUN
+                PsiElement(fun)('fun')
+                PsiWhiteSpace(' ')
+                PsiElement(IDENTIFIER)('copy')
+                VALUE_PARAMETER_LIST
+                  PsiElement(LPAR)('(')
+                  VALUE_PARAMETER
+                    PsiElement(IDENTIFIER)('from')
                     PsiWhiteSpace(' ')
-                    VALUE_PARAMETER
-                      PsiElement(IDENTIFIER)('x')
-                      PsiWhiteSpace(' ')
-                      PsiElement(COLON)(':')
-                      PsiWhiteSpace(' ')
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('Int')
-                      PsiWhiteSpace(' ')
-                      PsiElement(EQ)('=')
-                      PsiWhiteSpace(' ')
-                      DOT_QUALIFIED_EXPRESSION
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('from')
-                        PsiElement(DOT)('.')
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('x')
-                    PsiElement(COMMA)(',')
+                    PsiElement(COLON)(':')
                     PsiWhiteSpace(' ')
-                    VALUE_PARAMETER
-                      PsiElement(IDENTIFIER)('y')
-                      PsiWhiteSpace(' ')
-                      PsiElement(COLON)(':')
-                      PsiWhiteSpace(' ')
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('Int')
-                      PsiWhiteSpace(' ')
-                      PsiElement(EQ)('=')
-                      PsiWhiteSpace(' ')
-                      DOT_QUALIFIED_EXPRESSION
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('from')
-                        PsiElement(DOT)('.')
+                    TYPE_REFERENCE
+                      USER_TYPE
                         REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('y')
-                    PsiElement(RPAR)(')')
-                  PsiWhiteSpace(' ')
-                  PsiElement(EQ)('=')
+                          PsiElement(IDENTIFIER)('Pair')
+                  PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
-                  NEW
-                    PsiElement(new)('new')
+                  VALUE_PARAMETER
+                    PsiElement(IDENTIFIER)('x')
+                    PsiWhiteSpace(' ')
+                    PsiElement(COLON)(':')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
                       USER_TYPE
                         REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('Pair')
-                    VALUE_ARGUMENT_LIST
-                      PsiElement(LPAR)('(')
-                      VALUE_ARGUMENT
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('x')
-                      PsiElement(COMMA)(',')
-                      PsiWhiteSpace(' ')
-                      VALUE_ARGUMENT
+                          PsiElement(IDENTIFIER)('Int')
+                    PsiWhiteSpace(' ')
+                    PsiElement(EQ)('=')
+                    PsiWhiteSpace(' ')
+                    DOT_QUALIFIED_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('from')
+                      PsiElement(DOT)('.')
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('x')
+                  PsiElement(COMMA)(',')
+                  PsiWhiteSpace(' ')
+                  VALUE_PARAMETER
+                    PsiElement(IDENTIFIER)('y')
+                    PsiWhiteSpace(' ')
+                    PsiElement(COLON)(':')
+                    PsiWhiteSpace(' ')
+                    TYPE_REFERENCE
+                      USER_TYPE
                         REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('y')
-                      PsiElement(RPAR)(')')
-                PsiWhiteSpace('\n  ')
-                PsiElement(RBRACE)('}')
+                          PsiElement(IDENTIFIER)('Int')
+                    PsiWhiteSpace(' ')
+                    PsiElement(EQ)('=')
+                    PsiWhiteSpace(' ')
+                    DOT_QUALIFIED_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('from')
+                      PsiElement(DOT)('.')
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('y')
+                  PsiElement(RPAR)(')')
+                PsiWhiteSpace(' ')
+                PsiElement(EQ)('=')
+                PsiWhiteSpace(' ')
+                NEW
+                  PsiElement(new)('new')
+                  PsiWhiteSpace(' ')
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('Pair')
+                  VALUE_ARGUMENT_LIST
+                    PsiElement(LPAR)('(')
+                    VALUE_ARGUMENT
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('x')
+                    PsiElement(COMMA)(',')
+                    PsiWhiteSpace(' ')
+                    VALUE_ARGUMENT
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('y')
+                    PsiElement(RPAR)(')')
+              PsiWhiteSpace('\n  ')
+              PsiElement(RBRACE)('}')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n\n')

idea/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java

@@ -70,7 +70,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testCondJumpOnStack() throws Exception {
-        loadText("fun foo(a: String): Int = if (Boolean.parseBoolean(a)) 5 else 10");
+        loadText("fun foo(a: String): Int = if (java.lang.Boolean.parseBoolean(a)) 5 else 10");
         final Method main = generateFunction();
         assertEquals(5, main.invoke(null, "true"));
         assertEquals(10, main.invoke(null, "false"));

idea/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java

@@ -123,7 +123,7 @@ public class PrimitiveTypesTest extends CodegenTestCase {
     }
 
     public void testDoubleToJava() throws Exception {
-        loadText("fun foo(d: Double): String? = Double.toString(d)");
+        loadText("fun foo(d: Double): String? = java.lang.Double.toString(d)");
         final Method main = generateFunction();
         assertEquals("1.0", main.invoke(null, 1.0));
     }