add contracts for interface functions

src/func.c

@@ -320,6 +320,11 @@ void FuncDeclaration::semantic(Scope *sc)
 	    error("function body is not abstract in interface %s", id->toChars());
     }
 
+    /* Contracts can only appear without a body when they are virtual interface functions
+     */
+    if (!fbody && (fensure || frequire) && !(id && isVirtual()))
+	error("in and out contracts require function body");
+
     /* Template member functions aren't virtual:
      *   interface TestInterface { void tpl(T)(); }
      * and so won't work in interfaces
@@ -700,15 +705,15 @@ void FuncDeclaration::semantic(Scope *sc)
 	    fdrequire = fd;
 	}
 
+	if (!outId && f->nextOf() && f->nextOf()->toBasetype()->ty != Tvoid)
+	    outId = Id::result;	// provide a default
+
 	if (fensure)
 	{   /*   out (result) { ... }
 	     * becomes:
 	     *   tret __ensure(ref tret result) { ... }
 	     *   __ensure(result);
 	     */
-	    if (!outId && f->nextOf()->toBasetype()->ty != Tvoid)
-		outId = Id::result;	// provide a default
-
 	    Loc loc = fensure->loc;
 	    Parameters *arguments = new Parameters();
 	    Parameter *a = NULL;
@@ -784,6 +789,7 @@ void FuncDeclaration::semantic3(Scope *sc)
 	return;
     f = (TypeFunction *)(type);
 
+#if 0
     // Check the 'throws' clause
     if (fthrows)
     {
@@ -796,11 +802,12 @@ void FuncDeclaration::semantic3(Scope *sc)
 		error("can only throw classes, not %s", t->toChars());
 	}
     }
+#endif
 
     frequire = mergeFrequire(frequire);
     fensure = mergeFensure(fensure);
 
-    if (fbody || frequire)
+    if (fbody || frequire || fensure)
     {
 	/* Symbol table into which we place parameters and nested functions,
 	 * solely to diagnose name collisions.

src/glue.c

@@ -516,8 +516,6 @@ void Module::genobjfile(int multiobj)
 
 void FuncDeclaration::toObjFile(int multiobj)
 {
-    Symbol *s;
-    func_t *f;
     Symbol *senter;
     Symbol *sexit;
     FuncDeclaration *func = this;
@@ -559,8 +557,8 @@ void FuncDeclaration::toObjFile(int multiobj)
     if (global.params.verbose)
 	printf("function  %s\n",func->toChars());
 
-    s = func->toSymbol();
-    f = s->Sfunc;
+    Symbol *s = func->toSymbol();
+    func_t *f = s->Sfunc;
 
 #if TARGET_WINDOS
     /* This is done so that the 'this' pointer on the stack is the same

src/mars.c

@@ -169,7 +169,7 @@ void verror(Loc loc, const char *format, va_list ap)
 #endif
 	fprintf(stdmsg, "\n");
 	fflush(stdmsg);
-//halt();
+halt();
     }
     global.errors++;
 }

src/parse.c

@@ -3108,7 +3108,8 @@ void Parser::parseContracts(FuncDeclaration *f)
 	    goto L1;
 
 	default:
-	    error("semicolon expected following function declaration");
+	    if (!f->frequire && !f->fensure)		// allow these even with no body
+		error("semicolon expected following function declaration");
 	    break;
     }
     linkage = linksave;

src/toobj.c

@@ -922,12 +922,9 @@ void InterfaceDeclaration::toObjFile(int multiobj)
 
     // Put out the members
     for (i = 0; i < members->dim; i++)
-    {
-	Dsymbol *member;
+    {	Dsymbol *member = (Dsymbol *)members->data[i];
 
-	member = (Dsymbol *)members->data[i];
-	if (!member->isFuncDeclaration())
-	    member->toObjFile(0);
+	member->toObjFile(0);
     }
 
     // Generate C symbols