partial support for 'abstract' modifier added

idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java

@@ -43,4 +43,8 @@ public interface ClassDescriptor extends ClassifierDescriptor {
     JetType getClassObjectType();
 
     boolean isObject();
+
+    boolean isAbstract();
+
+    boolean isOpen();
 }

idea/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java

@@ -115,4 +115,14 @@ public class ClassDescriptorImpl extends DeclarationDescriptorImpl implements Cl
     public boolean hasConstructors() {
         return !constructors.isEmpty();
     }
+
+    @Override
+    public boolean isAbstract() {
+        return false;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return false;
+    }
 }

idea/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java

@@ -66,6 +66,11 @@ public class ConstructorDescriptorImpl extends FunctionDescriptorImpl implements
         return Collections.emptySet();
     }
 
+    @Nullable
+    public MemberModifiers getModifiers() {
+        return null;
+    }
+
     @Override
     public void addOverriddenFunction(@NotNull FunctionDescriptor overriddenFunction) {
         throw new UnsupportedOperationException("Constructors cannot override anything");

idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java

@@ -8,7 +8,7 @@ import java.util.Set;
 /**
  * @author abreslav
  */
-public interface FunctionDescriptor extends CallableDescriptor {
+public interface FunctionDescriptor extends CallableDescriptor, MemberDescriptor {
     @Override
     @NotNull
     DeclarationDescriptor getContainingDeclaration();

idea/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java

@@ -23,6 +23,7 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
     private JetType unsubstitutedReturnType;
     private JetType receiverType;
 
+    private MemberModifiers modifiers;
     private final Set<FunctionDescriptor> overriddenFunctions = Sets.newLinkedHashSet();
     private final FunctionDescriptor original;
 
@@ -69,6 +70,16 @@ public class FunctionDescriptorImpl extends DeclarationDescriptorImpl implements
         return overriddenFunctions;
     }
 
+    public void setModifiers(MemberModifiers modifiers) {
+        this.modifiers = modifiers;
+    }
+
+    @Nullable
+    @Override
+    public MemberModifiers getModifiers() {
+        return modifiers;
+    }
+
     public void addOverriddenFunction(@NotNull FunctionDescriptor overriddenFunction) {
         overriddenFunctions.add(overriddenFunction);
     }

idea/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java

@@ -139,6 +139,16 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
         return original.isObject();
     }
 
+    @Override
+    public boolean isAbstract() {
+        return original.isAbstract();
+    }
+
+    @Override
+    public boolean isOpen() {
+        return original.isOpen();
+    }
+
     @Override
     public boolean isClassObjectAValue() {
         return original.isClassObjectAValue();

idea/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java

@@ -23,6 +23,7 @@ public class MutableClassDescriptor extends MutableDeclarationDescriptor impleme
     private Collection<JetType> supertypes = Lists.newArrayList();
 
     private boolean open;
+    private boolean isAbstract;
     private TypeConstructor typeConstructor;
     private final WritableScope scopeForMemberResolution;
     private final WritableScope scopeForMemberLookup;
@@ -141,6 +142,15 @@ public class MutableClassDescriptor extends MutableDeclarationDescriptor impleme
         scopeForMemberResolution.addLabeledDeclaration(this);
     }
 
+    @Override
+    public boolean isAbstract() {
+        return isAbstract;
+    }
+
+    public void setAbstract(boolean isAbstract) {
+        this.isAbstract = isAbstract;
+    }
+
     public boolean isOpen() {
         return open;
     }

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

@@ -31,6 +31,7 @@ public interface BindingContext {
     WritableSlice<JetExpression, JetScope> RESOLUTION_SCOPE = Slices.createSimpleSlice("RESOLUTION_SCOPE");
 
     WritableSlice<JetExpression, Boolean> VARIABLE_REASSIGNMENT = Slices.createSimpleSetSlice("VARIABLE_REASSIGNMENT");
+    WritableSlice<JetExpression, DeclarationDescriptor> VARIABLE_ASSIGNMENT = Slices.createSimpleSlice("VARIABLE_ASSIGNMENT");    
     WritableSlice<JetExpression, Boolean> PROCESSED = Slices.createSimpleSetSlice("PROCESSED");
     WritableSlice<JetElement, Boolean> STATEMENT = Slices.createRemovableSetSlice("STATEMENT");
 
@@ -63,6 +64,7 @@ public interface BindingContext {
             return backingFieldRequired;
         }
     };
+    WritableSlice<PropertyDescriptor, Boolean> IS_INITIALIZED = Slices.createSimpleSetSlice("IS_INITIALIZED");
 
     WritableSlice<JetFunctionLiteralExpression, Boolean> BLOCK = new Slices.SetSlice<JetFunctionLiteralExpression>("BLOCK", RewritePolicy.DO_NOTHING) {
         @Override

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

@@ -65,6 +65,11 @@ public class ClassDescriptorResolver {
         Collection<JetType> supertypes = delegationSpecifiers.isEmpty()
                 ? Collections.singleton(JetStandardClasses.getAnyType())
                 : resolveDelegationSpecifiers(parameterScope, delegationSpecifiers, typeResolver);
+//        for (JetType supertype: supertypes) {
+//            if (supertype.getConstructor().isSealed()) {
+//                trace.getErrorHandler().genericError(classElement.getNameAsDeclaration().getNode(), "Class " + classElement.getName() + " can not extend final type " + supertype);
+//            }
+//        }
         boolean open = classElement.hasModifier(JetTokens.OPEN_KEYWORD);
 
         final WritableScope memberDeclarations = new WritableScopeImpl(JetScope.EMPTY, classDescriptor, trace.getErrorHandler());
@@ -141,6 +146,7 @@ public class ClassDescriptorResolver {
         descriptor.setTypeParameterDescriptors(typeParameters);
 
         descriptor.setOpen(classElement.hasModifier(JetTokens.OPEN_KEYWORD) || classElement.hasModifier(JetTokens.ABSTRACT_KEYWORD));
+        descriptor.setAbstract(classElement.hasModifier(JetTokens.ABSTRACT_KEYWORD));
 
         trace.record(BindingContext.CLASS, classElement, descriptor);
     }
@@ -220,6 +226,7 @@ public class ClassDescriptorResolver {
                 returnType = ErrorUtils.createErrorType("No type, no body");
             }
         }
+        functionDescriptor.setModifiers(resolveModifiers(function.getModifierList(), DEFAULT_MODIFIERS));
 
         functionDescriptor.initialize(
                 receiverType,

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

@@ -26,8 +26,8 @@ public class TopDownAnalyzer {
 
     private final Map<JetClass, MutableClassDescriptor> classes = Maps.newLinkedHashMap();
     private final Map<JetObjectDeclaration, MutableClassDescriptor> objects = Maps.newLinkedHashMap();
-    private final Map<JetNamespace, WritableScope> namespaceScopes = Maps.newHashMap();
+    protected final Map<JetNamespace, WritableScope> namespaceScopes = Maps.newHashMap();
-    private final Map<JetNamespace, NamespaceDescriptorImpl> namespaceDescriptors = Maps.newHashMap();
+    protected final Map<JetNamespace, NamespaceDescriptorImpl> namespaceDescriptors = Maps.newHashMap();
 
     private final Map<JetNamedFunction, FunctionDescriptorImpl> functions = Maps.newLinkedHashMap();
     private final Map<JetDeclaration, ConstructorDescriptor> constructors = Maps.newLinkedHashMap();
@@ -75,13 +75,6 @@ public class TopDownAnalyzer {
         });
     }
 
-    @Deprecated // For JetStandardLibraryOnly
-    public void processStandardLibraryNamespace(@NotNull WritableScope outerScope, @NotNull NamespaceDescriptorImpl standardLibraryNamespace, @NotNull JetNamespace namespace) {
-        namespaceScopes.put(namespace, standardLibraryNamespace.getMemberScope());
-        namespaceDescriptors.put(namespace, standardLibraryNamespace);
-        process(outerScope, standardLibraryNamespace, namespace.getDeclarations());
-    }
-
     public void processObject(@NotNull JetScope outerScope, @NotNull DeclarationDescriptor containingDeclaration, @NotNull JetObjectDeclaration object) {
         process(outerScope, new NamespaceLike.Adapter(containingDeclaration) {
 
@@ -413,6 +406,7 @@ public class TopDownAnalyzer {
                 @Override
                 public void visitNamedFunction(JetNamedFunction function) {
                     FunctionDescriptorImpl functionDescriptor = classDescriptorResolver.resolveFunctionDescriptor(namespaceLike, scope, function);
+                    checkFunctionCorrectness(function, functionDescriptor, namespaceLike);
                     namespaceLike.addFunctionDescriptor(functionDescriptor);
                     functions.put(function, functionDescriptor);
                     declaringScopes.put(function, scope);
@@ -641,7 +635,7 @@ public class TopDownAnalyzer {
             ConstructorDescriptor primaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor();
             assert primaryConstructor != null;
             final JetScope scopeForConstructor = getInnerScopeForConstructor(primaryConstructor, classDescriptor.getScopeForMemberResolution(), true);
-            JetTypeInferrer.Services typeInferrer = semanticServices.getTypeInferrerServices(traceForConstructors, JetFlowInformationProvider.NONE); // TODO : flow
+            JetTypeInferrer.Services typeInferrer = semanticServices.getTypeInferrerServices(createFieldAssignTrackingTrace(), JetFlowInformationProvider.NONE); // TODO : flow
             for (JetClassInitializer anonymousInitializer : anonymousInitializers) {
                 typeInferrer.getType(scopeForConstructor, anonymousInitializer.getBody(), NO_EXPECTED_TYPE);
             }
@@ -784,6 +778,7 @@ public class TopDownAnalyzer {
                 }
 
                 resolvePropertyAccessors(property, propertyDescriptor, declaringScope);
+                checkPropertyCorrectness(property, propertyDescriptor, classDescriptor);
                 processed.add(property);
             }
         }
@@ -802,6 +797,7 @@ public class TopDownAnalyzer {
             }
 
             resolvePropertyAccessors(property, propertyDescriptor, declaringScope);
+            checkPropertyCorrectness(property, propertyDescriptor, null);
         }
     }
 
@@ -835,9 +831,69 @@ public class TopDownAnalyzer {
             resolveFunctionBody(fieldAccessTrackingTrace, setter, setterDescriptor, accessorScope);
         }
 
+//        JetExpression initializer = property.getInitializer();
+//        if (!property.isVar() && initializer != null && !trace.getBindingContext().get(BindingContext.BACKING_FIELD_REQUIRED, propertyDescriptor)) {
+//            trace.getErrorHandler().genericError(initializer.getNode(), "Initializer is not allowed here because this property has no setter and no backing field either");
+//        }
+    }
+
+    protected void checkPropertyCorrectness(JetProperty property, PropertyDescriptor propertyDescriptor, @Nullable ClassDescriptor classDescriptor) {
         JetExpression initializer = property.getInitializer();
-        if (!property.isVar() && initializer != null && !trace.getBindingContext().get(BindingContext.BACKING_FIELD_REQUIRED, propertyDescriptor)) {
+        JetPropertyAccessor getter = property.getGetter();
-            trace.getErrorHandler().genericError(initializer.getNode(), "Initializer is not allowed here because this property has no setter and no backing field either");
+        JetPropertyAccessor setter = property.getSetter();
+        if (propertyDescriptor.getModifiers().isAbstract()) {
+            if (classDescriptor == null) {
+                trace.getErrorHandler().genericError(property.getModifierList().getModifierNode(JetTokens.ABSTRACT_KEYWORD),
+                                                     "Global property can not be abstract");
+                return;
+            }
+            if (! classDescriptor.isAbstract()) {
+                trace.getErrorHandler().genericError(property.getModifierList().getModifierNode(JetTokens.ABSTRACT_KEYWORD),
+                                                     "Abstract property " + property.getName() + " in non-abstract class " + classDescriptor.getName());
+                return;
+            }
+            if (initializer != null) {
+                trace.getErrorHandler().genericError(initializer.getNode(), "Property with initializer can not be abstract");
+            }
+            if (getter != null && getter.getBodyExpression() != null) {
+                trace.getErrorHandler().genericError(getter.getNode(), "Property with getter implementation can not be abstract");
+            }
+            if (setter != null && setter.getBodyExpression() != null) {
+                trace.getErrorHandler().genericError(setter.getNode(), "Property with setter implementation can not be abstract");
+            }
+            return;
+        }
+        boolean backingFieldRequired = trace.getBindingContext().get(BindingContext.BACKING_FIELD_REQUIRED, propertyDescriptor);
+        if (initializer != null && ! backingFieldRequired) {
+            trace.getErrorHandler().genericError(initializer.getNode(), "Initializer is not allowed here because this property has no backing field");
+        }
+        if (initializer == null && backingFieldRequired && ! trace.getBindingContext().get(BindingContext.IS_INITIALIZED, propertyDescriptor)) {
+            if (classDescriptor == null || (getter != null && getter.getBodyExpression() != null) || (setter != null && setter.getBodyExpression() != null)) {
+                trace.getErrorHandler().genericError(property.getNameIdentifier().getNode(), "Property must be initialized");
+            } else {
+                trace.getErrorHandler().genericError(property.getNameIdentifier().getNode(), "Property must be initialized or be abstract");
+            }
+        }
+    }
+
+    protected void checkFunctionCorrectness(JetNamedFunction function, FunctionDescriptor functionDescriptor, DeclarationDescriptor containingDescriptor) {
+        if (containingDescriptor instanceof ClassDescriptor) {
+            ClassDescriptor classDescriptor = (ClassDescriptor) containingDescriptor;
+            if (functionDescriptor.getModifiers().isAbstract() && !classDescriptor.isAbstract()) {
+                trace.getErrorHandler().genericError(function.getModifierList().getModifierNode(JetTokens.ABSTRACT_KEYWORD),
+                                                     "Abstract method " + function.getName() + " in non-abstract class " + classDescriptor.getName());
+            }
+            if (function.getBodyExpression() == null && !functionDescriptor.getModifiers().isAbstract()) {
+                trace.getErrorHandler().genericError(function.getNameIdentifier().getNode(), "Method without body must be abstract");
+            }
+            return;
+        }
+        if (functionDescriptor.getModifiers().isAbstract()) {
+            trace.getErrorHandler().genericError(function.getModifierList().getModifierNode(JetTokens.ABSTRACT_KEYWORD),
+                                                 "Global function " + function.getName() + " can not be abstract");
+        }
+        if (function.getBodyExpression() == null && !functionDescriptor.getModifiers().isAbstract()) {
+            trace.getErrorHandler().genericError(function.getNameIdentifier().getNode(), "Global function must have body");
         }
     }
 
@@ -858,6 +914,22 @@ public class TopDownAnalyzer {
         });
     }
 
+    private BindingTraceAdapter createFieldAssignTrackingTrace() {
+        return new BindingTraceAdapter(traceForConstructors).addHandler(BindingContext.VARIABLE_ASSIGNMENT, new BindingTraceAdapter.RecordHandler<JetExpression, DeclarationDescriptor>() {
+            @Override
+            public void handleRecord(WritableSlice<JetExpression, DeclarationDescriptor> jetExpressionBooleanWritableSlice, JetExpression expression, DeclarationDescriptor descriptor) {
+                if (expression instanceof JetSimpleNameExpression) {
+                    JetSimpleNameExpression variable = (JetSimpleNameExpression) expression;
+                    if (variable.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER) {
+                        if (descriptor instanceof PropertyDescriptor) {
+                            traceForMembers.record(BindingContext.IS_INITIALIZED, (PropertyDescriptor) descriptor);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
     private void resolvePropertyInitializer(JetProperty property, PropertyDescriptor propertyDescriptor, JetExpression initializer, JetScope scope) {
         JetFlowInformationProvider flowInformationProvider = classDescriptorResolver.computeFlowData(property, initializer); // TODO : flow JET-15
         JetTypeInferrer.Services typeInferrer = semanticServices.getTypeInferrerServices(traceForConstructors, flowInformationProvider);

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

@@ -0,0 +1,31 @@
+package org.jetbrains.jet.lang.resolve;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.JetSemanticServices;
+import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.psi.JetNamedFunction;
+import org.jetbrains.jet.lang.psi.JetNamespace;
+import org.jetbrains.jet.lang.psi.JetProperty;
+
+/**
+ * @author svtk
+ */
+public class TopDownAnalyzerForStandardLibrary extends TopDownAnalyzer {
+
+    public TopDownAnalyzerForStandardLibrary(JetSemanticServices semanticServices, @NotNull BindingTrace bindingTrace) {
+        super(semanticServices, bindingTrace);
+    }
+
+    public void processStandardLibraryNamespace(@NotNull WritableScope outerScope, @NotNull NamespaceDescriptorImpl standardLibraryNamespace, @NotNull JetNamespace namespace) {
+        namespaceScopes.put(namespace, standardLibraryNamespace.getMemberScope());
+        namespaceDescriptors.put(namespace, standardLibraryNamespace);
+        process(outerScope, standardLibraryNamespace, namespace.getDeclarations());
+    }
+
+    @Override
+    protected void checkPropertyCorrectness(JetProperty property, PropertyDescriptor propertyDescriptor, ClassDescriptor classDescriptor) {}
+
+
+    @Override
+    protected void checkFunctionCorrectness(JetNamedFunction function, FunctionDescriptor functionDescriptor, DeclarationDescriptor containingDescriptor) {}
+}

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

@@ -115,6 +115,16 @@ public class JavaClassDescriptor extends MutableDeclarationDescriptor implements
         return false;
     }
 
+    @Override
+    public boolean isAbstract() {
+        return false;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return false;
+    }
+
     @Override
     public boolean isClassObjectAValue() {
         return false;

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

@@ -81,7 +81,7 @@ public class JetStandardLibrary {
 
             JetSemanticServices bootstrappingSemanticServices = JetSemanticServices.createSemanticServices(this);
             BindingTraceContext bindingTraceContext = new BindingTraceContext();
-            TopDownAnalyzer bootstrappingTDA = new TopDownAnalyzer(bootstrappingSemanticServices, bindingTraceContext);
+            TopDownAnalyzerForStandardLibrary bootstrappingTDA = new TopDownAnalyzerForStandardLibrary(bootstrappingSemanticServices, bindingTraceContext);
             WritableScopeImpl writableScope = new WritableScopeImpl(JetStandardClasses.STANDARD_CLASSES, JetStandardClasses.STANDARD_CLASSES_NAMESPACE, ErrorHandler.THROW_EXCEPTION).setDebugName("Root bootstrap scope");
 //            this.libraryScope = bootstrappingTDA.process(JetStandardClasses.STANDARD_CLASSES, file.getRootNamespace().getDeclarations());
 //            bootstrappingTDA.process(writableScope, JetStandardClasses.STANDARD_CLASSES_NAMESPACE, file.getRootNamespace().getDeclarations());

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

@@ -2615,6 +2615,17 @@ public class JetTypeInferrer {
 //                    context.trace.getErrorHandler().typeMismatch(right, leftType, rightType);
 //                }
             }
+            if (left instanceof JetSimpleNameExpression) {
+                JetSimpleNameExpression variable = (JetSimpleNameExpression) left;
+                String referencedName = variable.getReferencedName();
+                if (variable.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER
+                    && referencedName != null) {
+                    PropertyDescriptor property = context.scope.getPropertyByFieldReference(referencedName);
+                    if (property != null) {
+                        context.trace.record(BindingContext.VARIABLE_ASSIGNMENT, variable, property);
+                    }
+                }
+            }
             return null;
         }
 

idea/testData/checker/Abstract.jet

@@ -0,0 +1,50 @@
+namespace abstract
+
+class A1() {
+    fun <error>foo</error>(): Int
+    <error>abstract</error> fun f(): Int
+}
+
+abstract class A2() {
+    abstract fun f(): Int
+}
+
+class A3() {
+    val <error>i</error>: Int
+    val <error>j</error>: Int?
+    var <error>k</error>: String
+    var <error>l</error>: Int?
+}
+
+class <error>A4</error> {
+    val <error>i</error>: Int?
+}
+
+class <error>A5</error> {
+    var <error>i</error>: Int?
+}
+
+class A6 {
+    <error>abstract</error> val i: Int
+}
+
+abstract class A7 {
+    abstract val i: Int //ok
+}
+
+class A8() {
+    val i = 11
+}
+
+class A9() {
+    <error>abstract</error> val i = 23
+}
+
+abstract class <error>A10</error> {
+    val <error>i</error>: Int
+}
+
+<error>abstract</error> val i: Int
+<error>abstract</error> fun foo(): fun(Int): Int
+val <error>j</error>: Int
+fun <error>foo1</error>(): fun(Int): Int

idea/testData/checker/BinaryCallsOnNullableValues.jet

@@ -1,13 +1,13 @@
-class A() {
+abstract class A() {
-  fun equals(a : Any?) : Boolean
+  abstract fun equals(a : Any?) : Boolean
 }
 
-class B() {
+abstract class B() {
-  fun equals(a : Any?) : Boolean?
+  abstract fun equals(a : Any?) : Boolean?
 }
 
-class C() {
+abstract class C() {
-  fun equals(a : Any?) : Int
+  abstract fun equals(a : Any?) : Int
 }
 
 fun f(): Unit {

idea/testData/checker/Bounds.jet

@@ -18,10 +18,10 @@ namespace boundsWithSubstitutors {
   open class A {}
   open class B<T : A>()
 
-  class C<T : B<<error>Int</error>>, X : fun (B<<error>Char</error>>) : (B<<error>Any</error>>, B<A>)>() : B<<error>Any</error>>() { // 2 errors
+  abstract class C<T : B<<error>Int</error>>, X : fun (B<<error>Char</error>>) : (B<<error>Any</error>>, B<A>)>() : B<<error>Any</error>>() { // 2 errors
     val a = B<<error>Char</error>>() // error
 
-    val x : fun (B<<error>Char</error>>) : B<<error>Any</error>>
+    abstract val x : fun (B<<error>Char</error>>) : B<<error>Any</error>>
   }
 
 

idea/testData/checker/Builders.jet

@@ -3,7 +3,7 @@ import java.util.*
 namespace html {
 
   abstract class Factory<T> {
-    fun create() : T
+    abstract fun create() : T
   }
 
   abstract class Element

idea/testData/checker/ExtensionFunctions.jet

@@ -1,5 +1,5 @@
-fun Int?.optint() : Unit
+fun Int?.optint() : Unit {}
-val Int?.optval : Unit
+val Int?.optval : Unit = ()
 
 fun <T, E> T.foo(x : E, y : A) : T   {
   y.plus(1)
@@ -33,21 +33,21 @@ fun test() {
 val Int.abs : Int
   get() = if (this > 0) this else -this;
 
-val <T> T.foo : T
+val <T> T.<error>foo</error> : T
 
 fun Int.foo() = this
 
 namespace null_safety {
 
         fun parse(cmd: String): Command? { return null  }
-        class Command() {
+        abstract class Command() {
         //  fun equals(other : Any?) : Boolean
-          val foo : Int
+          abstract val foo : Int
         }
 
-        fun Any.equals(other : Any?) : Boolean
+        fun Any.equals(other : Any?) : Boolean = true
-        fun Any?.equals1(other : Any?) : Boolean
+        fun Any?.equals1(other : Any?) : Boolean = true
-        fun Any.equals2(other : Any?) : Boolean
+        fun Any.equals2(other : Any?) : Boolean = true
 
         fun main(args: Array<String>) {
 

idea/testData/checker/ForRangeConventions.jet

@@ -4,65 +4,65 @@ class NotRange1() {
 
 }
 
-class NotRange2() {
+abstract class NotRange2() {
-  fun iterator() : Unit
+  abstract fun iterator() : Unit
 }
 
-class ImproperIterator1 {
+abstract class ImproperIterator1 {
-  fun hasNext() : Boolean
+  abstract fun hasNext() : Boolean
 }
 
-class NotRange3() {
+abstract class NotRange3() {
-  fun iterator() : ImproperIterator1
+  abstract fun iterator() : ImproperIterator1
 }
 
-class ImproperIterator2 {
+abstract class ImproperIterator2 {
-  fun next() : Boolean
+  abstract fun next() : Boolean
 }
 
-class NotRange4() {
+abstract class NotRange4() {
-  fun iterator() : ImproperIterator2
+  abstract fun iterator() : ImproperIterator2
 }
 
-class ImproperIterator3 {
+abstract class ImproperIterator3 {
-  fun hasNext() : Int
+  abstract fun hasNext() : Int
-  fun next() : Int
+  abstract fun next() : Int
 }
 
-class NotRange5() {
+abstract class NotRange5() {
-  fun iterator() : ImproperIterator3
+  abstract fun iterator() : ImproperIterator3
 }
 
-class AmbiguousHasNextIterator {
+abstract class AmbiguousHasNextIterator {
-  fun hasNext() : Boolean
+  abstract fun hasNext() : Boolean
   val hasNext : Boolean get() = false
-  fun next() : Int
+  abstract fun next() : Int
 }
 
-class NotRange6() {
+abstract class NotRange6() {
-  fun iterator() : AmbiguousHasNextIterator
+  abstract fun iterator() : AmbiguousHasNextIterator
 }
 
-class ImproperIterator4 {
+abstract class ImproperIterator4 {
   val hasNext : Int get() = 1
-  fun next() : Int
+  abstract fun next() : Int
 }
 
-class NotRange7() {
+abstract class NotRange7() {
-  fun iterator() : ImproperIterator3
+  abstract fun iterator() : ImproperIterator3
 }
 
-class GoodIterator {
+abstract class GoodIterator {
-  fun hasNext() : Boolean
+  abstract fun hasNext() : Boolean
-  fun next() : Int
+  abstract fun next() : Int
 }
 
-class Range0() {
+abstract class Range0() {
-  fun iterator() : GoodIterator
+  abstract fun iterator() : GoodIterator
 }
 
-class Range1() {
+abstract class Range1() {
-  fun iterator() : Iterator<Int>
+  abstract fun iterator() : Iterator<Int>
 }
 
 fun test() {

idea/testData/checker/FunctionReturnTypes.jet

@@ -1,4 +1,4 @@
-fun none()
+fun none() {}
 
 fun unitEmptyInfer() {}
 fun unitEmpty() : Unit {}

idea/testData/checker/MultipleBounds.jet

@@ -1,11 +1,11 @@
 namespace Jet87
 
 open class A() {
-  fun foo() : Int
+  fun foo() : Int = 1
 }
 
 open class B() {
-  fun bar() : Double;
+  fun bar() : Double = 1.0;
 }
 
 class C() : A(), B()
@@ -69,4 +69,4 @@ class Test<<error>T</error>>
     class object T : <error>Foo</error>,
     class object T : A {}
 
-val <T, B : T> x : Int
+val <T, B : T> x : Int = 0

idea/testData/checker/NamespaceQualified.jet

@@ -8,8 +8,8 @@ namespace a {
 
 }
 
-class Foo<T>() {
+abstract class Foo<T>() {
-    val x : T<Int>
+    abstract val x : T<Int>
 }
 
 namespace a {
@@ -26,22 +26,29 @@ val y1 = a.b
 
 /////////////////////////////////////////////////////////////////////////
 
-fun done<O>(result : O) : Iteratee<Any?, O>
+fun done<O>(result : O) : Iteratee<Any?, O> = StrangeIterateeImpl<Any?, O>(result)
 
-class Iteratee<in I, out O> {
+abstract class Iteratee<in I, out O> {
   abstract fun process(item : I) : Iteratee<I, O>
   abstract val isDone : Boolean
   abstract val result : O
   abstract fun done() : O
 }
 
-class Sum() : Iteratee<Int, Int> {
+class StrangeIterateeImpl<in I, out O>(val obj: O) : Iteratee<I, O> {
+    override fun process(item: I): Iteratee<I, O> = StrangeIterateeImpl<I, O>(obj)
+    override val isDone = true
+    override val result = obj
+    override val done = obj
+}
+
+abstract class Sum() : Iteratee<Int, Int> {
   override fun process(item : Int) : Iteratee<Int, Int> {
     return foobar.done<Int>(item);
   }
-  override val isDone : Boolean
+  abstract override val isDone : Boolean
-  override val result : Int
+  abstract override val result : Int
-  override fun done() : Int
+  abstract override fun done() : Int
 }
 
 class Collection<E> : Iterable<E> {

idea/testData/checker/Objects.jet

@@ -60,11 +60,11 @@ namespace nestedObejcts {
 
 namespace localObjects {
   object A {
-    val x : Int
+    val x : Int = 0
   }
 
   class Foo {
-    fun foo() : Int
+    fun foo() : Int = 1
   }
 
   fun test() {

idea/testData/checker/PrimaryConstructors.jet

@@ -1,9 +1,9 @@
 class <error>X</error> {
-  val x : Int
+  val <error>x</error> : Int
 }
 
 class Y() {
-  val x : Int
+  val x : Int = 2
 }
 
 class Y1 {

idea/testData/checker/Properties.jet

@@ -13,7 +13,7 @@
     get() = 1
 
 class Test() {
-    var a : Int
+    var a : Int = 111
     var b : Int get() = <error>$a</error>; set(x) {a = x; <error>$a</error> = x}
 
    this(i : Int) : this() {

idea/testData/checker/Redeclarations.jet

@@ -1,6 +1,6 @@
 namespace redeclarations {
   object <error>A</error> {
-    val x : Int
+    val x : Int = 0
 
     val A = 1
   }

idea/testData/checker/infos/PropertiesWithBackingFields.jet

@@ -1,10 +1,10 @@
-class Test() {
+<info>abstract</info> class Test() {
     <info>abstract</info> val x : Int
     <info>abstract</info> val x1 : Int <info>get</info>
-    <info>abstract</info> val x2 : Int <info>get</info>() = 1
+    <info>abstract</info> val x2 : Int <error><info>get</info>() = 1</error>
 
-    val <info>a</info> : Int
+    val <error>a</error> : Int
-    val <info>b</info> : Int <info>get</info>
+    val <error>b</error> : Int <info>get</info>
     val <info>c</info> = 1
 
     val <info>c1</info> = 1
@@ -15,29 +15,30 @@ class Test() {
         <info>get</info>() { return 1 }
     val c4 : Int
         <info>get</info>() = 1
-    val <info>c5</info> : Int
+    val <error>c5</error> : Int
         <info>get</info>() = $c5 + 1
 
     <info>abstract</info> var y : Int
     <info>abstract</info> var y1 : Int <info>get</info>
     <info>abstract</info> var y2 : Int <info>set</info>
     <info>abstract</info> var y3 : Int <info>set</info> <info>get</info>
-    <info>abstract</info> var y4 : Int <info>set</info> <info>get</info>() = 1
+    <info>abstract</info> var y4 : Int <info>set</info> <error><info>get</info>() = 1</error>
-    <info>abstract</info> var y5 : Int <info>set</info>(x) {} <info>get</info>() = 1
+    <info>abstract</info> var y5 : Int <error><info>set</info>(x) {}</error> <error><info>get</info>() = 1</error>
+    <info>abstract</info> var y6 : Int <error><info>set</info>(x) {}</error>
 
-    var <info>v</info> : Int
+    var <error>v</error> : Int
-    var <info>v1</info> : Int <info>get</info>
+    var <error>v1</error> : Int <info>get</info>
-    var <info>v2</info> : Int <info>get</info> <info>set</info>
+    var <error>v2</error> : Int <info>get</info> <info>set</info>
-    var <info>v3</info> : Int <info>get</info>() = 1; <info>set</info>
+    var <error>v3</error> : Int <info>get</info>() = 1; <info>set</info>
     var v4 : Int <info>get</info>() = 1; <info>set</info>(x){}
 
-    var <info>v5</info> : Int <info>get</info>() = 1; <info>set</info>(x){$v5 = x}
+    var <error>v5</error> : Int <info>get</info>() = 1; <info>set</info>(x){$v5 = x}
-    var <info>v6</info> : Int <info>get</info>() = $v6 + 1; <info>set</info>(x){}
+    var <error>v6</error> : Int <info>get</info>() = $v6 + 1; <info>set</info>(x){}
 
   val v7 : Int <info>abstract</info> <info>get</info>
   var v8 : Int <info>abstract</info> <info>get</info> <info>abstract</info> <info>set</info>
-  var <info>v9</info> : Int <info>abstract</info> <info>set</info>
+  var <error>v9</error> : Int <info>abstract</info> <info>set</info>
-  var <info>v10</info> : Int <info>abstract</info> <info>get</info>
+  var <error>v10</error> : Int <info>abstract</info> <info>get</info>
 
 }
 

idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet

@@ -3,10 +3,10 @@
 
 namespace x
 
-val b : Foo
+val b : Foo = Foo()
 val a1 = b.compareTo(2)
 
 class Foo() {
-  fun compareTo(other : Byte)   : Int
+  fun compareTo(other : Byte)   : Int = 0
-  fun compareTo(other : Char)   : Int
+  fun compareTo(other : Char)   : Int = 0
 }

idea/testData/checker/regression/Jet124.jet

@@ -1,4 +1,4 @@
-fun foo1() : fun (Int) : Int
+fun foo1() : fun (Int) : Int = { (x: Int) => x }
 
 fun foo() {
   val h : fun (Int) : Int = foo1();

idea/testData/checker/regression/Jet183-1.jet

@@ -1,4 +1,4 @@
-enum class ProtocolState {
+abstract enum class ProtocolState {
   WAITING {
     override fun signal() = ProtocolState.TALKING
   }

idea/testData/checker/regression/Jet183.jet

@@ -1,4 +1,4 @@
-enum class ProtocolState {
+abstract enum class ProtocolState {
   WAITING {
     override fun signal() = ProtocolState.TALKING
   }

idea/testData/checker/regression/Jet72.jet

@@ -2,8 +2,8 @@
 
 import java.util.ArrayList
 
-class Item(val room: Object) {
+abstract class Item(val room: Object) {
-   val name : String
+   abstract val name : String
 }
 
 val items: ArrayList<Item> = ArrayList<Item>

idea/testData/checker/regression/OverrideResolution.jet

@@ -4,13 +4,13 @@ fun box() {
 }
 
 open class A {
-    fun foo()
+    fun foo() {}
 }
 
 open class B : A {
-    fun foo()
+    fun foo() {}
 }
 
 open class C : B {
-    fun foo()
+    fun foo() {}
 }

idea/testData/checker/regression/SpecififcityByReceiver.jet

@@ -1,4 +1,4 @@
-fun Any.equals(other : Any?) : Boolean
+fun Any.equals(other : Any?) : Boolean = true
 
 fun main(args: Array<String>) {
 

idea/testData/codegen/classes/classObjectMethod.jet

@@ -1,5 +1,5 @@
 abstract open class Default {
-  fun defaultValue(): Int
+  abstract fun defaultValue(): Int
 }
 
 class MyInt() {

idea/testData/codegen/classes/diamondInheritance.jet

@@ -1,5 +1,5 @@
 class Base() {
-    public var v : Int
+    public var v : Int = 0
 }
 
 class Left() : Base() {}

idea/testData/codegen/classes/initializerBlock.jet

@@ -2,7 +2,7 @@ class C() {
   public var f: Int
 
   {
-    f = 610
+    $f = 610
   }
 }
 

idea/testData/codegen/classes/propertyDelegation.jet

@@ -3,7 +3,7 @@ class Base() {
     public val read : Int
       get() = 239
 
-    public var readwrite : Int
+    public var readwrite : Int = 0
       get() = $readwrite + 1
       set(n : Int) {
         $readwrite = n

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

@@ -72,7 +72,7 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testAbstractMethod() throws Exception {
-        loadText("class Foo { abstract fun x(): String; fun y(): Int = 0 }");
+        loadText("abstract class Foo { abstract fun x(): String; fun y(): Int = 0 }");
 
         final ClassFileFactory codegens = generateClassesInFile();
         final Class aClass = loadClass("Foo", codegens);

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

@@ -125,7 +125,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testAbstractVal() throws Exception {
-        loadText("class Foo { public abstract val x: String }");
+        loadText("abstract class Foo { public abstract val x: String }");
         final ClassFileFactory codegens = generateClassesInFile();
         final Class aClass = loadClass("Foo", codegens);
         assertNotNull(aClass.getMethod("getX"));