# HG changeset patch
# User Robert Clipsham <robert@octarineparrot.com>
# Date 1271171713 -3600
# Node ID 93810d5d169d5a1ef8a35f3c77a53130cd4534c9
# Parent  c369e99241511db504f33ee3e918fe9487a21954# Parent  9fe59705c82d75dd74bc673b2be50771ff1b6351
Automated merge with http://hg.dsource.org/projects/ddmd/

diff -r c369e9924151 -r 93810d5d169d commands.linux.txt
--- a/commands.linux.txt	Tue Apr 13 15:36:12 2010 +0400
+++ b/commands.linux.txt	Tue Apr 13 16:15:13 2010 +0100
@@ -1,6 +1,5 @@
 -gc
 -debug
--release
 -version=Bug3602
 -version=Bug4054
 -version=Bug4059
diff -r c369e9924151 -r 93810d5d169d dmd/Module.d
--- a/dmd/Module.d	Tue Apr 13 15:36:12 2010 +0400
+++ b/dmd/Module.d	Tue Apr 13 16:15:13 2010 +0100
@@ -1187,9 +1187,22 @@
 			docfile.remove();
 	}
 
-    void addDeferredSemantic(Dsymbol s)
+	/*******************************************
+	 * Can't run semantic on s now, try again later.
+	 */
+	void addDeferredSemantic(Dsymbol s)
 	{
-		assert(false);
+	    // Don't add it if it is already there
+	    for (int i = 0; i < deferred.dim; i++)
+	    {
+		Dsymbol sd = cast(Dsymbol)deferred.data[i];
+
+		if (sd == s)
+		    return;
+	    }
+
+	    //printf("Module::addDeferredSemantic('%s')\n", s->toChars());
+	    deferred.push(cast(void*)s);
 	}
 	
 	/******************************************