projects/ldc: dmd2/func.c comparison

comparison dmd2/func.c @ 1577:e4f7b5d9c68a

DMD 2.032 Merge.

author	Robert Clipsham <robert@octarineparrot.com>
date	Tue, 08 Sep 2009 10:07:56 +0100
parents	54b3c1394d62
children

comparison

equal deleted inserted replaced

-:4551475bc6b6
+:e4f7b5d9c68a
 	unsigned stc = storage_class;
 	if (type->isInvariant())
 	    stc |= STCimmutable;
 	if (type->isConst())
 	    stc |= STCconst;
-	if (type->isShared())
+	if (type->isShared() || storage_class & STCsynchronized)
 	    stc |= STCshared;
 	switch (stc & STC_TYPECTOR)
 	{
 	    case STCimmutable:
 	    case STCimmutable | STCconst:
 	    }
 	    else if (!hasReturnExp && type->nextOf()->ty != Tvoid)
 		error("expected to return a value of type %s", type->nextOf()->toChars());
 	    else if (!inlineAsm)
 	    {
+#if DMDV2
 		int blockexit = fbody ? fbody->blockExit() : BEfallthru;
 		if (f->isnothrow && blockexit & BEthrow)
 		    error("'%s' is nothrow yet may throw", toChars());
 		int offend = blockexit & BEfallthru;
+#endif
 		if (type->nextOf()->ty == Tvoid)
 		{
 		    if (offend && isMain())
 		    {	// Add a return 0; statement
 			Statement *s = new ReturnStatement(0, new IntegerExp(0));
 		}
 		else
 		{
 		    if (offend)
 		    {   Expression *e;
+#if DMDV1
-			//warning(loc, "no return exp; or assert(0); at end of function");
+			warning(loc, "no return exp; or assert(0); at end of function");
+#else
 			error("no return exp; or assert(0); at end of function");
+#endif
 			if (global.params.useAssert &&
 			    !global.params.useInline)
 			{   /* Add an assert(0, msg); where the missing return
 			     * should be.
 			     */
 		}
 	    }
 	    fbody = new CompoundStatement(0, a);
-#if IN_LLVM
+#if 0 // This seems to have been added in with dmd 2.032, see below
 	    // wrap body of synchronized functions in a synchronized statement
 	    if (isSynchronized())
 	    {
 		ClassDeclaration *cd = parent->isClassDeclaration();
 		if (!cd)
 		a = new Statements;
 		a->push(s);
 		fbody = new CompoundStatement(0, a);
 	    }
 #endif
+#if DMDV2
 	    /* Append destructor calls for parameters as finally blocks.
 	     */
 	    if (parameters)
 	    {	for (size_t i = 0; i < parameters->dim; i++)
 		{
 			else
 			    fbody = new TryFinallyStatement(0, fbody, s);
 		    }
 		}
 	    }
+#endif
+#if 1
+	    if (isSynchronized())
+	    {	/* Wrap the entire function body in a synchronized statement
+		 */
+		ClassDeclaration *cd = parent->isClassDeclaration();
+		if (cd)
+		{
+#if TARGET_WINDOS
+		    if (/*config.flags2 & CFG2seh &&*/	// always on for WINDOS
+			!isStatic() && !fbody->usesEH())
+		    {
+			/* The back end uses the "jmonitor" hack for syncing;
+			 * no need to do the sync at this level.
+			 */
+		    }
+		    else
+#endif
+		    {
+			Expression *vsync;
+			if (isStatic())
+			{   // The monitor is in the ClassInfo
+			    vsync = new DotIdExp(loc, new DsymbolExp(loc, cd), Id::classinfo);
+			}
+			else
+			{   // 'this' is the monitor
+			    vsync = new VarExp(loc, vthis);
+			}
+			fbody = new PeelStatement(fbody);	// don't redo semantic()
+			fbody = new SynchronizedStatement(loc, vsync, fbody);
+			fbody = fbody->semantic(sc2);
+		    }
+		}
+		else
+		{
+		    error("synchronized function %s must be a member of a class", toChars());
+		}
+	    }
+#endif
 	}
 	sc2->callSuper = 0;
 	sc2->pop();
 }
 }
 else
 {
 	OutBuffer buf;
+	buf.writeByte('(');
 	if (arguments)
 	{
 	    HdrGenState hgs;
 	    argExpTypesToCBuffer(&buf, arguments, &hgs);
-	}
+	    buf.writeByte(')');
+	    if (ethis)
+		ethis->type->modToBuffer(&buf);
+	}
+	else
+	    buf.writeByte(')');
 	if (m.last == MATCHnomatch)
 	{
 	    if (flags & 1)		// if do not print error messages
 		return NULL;		// no match
 	    tf = (TypeFunction *)type;
+	    OutBuffer buf2;
+	    tf->modToBuffer(&buf2);
 	    //printf("tf = %s, args = %s\n", tf->deco, ((Expression *)arguments->data[0])->type->deco);
-	    error(loc, "%s does not match parameter types (%s)",
+	    error(loc, "%s%s is not callable using argument types %s",
 		Argument::argsTypesToChars(tf->parameters, tf->varargs),
+		buf2.toChars(),
 		buf.toChars());
 	    return m.anyf;		// as long as it's not a FuncAliasDeclaration
 	}
 	else
 	{
 	else
 	    fbody = new CompoundStatement(0, fbody, s);
 }
 }
+const char *FuncDeclaration::toPrettyChars()
+{
+if (isMain())
+	return "D main";
+else
+	return Dsymbol::toPrettyChars();
+}
 int FuncDeclaration::isMain()
 {
 return ident == Id::main &&
 	linkage != LINKc && !isMember() && !isNested();

Mercurial > projects > ldc

comparison dmd2/func.c @ 1577:e4f7b5d9c68a