diff --git a/dmd2/artistic.txt b/dmd2/artistic.txt
index cd17757e..cae432b7 100644
--- a/dmd2/artistic.txt
+++ b/dmd2/artistic.txt
@@ -1,117 +1,117 @@
-
-
-
-
-			 The "Artistic License"
-
-				Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
-
-Definitions:
-
-	"Package" refers to the collection of files distributed by the
-	Copyright Holder, and derivatives of that collection of files
-	created through textual modification.
-
-	"Standard Version" refers to such a Package if it has not been
-	modified, or has been modified in accordance with the wishes
-	of the Copyright Holder as specified below.
-
-	"Copyright Holder" is whoever is named in the copyright or
-	copyrights for the package.
-
-	"You" is you, if you're thinking about copying or distributing
-	this Package.
-
-	"Reasonable copying fee" is whatever you can justify on the
-	basis of media cost, duplication charges, time of people involved,
-	and so on.  (You will not be required to justify it to the
-	Copyright Holder, but only to the computing community at large
-	as a market that must bear the fee.)
-
-	"Freely Available" means that no fee is charged for the item
-	itself, though there may be fees involved in handling the item.
-	It also means that recipients of the item may redistribute it
-	under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
-
-    a) place your modifications in the Public Domain or otherwise make them
-    Freely Available, such as by posting said modifications to Usenet or
-    an equivalent medium, or placing the modifications on a major archive
-    site such as uunet.uu.net, or by allowing the Copyright Holder to include
-    your modifications in the Standard Version of the Package.
-
-    b) use the modified Package only within your corporation or organization.
-
-    c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided, and provide
-    a separate manual page for each non-standard executable that clearly
-    documents how it differs from the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
-
-    a) distribute a Standard Version of the executables and library files,
-    together with instructions (in the manual page or equivalent) on where
-    to get the Standard Version.
-
-    b) accompany the distribution with the machine-readable source of
-    the Package with your modifications.
-
-    c) give non-standard executables non-standard names, and clearly
-    document the differences in manual pages (or equivalent), together
-    with instructions on where to get the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this
-Package.  You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own.  You may embed this Package's interpreter within
-an executable of yours (by linking); this shall be construed as a mere
-form of aggregation, provided that the complete Standard Version of the
-interpreter is so embedded.
-
-6. The source code and object code supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whoever generated
-them, and may be sold commercially, and may be aggregated with this
-Package.
-
-7. Aggregation of this Package with a commercial distribution is always
-permitted provided that the use of this Package is embedded; that is,
-when no overt attempt is made to make this Package's interfaces visible
-to the end user of the commercial distribution.  Such use shall not be
-construed as a distribution of this Package.
-
-8. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-				The End
+
+
+
+
+			 The "Artistic License"
+
+				Preamble
+
+The intent of this document is to state the conditions under which a
+Package may be copied, such that the Copyright Holder maintains some
+semblance of artistic control over the development of the package,
+while giving the users of the package the right to use and distribute
+the Package in a more-or-less customary fashion, plus the right to make
+reasonable modifications.
+
+Definitions:
+
+	"Package" refers to the collection of files distributed by the
+	Copyright Holder, and derivatives of that collection of files
+	created through textual modification.
+
+	"Standard Version" refers to such a Package if it has not been
+	modified, or has been modified in accordance with the wishes
+	of the Copyright Holder as specified below.
+
+	"Copyright Holder" is whoever is named in the copyright or
+	copyrights for the package.
+
+	"You" is you, if you're thinking about copying or distributing
+	this Package.
+
+	"Reasonable copying fee" is whatever you can justify on the
+	basis of media cost, duplication charges, time of people involved,
+	and so on.  (You will not be required to justify it to the
+	Copyright Holder, but only to the computing community at large
+	as a market that must bear the fee.)
+
+	"Freely Available" means that no fee is charged for the item
+	itself, though there may be fees involved in handling the item.
+	It also means that recipients of the item may redistribute it
+	under the same conditions they received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder.  A Package
+modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided
+that you insert a prominent notice in each changed file stating how and
+when you changed that file, and provided that you do at least ONE of the
+following:
+
+    a) place your modifications in the Public Domain or otherwise make them
+    Freely Available, such as by posting said modifications to Usenet or
+    an equivalent medium, or placing the modifications on a major archive
+    site such as uunet.uu.net, or by allowing the Copyright Holder to include
+    your modifications in the Standard Version of the Package.
+
+    b) use the modified Package only within your corporation or organization.
+
+    c) rename any non-standard executables so the names do not conflict
+    with standard executables, which must also be provided, and provide
+    a separate manual page for each non-standard executable that clearly
+    documents how it differs from the Standard Version.
+
+    d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+    a) distribute a Standard Version of the executables and library files,
+    together with instructions (in the manual page or equivalent) on where
+    to get the Standard Version.
+
+    b) accompany the distribution with the machine-readable source of
+    the Package with your modifications.
+
+    c) give non-standard executables non-standard names, and clearly
+    document the differences in manual pages (or equivalent), together
+    with instructions on where to get the Standard Version.
+
+    d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package.  You may charge any fee you choose for support of this
+Package.  You may not charge a fee for this Package itself.  However,
+you may distribute this Package in aggregate with other (possibly
+commercial) programs as part of a larger (possibly commercial) software
+distribution provided that you do not advertise this Package as a
+product of your own.  You may embed this Package's interpreter within
+an executable of yours (by linking); this shall be construed as a mere
+form of aggregation, provided that the complete Standard Version of the
+interpreter is so embedded.
+
+6. The source code and object code supplied as input to or produced as
+output from the programs of this Package do not automatically fall
+under the copyright of this Package, but belong to whoever generated
+them, and may be sold commercially, and may be aggregated with this
+Package.
+
+7. Aggregation of this Package with a commercial distribution is always
+permitted provided that the use of this Package is embedded; that is,
+when no overt attempt is made to make this Package's interfaces visible
+to the end user of the commercial distribution.  Such use shall not be
+construed as a distribution of this Package.
+
+8. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+				The End
diff --git a/dmd2/doc.c b/dmd2/doc.c
index 094d5947..4d8f104d 100644
--- a/dmd2/doc.c
+++ b/dmd2/doc.c
@@ -1,2229 +1,2229 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2012 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-// This implements the Ddoc capability.
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <assert.h>
-
-#include "rmem.h"
-#include "root.h"
-
-#include "mars.h"
-#include "dsymbol.h"
-#include "macro.h"
-#include "template.h"
-#include "lexer.h"
-#include "aggregate.h"
-#include "declaration.h"
-#include "enum.h"
-#include "id.h"
-#include "module.h"
-#include "scope.h"
-#include "hdrgen.h"
-#include "doc.h"
-#include "mtype.h"
-#include "utf.h"
-
-struct Escape
-{
-    const char *strings[256];
-
-    static const char *escapeChar(unsigned c);
-};
-
-struct Section
-{
-    unsigned char *name;
-    unsigned namelen;
-
-    unsigned char *body;
-    unsigned bodylen;
-
-    int nooutput;
-
-    virtual void write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf);
-};
-
-struct ParamSection : Section
-{
-    void write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf);
-};
-
-struct MacroSection : Section
-{
-    void write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf);
-};
-
-typedef ArrayBase<Section> Sections;
-
-struct DocComment
-{
-    Sections sections;             // Section*[]
-
-    Section *summary;
-    Section *copyright;
-    Section *macros;
-    Macro **pmacrotable;
-    Escape **pescapetable;
-
-    DocComment();
-
-    static DocComment *parse(Scope *sc, Dsymbol *s, unsigned char *comment);
-    static void parseMacros(Escape **pescapetable, Macro **pmacrotable, unsigned char *m, unsigned mlen);
-    static void parseEscapes(Escape **pescapetable, unsigned char *textstart, unsigned textlen);
-
-    void parseSections(unsigned char *comment);
-    void writeSections(Scope *sc, Dsymbol *s, OutBuffer *buf);
-};
-
-
-int cmp(const char *stringz, void *s, size_t slen);
-int icmp(const char *stringz, void *s, size_t slen);
-int isDitto(unsigned char *comment);
-unsigned char *skipwhitespace(unsigned char *p);
-unsigned skiptoident(OutBuffer *buf, size_t i);
-unsigned skippastident(OutBuffer *buf, size_t i);
-unsigned skippastURL(OutBuffer *buf, size_t i);
-void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
-void highlightCode(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
-void highlightCode2(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
-Parameter *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len);
-
-int isIdStart(unsigned char *p);
-int isIdTail(unsigned char *p);
-int utfStride(unsigned char *p);
-
-static unsigned char ddoc_default[] = "\
-DDOC =  <html><head>\n\
-        <META http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n\
-        <title>$(TITLE)</title>\n\
-        </head><body>\n\
-        <h1>$(TITLE)</h1>\n\
-        $(BODY)\n\
-        <hr>$(SMALL Page generated by $(LINK2 http://www.digitalmars.com/d/2.0/ddoc.html, Ddoc). $(COPYRIGHT))\n\
-        </body></html>\n\
-\n\
-B =     <b>$0</b>\n\
-I =     <i>$0</i>\n\
-U =     <u>$0</u>\n\
-P =     <p>$0</p>\n\
-DL =    <dl>$0</dl>\n\
-DT =    <dt>$0</dt>\n\
-DD =    <dd>$0</dd>\n\
-TABLE = <table>$0</table>\n\
-TR =    <tr>$0</tr>\n\
-TH =    <th>$0</th>\n\
-TD =    <td>$0</td>\n\
-OL =    <ol>$0</ol>\n\
-UL =    <ul>$0</ul>\n\
-LI =    <li>$0</li>\n\
-BIG =   <big>$0</big>\n\
-SMALL = <small>$0</small>\n\
-BR =    <br>\n\
-LINK =  <a href=\"$0\">$0</a>\n\
-LINK2 = <a href=\"$1\">$+</a>\n\
-LPAREN= (\n\
-RPAREN= )\n\
-DOLLAR= $\n\
-\n\
-RED =   <font color=red>$0</font>\n\
-BLUE =  <font color=blue>$0</font>\n\
-GREEN = <font color=green>$0</font>\n\
-YELLOW =<font color=yellow>$0</font>\n\
-BLACK = <font color=black>$0</font>\n\
-WHITE = <font color=white>$0</font>\n\
-\n\
-D_CODE = <pre class=\"d_code\">$0</pre>\n\
-D_COMMENT = $(GREEN $0)\n\
-D_STRING  = $(RED $0)\n\
-D_KEYWORD = $(BLUE $0)\n\
-D_PSYMBOL = $(U $0)\n\
-D_PARAM   = $(I $0)\n\
-\n\
-DDOC_COMMENT   = <!-- $0 -->\n\
-DDOC_DECL      = $(DT $(BIG $0))\n\
-DDOC_DECL_DD   = $(DD $0)\n\
-DDOC_DITTO     = $(BR)$0\n\
-DDOC_SECTIONS  = $0\n\
-DDOC_SUMMARY   = $0$(BR)$(BR)\n\
-DDOC_DESCRIPTION = $0$(BR)$(BR)\n\
-DDOC_AUTHORS   = $(B Authors:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_BUGS      = $(RED BUGS:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_COPYRIGHT = $(B Copyright:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_DATE      = $(B Date:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_DEPRECATED = $(RED Deprecated:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_EXAMPLES  = $(B Examples:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_HISTORY   = $(B History:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_LICENSE   = $(B License:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_RETURNS   = $(B Returns:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_SEE_ALSO  = $(B See Also:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_STANDARDS = $(B Standards:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_THROWS    = $(B Throws:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_VERSION   = $(B Version:)$(BR)\n$0$(BR)$(BR)\n\
-DDOC_SECTION_H = $(B $0)$(BR)\n\
-DDOC_SECTION   = $0$(BR)$(BR)\n\
-DDOC_MEMBERS   = $(DL $0)\n\
-DDOC_MODULE_MEMBERS = $(DDOC_MEMBERS $0)\n\
-DDOC_CLASS_MEMBERS  = $(DDOC_MEMBERS $0)\n\
-DDOC_STRUCT_MEMBERS = $(DDOC_MEMBERS $0)\n\
-DDOC_ENUM_MEMBERS   = $(DDOC_MEMBERS $0)\n\
-DDOC_TEMPLATE_MEMBERS = $(DDOC_MEMBERS $0)\n\
-DDOC_PARAMS    = $(B Params:)$(BR)\n$(TABLE $0)$(BR)\n\
-DDOC_PARAM_ROW = $(TR $0)\n\
-DDOC_PARAM_ID  = $(TD $0)\n\
-DDOC_PARAM_DESC = $(TD $0)\n\
-DDOC_BLANKLINE  = $(BR)$(BR)\n\
-\n\
-DDOC_PSYMBOL    = $(U $0)\n\
-DDOC_KEYWORD    = $(B $0)\n\
-DDOC_PARAM      = $(I $0)\n\
-\n\
-ESCAPES = /</&lt;/\n\
-          />/&gt;/\n\
-          /&/&amp;/\n\
-";
-
-static char ddoc_decl_s[] = "$(DDOC_DECL ";
-static char ddoc_decl_e[] = ")\n";
-
-static char ddoc_decl_dd_s[] = "$(DDOC_DECL_DD ";
-static char ddoc_decl_dd_e[] = ")\n";
-
-
-/****************************************************
- */
-
-void Module::gendocfile()
-{
-    static OutBuffer mbuf;
-    static int mbuf_done;
-
-    OutBuffer buf;
-
-    //printf("Module::gendocfile()\n");
-
-    if (!mbuf_done)             // if not already read the ddoc files
-    {   mbuf_done = 1;
-
-        // Use our internal default
-        mbuf.write(ddoc_default, sizeof(ddoc_default) - 1);
-
-        // Override with DDOCFILE specified in the sc.ini file
-        char *p = getenv("DDOCFILE");
-        if (p)
-            global.params.ddocfiles->shift(p);
-
-        // Override with the ddoc macro files from the command line
-        for (size_t i = 0; i < global.params.ddocfiles->dim; i++)
-        {
-            FileName f(global.params.ddocfiles->tdata()[i], 0);
-            File file(&f);
-            file.readv();
-            // BUG: convert file contents to UTF-8 before use
-
-            //printf("file: '%.*s'\n", file.len, file.buffer);
-            mbuf.write(file.buffer, file.len);
-        }
-    }
-    DocComment::parseMacros(&escapetable, &macrotable, mbuf.data, mbuf.offset);
-
-    Scope *sc = Scope::createGlobal(this);      // create root scope
-    sc->docbuf = &buf;
-
-    DocComment *dc = DocComment::parse(sc, this, comment);
-    dc->pmacrotable = &macrotable;
-    dc->pescapetable = &escapetable;
-
-    // Generate predefined macros
-
-    // Set the title to be the name of the module
-    {   const char *p = toPrettyChars();
-        Macro::define(&macrotable, (unsigned char *)"TITLE", 5, (unsigned char *)p, strlen(p));
-    }
-
-    // Set time macros
-    {   time_t t;
-        time(&t);
-        char *p = ctime(&t);
-        p = mem.strdup(p);
-        Macro::define(&macrotable, (unsigned char *)"DATETIME", 8, (unsigned char *)p, strlen(p));
-        Macro::define(&macrotable, (unsigned char *)"YEAR", 4, (unsigned char *)p + 20, 4);
-    }
-
-    char *srcfilename = srcfile->toChars();
-    Macro::define(&macrotable, (unsigned char *)"SRCFILENAME", 11, (unsigned char *)srcfilename, strlen(srcfilename));
-
-    char *docfilename = docfile->toChars();
-    Macro::define(&macrotable, (unsigned char *)"DOCFILENAME", 11, (unsigned char *)docfilename, strlen(docfilename));
-
-    if (dc->copyright)
-    {
-        dc->copyright->nooutput = 1;
-        Macro::define(&macrotable, (unsigned char *)"COPYRIGHT", 9, dc->copyright->body, dc->copyright->bodylen);
-    }
-
-    buf.printf("$(DDOC_COMMENT Generated by Ddoc from %s)\n", srcfile->toChars());
-    if (isDocFile)
-    {
-        size_t commentlen = strlen((char *)comment);
-        if (dc->macros)
-        {
-            commentlen = dc->macros->name - comment;
-            dc->macros->write(dc, sc, this, sc->docbuf);
-        }
-        sc->docbuf->write(comment, commentlen);
-        highlightText(NULL, this, sc->docbuf, 0);
-    }
-    else
-    {
-        dc->writeSections(sc, this, sc->docbuf);
-        emitMemberComments(sc);
-    }
-
-    //printf("BODY= '%.*s'\n", buf.offset, buf.data);
-    Macro::define(&macrotable, (unsigned char *)"BODY", 4, buf.data, buf.offset);
-
-    OutBuffer buf2;
-    buf2.writestring("$(DDOC)\n");
-    unsigned end = buf2.offset;
-    macrotable->expand(&buf2, 0, &end, NULL, 0);
-
-#if 1
-    /* Remove all the escape sequences from buf2,
-     * and make CR-LF the newline.
-     */
-    {
-        buf.setsize(0);
-        buf.reserve(buf2.offset);
-        unsigned char *p = buf2.data;
-        for (unsigned j = 0; j < buf2.offset; j++)
-        {
-            unsigned char c = p[j];
-            if (c == 0xFF && j + 1 < buf2.offset)
-            {
-                j++;
-                continue;
-            }
-            if (c == '\n')
-                buf.writeByte('\r');
-            else if (c == '\r')
-            {
-                buf.writestring("\r\n");
-                if (j + 1 < buf2.offset && p[j + 1] == '\n')
-                {
-                    j++;
-                }
-                continue;
-            }
-            buf.writeByte(c);
-        }
-    }
-
-    // Transfer image to file
-    assert(docfile);
-    docfile->setbuffer(buf.data, buf.offset);
-    docfile->ref = 1;
-    char *pt = FileName::path(docfile->toChars());
-    if (*pt)
-        FileName::ensurePathExists(pt);
-    mem.free(pt);
-    docfile->writev();
-#else
-    /* Remove all the escape sequences from buf2
-     */
-    {   unsigned i = 0;
-        unsigned char *p = buf2.data;
-        for (unsigned j = 0; j < buf2.offset; j++)
-        {
-            if (p[j] == 0xFF && j + 1 < buf2.offset)
-            {
-                j++;
-                continue;
-            }
-            p[i] = p[j];
-            i++;
-        }
-        buf2.setsize(i);
-    }
-
-    // Transfer image to file
-    docfile->setbuffer(buf2.data, buf2.offset);
-    docfile->ref = 1;
-    char *pt = FileName::path(docfile->toChars());
-    if (*pt)
-        FileName::ensurePathExists(pt);
-    mem.free(pt);
-    docfile->writev();
-#endif
-}
-
-/****************************************************
- * Having unmatched parentheses can hose the output of Ddoc,
- * as the macros depend on properly nested parentheses.
- * This function replaces all ( with $(LPAREN) and ) with $(RPAREN)
- * to preserve text literally. This also means macros in the
- * text won't be expanded.
- */
-void escapeDdocString(OutBuffer *buf, unsigned start)
-{
-    for (unsigned u = start; u < buf->offset; u++)
-    {
-        unsigned char c = buf->data[u];
-        switch(c)
-        {
-            case '$':
-                buf->remove(u, 1);
-                buf->insert(u, "$(DOLLAR)", 9);
-                u += 8;
-                break;
-
-            case '(':
-                buf->remove(u, 1); //remove the (
-                buf->insert(u, "$(LPAREN)", 9); //insert this instead
-                u += 8; //skip over newly inserted macro
-                break;
-
-            case ')':
-                buf->remove(u, 1); //remove the )
-                buf->insert(u, "$(RPAREN)", 9); //insert this instead
-                u += 8; //skip over newly inserted macro
-                break;
-        }
-    }
-}
-
-/****************************************************
- * Having unmatched parentheses can hose the output of Ddoc,
- * as the macros depend on properly nested parentheses.
-
- * Fix by replacing unmatched ( with $(LPAREN) and unmatched ) with $(RPAREN).
- */
-void escapeStrayParenthesis(OutBuffer *buf, unsigned start, Loc loc)
-{
-    unsigned par_open = 0;
-
-    for (unsigned u = start; u < buf->offset; u++)
-    {
-        unsigned char c = buf->data[u];
-        switch(c)
-        {
-            case '(':
-                par_open++;
-                break;
-
-            case ')':
-                if (par_open == 0)
-                {
-                    //stray ')'
-                    if (global.params.warnings)
-                        warning(loc, "Ddoc: Stray ')'. This may cause incorrect Ddoc output."
-                        " Use $(RPAREN) instead for unpaired right parentheses.");
-                    buf->remove(u, 1); //remove the )
-                    buf->insert(u, "$(RPAREN)", 9); //insert this instead
-                    u += 8; //skip over newly inserted macro
-                }
-                else
-                    par_open--;
-                break;
-#if 0
-            // For this to work, loc must be set to the beginning of the passed
-            // text which is currently not possible
-            // (loc is set to the Loc of the Dsymbol)
-            case '\n':
-                loc.linnum++;
-                break;
-#endif
-        }
-    }
-
-    if (par_open)                       // if any unmatched lparens
-    {   par_open = 0;
-        for (unsigned u = buf->offset; u > start;)
-        {   u--;
-            unsigned char c = buf->data[u];
-            switch(c)
-            {
-                case ')':
-                    par_open++;
-                    break;
-
-                case '(':
-                    if (par_open == 0)
-                    {
-                        //stray '('
-                        if (global.params.warnings)
-                            warning(loc, "Ddoc: Stray '('. This may cause incorrect Ddoc output."
-                            " Use $(LPAREN) instead for unpaired left parentheses.");
-                        buf->remove(u, 1); //remove the (
-                        buf->insert(u, "$(LPAREN)", 9); //insert this instead
-                    }
-                    else
-                        par_open--;
-                    break;
-            }
-        }
-    }
-}
-
-/******************************* emitComment **********************************/
-
-/*
- * Emit doc comment to documentation file
- */
-
-void Dsymbol::emitDitto(Scope *sc)
-{
-    //printf("Dsymbol::emitDitto() %s %s\n", kind(), toChars());
-    OutBuffer *buf = sc->docbuf;
-    unsigned o;
-    OutBuffer b;
-
-    b.writestring("$(DDOC_DITTO ");
-        o = b.offset;
-        toDocBuffer(&b);
-        //printf("b: '%.*s'\n", b.offset, b.data);
-        /* If 'this' is a function template, then highlightCode() was
-         * already run by FuncDeclaration::toDocbuffer().
-         */
-        TemplateDeclaration *td;
-        if (parent &&
-            (td = parent->isTemplateDeclaration()) != NULL &&
-            td->onemember == this)
-        {
-        }
-        else
-            highlightCode(sc, this, &b, o);
-    b.writeByte(')');
-    buf->spread(sc->lastoffset, b.offset);
-    memcpy(buf->data + sc->lastoffset, b.data, b.offset);
-    sc->lastoffset += b.offset;
-}
-
-void ScopeDsymbol::emitMemberComments(Scope *sc)
-{
-    //printf("ScopeDsymbol::emitMemberComments() %s\n", toChars());
-    OutBuffer *buf = sc->docbuf;
-
-    if (members)
-    {   const char *m = "$(DDOC_MEMBERS \n";
-
-        if (isModule())
-            m = "$(DDOC_MODULE_MEMBERS \n";
-        else if (isClassDeclaration())
-            m = "$(DDOC_CLASS_MEMBERS \n";
-        else if (isStructDeclaration())
-            m = "$(DDOC_STRUCT_MEMBERS \n";
-        else if (isEnumDeclaration())
-            m = "$(DDOC_ENUM_MEMBERS \n";
-        else if (isTemplateDeclaration())
-            m = "$(DDOC_TEMPLATE_MEMBERS \n";
-
-        unsigned offset1 = buf->offset;         // save starting offset
-        buf->writestring(m);
-        unsigned offset2 = buf->offset;         // to see if we write anything
-        sc = sc->push(this);
-        for (size_t i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = (*members)[i];
-            //printf("\ts = '%s'\n", s->toChars());
-            s->emitComment(sc);
-        }
-        sc->pop();
-        if (buf->offset == offset2)
-        {
-            /* Didn't write out any members, so back out last write
-             */
-            buf->offset = offset1;
-        }
-        else
-            buf->writestring(")\n");
-    }
-}
-
-void emitProtection(OutBuffer *buf, PROT prot)
-{
-    const char *p;
-
-    switch (prot)
-    {
-        case PROTpackage:       p = "package";   break;
-        case PROTprotected:     p = "protected"; break;
-        case PROTexport:        p = "export";    break;
-        default:                p = NULL;        break;
-    }
-    if (p)
-        buf->printf("%s ", p);
-}
-
-void Dsymbol::emitComment(Scope *sc)               { }
-void InvariantDeclaration::emitComment(Scope *sc)  { }
-#if DMDV2
-void PostBlitDeclaration::emitComment(Scope *sc)   { }
-#endif
-void DtorDeclaration::emitComment(Scope *sc)       { }
-void StaticCtorDeclaration::emitComment(Scope *sc) { }
-void StaticDtorDeclaration::emitComment(Scope *sc) { }
-void ClassInfoDeclaration::emitComment(Scope *sc)  { }
-void ModuleInfoDeclaration::emitComment(Scope *sc) { }
-void TypeInfoDeclaration::emitComment(Scope *sc)   { }
-
-
-void Declaration::emitComment(Scope *sc)
-{
-    //printf("Declaration::emitComment(%p '%s'), comment = '%s'\n", this, toChars(), comment);
-    //printf("type = %p\n", type);
-
-    if (protection == PROTprivate || !ident ||
-        (!type && !isCtorDeclaration() && !isAliasDeclaration()))
-        return;
-    if (!comment)
-        return;
-
-    OutBuffer *buf = sc->docbuf;
-    DocComment *dc = DocComment::parse(sc, this, comment);
-    unsigned o;
-
-    if (!dc)
-    {
-        emitDitto(sc);
-        return;
-    }
-    dc->pmacrotable = &sc->module->macrotable;
-
-    buf->writestring(ddoc_decl_s);
-        o = buf->offset;
-        toDocBuffer(buf);
-        highlightCode(sc, this, buf, o);
-        sc->lastoffset = buf->offset;
-    buf->writestring(ddoc_decl_e);
-
-    buf->writestring(ddoc_decl_dd_s);
-    dc->writeSections(sc, this, buf);
-    buf->writestring(ddoc_decl_dd_e);
-}
-
-void AggregateDeclaration::emitComment(Scope *sc)
-{
-    //printf("AggregateDeclaration::emitComment() '%s'\n", toChars());
-    if (prot() == PROTprivate)
-        return;
-    if (!comment)
-        return;
-
-    OutBuffer *buf = sc->docbuf;
-    DocComment *dc = DocComment::parse(sc, this, comment);
-
-    if (!dc)
-    {
-        emitDitto(sc);
-        return;
-    }
-    dc->pmacrotable = &sc->module->macrotable;
-
-    buf->writestring(ddoc_decl_s);
-    toDocBuffer(buf);
-    sc->lastoffset = buf->offset;
-    buf->writestring(ddoc_decl_e);
-
-    buf->writestring(ddoc_decl_dd_s);
-    dc->writeSections(sc, this, buf);
-    emitMemberComments(sc);
-    buf->writestring(ddoc_decl_dd_e);
-}
-
-void TemplateDeclaration::emitComment(Scope *sc)
-{
-    //printf("TemplateDeclaration::emitComment() '%s', kind = %s\n", toChars(), kind());
-    if (prot() == PROTprivate)
-        return;
-
-    unsigned char *com = comment;
-    int hasmembers = 1;
-
-    Dsymbol *ss = this;
-
-    if (onemember)
-    {
-        ss = onemember->isAggregateDeclaration();
-        if (!ss)
-        {
-            ss = onemember->isFuncDeclaration();
-            if (ss)
-            {   hasmembers = 0;
-                if (com != ss->comment)
-                    com = Lexer::combineComments(com, ss->comment);
-            }
-            else
-                ss = this;
-        }
-    }
-
-    if (!com)
-        return;
-
-    OutBuffer *buf = sc->docbuf;
-    DocComment *dc = DocComment::parse(sc, this, com);
-    unsigned o;
-
-    if (!dc)
-    {
-        ss->emitDitto(sc);
-        return;
-    }
-    dc->pmacrotable = &sc->module->macrotable;
-
-    buf->writestring(ddoc_decl_s);
-        o = buf->offset;
-        ss->toDocBuffer(buf);
-        if (ss == this)
-            highlightCode(sc, this, buf, o);
-        sc->lastoffset = buf->offset;
-    buf->writestring(ddoc_decl_e);
-
-    buf->writestring(ddoc_decl_dd_s);
-    dc->writeSections(sc, this, buf);
-    if (hasmembers)
-        ((ScopeDsymbol *)ss)->emitMemberComments(sc);
-    buf->writestring(ddoc_decl_dd_e);
-}
-
-void EnumDeclaration::emitComment(Scope *sc)
-{
-    if (prot() == PROTprivate)
-        return;
-//    if (!comment)
-    {   if (isAnonymous() && members)
-        {
-            for (size_t i = 0; i < members->dim; i++)
-            {
-                Dsymbol *s = (*members)[i];
-                s->emitComment(sc);
-            }
-            return;
-        }
-    }
-    if (!comment)
-        return;
-    if (isAnonymous())
-        return;
-
-    OutBuffer *buf = sc->docbuf;
-    DocComment *dc = DocComment::parse(sc, this, comment);
-
-    if (!dc)
-    {
-        emitDitto(sc);
-        return;
-    }
-    dc->pmacrotable = &sc->module->macrotable;
-
-    buf->writestring(ddoc_decl_s);
-        toDocBuffer(buf);
-        sc->lastoffset = buf->offset;
-    buf->writestring(ddoc_decl_e);
-
-    buf->writestring(ddoc_decl_dd_s);
-    dc->writeSections(sc, this, buf);
-    emitMemberComments(sc);
-    buf->writestring(ddoc_decl_dd_e);
-}
-
-void EnumMember::emitComment(Scope *sc)
-{
-    //printf("EnumMember::emitComment(%p '%s'), comment = '%s'\n", this, toChars(), comment);
-    if (prot() == PROTprivate)
-        return;
-    if (!comment)
-        return;
-
-    OutBuffer *buf = sc->docbuf;
-    DocComment *dc = DocComment::parse(sc, this, comment);
-    unsigned o;
-
-    if (!dc)
-    {
-        emitDitto(sc);
-        return;
-    }
-    dc->pmacrotable = &sc->module->macrotable;
-
-    buf->writestring(ddoc_decl_s);
-        o = buf->offset;
-        toDocBuffer(buf);
-        highlightCode(sc, this, buf, o);
-        sc->lastoffset = buf->offset;
-    buf->writestring(ddoc_decl_e);
-
-    buf->writestring(ddoc_decl_dd_s);
-    dc->writeSections(sc, this, buf);
-    buf->writestring(ddoc_decl_dd_e);
-}
-
-/******************************* toDocBuffer **********************************/
-
-void Dsymbol::toDocBuffer(OutBuffer *buf)
-{
-    //printf("Dsymbol::toDocbuffer() %s\n", toChars());
-    HdrGenState hgs;
-
-    hgs.ddoc = 1;
-    toCBuffer(buf, &hgs);
-}
-
-void prefix(OutBuffer *buf, Dsymbol *s)
-{
-    if (s->isDeprecated())
-        buf->writestring("deprecated ");
-    Declaration *d = s->isDeclaration();
-    if (d)
-    {
-        emitProtection(buf, d->protection);
-        if (d->isAbstract())
-            buf->writestring("abstract ");
-        if (d->isStatic())
-            buf->writestring("static ");
-        if (d->isConst())
-            buf->writestring("const ");
-#if DMDV2
-        if (d->isImmutable())
-            buf->writestring("immutable ");
-#endif
-        if (d->isFinal())
-            buf->writestring("final ");
-        if (d->isSynchronized())
-            buf->writestring("synchronized ");
-    }
-}
-
-void declarationToDocBuffer(Declaration *decl, OutBuffer *buf, TemplateDeclaration *td)
-{
-    //printf("declarationToDocBuffer() %s, originalType = %s, td = %s\n", decl->toChars(), decl->originalType ? decl->originalType->toChars() : "--", td ? td->toChars() : "--");
-    if (decl->ident)
-    {
-        prefix(buf, decl);
-
-        if (decl->type)
-        {   HdrGenState hgs;
-            hgs.ddoc = 1;
-            Type *origType = decl->originalType ? decl->originalType : decl->type;
-            if (origType->ty == Tfunction)
-            {
-                TypeFunction *attrType = (TypeFunction*)(decl->ident == Id::ctor ? origType : decl->type);
-                ((TypeFunction*)origType)->toCBufferWithAttributes(buf, decl->ident, &hgs, attrType, td);
-            }
-            else
-                origType->toCBuffer(buf, decl->ident, &hgs);
-        }
-        else
-            buf->writestring(decl->ident->toChars());
-        buf->writestring(";\n");
-    }
-}
-
-void Declaration::toDocBuffer(OutBuffer *buf)
-{
-    declarationToDocBuffer(this, buf, NULL);
-}
-
-void AliasDeclaration::toDocBuffer(OutBuffer *buf)
-{
-    //printf("AliasDeclaration::toDocbuffer() %s\n", toChars());
-    if (ident)
-    {
-        if (isDeprecated())
-            buf->writestring("deprecated ");
-
-        emitProtection(buf, protection);
-        buf->writestring("alias ");
-        buf->writestring(toChars());
-        buf->writestring(";\n");
-    }
-}
-
-
-void TypedefDeclaration::toDocBuffer(OutBuffer *buf)
-{
-    if (ident)
-    {
-        if (isDeprecated())
-            buf->writestring("deprecated ");
-
-        emitProtection(buf, protection);
-        buf->writestring("typedef ");
-        buf->writestring(toChars());
-        buf->writestring(";\n");
-    }
-}
-
-
-void FuncDeclaration::toDocBuffer(OutBuffer *buf)
-{
-    //printf("FuncDeclaration::toDocbuffer() %s\n", toChars());
-    if (ident)
-    {
-        TemplateDeclaration *td;
-
-        if (parent &&
-            (td = parent->isTemplateDeclaration()) != NULL &&
-            td->onemember == this)
-        {   /* It's a function template
-             */
-            unsigned o = buf->offset;
-
-            declarationToDocBuffer(this, buf, td);
-
-            highlightCode(NULL, this, buf, o);
-        }
-        else
-        {
-            Declaration::toDocBuffer(buf);
-        }
-    }
-}
-
-#if DMDV1
-void CtorDeclaration::toDocBuffer(OutBuffer *buf)
-{
-    HdrGenState hgs;
-
-    buf->writestring("this");
-    Parameter::argsToCBuffer(buf, &hgs, arguments, varargs);
-    buf->writestring(";\n");
-}
-#endif
-
-void AggregateDeclaration::toDocBuffer(OutBuffer *buf)
-{
-    if (ident)
-    {
-#if 0
-        emitProtection(buf, protection);
-#endif
-        buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
-        buf->writestring(";\n");
-    }
-}
-
-void StructDeclaration::toDocBuffer(OutBuffer *buf)
-{
-    //printf("StructDeclaration::toDocbuffer() %s\n", toChars());
-    if (ident)
-    {
-#if 0
-        emitProtection(buf, protection);
-#endif
-        TemplateDeclaration *td;
-
-        if (parent &&
-            (td = parent->isTemplateDeclaration()) != NULL &&
-            td->onemember == this)
-        {   unsigned o = buf->offset;
-            td->toDocBuffer(buf);
-            highlightCode(NULL, this, buf, o);
-        }
-        else
-        {
-            buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
-        }
-        buf->writestring(";\n");
-    }
-}
-
-void ClassDeclaration::toDocBuffer(OutBuffer *buf)
-{
-    //printf("ClassDeclaration::toDocbuffer() %s\n", toChars());
-    if (ident)
-    {
-#if 0
-        emitProtection(buf, protection);
-#endif
-        TemplateDeclaration *td;
-
-        if (parent &&
-            (td = parent->isTemplateDeclaration()) != NULL &&
-            td->onemember == this)
-        {   unsigned o = buf->offset;
-            td->toDocBuffer(buf);
-            highlightCode(NULL, this, buf, o);
-        }
-        else
-        {
-            if (isAbstract())
-                buf->writestring("abstract ");
-            buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
-        }
-        int any = 0;
-        for (size_t i = 0; i < baseclasses->dim; i++)
-        {   BaseClass *bc = (*baseclasses)[i];
-
-            if (bc->protection == PROTprivate)
-                continue;
-            if (bc->base && bc->base->ident == Id::Object)
-                continue;
-
-            if (any)
-                buf->writestring(", ");
-            else
-            {   buf->writestring(": ");
-                any = 1;
-            }
-            emitProtection(buf, bc->protection);
-            if (bc->base)
-            {
-                buf->writestring(bc->base->toPrettyChars());
-            }
-            else
-            {
-                HdrGenState hgs;
-                bc->type->toCBuffer(buf, NULL, &hgs);
-            }
-        }
-        buf->writestring(";\n");
-    }
-}
-
-
-void EnumDeclaration::toDocBuffer(OutBuffer *buf)
-{
-    if (ident)
-    {
-        buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
-        buf->writestring(";\n");
-    }
-}
-
-void EnumMember::toDocBuffer(OutBuffer *buf)
-{
-    if (ident)
-    {
-        buf->writestring(toChars());
-    }
-}
-
-
-/********************************* DocComment *********************************/
-
-DocComment::DocComment()
-{
-    memset(this, 0, sizeof(DocComment));
-}
-
-DocComment *DocComment::parse(Scope *sc, Dsymbol *s, unsigned char *comment)
-{
-    //printf("parse(%s): '%s'\n", s->toChars(), comment);
-    if (sc->lastdc && isDitto(comment))
-        return NULL;
-
-    DocComment *dc = new DocComment();
-    if (!comment)
-        return dc;
-
-    dc->parseSections(comment);
-
-    for (size_t i = 0; i < dc->sections.dim; i++)
-    {   Section *sec = dc->sections[i];
-
-        if (icmp("copyright", sec->name, sec->namelen) == 0)
-        {
-            dc->copyright = sec;
-        }
-        if (icmp("macros", sec->name, sec->namelen) == 0)
-        {
-            dc->macros = sec;
-        }
-    }
-
-    sc->lastdc = dc;
-    return dc;
-}
-
-/*****************************************
- * Parse next paragraph out of *pcomment.
- * Update *pcomment to point past paragraph.
- * Returns NULL if no more paragraphs.
- * If paragraph ends in 'identifier:',
- * then (*pcomment)[0 .. idlen] is the identifier.
- */
-
-void DocComment::parseSections(unsigned char *comment)
-{   unsigned char *p;
-    unsigned char *pstart;
-    unsigned char *pend;
-    unsigned char *idstart;
-    unsigned idlen;
-
-    unsigned char *name = NULL;
-    unsigned namelen = 0;
-
-    //printf("parseSections('%s')\n", comment);
-    p = comment;
-    while (*p)
-    {
-        p = skipwhitespace(p);
-        pstart = p;
-        pend = p;
-
-        /* Find end of section, which is ended by one of:
-         *      'identifier:' (but not inside a code section)
-         *      '\0'
-         */
-        idlen = 0;
-        int inCode = 0;
-        while (1)
-        {
-            // Check for start/end of a code section
-            if (*p == '-')
-            {
-                int numdash = 0;
-                while (*p == '-')
-                {
-                    ++numdash;
-                    p++;
-                }
-                // BUG: handle UTF PS and LS too
-                if (!*p || *p == '\r' || *p == '\n' && numdash >= 3)
-                    inCode ^= 1;
-                pend = p;
-            }
-
-            if (!inCode && isIdStart(p))
-            {
-                unsigned char *q = p + utfStride(p);
-                while (isIdTail(q))
-                    q += utfStride(q);
-                if (*q == ':')  // identifier: ends it
-                {   idlen = q - p;
-                    idstart = p;
-                    for (pend = p; pend > pstart; pend--)
-                    {   if (pend[-1] == '\n')
-                            break;
-                    }
-                    p = q + 1;
-                    break;
-                }
-            }
-            while (1)
-            {
-                if (!*p)
-                    goto L1;
-                if (*p == '\n')
-                {   p++;
-                    if (*p == '\n' && !summary && !namelen && !inCode)
-                    {
-                        pend = p;
-                        p++;
-                        goto L1;
-                    }
-                    break;
-                }
-                p++;
-                pend = p;
-            }
-            p = skipwhitespace(p);
-        }
-      L1:
-
-        if (namelen || pstart < pend)
-        {
-            Section *s;
-            if (icmp("Params", name, namelen) == 0)
-                s = new ParamSection();
-            else if (icmp("Macros", name, namelen) == 0)
-                s = new MacroSection();
-            else
-                s = new Section();
-            s->name = name;
-            s->namelen = namelen;
-            s->body = pstart;
-            s->bodylen = pend - pstart;
-            s->nooutput = 0;
-
-            //printf("Section: '%.*s' = '%.*s'\n", s->namelen, s->name, s->bodylen, s->body);
-
-            sections.push(s);
-
-            if (!summary && !namelen)
-                summary = s;
-        }
-
-        if (idlen)
-        {   name = idstart;
-            namelen = idlen;
-        }
-        else
-        {   name = NULL;
-            namelen = 0;
-            if (!*p)
-                break;
-        }
-    }
-}
-
-void DocComment::writeSections(Scope *sc, Dsymbol *s, OutBuffer *buf)
-{
-    //printf("DocComment::writeSections()\n");
-    if (sections.dim)
-    {
-        buf->writestring("$(DDOC_SECTIONS \n");
-        for (size_t i = 0; i < sections.dim; i++)
-        {   Section *sec = sections[i];
-
-            if (sec->nooutput)
-                continue;
-            //printf("Section: '%.*s' = '%.*s'\n", sec->namelen, sec->name, sec->bodylen, sec->body);
-            if (sec->namelen || i)
-                sec->write(this, sc, s, buf);
-            else
-            {
-                buf->writestring("$(DDOC_SUMMARY ");
-                    unsigned o = buf->offset;
-                    buf->write(sec->body, sec->bodylen);
-                    escapeStrayParenthesis(buf, o, s->loc);
-                    highlightText(sc, s, buf, o);
-                buf->writestring(")\n");
-            }
-        }
-        buf->writestring(")\n");
-    }
-    else
-    {
-        buf->writestring("$(DDOC_BLANKLINE)\n");
-    }
-}
-
-/***************************************************
- */
-
-void Section::write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf)
-{
-    if (namelen)
-    {
-        static const char *table[] =
-        {       "AUTHORS", "BUGS", "COPYRIGHT", "DATE",
-                "DEPRECATED", "EXAMPLES", "HISTORY", "LICENSE",
-                "RETURNS", "SEE_ALSO", "STANDARDS", "THROWS",
-                "VERSION" };
-
-        for (int i = 0; i < sizeof(table) / sizeof(table[0]); i++)
-        {
-            if (icmp(table[i], name, namelen) == 0)
-            {
-                buf->printf("$(DDOC_%s ", table[i]);
-                goto L1;
-            }
-        }
-
-        buf->writestring("$(DDOC_SECTION ");
-            // Replace _ characters with spaces
-            buf->writestring("$(DDOC_SECTION_H ");
-            unsigned o = buf->offset;
-            for (unsigned u = 0; u < namelen; u++)
-            {   unsigned char c = name[u];
-                buf->writeByte((c == '_') ? ' ' : c);
-            }
-            escapeStrayParenthesis(buf, o, s->loc);
-            buf->writestring(":)\n");
-    }
-    else
-    {
-        buf->writestring("$(DDOC_DESCRIPTION ");
-    }
-  L1:
-    unsigned o = buf->offset;
-    buf->write(body, bodylen);
-    escapeStrayParenthesis(buf, o, s->loc);
-    highlightText(sc, s, buf, o);
-    buf->writestring(")\n");
-}
-
-/***************************************************
- */
-
-void ParamSection::write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf)
-{
-    unsigned char *p = body;
-    unsigned len = bodylen;
-    unsigned char *pend = p + len;
-
-    unsigned char *tempstart;
-    unsigned templen;
-
-    unsigned char *namestart;
-    unsigned namelen = 0;       // !=0 if line continuation
-
-    unsigned char *textstart;
-    unsigned textlen;
-
-    unsigned o;
-    Parameter *arg;
-
-    buf->writestring("$(DDOC_PARAMS \n");
-    while (p < pend)
-    {
-        // Skip to start of macro
-        while (1)
-        {
-            switch (*p)
-            {
-                case ' ':
-                case '\t':
-                    p++;
-                    continue;
-
-                case '\n':
-                    p++;
-                    goto Lcont;
-
-                default:
-                    if (isIdStart(p))
-                        break;
-                    if (namelen)
-                        goto Ltext;             // continuation of prev macro
-                    goto Lskipline;
-            }
-            break;
-        }
-        tempstart = p;
-
-        while (isIdTail(p))
-            p += utfStride(p);
-        templen = p - tempstart;
-
-        while (*p == ' ' || *p == '\t')
-            p++;
-
-        if (*p != '=')
-        {   if (namelen)
-                goto Ltext;             // continuation of prev macro
-            goto Lskipline;
-        }
-        p++;
-
-        if (namelen)
-        {   // Output existing param
-
-        L1:
-            //printf("param '%.*s' = '%.*s'\n", namelen, namestart, textlen, textstart);
-            HdrGenState hgs;
-            buf->writestring("$(DDOC_PARAM_ROW ");
-                buf->writestring("$(DDOC_PARAM_ID ");
-                    o = buf->offset;
-                    arg = isFunctionParameter(s, namestart, namelen);
-                    if (arg && arg->type && arg->ident)
-                        arg->type->toCBuffer(buf, arg->ident, &hgs);
-                    else
-                        buf->write(namestart, namelen);
-                    escapeStrayParenthesis(buf, o, s->loc);
-                    highlightCode(sc, s, buf, o);
-                buf->writestring(")\n");
-
-                buf->writestring("$(DDOC_PARAM_DESC ");
-                    o = buf->offset;
-                    buf->write(textstart, textlen);
-                    escapeStrayParenthesis(buf, o, s->loc);
-                    highlightText(sc, s, buf, o);
-                buf->writestring(")");
-            buf->writestring(")\n");
-            namelen = 0;
-            if (p >= pend)
-                break;
-        }
-
-        namestart = tempstart;
-        namelen = templen;
-
-        while (*p == ' ' || *p == '\t')
-            p++;
-        textstart = p;
-
-      Ltext:
-        while (*p != '\n')
-            p++;
-        textlen = p - textstart;
-        p++;
-
-     Lcont:
-        continue;
-
-     Lskipline:
-        // Ignore this line
-        while (*p++ != '\n')
-            ;
-    }
-    if (namelen)
-        goto L1;                // write out last one
-    buf->writestring(")\n");
-}
-
-/***************************************************
- */
-
-void MacroSection::write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf)
-{
-    //printf("MacroSection::write()\n");
-    DocComment::parseMacros(dc->pescapetable, dc->pmacrotable, body, bodylen);
-}
-
-/************************************************
- * Parse macros out of Macros: section.
- * Macros are of the form:
- *      name1 = value1
- *
- *      name2 = value2
- */
-
-void DocComment::parseMacros(Escape **pescapetable, Macro **pmacrotable, unsigned char *m, unsigned mlen)
-{
-    unsigned char *p = m;
-    unsigned len = mlen;
-    unsigned char *pend = p + len;
-
-    unsigned char *tempstart;
-    unsigned templen;
-
-    unsigned char *namestart;
-    unsigned namelen = 0;       // !=0 if line continuation
-
-    unsigned char *textstart;
-    unsigned textlen;
-
-    while (p < pend)
-    {
-        // Skip to start of macro
-        while (1)
-        {
-            if (p >= pend)
-                goto Ldone;
-            switch (*p)
-            {
-                case ' ':
-                case '\t':
-                    p++;
-                    continue;
-
-                case '\n':
-                    p++;
-                    goto Lcont;
-
-                default:
-                    if (isIdStart(p))
-                        break;
-                    if (namelen)
-                        goto Ltext;             // continuation of prev macro
-                    goto Lskipline;
-            }
-            break;
-        }
-        tempstart = p;
-
-        while (1)
-        {
-            if (p >= pend)
-                goto Ldone;
-            if (!isIdTail(p))
-                break;
-            p += utfStride(p);
-        }
-        templen = p - tempstart;
-
-        while (1)
-        {
-            if (p >= pend)
-                goto Ldone;
-            if (!(*p == ' ' || *p == '\t'))
-                break;
-            p++;
-        }
-
-        if (*p != '=')
-        {   if (namelen)
-                goto Ltext;             // continuation of prev macro
-            goto Lskipline;
-        }
-        p++;
-        if (p >= pend)
-            goto Ldone;
-
-        if (namelen)
-        {   // Output existing macro
-        L1:
-            //printf("macro '%.*s' = '%.*s'\n", namelen, namestart, textlen, textstart);
-            if (icmp("ESCAPES", namestart, namelen) == 0)
-                parseEscapes(pescapetable, textstart, textlen);
-            else
-                Macro::define(pmacrotable, namestart, namelen, textstart, textlen);
-            namelen = 0;
-            if (p >= pend)
-                break;
-        }
-
-        namestart = tempstart;
-        namelen = templen;
-
-        while (p < pend && (*p == ' ' || *p == '\t'))
-            p++;
-        textstart = p;
-
-      Ltext:
-        while (p < pend && *p != '\n')
-            p++;
-        textlen = p - textstart;
-
-        // Remove trailing \r if there is one
-        if (p > m && p[-1] == '\r')
-            textlen--;
-
-        p++;
-        //printf("p = %p, pend = %p\n", p, pend);
-
-     Lcont:
-        continue;
-
-     Lskipline:
-        // Ignore this line
-        while (p < pend && *p++ != '\n')
-            ;
-    }
-Ldone:
-    if (namelen)
-        goto L1;                // write out last one
-}
-
-/**************************************
- * Parse escapes of the form:
- *      /c/string/
- * where c is a single character.
- * Multiple escapes can be separated
- * by whitespace and/or commas.
- */
-
-void DocComment::parseEscapes(Escape **pescapetable, unsigned char *textstart, unsigned textlen)
-{   Escape *escapetable = *pescapetable;
-
-    if (!escapetable)
-    {   escapetable = new Escape;
-        *pescapetable = escapetable;
-    }
-    unsigned char *p = textstart;
-    unsigned char *pend = p + textlen;
-
-    while (1)
-    {
-        while (1)
-        {
-            if (p + 4 >= pend)
-                return;
-            if (!(*p == ' ' || *p == '\t' || *p == '\n' || *p == ','))
-                break;
-            p++;
-        }
-        if (p[0] != '/' || p[2] != '/')
-            return;
-        unsigned char c = p[1];
-        p += 3;
-        unsigned char *start = p;
-        while (1)
-        {
-            if (p >= pend)
-                return;
-            if (*p == '/')
-                break;
-            p++;
-        }
-        size_t len = p - start;
-        char *s = (char *)memcpy(mem.malloc(len + 1), start, len);
-        s[len] = 0;
-        escapetable->strings[c] = s;
-        //printf("%c = '%s'\n", c, s);
-        p++;
-    }
-}
-
-
-/******************************************
- * Compare 0-terminated string with length terminated string.
- * Return < 0, ==0, > 0
- */
-
-int cmp(const char *stringz, void *s, size_t slen)
-{
-    size_t len1 = strlen(stringz);
-
-    if (len1 != slen)
-        return len1 - slen;
-    return memcmp(stringz, s, slen);
-}
-
-int icmp(const char *stringz, void *s, size_t slen)
-{
-    size_t len1 = strlen(stringz);
-
-    if (len1 != slen)
-        return len1 - slen;
-    return memicmp(stringz, (char *)s, slen);
-}
-
-/*****************************************
- * Return !=0 if comment consists entirely of "ditto".
- */
-
-int isDitto(unsigned char *comment)
-{
-    if (comment)
-    {
-        unsigned char *p = skipwhitespace(comment);
-
-        if (memicmp((char *)p, "ditto", 5) == 0 && *skipwhitespace(p + 5) == 0)
-            return 1;
-    }
-    return 0;
-}
-
-/**********************************************
- * Skip white space.
- */
-
-unsigned char *skipwhitespace(unsigned char *p)
-{
-    for (; 1; p++)
-    {   switch (*p)
-        {
-            case ' ':
-            case '\t':
-            case '\n':
-                continue;
-        }
-        break;
-    }
-    return p;
-}
-
-
-/************************************************
- * Scan forward to one of:
- *      start of identifier
- *      beginning of next line
- *      end of buf
- */
-
-unsigned skiptoident(OutBuffer *buf, size_t i)
-{
-    while (i < buf->offset)
-    {   dchar_t c;
-
-        size_t oi = i;
-        if (utf_decodeChar((unsigned char *)buf->data, buf->offset, &i, &c))
-            /* Ignore UTF errors, but still consume input
-             */
-            break;
-        if (c >= 0x80)
-        {
-            if (!isUniAlpha(c))
-                continue;
-        }
-        else if (!(isalpha(c) || c == '_' || c == '\n'))
-            continue;
-        i = oi;
-        break;
-    }
-    return i;
-}
-
-/************************************************
- * Scan forward past end of identifier.
- */
-
-unsigned skippastident(OutBuffer *buf, size_t i)
-{
-    while (i < buf->offset)
-    {   dchar_t c;
-
-        size_t oi = i;
-        if (utf_decodeChar((unsigned char *)buf->data, buf->offset, &i, &c))
-            /* Ignore UTF errors, but still consume input
-             */
-            break;
-        if (c >= 0x80)
-        {
-            if (isUniAlpha(c))
-                continue;
-        }
-        else if (isalnum(c) || c == '_')
-            continue;
-        i = oi;
-        break;
-    }
-    return i;
-}
-
-
-/************************************************
- * Scan forward past URL starting at i.
- * We don't want to highlight parts of a URL.
- * Returns:
- *      i if not a URL
- *      index just past it if it is a URL
- */
-
-unsigned skippastURL(OutBuffer *buf, size_t i)
-{   unsigned length = buf->offset - i;
-    unsigned char *p = &buf->data[i];
-    unsigned j;
-    unsigned sawdot = 0;
-
-    if (length > 7 && memicmp((char *)p, "http://", 7) == 0)
-    {
-        j = 7;
-    }
-    else if (length > 8 && memicmp((char *)p, "https://", 8) == 0)
-    {
-        j = 8;
-    }
-    else
-        goto Lno;
-
-    for (; j < length; j++)
-    {   unsigned char c = p[j];
-        if (isalnum(c))
-            continue;
-        if (c == '-' || c == '_' || c == '?' ||
-            c == '=' || c == '%' || c == '&' ||
-            c == '/' || c == '+' || c == '#' ||
-            c == '~')
-            continue;
-        if (c == '.')
-        {
-            sawdot = 1;
-            continue;
-        }
-        break;
-    }
-    if (sawdot)
-        return i + j;
-
-Lno:
-    return i;
-}
-
-
-/****************************************************
- */
-
-int isKeyword(unsigned char *p, unsigned len)
-{
-    static const char *table[] = { "true", "false", "null" };
-
-    for (int i = 0; i < sizeof(table) / sizeof(table[0]); i++)
-    {
-        if (cmp(table[i], p, len) == 0)
-            return 1;
-    }
-    return 0;
-}
-
-/****************************************************
- */
-
-Parameter *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len)
-{
-    FuncDeclaration *f = s->isFuncDeclaration();
-
-    /* f->type may be NULL for template members.
-     */
-    if (f && f->type)
-    {
-        TypeFunction *tf;
-        if (f->originalType)
-        {
-            tf = (TypeFunction *)f->originalType;
-        }
-        else
-            tf = (TypeFunction *)f->type;
-
-        if (tf->parameters)
-        {
-            for (size_t k = 0; k < tf->parameters->dim; k++)
-            {   Parameter *arg = (*tf->parameters)[k];
-
-                if (arg->ident && cmp(arg->ident->toChars(), p, len) == 0)
-                {
-                    return arg;
-                }
-            }
-        }
-    }
-    return NULL;
-}
-
-/**************************************************
- * Highlight text section.
- */
-
-void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset)
-{
-    //printf("highlightText()\n");
-    const char *sid = s->ident->toChars();
-    FuncDeclaration *f = s->isFuncDeclaration();
-    unsigned char *p;
-    const char *se;
-
-    int leadingBlank = 1;
-    int inCode = 0;
-    int inComment = 0;                  // in <!-- ... --> comment
-    unsigned iCodeStart;                // start of code section
-
-    unsigned iLineStart = offset;
-
-    for (unsigned i = offset; i < buf->offset; i++)
-    {   unsigned char c = buf->data[i];
-
-     Lcont:
-        switch (c)
-        {
-            case ' ':
-            case '\t':
-                break;
-
-            case '\n':
-                if (sc && !inCode && i == iLineStart && i + 1 < buf->offset)    // if "\n\n"
-                {
-                    static char blankline[] = "$(DDOC_BLANKLINE)\n";
-
-                    i = buf->insert(i, blankline, sizeof(blankline) - 1);
-                }
-                leadingBlank = 1;
-                iLineStart = i + 1;
-                break;
-
-            case '<':
-                leadingBlank = 0;
-                if (inCode)
-                    break;
-                p = &buf->data[i];
-
-                // Skip over comments
-                if (p[1] == '!' && p[2] == '-' && p[3] == '-')
-                {   unsigned j = i + 4;
-                    p += 4;
-                    while (1)
-                    {
-                        if (j == buf->offset)
-                            goto L1;
-                        if (p[0] == '-' && p[1] == '-' && p[2] == '>')
-                        {
-                            i = j + 2;  // place on closing '>'
-                            break;
-                        }
-                        j++;
-                        p++;
-                    }
-                    break;
-                }
-
-                // Skip over HTML tag
-                if (isalpha(p[1]) || (p[1] == '/' && isalpha(p[2])))
-                {   unsigned j = i + 2;
-                    p += 2;
-                    while (1)
-                    {
-                        if (j == buf->offset)
-                            goto L1;
-                        if (p[0] == '>')
-                        {
-                            i = j;      // place on closing '>'
-                            break;
-                        }
-                        j++;
-                        p++;
-                    }
-                    break;
-                }
-
-            L1:
-                // Replace '<' with '&lt;' character entity
-                se = Escape::escapeChar('<');
-                if (se)
-                {   size_t len = strlen(se);
-                    buf->remove(i, 1);
-                    i = buf->insert(i, se, len);
-                    i--;        // point to ';'
-                }
-                break;
-
-            case '>':
-                leadingBlank = 0;
-                if (inCode)
-                    break;
-                // Replace '>' with '&gt;' character entity
-                se = Escape::escapeChar('>');
-                if (se)
-                {   size_t len = strlen(se);
-                    buf->remove(i, 1);
-                    i = buf->insert(i, se, len);
-                    i--;        // point to ';'
-                }
-                break;
-
-            case '&':
-                leadingBlank = 0;
-                if (inCode)
-                    break;
-                p = &buf->data[i];
-                if (p[1] == '#' || isalpha(p[1]))
-                    break;                      // already a character entity
-                // Replace '&' with '&amp;' character entity
-                se = Escape::escapeChar('&');
-                if (se)
-                {   size_t len = strlen(se);
-                    buf->remove(i, 1);
-                    i = buf->insert(i, se, len);
-                    i--;        // point to ';'
-                }
-                break;
-
-            case '-':
-                /* A line beginning with --- delimits a code section.
-                 * inCode tells us if it is start or end of a code section.
-                 */
-                if (leadingBlank)
-                {   int istart = i;
-                    int eollen = 0;
-
-                    leadingBlank = 0;
-                    while (1)
-                    {
-                        ++i;
-                        if (i >= buf->offset)
-                            break;
-                        c = buf->data[i];
-                        if (c == '\n')
-                        {   eollen = 1;
-                            break;
-                        }
-                        if (c == '\r')
-                        {
-                            eollen = 1;
-                            if (i + 1 >= buf->offset)
-                                break;
-                            if (buf->data[i + 1] == '\n')
-                            {   eollen = 2;
-                                break;
-                            }
-                        }
-                        // BUG: handle UTF PS and LS too
-                        if (c != '-')
-                            goto Lcont;
-                    }
-                    if (i - istart < 3)
-                        goto Lcont;
-
-                    // We have the start/end of a code section
-
-                    // Remove the entire --- line, including blanks and \n
-                    buf->remove(iLineStart, i - iLineStart + eollen);
-                    i = iLineStart;
-
-                    if (inCode && (i <= iCodeStart))
-                    {   // Empty code section, just remove it completely.
-                        inCode = 0;
-                        break;
-                    }
-
-                    if (inCode)
-                    {
-                        inCode = 0;
-                        // The code section is from iCodeStart to i
-                        OutBuffer codebuf;
-
-                        codebuf.write(buf->data + iCodeStart, i - iCodeStart);
-                        codebuf.writeByte(0);
-                        highlightCode2(sc, s, &codebuf, 0);
-                        buf->remove(iCodeStart, i - iCodeStart);
-                        i = buf->insert(iCodeStart, codebuf.data, codebuf.offset);
-                        i = buf->insert(i, ")\n", 2);
-                        i--;
-                    }
-                    else
-                    {   static char pre[] = "$(D_CODE \n";
-
-                        inCode = 1;
-                        i = buf->insert(i, pre, sizeof(pre) - 1);
-                        iCodeStart = i;
-                        i--;            // place i on >
-                        leadingBlank = true;
-                    }
-                }
-                break;
-
-            default:
-                leadingBlank = 0;
-                if (sc && !inCode && isIdStart(&buf->data[i]))
-                {   unsigned j;
-
-                    j = skippastident(buf, i);
-                    if (j > i)
-                    {
-                        unsigned k = skippastURL(buf, i);
-                        if (k > i)
-                        {   i = k - 1;
-                            break;
-                        }
-
-                        if (buf->data[i] == '_')        // leading '_' means no highlight
-                        {
-                            buf->remove(i, 1);
-                            i = j - 1;
-                        }
-                        else
-                        {
-                            if (cmp(sid, buf->data + i, j - i) == 0)
-                            {
-                                i = buf->bracket(i, "$(DDOC_PSYMBOL ", j, ")") - 1;
-                                break;
-                            }
-                            else if (isKeyword(buf->data + i, j - i))
-                            {
-                                i = buf->bracket(i, "$(DDOC_KEYWORD ", j, ")") - 1;
-                                break;
-                            }
-                            else
-                            {
-                                if (f && isFunctionParameter(f, buf->data + i, j - i))
-                                {
-                                    //printf("highlighting arg '%s', i = %d, j = %d\n", arg->ident->toChars(), i, j);
-                                    i = buf->bracket(i, "$(DDOC_PARAM ", j, ")") - 1;
-                                    break;
-                                }
-                            }
-                            i = j - 1;
-                        }
-                    }
-                }
-                break;
-        }
-    }
-    if (inCode)
-        s->error("unmatched --- in DDoc comment");
-    ;
-}
-
-/**************************************************
- * Highlight code for DDOC section.
- */
-
-void highlightCode(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset)
-{
-    char *sid = s->ident->toChars();
-    FuncDeclaration *f = s->isFuncDeclaration();
-
-    //printf("highlightCode(s = '%s', kind = %s)\n", sid, s->kind());
-    for (unsigned i = offset; i < buf->offset; i++)
-    {   unsigned char c = buf->data[i];
-        const char *se;
-
-        se = Escape::escapeChar(c);
-        if (se)
-        {
-            size_t len = strlen(se);
-            buf->remove(i, 1);
-            i = buf->insert(i, se, len);
-            i--;                // point to ';'
-        }
-        else if (isIdStart(&buf->data[i]))
-        {   unsigned j;
-
-            j = skippastident(buf, i);
-            if (j > i)
-            {
-                if (cmp(sid, buf->data + i, j - i) == 0)
-                {
-                    i = buf->bracket(i, "$(DDOC_PSYMBOL ", j, ")") - 1;
-                    continue;
-                }
-                else if (f)
-                {
-                    if (isFunctionParameter(f, buf->data + i, j - i))
-                    {
-                        //printf("highlighting arg '%s', i = %d, j = %d\n", arg->ident->toChars(), i, j);
-                        i = buf->bracket(i, "$(DDOC_PARAM ", j, ")") - 1;
-                        continue;
-                    }
-                }
-                i = j - 1;
-            }
-        }
-    }
-}
-
-/****************************************
- */
-
-void highlightCode3(OutBuffer *buf, unsigned char *p, unsigned char *pend)
-{
-    for (; p < pend; p++)
-    {   const char *s = Escape::escapeChar(*p);
-        if (s)
-            buf->writestring(s);
-        else
-            buf->writeByte(*p);
-    }
-}
-
-/**************************************************
- * Highlight code for CODE section.
- */
-
-
-void highlightCode2(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset)
-{
-    char *sid = s->ident->toChars();
-    FuncDeclaration *f = s->isFuncDeclaration();
-    unsigned errorsave = global.errors;
-    Lexer lex(NULL, buf->data, 0, buf->offset - 1, 0, 1);
-    Token tok;
-    OutBuffer res;
-    unsigned char *lastp = buf->data;
-    const char *highlight;
-
-    //printf("highlightCode2('%.*s')\n", buf->offset - 1, buf->data);
-    res.reserve(buf->offset);
-    while (1)
-    {
-        lex.scan(&tok);
-        highlightCode3(&res, lastp, tok.ptr);
-        highlight = NULL;
-        switch (tok.value)
-        {
-            case TOKidentifier:
-                if (!sc)
-                    break;
-                if (cmp(sid, tok.ptr, lex.p - tok.ptr) == 0)
-                {
-                    highlight = "$(D_PSYMBOL ";
-                    break;
-                }
-                else if (f)
-                {
-                    if (isFunctionParameter(f, tok.ptr, lex.p - tok.ptr))
-                    {
-                        //printf("highlighting arg '%s', i = %d, j = %d\n", arg->ident->toChars(), i, j);
-                        highlight = "$(D_PARAM ";
-                        break;
-                    }
-                }
-                break;
-
-            case TOKcomment:
-                highlight = "$(D_COMMENT ";
-                break;
-
-            case TOKstring:
-                highlight = "$(D_STRING ";
-                break;
-
-            default:
-                if (tok.isKeyword())
-                    highlight = "$(D_KEYWORD ";
-                break;
-        }
-        if (highlight)
-            res.writestring(highlight);
-        highlightCode3(&res, tok.ptr, lex.p);
-        if (highlight)
-            res.writeByte(')');
-        if (tok.value == TOKeof)
-            break;
-        lastp = lex.p;
-    }
-    buf->setsize(offset);
-    buf->write(&res);
-    global.errors = errorsave;
-}
-
-/***************************************
- * Find character string to replace c with.
- */
-
-const char *Escape::escapeChar(unsigned c)
-{   const char *s;
-
-    switch (c)
-    {
-        case '<':
-            s = "&lt;";
-            break;
-        case '>':
-            s = "&gt;";
-            break;
-        case '&':
-            s = "&amp;";
-            break;
-        default:
-            s = NULL;
-            break;
-    }
-    return s;
-}
-
-/****************************************
- * Determine if p points to the start of an identifier.
- */
-
-int isIdStart(unsigned char *p)
-{
-    unsigned c = *p;
-    if (isalpha(c) || c == '_')
-        return 1;
-    if (c >= 0x80)
-    {   size_t i = 0;
-        if (utf_decodeChar(p, 4, &i, &c))
-            return 0;   // ignore errors
-        if (isUniAlpha(c))
-            return 1;
-    }
-    return 0;
-}
-
-/****************************************
- * Determine if p points to the rest of an identifier.
- */
-
-int isIdTail(unsigned char *p)
-{
-    unsigned c = *p;
-    if (isalnum(c) || c == '_')
-        return 1;
-    if (c >= 0x80)
-    {   size_t i = 0;
-        if (utf_decodeChar(p, 4, &i, &c))
-            return 0;   // ignore errors
-        if (isUniAlpha(c))
-            return 1;
-    }
-    return 0;
-}
-
-/*****************************************
- * Return number of bytes in UTF character.
- */
-
-int utfStride(unsigned char *p)
-{
-    unsigned c = *p;
-    if (c < 0x80)
-        return 1;
-    size_t i = 0;
-    utf_decodeChar(p, 4, &i, &c);       // ignore errors, but still consume input
-    return i;
-}
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2012 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+// This implements the Ddoc capability.
+
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <ctype.h>
+#include <assert.h>
+
+#include "rmem.h"
+#include "root.h"
+
+#include "mars.h"
+#include "dsymbol.h"
+#include "macro.h"
+#include "template.h"
+#include "lexer.h"
+#include "aggregate.h"
+#include "declaration.h"
+#include "enum.h"
+#include "id.h"
+#include "module.h"
+#include "scope.h"
+#include "hdrgen.h"
+#include "doc.h"
+#include "mtype.h"
+#include "utf.h"
+
+struct Escape
+{
+    const char *strings[256];
+
+    static const char *escapeChar(unsigned c);
+};
+
+struct Section
+{
+    unsigned char *name;
+    unsigned namelen;
+
+    unsigned char *body;
+    unsigned bodylen;
+
+    int nooutput;
+
+    virtual void write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf);
+};
+
+struct ParamSection : Section
+{
+    void write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf);
+};
+
+struct MacroSection : Section
+{
+    void write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf);
+};
+
+typedef ArrayBase<Section> Sections;
+
+struct DocComment
+{
+    Sections sections;             // Section*[]
+
+    Section *summary;
+    Section *copyright;
+    Section *macros;
+    Macro **pmacrotable;
+    Escape **pescapetable;
+
+    DocComment();
+
+    static DocComment *parse(Scope *sc, Dsymbol *s, unsigned char *comment);
+    static void parseMacros(Escape **pescapetable, Macro **pmacrotable, unsigned char *m, unsigned mlen);
+    static void parseEscapes(Escape **pescapetable, unsigned char *textstart, unsigned textlen);
+
+    void parseSections(unsigned char *comment);
+    void writeSections(Scope *sc, Dsymbol *s, OutBuffer *buf);
+};
+
+
+int cmp(const char *stringz, void *s, size_t slen);
+int icmp(const char *stringz, void *s, size_t slen);
+int isDitto(unsigned char *comment);
+unsigned char *skipwhitespace(unsigned char *p);
+unsigned skiptoident(OutBuffer *buf, size_t i);
+unsigned skippastident(OutBuffer *buf, size_t i);
+unsigned skippastURL(OutBuffer *buf, size_t i);
+void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
+void highlightCode(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
+void highlightCode2(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
+Parameter *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len);
+
+int isIdStart(unsigned char *p);
+int isIdTail(unsigned char *p);
+int utfStride(unsigned char *p);
+
+static unsigned char ddoc_default[] = "\
+DDOC =  <html><head>\n\
+        <META http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n\
+        <title>$(TITLE)</title>\n\
+        </head><body>\n\
+        <h1>$(TITLE)</h1>\n\
+        $(BODY)\n\
+        <hr>$(SMALL Page generated by $(LINK2 http://www.digitalmars.com/d/2.0/ddoc.html, Ddoc). $(COPYRIGHT))\n\
+        </body></html>\n\
+\n\
+B =     <b>$0</b>\n\
+I =     <i>$0</i>\n\
+U =     <u>$0</u>\n\
+P =     <p>$0</p>\n\
+DL =    <dl>$0</dl>\n\
+DT =    <dt>$0</dt>\n\
+DD =    <dd>$0</dd>\n\
+TABLE = <table>$0</table>\n\
+TR =    <tr>$0</tr>\n\
+TH =    <th>$0</th>\n\
+TD =    <td>$0</td>\n\
+OL =    <ol>$0</ol>\n\
+UL =    <ul>$0</ul>\n\
+LI =    <li>$0</li>\n\
+BIG =   <big>$0</big>\n\
+SMALL = <small>$0</small>\n\
+BR =    <br>\n\
+LINK =  <a href=\"$0\">$0</a>\n\
+LINK2 = <a href=\"$1\">$+</a>\n\
+LPAREN= (\n\
+RPAREN= )\n\
+DOLLAR= $\n\
+\n\
+RED =   <font color=red>$0</font>\n\
+BLUE =  <font color=blue>$0</font>\n\
+GREEN = <font color=green>$0</font>\n\
+YELLOW =<font color=yellow>$0</font>\n\
+BLACK = <font color=black>$0</font>\n\
+WHITE = <font color=white>$0</font>\n\
+\n\
+D_CODE = <pre class=\"d_code\">$0</pre>\n\
+D_COMMENT = $(GREEN $0)\n\
+D_STRING  = $(RED $0)\n\
+D_KEYWORD = $(BLUE $0)\n\
+D_PSYMBOL = $(U $0)\n\
+D_PARAM   = $(I $0)\n\
+\n\
+DDOC_COMMENT   = <!-- $0 -->\n\
+DDOC_DECL      = $(DT $(BIG $0))\n\
+DDOC_DECL_DD   = $(DD $0)\n\
+DDOC_DITTO     = $(BR)$0\n\
+DDOC_SECTIONS  = $0\n\
+DDOC_SUMMARY   = $0$(BR)$(BR)\n\
+DDOC_DESCRIPTION = $0$(BR)$(BR)\n\
+DDOC_AUTHORS   = $(B Authors:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_BUGS      = $(RED BUGS:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_COPYRIGHT = $(B Copyright:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_DATE      = $(B Date:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_DEPRECATED = $(RED Deprecated:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_EXAMPLES  = $(B Examples:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_HISTORY   = $(B History:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_LICENSE   = $(B License:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_RETURNS   = $(B Returns:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_SEE_ALSO  = $(B See Also:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_STANDARDS = $(B Standards:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_THROWS    = $(B Throws:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_VERSION   = $(B Version:)$(BR)\n$0$(BR)$(BR)\n\
+DDOC_SECTION_H = $(B $0)$(BR)\n\
+DDOC_SECTION   = $0$(BR)$(BR)\n\
+DDOC_MEMBERS   = $(DL $0)\n\
+DDOC_MODULE_MEMBERS = $(DDOC_MEMBERS $0)\n\
+DDOC_CLASS_MEMBERS  = $(DDOC_MEMBERS $0)\n\
+DDOC_STRUCT_MEMBERS = $(DDOC_MEMBERS $0)\n\
+DDOC_ENUM_MEMBERS   = $(DDOC_MEMBERS $0)\n\
+DDOC_TEMPLATE_MEMBERS = $(DDOC_MEMBERS $0)\n\
+DDOC_PARAMS    = $(B Params:)$(BR)\n$(TABLE $0)$(BR)\n\
+DDOC_PARAM_ROW = $(TR $0)\n\
+DDOC_PARAM_ID  = $(TD $0)\n\
+DDOC_PARAM_DESC = $(TD $0)\n\
+DDOC_BLANKLINE  = $(BR)$(BR)\n\
+\n\
+DDOC_PSYMBOL    = $(U $0)\n\
+DDOC_KEYWORD    = $(B $0)\n\
+DDOC_PARAM      = $(I $0)\n\
+\n\
+ESCAPES = /</&lt;/\n\
+          />/&gt;/\n\
+          /&/&amp;/\n\
+";
+
+static char ddoc_decl_s[] = "$(DDOC_DECL ";
+static char ddoc_decl_e[] = ")\n";
+
+static char ddoc_decl_dd_s[] = "$(DDOC_DECL_DD ";
+static char ddoc_decl_dd_e[] = ")\n";
+
+
+/****************************************************
+ */
+
+void Module::gendocfile()
+{
+    static OutBuffer mbuf;
+    static int mbuf_done;
+
+    OutBuffer buf;
+
+    //printf("Module::gendocfile()\n");
+
+    if (!mbuf_done)             // if not already read the ddoc files
+    {   mbuf_done = 1;
+
+        // Use our internal default
+        mbuf.write(ddoc_default, sizeof(ddoc_default) - 1);
+
+        // Override with DDOCFILE specified in the sc.ini file
+        char *p = getenv("DDOCFILE");
+        if (p)
+            global.params.ddocfiles->shift(p);
+
+        // Override with the ddoc macro files from the command line
+        for (size_t i = 0; i < global.params.ddocfiles->dim; i++)
+        {
+            FileName f(global.params.ddocfiles->tdata()[i], 0);
+            File file(&f);
+            file.readv();
+            // BUG: convert file contents to UTF-8 before use
+
+            //printf("file: '%.*s'\n", file.len, file.buffer);
+            mbuf.write(file.buffer, file.len);
+        }
+    }
+    DocComment::parseMacros(&escapetable, &macrotable, mbuf.data, mbuf.offset);
+
+    Scope *sc = Scope::createGlobal(this);      // create root scope
+    sc->docbuf = &buf;
+
+    DocComment *dc = DocComment::parse(sc, this, comment);
+    dc->pmacrotable = &macrotable;
+    dc->pescapetable = &escapetable;
+
+    // Generate predefined macros
+
+    // Set the title to be the name of the module
+    {   const char *p = toPrettyChars();
+        Macro::define(&macrotable, (unsigned char *)"TITLE", 5, (unsigned char *)p, strlen(p));
+    }
+
+    // Set time macros
+    {   time_t t;
+        time(&t);
+        char *p = ctime(&t);
+        p = mem.strdup(p);
+        Macro::define(&macrotable, (unsigned char *)"DATETIME", 8, (unsigned char *)p, strlen(p));
+        Macro::define(&macrotable, (unsigned char *)"YEAR", 4, (unsigned char *)p + 20, 4);
+    }
+
+    char *srcfilename = srcfile->toChars();
+    Macro::define(&macrotable, (unsigned char *)"SRCFILENAME", 11, (unsigned char *)srcfilename, strlen(srcfilename));
+
+    char *docfilename = docfile->toChars();
+    Macro::define(&macrotable, (unsigned char *)"DOCFILENAME", 11, (unsigned char *)docfilename, strlen(docfilename));
+
+    if (dc->copyright)
+    {
+        dc->copyright->nooutput = 1;
+        Macro::define(&macrotable, (unsigned char *)"COPYRIGHT", 9, dc->copyright->body, dc->copyright->bodylen);
+    }
+
+    buf.printf("$(DDOC_COMMENT Generated by Ddoc from %s)\n", srcfile->toChars());
+    if (isDocFile)
+    {
+        size_t commentlen = strlen((char *)comment);
+        if (dc->macros)
+        {
+            commentlen = dc->macros->name - comment;
+            dc->macros->write(dc, sc, this, sc->docbuf);
+        }
+        sc->docbuf->write(comment, commentlen);
+        highlightText(NULL, this, sc->docbuf, 0);
+    }
+    else
+    {
+        dc->writeSections(sc, this, sc->docbuf);
+        emitMemberComments(sc);
+    }
+
+    //printf("BODY= '%.*s'\n", buf.offset, buf.data);
+    Macro::define(&macrotable, (unsigned char *)"BODY", 4, buf.data, buf.offset);
+
+    OutBuffer buf2;
+    buf2.writestring("$(DDOC)\n");
+    unsigned end = buf2.offset;
+    macrotable->expand(&buf2, 0, &end, NULL, 0);
+
+#if 1
+    /* Remove all the escape sequences from buf2,
+     * and make CR-LF the newline.
+     */
+    {
+        buf.setsize(0);
+        buf.reserve(buf2.offset);
+        unsigned char *p = buf2.data;
+        for (unsigned j = 0; j < buf2.offset; j++)
+        {
+            unsigned char c = p[j];
+            if (c == 0xFF && j + 1 < buf2.offset)
+            {
+                j++;
+                continue;
+            }
+            if (c == '\n')
+                buf.writeByte('\r');
+            else if (c == '\r')
+            {
+                buf.writestring("\r\n");
+                if (j + 1 < buf2.offset && p[j + 1] == '\n')
+                {
+                    j++;
+                }
+                continue;
+            }
+            buf.writeByte(c);
+        }
+    }
+
+    // Transfer image to file
+    assert(docfile);
+    docfile->setbuffer(buf.data, buf.offset);
+    docfile->ref = 1;
+    char *pt = FileName::path(docfile->toChars());
+    if (*pt)
+        FileName::ensurePathExists(pt);
+    mem.free(pt);
+    docfile->writev();
+#else
+    /* Remove all the escape sequences from buf2
+     */
+    {   unsigned i = 0;
+        unsigned char *p = buf2.data;
+        for (unsigned j = 0; j < buf2.offset; j++)
+        {
+            if (p[j] == 0xFF && j + 1 < buf2.offset)
+            {
+                j++;
+                continue;
+            }
+            p[i] = p[j];
+            i++;
+        }
+        buf2.setsize(i);
+    }
+
+    // Transfer image to file
+    docfile->setbuffer(buf2.data, buf2.offset);
+    docfile->ref = 1;
+    char *pt = FileName::path(docfile->toChars());
+    if (*pt)
+        FileName::ensurePathExists(pt);
+    mem.free(pt);
+    docfile->writev();
+#endif
+}
+
+/****************************************************
+ * Having unmatched parentheses can hose the output of Ddoc,
+ * as the macros depend on properly nested parentheses.
+ * This function replaces all ( with $(LPAREN) and ) with $(RPAREN)
+ * to preserve text literally. This also means macros in the
+ * text won't be expanded.
+ */
+void escapeDdocString(OutBuffer *buf, unsigned start)
+{
+    for (unsigned u = start; u < buf->offset; u++)
+    {
+        unsigned char c = buf->data[u];
+        switch(c)
+        {
+            case '$':
+                buf->remove(u, 1);
+                buf->insert(u, "$(DOLLAR)", 9);
+                u += 8;
+                break;
+
+            case '(':
+                buf->remove(u, 1); //remove the (
+                buf->insert(u, "$(LPAREN)", 9); //insert this instead
+                u += 8; //skip over newly inserted macro
+                break;
+
+            case ')':
+                buf->remove(u, 1); //remove the )
+                buf->insert(u, "$(RPAREN)", 9); //insert this instead
+                u += 8; //skip over newly inserted macro
+                break;
+        }
+    }
+}
+
+/****************************************************
+ * Having unmatched parentheses can hose the output of Ddoc,
+ * as the macros depend on properly nested parentheses.
+
+ * Fix by replacing unmatched ( with $(LPAREN) and unmatched ) with $(RPAREN).
+ */
+void escapeStrayParenthesis(OutBuffer *buf, unsigned start, Loc loc)
+{
+    unsigned par_open = 0;
+
+    for (unsigned u = start; u < buf->offset; u++)
+    {
+        unsigned char c = buf->data[u];
+        switch(c)
+        {
+            case '(':
+                par_open++;
+                break;
+
+            case ')':
+                if (par_open == 0)
+                {
+                    //stray ')'
+                    if (global.params.warnings)
+                        warning(loc, "Ddoc: Stray ')'. This may cause incorrect Ddoc output."
+                        " Use $(RPAREN) instead for unpaired right parentheses.");
+                    buf->remove(u, 1); //remove the )
+                    buf->insert(u, "$(RPAREN)", 9); //insert this instead
+                    u += 8; //skip over newly inserted macro
+                }
+                else
+                    par_open--;
+                break;
+#if 0
+            // For this to work, loc must be set to the beginning of the passed
+            // text which is currently not possible
+            // (loc is set to the Loc of the Dsymbol)
+            case '\n':
+                loc.linnum++;
+                break;
+#endif
+        }
+    }
+
+    if (par_open)                       // if any unmatched lparens
+    {   par_open = 0;
+        for (unsigned u = buf->offset; u > start;)
+        {   u--;
+            unsigned char c = buf->data[u];
+            switch(c)
+            {
+                case ')':
+                    par_open++;
+                    break;
+
+                case '(':
+                    if (par_open == 0)
+                    {
+                        //stray '('
+                        if (global.params.warnings)
+                            warning(loc, "Ddoc: Stray '('. This may cause incorrect Ddoc output."
+                            " Use $(LPAREN) instead for unpaired left parentheses.");
+                        buf->remove(u, 1); //remove the (
+                        buf->insert(u, "$(LPAREN)", 9); //insert this instead
+                    }
+                    else
+                        par_open--;
+                    break;
+            }
+        }
+    }
+}
+
+/******************************* emitComment **********************************/
+
+/*
+ * Emit doc comment to documentation file
+ */
+
+void Dsymbol::emitDitto(Scope *sc)
+{
+    //printf("Dsymbol::emitDitto() %s %s\n", kind(), toChars());
+    OutBuffer *buf = sc->docbuf;
+    unsigned o;
+    OutBuffer b;
+
+    b.writestring("$(DDOC_DITTO ");
+        o = b.offset;
+        toDocBuffer(&b);
+        //printf("b: '%.*s'\n", b.offset, b.data);
+        /* If 'this' is a function template, then highlightCode() was
+         * already run by FuncDeclaration::toDocbuffer().
+         */
+        TemplateDeclaration *td;
+        if (parent &&
+            (td = parent->isTemplateDeclaration()) != NULL &&
+            td->onemember == this)
+        {
+        }
+        else
+            highlightCode(sc, this, &b, o);
+    b.writeByte(')');
+    buf->spread(sc->lastoffset, b.offset);
+    memcpy(buf->data + sc->lastoffset, b.data, b.offset);
+    sc->lastoffset += b.offset;
+}
+
+void ScopeDsymbol::emitMemberComments(Scope *sc)
+{
+    //printf("ScopeDsymbol::emitMemberComments() %s\n", toChars());
+    OutBuffer *buf = sc->docbuf;
+
+    if (members)
+    {   const char *m = "$(DDOC_MEMBERS \n";
+
+        if (isModule())
+            m = "$(DDOC_MODULE_MEMBERS \n";
+        else if (isClassDeclaration())
+            m = "$(DDOC_CLASS_MEMBERS \n";
+        else if (isStructDeclaration())
+            m = "$(DDOC_STRUCT_MEMBERS \n";
+        else if (isEnumDeclaration())
+            m = "$(DDOC_ENUM_MEMBERS \n";
+        else if (isTemplateDeclaration())
+            m = "$(DDOC_TEMPLATE_MEMBERS \n";
+
+        unsigned offset1 = buf->offset;         // save starting offset
+        buf->writestring(m);
+        unsigned offset2 = buf->offset;         // to see if we write anything
+        sc = sc->push(this);
+        for (size_t i = 0; i < members->dim; i++)
+        {
+            Dsymbol *s = (*members)[i];
+            //printf("\ts = '%s'\n", s->toChars());
+            s->emitComment(sc);
+        }
+        sc->pop();
+        if (buf->offset == offset2)
+        {
+            /* Didn't write out any members, so back out last write
+             */
+            buf->offset = offset1;
+        }
+        else
+            buf->writestring(")\n");
+    }
+}
+
+void emitProtection(OutBuffer *buf, PROT prot)
+{
+    const char *p;
+
+    switch (prot)
+    {
+        case PROTpackage:       p = "package";   break;
+        case PROTprotected:     p = "protected"; break;
+        case PROTexport:        p = "export";    break;
+        default:                p = NULL;        break;
+    }
+    if (p)
+        buf->printf("%s ", p);
+}
+
+void Dsymbol::emitComment(Scope *sc)               { }
+void InvariantDeclaration::emitComment(Scope *sc)  { }
+#if DMDV2
+void PostBlitDeclaration::emitComment(Scope *sc)   { }
+#endif
+void DtorDeclaration::emitComment(Scope *sc)       { }
+void StaticCtorDeclaration::emitComment(Scope *sc) { }
+void StaticDtorDeclaration::emitComment(Scope *sc) { }
+void ClassInfoDeclaration::emitComment(Scope *sc)  { }
+void ModuleInfoDeclaration::emitComment(Scope *sc) { }
+void TypeInfoDeclaration::emitComment(Scope *sc)   { }
+
+
+void Declaration::emitComment(Scope *sc)
+{
+    //printf("Declaration::emitComment(%p '%s'), comment = '%s'\n", this, toChars(), comment);
+    //printf("type = %p\n", type);
+
+    if (protection == PROTprivate || !ident ||
+        (!type && !isCtorDeclaration() && !isAliasDeclaration()))
+        return;
+    if (!comment)
+        return;
+
+    OutBuffer *buf = sc->docbuf;
+    DocComment *dc = DocComment::parse(sc, this, comment);
+    unsigned o;
+
+    if (!dc)
+    {
+        emitDitto(sc);
+        return;
+    }
+    dc->pmacrotable = &sc->module->macrotable;
+
+    buf->writestring(ddoc_decl_s);
+        o = buf->offset;
+        toDocBuffer(buf);
+        highlightCode(sc, this, buf, o);
+        sc->lastoffset = buf->offset;
+    buf->writestring(ddoc_decl_e);
+
+    buf->writestring(ddoc_decl_dd_s);
+    dc->writeSections(sc, this, buf);
+    buf->writestring(ddoc_decl_dd_e);
+}
+
+void AggregateDeclaration::emitComment(Scope *sc)
+{
+    //printf("AggregateDeclaration::emitComment() '%s'\n", toChars());
+    if (prot() == PROTprivate)
+        return;
+    if (!comment)
+        return;
+
+    OutBuffer *buf = sc->docbuf;
+    DocComment *dc = DocComment::parse(sc, this, comment);
+
+    if (!dc)
+    {
+        emitDitto(sc);
+        return;
+    }
+    dc->pmacrotable = &sc->module->macrotable;
+
+    buf->writestring(ddoc_decl_s);
+    toDocBuffer(buf);
+    sc->lastoffset = buf->offset;
+    buf->writestring(ddoc_decl_e);
+
+    buf->writestring(ddoc_decl_dd_s);
+    dc->writeSections(sc, this, buf);
+    emitMemberComments(sc);
+    buf->writestring(ddoc_decl_dd_e);
+}
+
+void TemplateDeclaration::emitComment(Scope *sc)
+{
+    //printf("TemplateDeclaration::emitComment() '%s', kind = %s\n", toChars(), kind());
+    if (prot() == PROTprivate)
+        return;
+
+    unsigned char *com = comment;
+    int hasmembers = 1;
+
+    Dsymbol *ss = this;
+
+    if (onemember)
+    {
+        ss = onemember->isAggregateDeclaration();
+        if (!ss)
+        {
+            ss = onemember->isFuncDeclaration();
+            if (ss)
+            {   hasmembers = 0;
+                if (com != ss->comment)
+                    com = Lexer::combineComments(com, ss->comment);
+            }
+            else
+                ss = this;
+        }
+    }
+
+    if (!com)
+        return;
+
+    OutBuffer *buf = sc->docbuf;
+    DocComment *dc = DocComment::parse(sc, this, com);
+    unsigned o;
+
+    if (!dc)
+    {
+        ss->emitDitto(sc);
+        return;
+    }
+    dc->pmacrotable = &sc->module->macrotable;
+
+    buf->writestring(ddoc_decl_s);
+        o = buf->offset;
+        ss->toDocBuffer(buf);
+        if (ss == this)
+            highlightCode(sc, this, buf, o);
+        sc->lastoffset = buf->offset;
+    buf->writestring(ddoc_decl_e);
+
+    buf->writestring(ddoc_decl_dd_s);
+    dc->writeSections(sc, this, buf);
+    if (hasmembers)
+        ((ScopeDsymbol *)ss)->emitMemberComments(sc);
+    buf->writestring(ddoc_decl_dd_e);
+}
+
+void EnumDeclaration::emitComment(Scope *sc)
+{
+    if (prot() == PROTprivate)
+        return;
+//    if (!comment)
+    {   if (isAnonymous() && members)
+        {
+            for (size_t i = 0; i < members->dim; i++)
+            {
+                Dsymbol *s = (*members)[i];
+                s->emitComment(sc);
+            }
+            return;
+        }
+    }
+    if (!comment)
+        return;
+    if (isAnonymous())
+        return;
+
+    OutBuffer *buf = sc->docbuf;
+    DocComment *dc = DocComment::parse(sc, this, comment);
+
+    if (!dc)
+    {
+        emitDitto(sc);
+        return;
+    }
+    dc->pmacrotable = &sc->module->macrotable;
+
+    buf->writestring(ddoc_decl_s);
+        toDocBuffer(buf);
+        sc->lastoffset = buf->offset;
+    buf->writestring(ddoc_decl_e);
+
+    buf->writestring(ddoc_decl_dd_s);
+    dc->writeSections(sc, this, buf);
+    emitMemberComments(sc);
+    buf->writestring(ddoc_decl_dd_e);
+}
+
+void EnumMember::emitComment(Scope *sc)
+{
+    //printf("EnumMember::emitComment(%p '%s'), comment = '%s'\n", this, toChars(), comment);
+    if (prot() == PROTprivate)
+        return;
+    if (!comment)
+        return;
+
+    OutBuffer *buf = sc->docbuf;
+    DocComment *dc = DocComment::parse(sc, this, comment);
+    unsigned o;
+
+    if (!dc)
+    {
+        emitDitto(sc);
+        return;
+    }
+    dc->pmacrotable = &sc->module->macrotable;
+
+    buf->writestring(ddoc_decl_s);
+        o = buf->offset;
+        toDocBuffer(buf);
+        highlightCode(sc, this, buf, o);
+        sc->lastoffset = buf->offset;
+    buf->writestring(ddoc_decl_e);
+
+    buf->writestring(ddoc_decl_dd_s);
+    dc->writeSections(sc, this, buf);
+    buf->writestring(ddoc_decl_dd_e);
+}
+
+/******************************* toDocBuffer **********************************/
+
+void Dsymbol::toDocBuffer(OutBuffer *buf)
+{
+    //printf("Dsymbol::toDocbuffer() %s\n", toChars());
+    HdrGenState hgs;
+
+    hgs.ddoc = 1;
+    toCBuffer(buf, &hgs);
+}
+
+void prefix(OutBuffer *buf, Dsymbol *s)
+{
+    if (s->isDeprecated())
+        buf->writestring("deprecated ");
+    Declaration *d = s->isDeclaration();
+    if (d)
+    {
+        emitProtection(buf, d->protection);
+        if (d->isAbstract())
+            buf->writestring("abstract ");
+        if (d->isStatic())
+            buf->writestring("static ");
+        if (d->isConst())
+            buf->writestring("const ");
+#if DMDV2
+        if (d->isImmutable())
+            buf->writestring("immutable ");
+#endif
+        if (d->isFinal())
+            buf->writestring("final ");
+        if (d->isSynchronized())
+            buf->writestring("synchronized ");
+    }
+}
+
+void declarationToDocBuffer(Declaration *decl, OutBuffer *buf, TemplateDeclaration *td)
+{
+    //printf("declarationToDocBuffer() %s, originalType = %s, td = %s\n", decl->toChars(), decl->originalType ? decl->originalType->toChars() : "--", td ? td->toChars() : "--");
+    if (decl->ident)
+    {
+        prefix(buf, decl);
+
+        if (decl->type)
+        {   HdrGenState hgs;
+            hgs.ddoc = 1;
+            Type *origType = decl->originalType ? decl->originalType : decl->type;
+            if (origType->ty == Tfunction)
+            {
+                TypeFunction *attrType = (TypeFunction*)(decl->ident == Id::ctor ? origType : decl->type);
+                ((TypeFunction*)origType)->toCBufferWithAttributes(buf, decl->ident, &hgs, attrType, td);
+            }
+            else
+                origType->toCBuffer(buf, decl->ident, &hgs);
+        }
+        else
+            buf->writestring(decl->ident->toChars());
+        buf->writestring(";\n");
+    }
+}
+
+void Declaration::toDocBuffer(OutBuffer *buf)
+{
+    declarationToDocBuffer(this, buf, NULL);
+}
+
+void AliasDeclaration::toDocBuffer(OutBuffer *buf)
+{
+    //printf("AliasDeclaration::toDocbuffer() %s\n", toChars());
+    if (ident)
+    {
+        if (isDeprecated())
+            buf->writestring("deprecated ");
+
+        emitProtection(buf, protection);
+        buf->writestring("alias ");
+        buf->writestring(toChars());
+        buf->writestring(";\n");
+    }
+}
+
+
+void TypedefDeclaration::toDocBuffer(OutBuffer *buf)
+{
+    if (ident)
+    {
+        if (isDeprecated())
+            buf->writestring("deprecated ");
+
+        emitProtection(buf, protection);
+        buf->writestring("typedef ");
+        buf->writestring(toChars());
+        buf->writestring(";\n");
+    }
+}
+
+
+void FuncDeclaration::toDocBuffer(OutBuffer *buf)
+{
+    //printf("FuncDeclaration::toDocbuffer() %s\n", toChars());
+    if (ident)
+    {
+        TemplateDeclaration *td;
+
+        if (parent &&
+            (td = parent->isTemplateDeclaration()) != NULL &&
+            td->onemember == this)
+        {   /* It's a function template
+             */
+            unsigned o = buf->offset;
+
+            declarationToDocBuffer(this, buf, td);
+
+            highlightCode(NULL, this, buf, o);
+        }
+        else
+        {
+            Declaration::toDocBuffer(buf);
+        }
+    }
+}
+
+#if DMDV1
+void CtorDeclaration::toDocBuffer(OutBuffer *buf)
+{
+    HdrGenState hgs;
+
+    buf->writestring("this");
+    Parameter::argsToCBuffer(buf, &hgs, arguments, varargs);
+    buf->writestring(";\n");
+}
+#endif
+
+void AggregateDeclaration::toDocBuffer(OutBuffer *buf)
+{
+    if (ident)
+    {
+#if 0
+        emitProtection(buf, protection);
+#endif
+        buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
+        buf->writestring(";\n");
+    }
+}
+
+void StructDeclaration::toDocBuffer(OutBuffer *buf)
+{
+    //printf("StructDeclaration::toDocbuffer() %s\n", toChars());
+    if (ident)
+    {
+#if 0
+        emitProtection(buf, protection);
+#endif
+        TemplateDeclaration *td;
+
+        if (parent &&
+            (td = parent->isTemplateDeclaration()) != NULL &&
+            td->onemember == this)
+        {   unsigned o = buf->offset;
+            td->toDocBuffer(buf);
+            highlightCode(NULL, this, buf, o);
+        }
+        else
+        {
+            buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
+        }
+        buf->writestring(";\n");
+    }
+}
+
+void ClassDeclaration::toDocBuffer(OutBuffer *buf)
+{
+    //printf("ClassDeclaration::toDocbuffer() %s\n", toChars());
+    if (ident)
+    {
+#if 0
+        emitProtection(buf, protection);
+#endif
+        TemplateDeclaration *td;
+
+        if (parent &&
+            (td = parent->isTemplateDeclaration()) != NULL &&
+            td->onemember == this)
+        {   unsigned o = buf->offset;
+            td->toDocBuffer(buf);
+            highlightCode(NULL, this, buf, o);
+        }
+        else
+        {
+            if (isAbstract())
+                buf->writestring("abstract ");
+            buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
+        }
+        int any = 0;
+        for (size_t i = 0; i < baseclasses->dim; i++)
+        {   BaseClass *bc = (*baseclasses)[i];
+
+            if (bc->protection == PROTprivate)
+                continue;
+            if (bc->base && bc->base->ident == Id::Object)
+                continue;
+
+            if (any)
+                buf->writestring(", ");
+            else
+            {   buf->writestring(": ");
+                any = 1;
+            }
+            emitProtection(buf, bc->protection);
+            if (bc->base)
+            {
+                buf->writestring(bc->base->toPrettyChars());
+            }
+            else
+            {
+                HdrGenState hgs;
+                bc->type->toCBuffer(buf, NULL, &hgs);
+            }
+        }
+        buf->writestring(";\n");
+    }
+}
+
+
+void EnumDeclaration::toDocBuffer(OutBuffer *buf)
+{
+    if (ident)
+    {
+        buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
+        buf->writestring(";\n");
+    }
+}
+
+void EnumMember::toDocBuffer(OutBuffer *buf)
+{
+    if (ident)
+    {
+        buf->writestring(toChars());
+    }
+}
+
+
+/********************************* DocComment *********************************/
+
+DocComment::DocComment()
+{
+    memset(this, 0, sizeof(DocComment));
+}
+
+DocComment *DocComment::parse(Scope *sc, Dsymbol *s, unsigned char *comment)
+{
+    //printf("parse(%s): '%s'\n", s->toChars(), comment);
+    if (sc->lastdc && isDitto(comment))
+        return NULL;
+
+    DocComment *dc = new DocComment();
+    if (!comment)
+        return dc;
+
+    dc->parseSections(comment);
+
+    for (size_t i = 0; i < dc->sections.dim; i++)
+    {   Section *sec = dc->sections[i];
+
+        if (icmp("copyright", sec->name, sec->namelen) == 0)
+        {
+            dc->copyright = sec;
+        }
+        if (icmp("macros", sec->name, sec->namelen) == 0)
+        {
+            dc->macros = sec;
+        }
+    }
+
+    sc->lastdc = dc;
+    return dc;
+}
+
+/*****************************************
+ * Parse next paragraph out of *pcomment.
+ * Update *pcomment to point past paragraph.
+ * Returns NULL if no more paragraphs.
+ * If paragraph ends in 'identifier:',
+ * then (*pcomment)[0 .. idlen] is the identifier.
+ */
+
+void DocComment::parseSections(unsigned char *comment)
+{   unsigned char *p;
+    unsigned char *pstart;
+    unsigned char *pend;
+    unsigned char *idstart;
+    unsigned idlen;
+
+    unsigned char *name = NULL;
+    unsigned namelen = 0;
+
+    //printf("parseSections('%s')\n", comment);
+    p = comment;
+    while (*p)
+    {
+        p = skipwhitespace(p);
+        pstart = p;
+        pend = p;
+
+        /* Find end of section, which is ended by one of:
+         *      'identifier:' (but not inside a code section)
+         *      '\0'
+         */
+        idlen = 0;
+        int inCode = 0;
+        while (1)
+        {
+            // Check for start/end of a code section
+            if (*p == '-')
+            {
+                int numdash = 0;
+                while (*p == '-')
+                {
+                    ++numdash;
+                    p++;
+                }
+                // BUG: handle UTF PS and LS too
+                if (!*p || *p == '\r' || *p == '\n' && numdash >= 3)
+                    inCode ^= 1;
+                pend = p;
+            }
+
+            if (!inCode && isIdStart(p))
+            {
+                unsigned char *q = p + utfStride(p);
+                while (isIdTail(q))
+                    q += utfStride(q);
+                if (*q == ':')  // identifier: ends it
+                {   idlen = q - p;
+                    idstart = p;
+                    for (pend = p; pend > pstart; pend--)
+                    {   if (pend[-1] == '\n')
+                            break;
+                    }
+                    p = q + 1;
+                    break;
+                }
+            }
+            while (1)
+            {
+                if (!*p)
+                    goto L1;
+                if (*p == '\n')
+                {   p++;
+                    if (*p == '\n' && !summary && !namelen && !inCode)
+                    {
+                        pend = p;
+                        p++;
+                        goto L1;
+                    }
+                    break;
+                }
+                p++;
+                pend = p;
+            }
+            p = skipwhitespace(p);
+        }
+      L1:
+
+        if (namelen || pstart < pend)
+        {
+            Section *s;
+            if (icmp("Params", name, namelen) == 0)
+                s = new ParamSection();
+            else if (icmp("Macros", name, namelen) == 0)
+                s = new MacroSection();
+            else
+                s = new Section();
+            s->name = name;
+            s->namelen = namelen;
+            s->body = pstart;
+            s->bodylen = pend - pstart;
+            s->nooutput = 0;
+
+            //printf("Section: '%.*s' = '%.*s'\n", s->namelen, s->name, s->bodylen, s->body);
+
+            sections.push(s);
+
+            if (!summary && !namelen)
+                summary = s;
+        }
+
+        if (idlen)
+        {   name = idstart;
+            namelen = idlen;
+        }
+        else
+        {   name = NULL;
+            namelen = 0;
+            if (!*p)
+                break;
+        }
+    }
+}
+
+void DocComment::writeSections(Scope *sc, Dsymbol *s, OutBuffer *buf)
+{
+    //printf("DocComment::writeSections()\n");
+    if (sections.dim)
+    {
+        buf->writestring("$(DDOC_SECTIONS \n");
+        for (size_t i = 0; i < sections.dim; i++)
+        {   Section *sec = sections[i];
+
+            if (sec->nooutput)
+                continue;
+            //printf("Section: '%.*s' = '%.*s'\n", sec->namelen, sec->name, sec->bodylen, sec->body);
+            if (sec->namelen || i)
+                sec->write(this, sc, s, buf);
+            else
+            {
+                buf->writestring("$(DDOC_SUMMARY ");
+                    unsigned o = buf->offset;
+                    buf->write(sec->body, sec->bodylen);
+                    escapeStrayParenthesis(buf, o, s->loc);
+                    highlightText(sc, s, buf, o);
+                buf->writestring(")\n");
+            }
+        }
+        buf->writestring(")\n");
+    }
+    else
+    {
+        buf->writestring("$(DDOC_BLANKLINE)\n");
+    }
+}
+
+/***************************************************
+ */
+
+void Section::write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf)
+{
+    if (namelen)
+    {
+        static const char *table[] =
+        {       "AUTHORS", "BUGS", "COPYRIGHT", "DATE",
+                "DEPRECATED", "EXAMPLES", "HISTORY", "LICENSE",
+                "RETURNS", "SEE_ALSO", "STANDARDS", "THROWS",
+                "VERSION" };
+
+        for (int i = 0; i < sizeof(table) / sizeof(table[0]); i++)
+        {
+            if (icmp(table[i], name, namelen) == 0)
+            {
+                buf->printf("$(DDOC_%s ", table[i]);
+                goto L1;
+            }
+        }
+
+        buf->writestring("$(DDOC_SECTION ");
+            // Replace _ characters with spaces
+            buf->writestring("$(DDOC_SECTION_H ");
+            unsigned o = buf->offset;
+            for (unsigned u = 0; u < namelen; u++)
+            {   unsigned char c = name[u];
+                buf->writeByte((c == '_') ? ' ' : c);
+            }
+            escapeStrayParenthesis(buf, o, s->loc);
+            buf->writestring(":)\n");
+    }
+    else
+    {
+        buf->writestring("$(DDOC_DESCRIPTION ");
+    }
+  L1:
+    unsigned o = buf->offset;
+    buf->write(body, bodylen);
+    escapeStrayParenthesis(buf, o, s->loc);
+    highlightText(sc, s, buf, o);
+    buf->writestring(")\n");
+}
+
+/***************************************************
+ */
+
+void ParamSection::write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf)
+{
+    unsigned char *p = body;
+    unsigned len = bodylen;
+    unsigned char *pend = p + len;
+
+    unsigned char *tempstart;
+    unsigned templen;
+
+    unsigned char *namestart;
+    unsigned namelen = 0;       // !=0 if line continuation
+
+    unsigned char *textstart;
+    unsigned textlen;
+
+    unsigned o;
+    Parameter *arg;
+
+    buf->writestring("$(DDOC_PARAMS \n");
+    while (p < pend)
+    {
+        // Skip to start of macro
+        while (1)
+        {
+            switch (*p)
+            {
+                case ' ':
+                case '\t':
+                    p++;
+                    continue;
+
+                case '\n':
+                    p++;
+                    goto Lcont;
+
+                default:
+                    if (isIdStart(p))
+                        break;
+                    if (namelen)
+                        goto Ltext;             // continuation of prev macro
+                    goto Lskipline;
+            }
+            break;
+        }
+        tempstart = p;
+
+        while (isIdTail(p))
+            p += utfStride(p);
+        templen = p - tempstart;
+
+        while (*p == ' ' || *p == '\t')
+            p++;
+
+        if (*p != '=')
+        {   if (namelen)
+                goto Ltext;             // continuation of prev macro
+            goto Lskipline;
+        }
+        p++;
+
+        if (namelen)
+        {   // Output existing param
+
+        L1:
+            //printf("param '%.*s' = '%.*s'\n", namelen, namestart, textlen, textstart);
+            HdrGenState hgs;
+            buf->writestring("$(DDOC_PARAM_ROW ");
+                buf->writestring("$(DDOC_PARAM_ID ");
+                    o = buf->offset;
+                    arg = isFunctionParameter(s, namestart, namelen);
+                    if (arg && arg->type && arg->ident)
+                        arg->type->toCBuffer(buf, arg->ident, &hgs);
+                    else
+                        buf->write(namestart, namelen);
+                    escapeStrayParenthesis(buf, o, s->loc);
+                    highlightCode(sc, s, buf, o);
+                buf->writestring(")\n");
+
+                buf->writestring("$(DDOC_PARAM_DESC ");
+                    o = buf->offset;
+                    buf->write(textstart, textlen);
+                    escapeStrayParenthesis(buf, o, s->loc);
+                    highlightText(sc, s, buf, o);
+                buf->writestring(")");
+            buf->writestring(")\n");
+            namelen = 0;
+            if (p >= pend)
+                break;
+        }
+
+        namestart = tempstart;
+        namelen = templen;
+
+        while (*p == ' ' || *p == '\t')
+            p++;
+        textstart = p;
+
+      Ltext:
+        while (*p != '\n')
+            p++;
+        textlen = p - textstart;
+        p++;
+
+     Lcont:
+        continue;
+
+     Lskipline:
+        // Ignore this line
+        while (*p++ != '\n')
+            ;
+    }
+    if (namelen)
+        goto L1;                // write out last one
+    buf->writestring(")\n");
+}
+
+/***************************************************
+ */
+
+void MacroSection::write(DocComment *dc, Scope *sc, Dsymbol *s, OutBuffer *buf)
+{
+    //printf("MacroSection::write()\n");
+    DocComment::parseMacros(dc->pescapetable, dc->pmacrotable, body, bodylen);
+}
+
+/************************************************
+ * Parse macros out of Macros: section.
+ * Macros are of the form:
+ *      name1 = value1
+ *
+ *      name2 = value2
+ */
+
+void DocComment::parseMacros(Escape **pescapetable, Macro **pmacrotable, unsigned char *m, unsigned mlen)
+{
+    unsigned char *p = m;
+    unsigned len = mlen;
+    unsigned char *pend = p + len;
+
+    unsigned char *tempstart;
+    unsigned templen;
+
+    unsigned char *namestart;
+    unsigned namelen = 0;       // !=0 if line continuation
+
+    unsigned char *textstart;
+    unsigned textlen;
+
+    while (p < pend)
+    {
+        // Skip to start of macro
+        while (1)
+        {
+            if (p >= pend)
+                goto Ldone;
+            switch (*p)
+            {
+                case ' ':
+                case '\t':
+                    p++;
+                    continue;
+
+                case '\n':
+                    p++;
+                    goto Lcont;
+
+                default:
+                    if (isIdStart(p))
+                        break;
+                    if (namelen)
+                        goto Ltext;             // continuation of prev macro
+                    goto Lskipline;
+            }
+            break;
+        }
+        tempstart = p;
+
+        while (1)
+        {
+            if (p >= pend)
+                goto Ldone;
+            if (!isIdTail(p))
+                break;
+            p += utfStride(p);
+        }
+        templen = p - tempstart;
+
+        while (1)
+        {
+            if (p >= pend)
+                goto Ldone;
+            if (!(*p == ' ' || *p == '\t'))
+                break;
+            p++;
+        }
+
+        if (*p != '=')
+        {   if (namelen)
+                goto Ltext;             // continuation of prev macro
+            goto Lskipline;
+        }
+        p++;
+        if (p >= pend)
+            goto Ldone;
+
+        if (namelen)
+        {   // Output existing macro
+        L1:
+            //printf("macro '%.*s' = '%.*s'\n", namelen, namestart, textlen, textstart);
+            if (icmp("ESCAPES", namestart, namelen) == 0)
+                parseEscapes(pescapetable, textstart, textlen);
+            else
+                Macro::define(pmacrotable, namestart, namelen, textstart, textlen);
+            namelen = 0;
+            if (p >= pend)
+                break;
+        }
+
+        namestart = tempstart;
+        namelen = templen;
+
+        while (p < pend && (*p == ' ' || *p == '\t'))
+            p++;
+        textstart = p;
+
+      Ltext:
+        while (p < pend && *p != '\n')
+            p++;
+        textlen = p - textstart;
+
+        // Remove trailing \r if there is one
+        if (p > m && p[-1] == '\r')
+            textlen--;
+
+        p++;
+        //printf("p = %p, pend = %p\n", p, pend);
+
+     Lcont:
+        continue;
+
+     Lskipline:
+        // Ignore this line
+        while (p < pend && *p++ != '\n')
+            ;
+    }
+Ldone:
+    if (namelen)
+        goto L1;                // write out last one
+}
+
+/**************************************
+ * Parse escapes of the form:
+ *      /c/string/
+ * where c is a single character.
+ * Multiple escapes can be separated
+ * by whitespace and/or commas.
+ */
+
+void DocComment::parseEscapes(Escape **pescapetable, unsigned char *textstart, unsigned textlen)
+{   Escape *escapetable = *pescapetable;
+
+    if (!escapetable)
+    {   escapetable = new Escape;
+        *pescapetable = escapetable;
+    }
+    unsigned char *p = textstart;
+    unsigned char *pend = p + textlen;
+
+    while (1)
+    {
+        while (1)
+        {
+            if (p + 4 >= pend)
+                return;
+            if (!(*p == ' ' || *p == '\t' || *p == '\n' || *p == ','))
+                break;
+            p++;
+        }
+        if (p[0] != '/' || p[2] != '/')
+            return;
+        unsigned char c = p[1];
+        p += 3;
+        unsigned char *start = p;
+        while (1)
+        {
+            if (p >= pend)
+                return;
+            if (*p == '/')
+                break;
+            p++;
+        }
+        size_t len = p - start;
+        char *s = (char *)memcpy(mem.malloc(len + 1), start, len);
+        s[len] = 0;
+        escapetable->strings[c] = s;
+        //printf("%c = '%s'\n", c, s);
+        p++;
+    }
+}
+
+
+/******************************************
+ * Compare 0-terminated string with length terminated string.
+ * Return < 0, ==0, > 0
+ */
+
+int cmp(const char *stringz, void *s, size_t slen)
+{
+    size_t len1 = strlen(stringz);
+
+    if (len1 != slen)
+        return len1 - slen;
+    return memcmp(stringz, s, slen);
+}
+
+int icmp(const char *stringz, void *s, size_t slen)
+{
+    size_t len1 = strlen(stringz);
+
+    if (len1 != slen)
+        return len1 - slen;
+    return memicmp(stringz, (char *)s, slen);
+}
+
+/*****************************************
+ * Return !=0 if comment consists entirely of "ditto".
+ */
+
+int isDitto(unsigned char *comment)
+{
+    if (comment)
+    {
+        unsigned char *p = skipwhitespace(comment);
+
+        if (memicmp((char *)p, "ditto", 5) == 0 && *skipwhitespace(p + 5) == 0)
+            return 1;
+    }
+    return 0;
+}
+
+/**********************************************
+ * Skip white space.
+ */
+
+unsigned char *skipwhitespace(unsigned char *p)
+{
+    for (; 1; p++)
+    {   switch (*p)
+        {
+            case ' ':
+            case '\t':
+            case '\n':
+                continue;
+        }
+        break;
+    }
+    return p;
+}
+
+
+/************************************************
+ * Scan forward to one of:
+ *      start of identifier
+ *      beginning of next line
+ *      end of buf
+ */
+
+unsigned skiptoident(OutBuffer *buf, size_t i)
+{
+    while (i < buf->offset)
+    {   dchar_t c;
+
+        size_t oi = i;
+        if (utf_decodeChar((unsigned char *)buf->data, buf->offset, &i, &c))
+            /* Ignore UTF errors, but still consume input
+             */
+            break;
+        if (c >= 0x80)
+        {
+            if (!isUniAlpha(c))
+                continue;
+        }
+        else if (!(isalpha(c) || c == '_' || c == '\n'))
+            continue;
+        i = oi;
+        break;
+    }
+    return i;
+}
+
+/************************************************
+ * Scan forward past end of identifier.
+ */
+
+unsigned skippastident(OutBuffer *buf, size_t i)
+{
+    while (i < buf->offset)
+    {   dchar_t c;
+
+        size_t oi = i;
+        if (utf_decodeChar((unsigned char *)buf->data, buf->offset, &i, &c))
+            /* Ignore UTF errors, but still consume input
+             */
+            break;
+        if (c >= 0x80)
+        {
+            if (isUniAlpha(c))
+                continue;
+        }
+        else if (isalnum(c) || c == '_')
+            continue;
+        i = oi;
+        break;
+    }
+    return i;
+}
+
+
+/************************************************
+ * Scan forward past URL starting at i.
+ * We don't want to highlight parts of a URL.
+ * Returns:
+ *      i if not a URL
+ *      index just past it if it is a URL
+ */
+
+unsigned skippastURL(OutBuffer *buf, size_t i)
+{   unsigned length = buf->offset - i;
+    unsigned char *p = &buf->data[i];
+    unsigned j;
+    unsigned sawdot = 0;
+
+    if (length > 7 && memicmp((char *)p, "http://", 7) == 0)
+    {
+        j = 7;
+    }
+    else if (length > 8 && memicmp((char *)p, "https://", 8) == 0)
+    {
+        j = 8;
+    }
+    else
+        goto Lno;
+
+    for (; j < length; j++)
+    {   unsigned char c = p[j];
+        if (isalnum(c))
+            continue;
+        if (c == '-' || c == '_' || c == '?' ||
+            c == '=' || c == '%' || c == '&' ||
+            c == '/' || c == '+' || c == '#' ||
+            c == '~')
+            continue;
+        if (c == '.')
+        {
+            sawdot = 1;
+            continue;
+        }
+        break;
+    }
+    if (sawdot)
+        return i + j;
+
+Lno:
+    return i;
+}
+
+
+/****************************************************
+ */
+
+int isKeyword(unsigned char *p, unsigned len)
+{
+    static const char *table[] = { "true", "false", "null" };
+
+    for (int i = 0; i < sizeof(table) / sizeof(table[0]); i++)
+    {
+        if (cmp(table[i], p, len) == 0)
+            return 1;
+    }
+    return 0;
+}
+
+/****************************************************
+ */
+
+Parameter *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len)
+{
+    FuncDeclaration *f = s->isFuncDeclaration();
+
+    /* f->type may be NULL for template members.
+     */
+    if (f && f->type)
+    {
+        TypeFunction *tf;
+        if (f->originalType)
+        {
+            tf = (TypeFunction *)f->originalType;
+        }
+        else
+            tf = (TypeFunction *)f->type;
+
+        if (tf->parameters)
+        {
+            for (size_t k = 0; k < tf->parameters->dim; k++)
+            {   Parameter *arg = (*tf->parameters)[k];
+
+                if (arg->ident && cmp(arg->ident->toChars(), p, len) == 0)
+                {
+                    return arg;
+                }
+            }
+        }
+    }
+    return NULL;
+}
+
+/**************************************************
+ * Highlight text section.
+ */
+
+void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset)
+{
+    //printf("highlightText()\n");
+    const char *sid = s->ident->toChars();
+    FuncDeclaration *f = s->isFuncDeclaration();
+    unsigned char *p;
+    const char *se;
+
+    int leadingBlank = 1;
+    int inCode = 0;
+    int inComment = 0;                  // in <!-- ... --> comment
+    unsigned iCodeStart;                // start of code section
+
+    unsigned iLineStart = offset;
+
+    for (unsigned i = offset; i < buf->offset; i++)
+    {   unsigned char c = buf->data[i];
+
+     Lcont:
+        switch (c)
+        {
+            case ' ':
+            case '\t':
+                break;
+
+            case '\n':
+                if (sc && !inCode && i == iLineStart && i + 1 < buf->offset)    // if "\n\n"
+                {
+                    static char blankline[] = "$(DDOC_BLANKLINE)\n";
+
+                    i = buf->insert(i, blankline, sizeof(blankline) - 1);
+                }
+                leadingBlank = 1;
+                iLineStart = i + 1;
+                break;
+
+            case '<':
+                leadingBlank = 0;
+                if (inCode)
+                    break;
+                p = &buf->data[i];
+
+                // Skip over comments
+                if (p[1] == '!' && p[2] == '-' && p[3] == '-')
+                {   unsigned j = i + 4;
+                    p += 4;
+                    while (1)
+                    {
+                        if (j == buf->offset)
+                            goto L1;
+                        if (p[0] == '-' && p[1] == '-' && p[2] == '>')
+                        {
+                            i = j + 2;  // place on closing '>'
+                            break;
+                        }
+                        j++;
+                        p++;
+                    }
+                    break;
+                }
+
+                // Skip over HTML tag
+                if (isalpha(p[1]) || (p[1] == '/' && isalpha(p[2])))
+                {   unsigned j = i + 2;
+                    p += 2;
+                    while (1)
+                    {
+                        if (j == buf->offset)
+                            goto L1;
+                        if (p[0] == '>')
+                        {
+                            i = j;      // place on closing '>'
+                            break;
+                        }
+                        j++;
+                        p++;
+                    }
+                    break;
+                }
+
+            L1:
+                // Replace '<' with '&lt;' character entity
+                se = Escape::escapeChar('<');
+                if (se)
+                {   size_t len = strlen(se);
+                    buf->remove(i, 1);
+                    i = buf->insert(i, se, len);
+                    i--;        // point to ';'
+                }
+                break;
+
+            case '>':
+                leadingBlank = 0;
+                if (inCode)
+                    break;
+                // Replace '>' with '&gt;' character entity
+                se = Escape::escapeChar('>');
+                if (se)
+                {   size_t len = strlen(se);
+                    buf->remove(i, 1);
+                    i = buf->insert(i, se, len);
+                    i--;        // point to ';'
+                }
+                break;
+
+            case '&':
+                leadingBlank = 0;
+                if (inCode)
+                    break;
+                p = &buf->data[i];
+                if (p[1] == '#' || isalpha(p[1]))
+                    break;                      // already a character entity
+                // Replace '&' with '&amp;' character entity
+                se = Escape::escapeChar('&');
+                if (se)
+                {   size_t len = strlen(se);
+                    buf->remove(i, 1);
+                    i = buf->insert(i, se, len);
+                    i--;        // point to ';'
+                }
+                break;
+
+            case '-':
+                /* A line beginning with --- delimits a code section.
+                 * inCode tells us if it is start or end of a code section.
+                 */
+                if (leadingBlank)
+                {   int istart = i;
+                    int eollen = 0;
+
+                    leadingBlank = 0;
+                    while (1)
+                    {
+                        ++i;
+                        if (i >= buf->offset)
+                            break;
+                        c = buf->data[i];
+                        if (c == '\n')
+                        {   eollen = 1;
+                            break;
+                        }
+                        if (c == '\r')
+                        {
+                            eollen = 1;
+                            if (i + 1 >= buf->offset)
+                                break;
+                            if (buf->data[i + 1] == '\n')
+                            {   eollen = 2;
+                                break;
+                            }
+                        }
+                        // BUG: handle UTF PS and LS too
+                        if (c != '-')
+                            goto Lcont;
+                    }
+                    if (i - istart < 3)
+                        goto Lcont;
+
+                    // We have the start/end of a code section
+
+                    // Remove the entire --- line, including blanks and \n
+                    buf->remove(iLineStart, i - iLineStart + eollen);
+                    i = iLineStart;
+
+                    if (inCode && (i <= iCodeStart))
+                    {   // Empty code section, just remove it completely.
+                        inCode = 0;
+                        break;
+                    }
+
+                    if (inCode)
+                    {
+                        inCode = 0;
+                        // The code section is from iCodeStart to i
+                        OutBuffer codebuf;
+
+                        codebuf.write(buf->data + iCodeStart, i - iCodeStart);
+                        codebuf.writeByte(0);
+                        highlightCode2(sc, s, &codebuf, 0);
+                        buf->remove(iCodeStart, i - iCodeStart);
+                        i = buf->insert(iCodeStart, codebuf.data, codebuf.offset);
+                        i = buf->insert(i, ")\n", 2);
+                        i--;
+                    }
+                    else
+                    {   static char pre[] = "$(D_CODE \n";
+
+                        inCode = 1;
+                        i = buf->insert(i, pre, sizeof(pre) - 1);
+                        iCodeStart = i;
+                        i--;            // place i on >
+                        leadingBlank = true;
+                    }
+                }
+                break;
+
+            default:
+                leadingBlank = 0;
+                if (sc && !inCode && isIdStart(&buf->data[i]))
+                {   unsigned j;
+
+                    j = skippastident(buf, i);
+                    if (j > i)
+                    {
+                        unsigned k = skippastURL(buf, i);
+                        if (k > i)
+                        {   i = k - 1;
+                            break;
+                        }
+
+                        if (buf->data[i] == '_')        // leading '_' means no highlight
+                        {
+                            buf->remove(i, 1);
+                            i = j - 1;
+                        }
+                        else
+                        {
+                            if (cmp(sid, buf->data + i, j - i) == 0)
+                            {
+                                i = buf->bracket(i, "$(DDOC_PSYMBOL ", j, ")") - 1;
+                                break;
+                            }
+                            else if (isKeyword(buf->data + i, j - i))
+                            {
+                                i = buf->bracket(i, "$(DDOC_KEYWORD ", j, ")") - 1;
+                                break;
+                            }
+                            else
+                            {
+                                if (f && isFunctionParameter(f, buf->data + i, j - i))
+                                {
+                                    //printf("highlighting arg '%s', i = %d, j = %d\n", arg->ident->toChars(), i, j);
+                                    i = buf->bracket(i, "$(DDOC_PARAM ", j, ")") - 1;
+                                    break;
+                                }
+                            }
+                            i = j - 1;
+                        }
+                    }
+                }
+                break;
+        }
+    }
+    if (inCode)
+        s->error("unmatched --- in DDoc comment");
+    ;
+}
+
+/**************************************************
+ * Highlight code for DDOC section.
+ */
+
+void highlightCode(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset)
+{
+    char *sid = s->ident->toChars();
+    FuncDeclaration *f = s->isFuncDeclaration();
+
+    //printf("highlightCode(s = '%s', kind = %s)\n", sid, s->kind());
+    for (unsigned i = offset; i < buf->offset; i++)
+    {   unsigned char c = buf->data[i];
+        const char *se;
+
+        se = Escape::escapeChar(c);
+        if (se)
+        {
+            size_t len = strlen(se);
+            buf->remove(i, 1);
+            i = buf->insert(i, se, len);
+            i--;                // point to ';'
+        }
+        else if (isIdStart(&buf->data[i]))
+        {   unsigned j;
+
+            j = skippastident(buf, i);
+            if (j > i)
+            {
+                if (cmp(sid, buf->data + i, j - i) == 0)
+                {
+                    i = buf->bracket(i, "$(DDOC_PSYMBOL ", j, ")") - 1;
+                    continue;
+                }
+                else if (f)
+                {
+                    if (isFunctionParameter(f, buf->data + i, j - i))
+                    {
+                        //printf("highlighting arg '%s', i = %d, j = %d\n", arg->ident->toChars(), i, j);
+                        i = buf->bracket(i, "$(DDOC_PARAM ", j, ")") - 1;
+                        continue;
+                    }
+                }
+                i = j - 1;
+            }
+        }
+    }
+}
+
+/****************************************
+ */
+
+void highlightCode3(OutBuffer *buf, unsigned char *p, unsigned char *pend)
+{
+    for (; p < pend; p++)
+    {   const char *s = Escape::escapeChar(*p);
+        if (s)
+            buf->writestring(s);
+        else
+            buf->writeByte(*p);
+    }
+}
+
+/**************************************************
+ * Highlight code for CODE section.
+ */
+
+
+void highlightCode2(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset)
+{
+    char *sid = s->ident->toChars();
+    FuncDeclaration *f = s->isFuncDeclaration();
+    unsigned errorsave = global.errors;
+    Lexer lex(NULL, buf->data, 0, buf->offset - 1, 0, 1);
+    Token tok;
+    OutBuffer res;
+    unsigned char *lastp = buf->data;
+    const char *highlight;
+
+    //printf("highlightCode2('%.*s')\n", buf->offset - 1, buf->data);
+    res.reserve(buf->offset);
+    while (1)
+    {
+        lex.scan(&tok);
+        highlightCode3(&res, lastp, tok.ptr);
+        highlight = NULL;
+        switch (tok.value)
+        {
+            case TOKidentifier:
+                if (!sc)
+                    break;
+                if (cmp(sid, tok.ptr, lex.p - tok.ptr) == 0)
+                {
+                    highlight = "$(D_PSYMBOL ";
+                    break;
+                }
+                else if (f)
+                {
+                    if (isFunctionParameter(f, tok.ptr, lex.p - tok.ptr))
+                    {
+                        //printf("highlighting arg '%s', i = %d, j = %d\n", arg->ident->toChars(), i, j);
+                        highlight = "$(D_PARAM ";
+                        break;
+                    }
+                }
+                break;
+
+            case TOKcomment:
+                highlight = "$(D_COMMENT ";
+                break;
+
+            case TOKstring:
+                highlight = "$(D_STRING ";
+                break;
+
+            default:
+                if (tok.isKeyword())
+                    highlight = "$(D_KEYWORD ";
+                break;
+        }
+        if (highlight)
+            res.writestring(highlight);
+        highlightCode3(&res, tok.ptr, lex.p);
+        if (highlight)
+            res.writeByte(')');
+        if (tok.value == TOKeof)
+            break;
+        lastp = lex.p;
+    }
+    buf->setsize(offset);
+    buf->write(&res);
+    global.errors = errorsave;
+}
+
+/***************************************
+ * Find character string to replace c with.
+ */
+
+const char *Escape::escapeChar(unsigned c)
+{   const char *s;
+
+    switch (c)
+    {
+        case '<':
+            s = "&lt;";
+            break;
+        case '>':
+            s = "&gt;";
+            break;
+        case '&':
+            s = "&amp;";
+            break;
+        default:
+            s = NULL;
+            break;
+    }
+    return s;
+}
+
+/****************************************
+ * Determine if p points to the start of an identifier.
+ */
+
+int isIdStart(unsigned char *p)
+{
+    unsigned c = *p;
+    if (isalpha(c) || c == '_')
+        return 1;
+    if (c >= 0x80)
+    {   size_t i = 0;
+        if (utf_decodeChar(p, 4, &i, &c))
+            return 0;   // ignore errors
+        if (isUniAlpha(c))
+            return 1;
+    }
+    return 0;
+}
+
+/****************************************
+ * Determine if p points to the rest of an identifier.
+ */
+
+int isIdTail(unsigned char *p)
+{
+    unsigned c = *p;
+    if (isalnum(c) || c == '_')
+        return 1;
+    if (c >= 0x80)
+    {   size_t i = 0;
+        if (utf_decodeChar(p, 4, &i, &c))
+            return 0;   // ignore errors
+        if (isUniAlpha(c))
+            return 1;
+    }
+    return 0;
+}
+
+/*****************************************
+ * Return number of bytes in UTF character.
+ */
+
+int utfStride(unsigned char *p)
+{
+    unsigned c = *p;
+    if (c < 0x80)
+        return 1;
+    size_t i = 0;
+    utf_decodeChar(p, 4, &i, &c);       // ignore errors, but still consume input
+    return i;
+}
diff --git a/dmd2/dsymbol.c b/dmd2/dsymbol.c
index ef23de74..71efca43 100644
--- a/dmd2/dsymbol.c
+++ b/dmd2/dsymbol.c
@@ -1,1528 +1,1528 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2012 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "rmem.h"
-#include "speller.h"
-#include "aav.h"
-
-#include "mars.h"
-#include "dsymbol.h"
-#include "aggregate.h"
-#include "identifier.h"
-#include "module.h"
-#include "mtype.h"
-#include "expression.h"
-#include "statement.h"
-#include "declaration.h"
-#include "id.h"
-#include "scope.h"
-#include "init.h"
-#include "import.h"
-#include "template.h"
-#include "attrib.h"
-#if IN_LLVM
-#include "../gen/pragma.h"
-#endif
-
-/****************************** Dsymbol ******************************/
-
-Dsymbol::Dsymbol()
-{
-    //printf("Dsymbol::Dsymbol(%p)\n", this);
-    this->ident = NULL;
-    this->c_ident = NULL;
-    this->parent = NULL;
-#if IN_DMD
-    this->csym = NULL;
-    this->isym = NULL;
-#endif
-    this->loc = 0;
-    this->comment = NULL;
-    this->scope = NULL;
-    this->errors = false;
-
-#if IN_LLVM
-    this->llvmInternal = LLVMnone;
-    this->irsym = NULL;
-#endif
-}
-
-Dsymbol::Dsymbol(Identifier *ident)
-{
-    //printf("Dsymbol::Dsymbol(%p, ident)\n", this);
-    this->ident = ident;
-    this->c_ident = NULL;
-    this->parent = NULL;
-#if IN_DMD
-    this->csym = NULL;
-    this->isym = NULL;
-#endif
-    this->loc = 0;
-    this->comment = NULL;
-    this->scope = NULL;
-    this->errors = false;
-
-#if IN_LLVM
-    this->llvmInternal = LLVMnone;
-    this->irsym = NULL;
-#endif
-}
-
-int Dsymbol::equals(Object *o)
-{   Dsymbol *s;
-
-    if (this == o)
-        return TRUE;
-    s = (Dsymbol *)(o);
-    // Overload sets don't have an ident
-    if (s && ident && s->ident && ident->equals(s->ident))
-        return TRUE;
-    return FALSE;
-}
-
-/**************************************
- * Copy the syntax.
- * Used for template instantiations.
- * If s is NULL, allocate the new object, otherwise fill it in.
- */
-
-Dsymbol *Dsymbol::syntaxCopy(Dsymbol *s)
-{
-    print();
-    printf("%s %s\n", kind(), toChars());
-    assert(0);
-    return NULL;
-}
-
-/**************************************
- * Determine if this symbol is only one.
- * Returns:
- *      FALSE, *ps = NULL: There are 2 or more symbols
- *      TRUE,  *ps = NULL: There are zero symbols
- *      TRUE,  *ps = symbol: The one and only one symbol
- */
-
-int Dsymbol::oneMember(Dsymbol **ps, Identifier *ident)
-{
-    //printf("Dsymbol::oneMember()\n");
-    *ps = this;
-    return TRUE;
-}
-
-/*****************************************
- * Same as Dsymbol::oneMember(), but look at an array of Dsymbols.
- */
-
-int Dsymbol::oneMembers(Dsymbols *members, Dsymbol **ps, Identifier *ident)
-{
-    //printf("Dsymbol::oneMembers() %d\n", members ? members->dim : 0);
-    Dsymbol *s = NULL;
-
-    if (members)
-    {
-        for (size_t i = 0; i < members->dim; i++)
-        {   Dsymbol *sx = (*members)[i];
-
-            int x = sx->oneMember(ps, ident);
-            //printf("\t[%d] kind %s = %d, s = %p\n", i, sx->kind(), x, *ps);
-            if (!x)
-            {
-                //printf("\tfalse 1\n");
-                assert(*ps == NULL);
-                return FALSE;
-            }
-            if (*ps)
-            {
-                if (ident)
-                {
-                    if (!(*ps)->ident || !(*ps)->ident->equals(ident))
-                        continue;
-                }
-                if (!s)
-                    s = *ps;
-                else if (s->isOverloadable() && (*ps)->isOverloadable())
-                    ;   // keep head of overload set
-                else                    // more than one symbol
-                {   *ps = NULL;
-                    //printf("\tfalse 2\n");
-                    return FALSE;
-                }
-            }
-        }
-    }
-    *ps = s;            // s is the one symbol, NULL if none
-    //printf("\ttrue\n");
-    return TRUE;
-}
-
-/*****************************************
- * Is Dsymbol a variable that contains pointers?
- */
-
-int Dsymbol::hasPointers()
-{
-    //printf("Dsymbol::hasPointers() %s\n", toChars());
-    return 0;
-}
-
-bool Dsymbol::hasStaticCtorOrDtor()
-{
-    //printf("Dsymbol::hasStaticCtorOrDtor() %s\n", toChars());
-    return FALSE;
-}
-
-void Dsymbol::setFieldOffset(AggregateDeclaration *ad, unsigned *poffset, bool isunion)
-{
-}
-
-char *Dsymbol::toChars()
-{
-    return ident ? ident->toChars() : (char *)"__anonymous";
-}
-
-const char *Dsymbol::toPrettyChars()
-{   Dsymbol *p;
-    char *s;
-    char *q;
-    size_t len;
-
-    //printf("Dsymbol::toPrettyChars() '%s'\n", toChars());
-    if (!parent)
-        return toChars();
-
-    len = 0;
-    for (p = this; p; p = p->parent)
-        len += strlen(p->toChars()) + 1;
-
-    s = (char *)mem.malloc(len);
-    q = s + len - 1;
-    *q = 0;
-    for (p = this; p; p = p->parent)
-    {
-        char *t = p->toChars();
-        len = strlen(t);
-        q -= len;
-        memcpy(q, t, len);
-        if (q == s)
-            break;
-        q--;
-#if TARGET_NET
-    if (AggregateDeclaration* ad = p->isAggregateDeclaration())
-    {
-        if (ad->isNested() && p->parent && p->parent->isAggregateDeclaration())
-        {
-            *q = '/';
-            continue;
-        }
-    }
-#endif
-        *q = '.';
-    }
-    return s;
-}
-
-char *Dsymbol::locToChars()
-{
-    OutBuffer buf;
-
-    if (!loc.filename)  // avoid bug 5861.
-    {
-        Module *m = getModule();
-
-        if (m && m->srcfile)
-            loc.filename = m->srcfile->toChars();
-    }
-    return loc.toChars();
-}
-
-const char *Dsymbol::kind()
-{
-    return "symbol";
-}
-
-/*********************************
- * If this symbol is really an alias for another,
- * return that other.
- */
-
-Dsymbol *Dsymbol::toAlias()
-{
-    return this;
-}
-
-Dsymbol *Dsymbol::toParent()
-{
-    return parent ? parent->pastMixin() : NULL;
-}
-
-Dsymbol *Dsymbol::pastMixin()
-{
-    Dsymbol *s = this;
-
-    //printf("Dsymbol::pastMixin() %s\n", toChars());
-    while (s && s->isTemplateMixin())
-        s = s->parent;
-    return s;
-}
-
-/**********************************
- * Use this instead of toParent() when looking for the
- * 'this' pointer of the enclosing function/class.
- */
-
-Dsymbol *Dsymbol::toParent2()
-{
-    Dsymbol *s = parent;
-    while (s && s->isTemplateInstance())
-        s = s->parent;
-    return s;
-}
-
-TemplateInstance *Dsymbol::inTemplateInstance()
-{
-    for (Dsymbol *parent = this->parent; parent; parent = parent->parent)
-    {
-        TemplateInstance *ti = parent->isTemplateInstance();
-        if (ti)
-            return ti;
-    }
-    return NULL;
-}
-
-// Check if this function is a member of a template which has only been
-// instantiated speculatively, eg from inside is(typeof()).
-// Return the speculative template instance it is part of,
-// or NULL if not speculative.
-TemplateInstance *Dsymbol::isSpeculative()
-{
-    Dsymbol * par = parent;
-    while (par)
-    {
-        TemplateInstance *ti = par->isTemplateInstance();
-        if (ti && ti->speculative)
-            return ti;
-        par = par->toParent();
-    }
-    return NULL;
-}
-
-int Dsymbol::isAnonymous()
-{
-    return ident ? 0 : 1;
-}
-
-/*************************************
- * Set scope for future semantic analysis so we can
- * deal better with forward references.
- */
-
-void Dsymbol::setScope(Scope *sc)
-{
-    //printf("Dsymbol::setScope() %p %s, %p stc = %llx\n", this, toChars(), sc, sc->stc);
-    if (!sc->nofree)
-        sc->setNoFree();                // may need it even after semantic() finishes
-    scope = sc;
-}
-
-void Dsymbol::importAll(Scope *sc)
-{
-}
-
-/*************************************
- * Does semantic analysis on the public face of declarations.
- */
-
-void Dsymbol::semantic0(Scope *sc)
-{
-}
-
-void Dsymbol::semantic(Scope *sc)
-{
-    error("%p has no semantic routine", this);
-}
-
-/*************************************
- * Does semantic analysis on initializers and members of aggregates.
- */
-
-void Dsymbol::semantic2(Scope *sc)
-{
-    // Most Dsymbols have no further semantic analysis needed
-}
-
-/*************************************
- * Does semantic analysis on function bodies.
- */
-
-void Dsymbol::semantic3(Scope *sc)
-{
-    // Most Dsymbols have no further semantic analysis needed
-}
-
-/*************************************
- * Look for function inlining possibilities.
- */
-
-void Dsymbol::inlineScan()
-{
-    // Most Dsymbols aren't functions
-}
-
-/*********************************************
- * Search for ident as member of s.
- * Input:
- *      flags:  1       don't find private members
- *              2       don't give error messages
- *              4       return NULL if ambiguous
- * Returns:
- *      NULL if not found
- */
-
-Dsymbol *Dsymbol::search(Loc loc, Identifier *ident, int flags)
-{
-    //printf("Dsymbol::search(this=%p,%s, ident='%s')\n", this, toChars(), ident->toChars());
-    return NULL;
-}
-
-/***************************************************
- * Search for symbol with correct spelling.
- */
-
-void *symbol_search_fp(void *arg, const char *seed)
-{
-    /* If not in the lexer's string table, it certainly isn't in the symbol table.
-     * Doing this first is a lot faster.
-     */
-    size_t len = strlen(seed);
-    if (!len)
-        return NULL;
-    StringValue *sv = Lexer::stringtable.lookup(seed, len);
-    if (!sv)
-        return NULL;
-    Identifier *id = (Identifier *)sv->ptrvalue;
-    assert(id);
-
-    Dsymbol *s = (Dsymbol *)arg;
-    Module::clearCache();
-    return s->search(0, id, 4|2);
-}
-
-Dsymbol *Dsymbol::search_correct(Identifier *ident)
-{
-    if (global.gag)
-        return NULL;            // don't do it for speculative compiles; too time consuming
-
-    return (Dsymbol *)speller(ident->toChars(), &symbol_search_fp, this, idchars);
-}
-
-/***************************************
- * Search for identifier id as a member of 'this'.
- * id may be a template instance.
- * Returns:
- *      symbol found, NULL if not
- */
-
-Dsymbol *Dsymbol::searchX(Loc loc, Scope *sc, Identifier *id)
-{
-    //printf("Dsymbol::searchX(this=%p,%s, ident='%s')\n", this, toChars(), ident->toChars());
-    Dsymbol *s = toAlias();
-    Dsymbol *sm;
-
-    switch (id->dyncast())
-    {
-        case DYNCAST_IDENTIFIER:
-            sm = s->search(loc, id, 0);
-            break;
-
-        case DYNCAST_DSYMBOL:
-        {   // It's a template instance
-            //printf("\ttemplate instance id\n");
-            Dsymbol *st = (Dsymbol *)id;
-            TemplateInstance *ti = st->isTemplateInstance();
-            id = ti->name;
-            sm = s->search(loc, id, 0);
-            if (!sm)
-            {
-                sm = s->search_correct(id);
-                if (sm)
-                    error("template identifier '%s' is not a member of '%s %s', did you mean '%s %s'?",
-                          id->toChars(), s->kind(), s->toChars(), sm->kind(), sm->toChars());
-                else
-                    error("template identifier '%s' is not a member of '%s %s'",
-                          id->toChars(), s->kind(), s->toChars());
-                return NULL;
-            }
-            sm = sm->toAlias();
-            TemplateDeclaration *td = sm->isTemplateDeclaration();
-            if (!td)
-            {
-                error("%s is not a template, it is a %s", id->toChars(), sm->kind());
-                return NULL;
-            }
-            ti->tempdecl = td;
-            if (!ti->semanticRun)
-                ti->semantic(sc);
-            sm = ti->toAlias();
-            break;
-        }
-
-        default:
-            assert(0);
-    }
-    return sm;
-}
-
-int Dsymbol::overloadInsert(Dsymbol *s)
-{
-    //printf("Dsymbol::overloadInsert('%s')\n", s->toChars());
-    return FALSE;
-}
-
-void Dsymbol::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring(toChars());
-}
-
-unsigned Dsymbol::size(Loc loc)
-{
-    error("Dsymbol '%s' has no size\n", toChars());
-    return 0;
-}
-
-int Dsymbol::isforwardRef()
-{
-    return FALSE;
-}
-
-AggregateDeclaration *Dsymbol::isThis()
-{
-    return NULL;
-}
-
-AggregateDeclaration *Dsymbol::isAggregateMember()      // are we a member of an aggregate?
-{
-    Dsymbol *parent = toParent();
-    if (parent && parent->isAggregateDeclaration())
-        return (AggregateDeclaration *)parent;
-    return NULL;
-}
-
-ClassDeclaration *Dsymbol::isClassMember()      // are we a member of a class?
-{
-    AggregateDeclaration *ad = isAggregateMember();
-    return ad ? ad->isClassDeclaration() : NULL;
-}
-
-void Dsymbol::defineRef(Dsymbol *s)
-{
-    assert(0);
-}
-
-int Dsymbol::isExport()
-{
-    return FALSE;
-}
-
-int Dsymbol::isImportedSymbol()
-{
-    return FALSE;
-}
-
-int Dsymbol::isDeprecated()
-{
-    return FALSE;
-}
-
-#if DMDV2
-int Dsymbol::isOverloadable()
-{
-    return 0;
-}
-
-int Dsymbol::hasOverloads()
-{
-    return 0;
-}
-#endif
-
-LabelDsymbol *Dsymbol::isLabel()                // is this a LabelDsymbol()?
-{
-    return NULL;
-}
-
-AggregateDeclaration *Dsymbol::isMember()       // is this a member of an AggregateDeclaration?
-{
-    //printf("Dsymbol::isMember() %s\n", toChars());
-    Dsymbol *parent = toParent();
-    //printf("parent is %s %s\n", parent->kind(), parent->toChars());
-    return parent ? parent->isAggregateDeclaration() : NULL;
-}
-
-Type *Dsymbol::getType()
-{
-    return NULL;
-}
-
-int Dsymbol::needThis()
-{
-    return FALSE;
-}
-
-int Dsymbol::apply(Dsymbol_apply_ft_t fp, void *param)
-{
-    return (*fp)(this, param);
-}
-
-int Dsymbol::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
-{
-    //printf("Dsymbol::addMember('%s')\n", toChars());
-    //printf("Dsymbol::addMember(this = %p, '%s' scopesym = '%s')\n", this, toChars(), sd->toChars());
-    //printf("Dsymbol::addMember(this = %p, '%s' sd = %p, sd->symtab = %p)\n", this, toChars(), sd, sd->symtab);
-    parent = sd;
-    if (!isAnonymous())         // no name, so can't add it to symbol table
-    {
-        if (!sd->symtabInsert(this))    // if name is already defined
-        {
-            Dsymbol *s2;
-
-            s2 = sd->symtab->lookup(ident);
-            if (!s2->overloadInsert(this))
-            {
-                sd->multiplyDefined(0, this, s2);
-            }
-        }
-        if (sd->isAggregateDeclaration() || sd->isEnumDeclaration())
-        {
-            if (ident == Id::__sizeof || ident == Id::__xalignof || ident == Id::mangleof)
-                error(".%s property cannot be redefined", ident->toChars());
-        }
-        return 1;
-    }
-    return 0;
-}
-
-void Dsymbol::error(const char *format, ...)
-{
-    //printf("Dsymbol::error()\n");
-    if (!loc.filename)  // avoid bug 5861.
-    {
-        Module *m = getModule();
-
-        if (m && m->srcfile)
-            loc.filename = m->srcfile->toChars();
-    }
-    va_list ap;
-    va_start(ap, format);
-    verror(loc, format, ap);
-    va_end(ap);
-}
-
-void Dsymbol::error(Loc loc, const char *format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    verror(loc, format, ap);
-    va_end(ap);
-}
-
-void Dsymbol::verror(Loc loc, const char *format, va_list ap)
-{
-    if (!global.gag)
-    {
-        char *p = loc.toChars();
-        if (!*p)
-            p = locToChars();
-
-        if (*p)
-            fprintf(stdmsg, "%s: ", p);
-        mem.free(p);
-
-        fprintf(stdmsg, "Error: ");
-        fprintf(stdmsg, "%s %s ", kind(), toPrettyChars());
-
-        vfprintf(stdmsg, format, ap);
-
-        fprintf(stdmsg, "\n");
-        fflush(stdmsg);
-halt();
-    }
-    else
-    {
-        global.gaggedErrors++;
-    }
-
-    global.errors++;
-
-    //fatal();
-}
-
-void Dsymbol::checkDeprecated(Loc loc, Scope *sc)
-{
-    if (!global.params.useDeprecated && isDeprecated())
-    {
-        // Don't complain if we're inside a deprecated symbol's scope
-        for (Dsymbol *sp = sc->parent; sp; sp = sp->parent)
-        {   if (sp->isDeprecated())
-                goto L1;
-        }
-
-        for (Scope *sc2 = sc; sc2; sc2 = sc2->enclosing)
-        {
-            if (sc2->scopesym && sc2->scopesym->isDeprecated())
-                goto L1;
-
-            // If inside a StorageClassDeclaration that is deprecated
-            if (sc2->stc & STCdeprecated)
-                goto L1;
-        }
-
-        error(loc, "is deprecated");
-    }
-
-  L1:
-    Declaration *d = isDeclaration();
-    if (d && d->storage_class & STCdisable)
-    {
-        if (!(sc->func && sc->func->storage_class & STCdisable))
-        {
-            if (d->ident == Id::cpctor && d->toParent())
-                d->toParent()->error(loc, "is not copyable because it is annotated with @disable");
-            else
-                error(loc, "is not callable because it is annotated with @disable");
-        }
-    }
-}
-
-/**********************************
- * Determine which Module a Dsymbol is in.
- */
-
-Module *Dsymbol::getModule()
-{
-    //printf("Dsymbol::getModule()\n");
-    TemplateDeclaration *td = getFuncTemplateDecl(this);
-    if (td)
-        return td->getModule();
-
-    Dsymbol *s = this;
-    while (s)
-    {
-        //printf("\ts = %s '%s'\n", s->kind(), s->toPrettyChars());
-        Module *m = s->isModule();
-        if (m)
-            return m;
-        s = s->parent;
-    }
-    return NULL;
-}
-
-/**********************************
- * Determine which Module a Dsymbol is in, as far as access rights go.
- */
-
-Module *Dsymbol::getAccessModule()
-{
-    //printf("Dsymbol::getAccessModule()\n");
-    TemplateDeclaration *td = getFuncTemplateDecl(this);
-    if (td)
-        return td->getAccessModule();
-
-    Dsymbol *s = this;
-    while (s)
-    {
-        //printf("\ts = %s '%s'\n", s->kind(), s->toPrettyChars());
-        Module *m = s->isModule();
-        if (m)
-            return m;
-        TemplateInstance *ti = s->isTemplateInstance();
-        if (ti && ti->isnested)
-            /* Because of local template instantiation, the parent isn't where the access
-             * rights come from - it's the template declaration
-             */
-            s = ti->tempdecl;
-        else
-            s = s->parent;
-    }
-    return NULL;
-}
-
-/*************************************
- */
-
-enum PROT Dsymbol::prot()
-{
-    return PROTpublic;
-}
-
-/*************************************
- * Do syntax copy of an array of Dsymbol's.
- */
-
-
-Dsymbols *Dsymbol::arraySyntaxCopy(Dsymbols *a)
-{
-
-    Dsymbols *b = NULL;
-    if (a)
-    {
-        b = a->copy();
-        for (size_t i = 0; i < b->dim; i++)
-        {
-            Dsymbol *s = (*b)[i];
-
-            s = s->syntaxCopy(NULL);
-            (*b)[i] = s;
-        }
-    }
-    return b;
-}
-
-
-/****************************************
- * Add documentation comment to Dsymbol.
- * Ignore NULL comments.
- */
-
-void Dsymbol::addComment(unsigned char *comment)
-{
-    //if (comment)
-        //printf("adding comment '%s' to symbol %p '%s'\n", comment, this, toChars());
-
-    if (!this->comment)
-        this->comment = comment;
-#if 1
-    else if (comment && strcmp((char *)comment, (char *)this->comment))
-    {   // Concatenate the two
-        this->comment = Lexer::combineComments(this->comment, comment);
-    }
-#endif
-}
-
-/********************************* OverloadSet ****************************/
-
-#if DMDV2
-OverloadSet::OverloadSet()
-    : Dsymbol()
-{
-}
-
-void OverloadSet::push(Dsymbol *s)
-{
-    a.push(s);
-}
-
-const char *OverloadSet::kind()
-{
-    return "overloadset";
-}
-#endif
-
-
-/********************************* ScopeDsymbol ****************************/
-
-ScopeDsymbol::ScopeDsymbol()
-    : Dsymbol()
-{
-    members = NULL;
-    symtab = NULL;
-    imports = NULL;
-    prots = NULL;
-}
-
-ScopeDsymbol::ScopeDsymbol(Identifier *id)
-    : Dsymbol(id)
-{
-    members = NULL;
-    symtab = NULL;
-    imports = NULL;
-    prots = NULL;
-}
-
-Dsymbol *ScopeDsymbol::syntaxCopy(Dsymbol *s)
-{
-    //printf("ScopeDsymbol::syntaxCopy('%s')\n", toChars());
-
-    ScopeDsymbol *sd;
-    if (s)
-        sd = (ScopeDsymbol *)s;
-    else
-        sd = new ScopeDsymbol(ident);
-    sd->members = arraySyntaxCopy(members);
-    return sd;
-}
-
-Dsymbol *ScopeDsymbol::search(Loc loc, Identifier *ident, int flags)
-{
-    //printf("%s->ScopeDsymbol::search(ident='%s', flags=x%x)\n", toChars(), ident->toChars(), flags);
-    //if (strcmp(ident->toChars(),"c") == 0) *(char*)0=0;
-
-    // Look in symbols declared in this module
-    Dsymbol *s = symtab ? symtab->lookup(ident) : NULL;
-    //printf("\ts = %p, imports = %p, %d\n", s, imports, imports ? imports->dim : 0);
-    // hide the aliases generated by selective or renamed private imports
-    if (s && flags & 1)
-        if (AliasDeclaration* ad = s->isAliasDeclaration())
-	    // may be a private alias to a function that is overloaded. these
-	    // are sorted out during overload resolution, accept them here
-	    if (ad->importprot == PROTprivate && !ad->aliassym->isFuncAliasDeclaration())
-		s = NULL;
-
-    if (s)
-    {
-        //printf("\ts = '%s.%s'\n",toChars(),s->toChars());
-    }
-    else if (imports)
-    {
-        OverloadSet *a = NULL;
-
-        // Look in imported modules
-        for (size_t i = 0; i < imports->dim; i++)
-        {   Dsymbol *ss = (*imports)[i];
-            Dsymbol *s2;
-
-            // If private import, don't search it
-            if (flags & 1 && prots[i] == PROTprivate)
-                continue;
-
-            //printf("\tscanning import '%s', prots = %d, isModule = %p, isImport = %p\n", ss->toChars(), prots[i], ss->isModule(), ss->isImport());
-            /* Don't find private members if ss is a module
-             */
-            s2 = ss->search(loc, ident, ss->isModule() ? 1 : 0);
-            if (!s)
-                s = s2;
-            else if (s2 && s != s2)
-            {
-                if (s->toAlias() == s2->toAlias())
-                {
-                    /* After following aliases, we found the same
-                     * symbol, so it's not an ambiguity.  But if one
-                     * alias is deprecated or less accessible, prefer
-                     * the other.
-                     */
-                    if (s->isDeprecated() ||
-                        s2->prot() > s->prot() && s2->prot() != PROTnone)
-                        s = s2;
-                }
-                else
-                {
-                    /* Two imports of the same module should be regarded as
-                     * the same.
-                     */
-                    Import *i1 = s->isImport();
-                    Import *i2 = s2->isImport();
-                    if (!(i1 && i2 &&
-                          (i1->mod == i2->mod ||
-                           (!i1->parent->isImport() && !i2->parent->isImport() &&
-                            i1->ident->equals(i2->ident))
-                          )
-                         )
-                       )
-                    {
-                        /* If both s2 and s are overloadable (though we only
-                         * need to check s once)
-                         */
-                        if (s2->isOverloadable() && (a || s->isOverloadable()))
-                        {   if (!a)
-                                a = new OverloadSet();
-                            /* Don't add to a[] if s2 is alias of previous sym
-                             */
-                            for (size_t j = 0; j < a->a.dim; j++)
-                            {   Dsymbol *s3 = a->a[j];
-                                if (s2->toAlias() == s3->toAlias())
-                                {
-                                    if (s3->isDeprecated() ||
-                                        s2->prot() > s3->prot() && s2->prot() != PROTnone)
-                                        a->a[j] = s2;
-                                    goto Lcontinue;
-                                }
-                            }
-                            a->push(s2);
-                        Lcontinue:
-                            continue;
-                        }
-                        if (flags & 4)          // if return NULL on ambiguity
-                            return NULL;
-                        if (!(flags & 2))
-                            ScopeDsymbol::multiplyDefined(loc, s, s2);
-                        break;
-                    }
-                }
-            }
-        }
-
-        /* Build special symbol if we had multiple finds
-         */
-        if (a)
-        {   assert(s);
-            a->push(s);
-            s = a;
-        }
-
-        if (s)
-        {
-            Declaration *d = s->isDeclaration();
-            if (d && d->protection == PROTprivate &&
-                !d->parent->isTemplateMixin() &&
-                !(flags & 2))
-                error(loc, "%s is private", d->toPrettyChars());
-        }
-    }
-    return s;
-}
-
-void ScopeDsymbol::importScope(Dsymbol *s, enum PROT protection)
-{
-    //printf("%s->ScopeDsymbol::importScope(%s, %d)\n", toChars(), s->toChars(), protection);
-
-    // No circular or redundant import's
-    if (s != this)
-    {
-        if (!imports)
-            imports = new Dsymbols();
-        else
-        {
-            for (size_t i = 0; i < imports->dim; i++)
-            {   Dsymbol *ss = (*imports)[i];
-                if (ss == s)                    // if already imported
-                {
-                    if (protection > prots[i])
-                        prots[i] = protection;  // upgrade access
-                    return;
-                }
-            }
-        }
-        imports->push(s);
-        prots = (unsigned char *)mem.realloc(prots, imports->dim * sizeof(prots[0]));
-        prots[imports->dim - 1] = protection;
-    }
-}
-
-int ScopeDsymbol::isforwardRef()
-{
-    return (members == NULL);
-}
-
-void ScopeDsymbol::defineRef(Dsymbol *s)
-{
-    ScopeDsymbol *ss;
-
-    ss = s->isScopeDsymbol();
-    members = ss->members;
-    ss->members = NULL;
-}
-
-void ScopeDsymbol::multiplyDefined(Loc loc, Dsymbol *s1, Dsymbol *s2)
-{
-#if 0
-    printf("ScopeDsymbol::multiplyDefined()\n");
-    printf("s1 = %p, '%s' kind = '%s', parent = %s\n", s1, s1->toChars(), s1->kind(), s1->parent ? s1->parent->toChars() : "");
-    printf("s2 = %p, '%s' kind = '%s', parent = %s\n", s2, s2->toChars(), s2->kind(), s2->parent ? s2->parent->toChars() : "");
-#endif
-    if (loc.filename)
-    {   ::error(loc, "%s at %s conflicts with %s at %s",
-            s1->toPrettyChars(),
-            s1->locToChars(),
-            s2->toPrettyChars(),
-            s2->locToChars());
-    }
-    else
-    {
-        s1->error(loc, "conflicts with %s %s at %s",
-            s2->kind(),
-            s2->toPrettyChars(),
-            s2->locToChars());
-    }
-}
-
-Dsymbol *ScopeDsymbol::nameCollision(Dsymbol *s)
-{
-    Dsymbol *sprev;
-
-    // Look to see if we are defining a forward referenced symbol
-
-    sprev = symtab->lookup(s->ident);
-    assert(sprev);
-    if (s->equals(sprev))               // if the same symbol
-    {
-        if (s->isforwardRef())          // if second declaration is a forward reference
-            return sprev;
-        if (sprev->isforwardRef())
-        {
-            sprev->defineRef(s);        // copy data from s into sprev
-            return sprev;
-        }
-    }
-    multiplyDefined(0, s, sprev);
-    return sprev;
-}
-
-const char *ScopeDsymbol::kind()
-{
-    return "ScopeDsymbol";
-}
-
-Dsymbol *ScopeDsymbol::symtabInsert(Dsymbol *s)
-{
-    return symtab->insert(s);
-}
-
-/****************************************
- * Return true if any of the members are static ctors or static dtors, or if
- * any members have members that are.
- */
-
-bool ScopeDsymbol::hasStaticCtorOrDtor()
-{
-    if (members)
-    {
-        for (size_t i = 0; i < members->dim; i++)
-        {   Dsymbol *member = (*members)[i];
-
-            if (member->hasStaticCtorOrDtor())
-                return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-/***************************************
- * Determine number of Dsymbols, folding in AttribDeclaration members.
- */
-
-#if DMDV2
-static int dimDg(void *ctx, size_t n, Dsymbol *)
-{
-    ++*(size_t *)ctx;
-    return 0;
-}
-
-size_t ScopeDsymbol::dim(Dsymbols *members)
-{
-    size_t n = 0;
-    foreach(NULL, members, &dimDg, &n);
-    return n;
-}
-#endif
-
-/***************************************
- * Get nth Dsymbol, folding in AttribDeclaration members.
- * Returns:
- *      Dsymbol*        nth Dsymbol
- *      NULL            not found, *pn gets incremented by the number
- *                      of Dsymbols
- */
-
-#if DMDV2
-struct GetNthSymbolCtx
-{
-    size_t nth;
-    Dsymbol *sym;
-};
-
-static int getNthSymbolDg(void *ctx, size_t n, Dsymbol *sym)
-{
-    GetNthSymbolCtx *p = (GetNthSymbolCtx *)ctx;
-    if (n == p->nth)
-    {   p->sym = sym;
-        return 1;
-    }
-    return 0;
-}
-
-Dsymbol *ScopeDsymbol::getNth(Dsymbols *members, size_t nth, size_t *pn)
-{
-    GetNthSymbolCtx ctx = { nth, NULL };
-    int res = foreach(NULL, members, &getNthSymbolDg, &ctx);
-    return res ? ctx.sym : NULL;
-}
-#endif
-
-/***************************************
- * Expands attribute declarations in members in depth first
- * order. Calls dg(void *ctx, size_t symidx, Dsymbol *sym) for each
- * member.
- * If dg returns !=0, stops and returns that value else returns 0.
- * Use this function to avoid the O(N + N^2/2) complexity of
- * calculating dim and calling N times getNth.
- */
-
-#if DMDV2
-int ScopeDsymbol::foreach(Scope *sc, Dsymbols *members, ScopeDsymbol::ForeachDg dg, void *ctx, size_t *pn)
-{
-    assert(dg);
-    if (!members)
-        return 0;
-
-    size_t n = pn ? *pn : 0; // take over index
-    int result = 0;
-    for (size_t i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (*members)[i];
-
-        if (AttribDeclaration *a = s->isAttribDeclaration())
-            result = foreach(sc, a->include(sc, NULL), dg, ctx, &n);
-        else if (TemplateMixin *tm = s->isTemplateMixin())
-            result = foreach(sc, tm->members, dg, ctx, &n);
-        else if (s->isTemplateInstance())
-            ;
-        else
-            result = dg(ctx, n++, s);
-
-        if (result)
-            break;
-    }
-
-    if (pn)
-        *pn = n; // update index
-    return result;
-}
-#endif
-
-/*******************************************
- * Look for member of the form:
- *      const(MemberInfo)[] getMembers(string);
- * Returns NULL if not found
- */
-
-#if DMDV2
-FuncDeclaration *ScopeDsymbol::findGetMembers()
-{
-    Dsymbol *s = search_function(this, Id::getmembers);
-    FuncDeclaration *fdx = s ? s->isFuncDeclaration() : NULL;
-
-#if 0  // Finish
-    static TypeFunction *tfgetmembers;
-
-    if (!tfgetmembers)
-    {
-        Scope sc;
-        Parameters *arguments = new Parameters;
-        Parameters *arg = new Parameter(STCin, Type::tchar->constOf()->arrayOf(), NULL, NULL);
-        arguments->push(arg);
-
-        Type *tret = NULL;
-        tfgetmembers = new TypeFunction(arguments, tret, 0, LINKd);
-        tfgetmembers = (TypeFunction *)tfgetmembers->semantic(0, &sc);
-    }
-    if (fdx)
-        fdx = fdx->overloadExactMatch(tfgetmembers);
-#endif
-    if (fdx && fdx->isVirtual())
-        fdx = NULL;
-
-    return fdx;
-}
-#endif
-
-
-/****************************** WithScopeSymbol ******************************/
-
-WithScopeSymbol::WithScopeSymbol(WithStatement *withstate)
-    : ScopeDsymbol()
-{
-    this->withstate = withstate;
-}
-
-Dsymbol *WithScopeSymbol::search(Loc loc, Identifier *ident, int flags)
-{
-    // Acts as proxy to the with class declaration
-    return withstate->exp->type->toDsymbol(NULL)->search(loc, ident, 0);
-}
-
-/****************************** ArrayScopeSymbol ******************************/
-
-ArrayScopeSymbol::ArrayScopeSymbol(Scope *sc, Expression *e)
-    : ScopeDsymbol()
-{
-    assert(e->op == TOKindex || e->op == TOKslice || e->op == TOKarray);
-    exp = e;
-    type = NULL;
-    td = NULL;
-    this->sc = sc;
-}
-
-ArrayScopeSymbol::ArrayScopeSymbol(Scope *sc, TypeTuple *t)
-    : ScopeDsymbol()
-{
-    exp = NULL;
-    type = t;
-    td = NULL;
-    this->sc = sc;
-}
-
-ArrayScopeSymbol::ArrayScopeSymbol(Scope *sc, TupleDeclaration *s)
-    : ScopeDsymbol()
-{
-    exp = NULL;
-    type = NULL;
-    td = s;
-    this->sc = sc;
-}
-
-Dsymbol *ArrayScopeSymbol::search(Loc loc, Identifier *ident, int flags)
-{
-    //printf("ArrayScopeSymbol::search('%s', flags = %d)\n", ident->toChars(), flags);
-    if (ident == Id::length || ident == Id::dollar)
-    {   VarDeclaration **pvar;
-        Expression *ce;
-
-        if (ident == Id::length && !global.params.useDeprecated)
-            error("using 'length' inside [ ] is deprecated, use '$' instead");
-
-    L1:
-
-        if (td)
-        {   /* $ gives the number of elements in the tuple
-             */
-            VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-            Expression *e = new IntegerExp(0, td->objects->dim, Type::tsize_t);
-            v->init = new ExpInitializer(0, e);
-            v->storage_class |= STCstatic | STCconst;
-            v->semantic(sc);
-            return v;
-        }
-
-        if (type)
-        {   /* $ gives the number of type entries in the type tuple
-             */
-            VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-            Expression *e = new IntegerExp(0, type->arguments->dim, Type::tsize_t);
-            v->init = new ExpInitializer(0, e);
-            v->storage_class |= STCstatic | STCconst;
-            v->semantic(sc);
-            return v;
-        }
-
-        if (exp->op == TOKindex)
-        {   /* array[index] where index is some function of $
-             */
-            IndexExp *ie = (IndexExp *)exp;
-
-            pvar = &ie->lengthVar;
-            ce = ie->e1;
-        }
-        else if (exp->op == TOKslice)
-        {   /* array[lwr .. upr] where lwr or upr is some function of $
-             */
-            SliceExp *se = (SliceExp *)exp;
-
-            pvar = &se->lengthVar;
-            ce = se->e1;
-        }
-        else if (exp->op == TOKarray)
-        {   /* array[e0, e1, e2, e3] where e0, e1, e2 are some function of $
-             * $ is a opDollar!(dim)() where dim is the dimension(0,1,2,...)
-             */
-            ArrayExp *ae = (ArrayExp *)exp;
-            AggregateDeclaration *ad = NULL;
-
-            Type *t = ae->e1->type->toBasetype();
-            if (t->ty == Tclass)
-            {
-                ad = ((TypeClass *)t)->sym;
-            }
-            else if (t->ty == Tstruct)
-            {
-                ad = ((TypeStruct *)t)->sym;
-            }
-            assert(ad);
-
-            Dsymbol *dsym = search_function(ad, Id::opDollar);
-            if (!dsym)  // no dollar exists -- search in higher scope
-                return NULL;
-            VarDeclaration *v = ae->lengthVar;
-            if (!v)
-            {   // $ is lazily initialized. Create it now.
-                TemplateDeclaration *td = dsym->isTemplateDeclaration();
-                if (td)
-                {   // Instantiate opDollar!(dim) with the index as a template argument
-                    Objects *tdargs = new Objects();
-                    tdargs->setDim(1);
-
-                    Expression *x = new IntegerExp(0, ae->currentDimension, Type::tsize_t);
-                    x = x->semantic(sc);
-                    tdargs->data[0] = x;
-
-                    //TemplateInstance *ti = new TemplateInstance(loc, td, tdargs);
-                    //ti->semantic(sc);
-
-                    DotTemplateInstanceExp *dte = new DotTemplateInstanceExp(loc, ae->e1, td->ident, tdargs);
-
-                    v = new VarDeclaration(loc, NULL, Id::dollar, new ExpInitializer(0, dte));
-                }
-                else
-                {   /* opDollar exists, but it's a function, not a template.
-                     * This is acceptable ONLY for single-dimension indexing.
-                     * Note that it's impossible to have both template & function opDollar,
-                     * because both take no arguments.
-                     */
-                    if (ae->arguments->dim != 1) {
-                        ae->error("%s only defines opDollar for one dimension", ad->toChars());
-                        return NULL;
-                    }
-                    FuncDeclaration *fd = dsym->isFuncDeclaration();
-                    assert(fd);
-                    Expression * x = new DotVarExp(loc, ae->e1, fd);
-
-                    v = new VarDeclaration(loc, NULL, Id::dollar, new ExpInitializer(0, x));
-                }
-                v->semantic(sc);
-                ae->lengthVar = v;
-            }
-            return v;
-        }
-        else
-            /* Didn't find $, look in enclosing scope(s).
-             */
-            return NULL;
-
-        /* If we are indexing into an array that is really a type
-         * tuple, rewrite this as an index into a type tuple and
-         * try again.
-         */
-        if (ce->op == TOKtype)
-        {
-            Type *t = ((TypeExp *)ce)->type;
-            if (t->ty == Ttuple)
-            {   type = (TypeTuple *)t;
-                goto L1;
-            }
-        }
-
-        /* *pvar is lazily initialized, so if we refer to $
-         * multiple times, it gets set only once.
-         */
-        if (!*pvar)             // if not already initialized
-        {   /* Create variable v and set it to the value of $
-             */
-            VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-            if (ce->op == TOKtuple)
-            {   /* It is for an expression tuple, so the
-                 * length will be a const.
-                 */
-                Expression *e = new IntegerExp(0, ((TupleExp *)ce)->exps->dim, Type::tsize_t);
-                v->init = new ExpInitializer(0, e);
-                v->storage_class |= STCstatic | STCconst;
-            }
-            else
-            {   /* For arrays, $ will either be a compile-time constant
-                 * (in which case its value in set during constant-folding),
-                 * or a variable (in which case an expression is created in
-                 * toir.c).
-                 */
-                VoidInitializer *e = new VoidInitializer(0);
-                e->type = Type::tsize_t;
-                v->init = e;
-            }
-            *pvar = v;
-        }
-        (*pvar)->semantic(sc);
-        return (*pvar);
-    }
-    return NULL;
-}
-
-
-/****************************** DsymbolTable ******************************/
-
-DsymbolTable::DsymbolTable()
-{
-#if STRINGTABLE
-    tab = new StringTable;
-    tab->init();
-#else
-    tab = NULL;
-#endif
-}
-
-DsymbolTable::~DsymbolTable()
-{
-#if STRINGTABLE
-    delete tab;
-#endif
-}
-
-Dsymbol *DsymbolTable::lookup(Identifier *ident)
-{
-#if STRINGTABLE
-#ifdef DEBUG
-    assert(ident);
-    assert(tab);
-#endif
-    //printf("DsymbolTable::lookup(%s)\n", (char*)ident->string);
-    StringValue *sv = tab->lookup((char*)ident->string, ident->len);
-    return (Dsymbol *)(sv ? sv->ptrvalue : NULL);
-#else
-    //printf("DsymbolTable::lookup(%s)\n", (char*)ident->string);
-    return (Dsymbol *)_aaGetRvalue(tab, ident);
-#endif
-}
-
-Dsymbol *DsymbolTable::insert(Dsymbol *s)
-{
-    //printf("DsymbolTable::insert(this = %p, '%s')\n", this, s->ident->toChars());
-    Identifier *ident = s->ident;
-#if STRINGTABLE
-#ifdef DEBUG
-    assert(ident);
-    assert(tab);
-#endif
-    StringValue *sv = tab->insert(ident->toChars(), ident->len);
-    if (!sv)
-        return NULL;            // already in table
-    sv->ptrvalue = s;
-    return s;
-#else
-    Dsymbol **ps = (Dsymbol **)_aaGet(&tab, ident);
-    if (*ps)
-        return NULL;            // already in table
-    *ps = s;
-    return s;
-#endif
-}
-
-Dsymbol *DsymbolTable::insert(Identifier *ident, Dsymbol *s)
-{
-    //printf("DsymbolTable::insert()\n");
-#if STRINGTABLE
-    StringValue *sv = tab->insert(ident->toChars(), ident->len);
-    if (!sv)
-        return NULL;            // already in table
-    sv->ptrvalue = s;
-    return s;
-#else
-    Dsymbol **ps = (Dsymbol **)_aaGet(&tab, ident);
-    if (*ps)
-        return NULL;            // already in table
-    *ps = s;
-    return s;
-#endif
-}
-
-Dsymbol *DsymbolTable::update(Dsymbol *s)
-{
-    Identifier *ident = s->ident;
-#if STRINGTABLE
-    StringValue *sv = tab->update(ident->toChars(), ident->len);
-    sv->ptrvalue = s;
-    return s;
-#else
-    Dsymbol **ps = (Dsymbol **)_aaGet(&tab, ident);
-    *ps = s;
-    return s;
-#endif
-}
-
-
-
-
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2012 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#include "rmem.h"
+#include "speller.h"
+#include "aav.h"
+
+#include "mars.h"
+#include "dsymbol.h"
+#include "aggregate.h"
+#include "identifier.h"
+#include "module.h"
+#include "mtype.h"
+#include "expression.h"
+#include "statement.h"
+#include "declaration.h"
+#include "id.h"
+#include "scope.h"
+#include "init.h"
+#include "import.h"
+#include "template.h"
+#include "attrib.h"
+#if IN_LLVM
+#include "../gen/pragma.h"
+#endif
+
+/****************************** Dsymbol ******************************/
+
+Dsymbol::Dsymbol()
+{
+    //printf("Dsymbol::Dsymbol(%p)\n", this);
+    this->ident = NULL;
+    this->c_ident = NULL;
+    this->parent = NULL;
+#if IN_DMD
+    this->csym = NULL;
+    this->isym = NULL;
+#endif
+    this->loc = 0;
+    this->comment = NULL;
+    this->scope = NULL;
+    this->errors = false;
+
+#if IN_LLVM
+    this->llvmInternal = LLVMnone;
+    this->irsym = NULL;
+#endif
+}
+
+Dsymbol::Dsymbol(Identifier *ident)
+{
+    //printf("Dsymbol::Dsymbol(%p, ident)\n", this);
+    this->ident = ident;
+    this->c_ident = NULL;
+    this->parent = NULL;
+#if IN_DMD
+    this->csym = NULL;
+    this->isym = NULL;
+#endif
+    this->loc = 0;
+    this->comment = NULL;
+    this->scope = NULL;
+    this->errors = false;
+
+#if IN_LLVM
+    this->llvmInternal = LLVMnone;
+    this->irsym = NULL;
+#endif
+}
+
+int Dsymbol::equals(Object *o)
+{   Dsymbol *s;
+
+    if (this == o)
+        return TRUE;
+    s = (Dsymbol *)(o);
+    // Overload sets don't have an ident
+    if (s && ident && s->ident && ident->equals(s->ident))
+        return TRUE;
+    return FALSE;
+}
+
+/**************************************
+ * Copy the syntax.
+ * Used for template instantiations.
+ * If s is NULL, allocate the new object, otherwise fill it in.
+ */
+
+Dsymbol *Dsymbol::syntaxCopy(Dsymbol *s)
+{
+    print();
+    printf("%s %s\n", kind(), toChars());
+    assert(0);
+    return NULL;
+}
+
+/**************************************
+ * Determine if this symbol is only one.
+ * Returns:
+ *      FALSE, *ps = NULL: There are 2 or more symbols
+ *      TRUE,  *ps = NULL: There are zero symbols
+ *      TRUE,  *ps = symbol: The one and only one symbol
+ */
+
+int Dsymbol::oneMember(Dsymbol **ps, Identifier *ident)
+{
+    //printf("Dsymbol::oneMember()\n");
+    *ps = this;
+    return TRUE;
+}
+
+/*****************************************
+ * Same as Dsymbol::oneMember(), but look at an array of Dsymbols.
+ */
+
+int Dsymbol::oneMembers(Dsymbols *members, Dsymbol **ps, Identifier *ident)
+{
+    //printf("Dsymbol::oneMembers() %d\n", members ? members->dim : 0);
+    Dsymbol *s = NULL;
+
+    if (members)
+    {
+        for (size_t i = 0; i < members->dim; i++)
+        {   Dsymbol *sx = (*members)[i];
+
+            int x = sx->oneMember(ps, ident);
+            //printf("\t[%d] kind %s = %d, s = %p\n", i, sx->kind(), x, *ps);
+            if (!x)
+            {
+                //printf("\tfalse 1\n");
+                assert(*ps == NULL);
+                return FALSE;
+            }
+            if (*ps)
+            {
+                if (ident)
+                {
+                    if (!(*ps)->ident || !(*ps)->ident->equals(ident))
+                        continue;
+                }
+                if (!s)
+                    s = *ps;
+                else if (s->isOverloadable() && (*ps)->isOverloadable())
+                    ;   // keep head of overload set
+                else                    // more than one symbol
+                {   *ps = NULL;
+                    //printf("\tfalse 2\n");
+                    return FALSE;
+                }
+            }
+        }
+    }
+    *ps = s;            // s is the one symbol, NULL if none
+    //printf("\ttrue\n");
+    return TRUE;
+}
+
+/*****************************************
+ * Is Dsymbol a variable that contains pointers?
+ */
+
+int Dsymbol::hasPointers()
+{
+    //printf("Dsymbol::hasPointers() %s\n", toChars());
+    return 0;
+}
+
+bool Dsymbol::hasStaticCtorOrDtor()
+{
+    //printf("Dsymbol::hasStaticCtorOrDtor() %s\n", toChars());
+    return FALSE;
+}
+
+void Dsymbol::setFieldOffset(AggregateDeclaration *ad, unsigned *poffset, bool isunion)
+{
+}
+
+char *Dsymbol::toChars()
+{
+    return ident ? ident->toChars() : (char *)"__anonymous";
+}
+
+const char *Dsymbol::toPrettyChars()
+{   Dsymbol *p;
+    char *s;
+    char *q;
+    size_t len;
+
+    //printf("Dsymbol::toPrettyChars() '%s'\n", toChars());
+    if (!parent)
+        return toChars();
+
+    len = 0;
+    for (p = this; p; p = p->parent)
+        len += strlen(p->toChars()) + 1;
+
+    s = (char *)mem.malloc(len);
+    q = s + len - 1;
+    *q = 0;
+    for (p = this; p; p = p->parent)
+    {
+        char *t = p->toChars();
+        len = strlen(t);
+        q -= len;
+        memcpy(q, t, len);
+        if (q == s)
+            break;
+        q--;
+#if TARGET_NET
+    if (AggregateDeclaration* ad = p->isAggregateDeclaration())
+    {
+        if (ad->isNested() && p->parent && p->parent->isAggregateDeclaration())
+        {
+            *q = '/';
+            continue;
+        }
+    }
+#endif
+        *q = '.';
+    }
+    return s;
+}
+
+char *Dsymbol::locToChars()
+{
+    OutBuffer buf;
+
+    if (!loc.filename)  // avoid bug 5861.
+    {
+        Module *m = getModule();
+
+        if (m && m->srcfile)
+            loc.filename = m->srcfile->toChars();
+    }
+    return loc.toChars();
+}
+
+const char *Dsymbol::kind()
+{
+    return "symbol";
+}
+
+/*********************************
+ * If this symbol is really an alias for another,
+ * return that other.
+ */
+
+Dsymbol *Dsymbol::toAlias()
+{
+    return this;
+}
+
+Dsymbol *Dsymbol::toParent()
+{
+    return parent ? parent->pastMixin() : NULL;
+}
+
+Dsymbol *Dsymbol::pastMixin()
+{
+    Dsymbol *s = this;
+
+    //printf("Dsymbol::pastMixin() %s\n", toChars());
+    while (s && s->isTemplateMixin())
+        s = s->parent;
+    return s;
+}
+
+/**********************************
+ * Use this instead of toParent() when looking for the
+ * 'this' pointer of the enclosing function/class.
+ */
+
+Dsymbol *Dsymbol::toParent2()
+{
+    Dsymbol *s = parent;
+    while (s && s->isTemplateInstance())
+        s = s->parent;
+    return s;
+}
+
+TemplateInstance *Dsymbol::inTemplateInstance()
+{
+    for (Dsymbol *parent = this->parent; parent; parent = parent->parent)
+    {
+        TemplateInstance *ti = parent->isTemplateInstance();
+        if (ti)
+            return ti;
+    }
+    return NULL;
+}
+
+// Check if this function is a member of a template which has only been
+// instantiated speculatively, eg from inside is(typeof()).
+// Return the speculative template instance it is part of,
+// or NULL if not speculative.
+TemplateInstance *Dsymbol::isSpeculative()
+{
+    Dsymbol * par = parent;
+    while (par)
+    {
+        TemplateInstance *ti = par->isTemplateInstance();
+        if (ti && ti->speculative)
+            return ti;
+        par = par->toParent();
+    }
+    return NULL;
+}
+
+int Dsymbol::isAnonymous()
+{
+    return ident ? 0 : 1;
+}
+
+/*************************************
+ * Set scope for future semantic analysis so we can
+ * deal better with forward references.
+ */
+
+void Dsymbol::setScope(Scope *sc)
+{
+    //printf("Dsymbol::setScope() %p %s, %p stc = %llx\n", this, toChars(), sc, sc->stc);
+    if (!sc->nofree)
+        sc->setNoFree();                // may need it even after semantic() finishes
+    scope = sc;
+}
+
+void Dsymbol::importAll(Scope *sc)
+{
+}
+
+/*************************************
+ * Does semantic analysis on the public face of declarations.
+ */
+
+void Dsymbol::semantic0(Scope *sc)
+{
+}
+
+void Dsymbol::semantic(Scope *sc)
+{
+    error("%p has no semantic routine", this);
+}
+
+/*************************************
+ * Does semantic analysis on initializers and members of aggregates.
+ */
+
+void Dsymbol::semantic2(Scope *sc)
+{
+    // Most Dsymbols have no further semantic analysis needed
+}
+
+/*************************************
+ * Does semantic analysis on function bodies.
+ */
+
+void Dsymbol::semantic3(Scope *sc)
+{
+    // Most Dsymbols have no further semantic analysis needed
+}
+
+/*************************************
+ * Look for function inlining possibilities.
+ */
+
+void Dsymbol::inlineScan()
+{
+    // Most Dsymbols aren't functions
+}
+
+/*********************************************
+ * Search for ident as member of s.
+ * Input:
+ *      flags:  1       don't find private members
+ *              2       don't give error messages
+ *              4       return NULL if ambiguous
+ * Returns:
+ *      NULL if not found
+ */
+
+Dsymbol *Dsymbol::search(Loc loc, Identifier *ident, int flags)
+{
+    //printf("Dsymbol::search(this=%p,%s, ident='%s')\n", this, toChars(), ident->toChars());
+    return NULL;
+}
+
+/***************************************************
+ * Search for symbol with correct spelling.
+ */
+
+void *symbol_search_fp(void *arg, const char *seed)
+{
+    /* If not in the lexer's string table, it certainly isn't in the symbol table.
+     * Doing this first is a lot faster.
+     */
+    size_t len = strlen(seed);
+    if (!len)
+        return NULL;
+    StringValue *sv = Lexer::stringtable.lookup(seed, len);
+    if (!sv)
+        return NULL;
+    Identifier *id = (Identifier *)sv->ptrvalue;
+    assert(id);
+
+    Dsymbol *s = (Dsymbol *)arg;
+    Module::clearCache();
+    return s->search(0, id, 4|2);
+}
+
+Dsymbol *Dsymbol::search_correct(Identifier *ident)
+{
+    if (global.gag)
+        return NULL;            // don't do it for speculative compiles; too time consuming
+
+    return (Dsymbol *)speller(ident->toChars(), &symbol_search_fp, this, idchars);
+}
+
+/***************************************
+ * Search for identifier id as a member of 'this'.
+ * id may be a template instance.
+ * Returns:
+ *      symbol found, NULL if not
+ */
+
+Dsymbol *Dsymbol::searchX(Loc loc, Scope *sc, Identifier *id)
+{
+    //printf("Dsymbol::searchX(this=%p,%s, ident='%s')\n", this, toChars(), ident->toChars());
+    Dsymbol *s = toAlias();
+    Dsymbol *sm;
+
+    switch (id->dyncast())
+    {
+        case DYNCAST_IDENTIFIER:
+            sm = s->search(loc, id, 0);
+            break;
+
+        case DYNCAST_DSYMBOL:
+        {   // It's a template instance
+            //printf("\ttemplate instance id\n");
+            Dsymbol *st = (Dsymbol *)id;
+            TemplateInstance *ti = st->isTemplateInstance();
+            id = ti->name;
+            sm = s->search(loc, id, 0);
+            if (!sm)
+            {
+                sm = s->search_correct(id);
+                if (sm)
+                    error("template identifier '%s' is not a member of '%s %s', did you mean '%s %s'?",
+                          id->toChars(), s->kind(), s->toChars(), sm->kind(), sm->toChars());
+                else
+                    error("template identifier '%s' is not a member of '%s %s'",
+                          id->toChars(), s->kind(), s->toChars());
+                return NULL;
+            }
+            sm = sm->toAlias();
+            TemplateDeclaration *td = sm->isTemplateDeclaration();
+            if (!td)
+            {
+                error("%s is not a template, it is a %s", id->toChars(), sm->kind());
+                return NULL;
+            }
+            ti->tempdecl = td;
+            if (!ti->semanticRun)
+                ti->semantic(sc);
+            sm = ti->toAlias();
+            break;
+        }
+
+        default:
+            assert(0);
+    }
+    return sm;
+}
+
+int Dsymbol::overloadInsert(Dsymbol *s)
+{
+    //printf("Dsymbol::overloadInsert('%s')\n", s->toChars());
+    return FALSE;
+}
+
+void Dsymbol::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring(toChars());
+}
+
+unsigned Dsymbol::size(Loc loc)
+{
+    error("Dsymbol '%s' has no size\n", toChars());
+    return 0;
+}
+
+int Dsymbol::isforwardRef()
+{
+    return FALSE;
+}
+
+AggregateDeclaration *Dsymbol::isThis()
+{
+    return NULL;
+}
+
+AggregateDeclaration *Dsymbol::isAggregateMember()      // are we a member of an aggregate?
+{
+    Dsymbol *parent = toParent();
+    if (parent && parent->isAggregateDeclaration())
+        return (AggregateDeclaration *)parent;
+    return NULL;
+}
+
+ClassDeclaration *Dsymbol::isClassMember()      // are we a member of a class?
+{
+    AggregateDeclaration *ad = isAggregateMember();
+    return ad ? ad->isClassDeclaration() : NULL;
+}
+
+void Dsymbol::defineRef(Dsymbol *s)
+{
+    assert(0);
+}
+
+int Dsymbol::isExport()
+{
+    return FALSE;
+}
+
+int Dsymbol::isImportedSymbol()
+{
+    return FALSE;
+}
+
+int Dsymbol::isDeprecated()
+{
+    return FALSE;
+}
+
+#if DMDV2
+int Dsymbol::isOverloadable()
+{
+    return 0;
+}
+
+int Dsymbol::hasOverloads()
+{
+    return 0;
+}
+#endif
+
+LabelDsymbol *Dsymbol::isLabel()                // is this a LabelDsymbol()?
+{
+    return NULL;
+}
+
+AggregateDeclaration *Dsymbol::isMember()       // is this a member of an AggregateDeclaration?
+{
+    //printf("Dsymbol::isMember() %s\n", toChars());
+    Dsymbol *parent = toParent();
+    //printf("parent is %s %s\n", parent->kind(), parent->toChars());
+    return parent ? parent->isAggregateDeclaration() : NULL;
+}
+
+Type *Dsymbol::getType()
+{
+    return NULL;
+}
+
+int Dsymbol::needThis()
+{
+    return FALSE;
+}
+
+int Dsymbol::apply(Dsymbol_apply_ft_t fp, void *param)
+{
+    return (*fp)(this, param);
+}
+
+int Dsymbol::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
+{
+    //printf("Dsymbol::addMember('%s')\n", toChars());
+    //printf("Dsymbol::addMember(this = %p, '%s' scopesym = '%s')\n", this, toChars(), sd->toChars());
+    //printf("Dsymbol::addMember(this = %p, '%s' sd = %p, sd->symtab = %p)\n", this, toChars(), sd, sd->symtab);
+    parent = sd;
+    if (!isAnonymous())         // no name, so can't add it to symbol table
+    {
+        if (!sd->symtabInsert(this))    // if name is already defined
+        {
+            Dsymbol *s2;
+
+            s2 = sd->symtab->lookup(ident);
+            if (!s2->overloadInsert(this))
+            {
+                sd->multiplyDefined(0, this, s2);
+            }
+        }
+        if (sd->isAggregateDeclaration() || sd->isEnumDeclaration())
+        {
+            if (ident == Id::__sizeof || ident == Id::__xalignof || ident == Id::mangleof)
+                error(".%s property cannot be redefined", ident->toChars());
+        }
+        return 1;
+    }
+    return 0;
+}
+
+void Dsymbol::error(const char *format, ...)
+{
+    //printf("Dsymbol::error()\n");
+    if (!loc.filename)  // avoid bug 5861.
+    {
+        Module *m = getModule();
+
+        if (m && m->srcfile)
+            loc.filename = m->srcfile->toChars();
+    }
+    va_list ap;
+    va_start(ap, format);
+    verror(loc, format, ap);
+    va_end(ap);
+}
+
+void Dsymbol::error(Loc loc, const char *format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    verror(loc, format, ap);
+    va_end(ap);
+}
+
+void Dsymbol::verror(Loc loc, const char *format, va_list ap)
+{
+    if (!global.gag)
+    {
+        char *p = loc.toChars();
+        if (!*p)
+            p = locToChars();
+
+        if (*p)
+            fprintf(stdmsg, "%s: ", p);
+        mem.free(p);
+
+        fprintf(stdmsg, "Error: ");
+        fprintf(stdmsg, "%s %s ", kind(), toPrettyChars());
+
+        vfprintf(stdmsg, format, ap);
+
+        fprintf(stdmsg, "\n");
+        fflush(stdmsg);
+halt();
+    }
+    else
+    {
+        global.gaggedErrors++;
+    }
+
+    global.errors++;
+
+    //fatal();
+}
+
+void Dsymbol::checkDeprecated(Loc loc, Scope *sc)
+{
+    if (!global.params.useDeprecated && isDeprecated())
+    {
+        // Don't complain if we're inside a deprecated symbol's scope
+        for (Dsymbol *sp = sc->parent; sp; sp = sp->parent)
+        {   if (sp->isDeprecated())
+                goto L1;
+        }
+
+        for (Scope *sc2 = sc; sc2; sc2 = sc2->enclosing)
+        {
+            if (sc2->scopesym && sc2->scopesym->isDeprecated())
+                goto L1;
+
+            // If inside a StorageClassDeclaration that is deprecated
+            if (sc2->stc & STCdeprecated)
+                goto L1;
+        }
+
+        error(loc, "is deprecated");
+    }
+
+  L1:
+    Declaration *d = isDeclaration();
+    if (d && d->storage_class & STCdisable)
+    {
+        if (!(sc->func && sc->func->storage_class & STCdisable))
+        {
+            if (d->ident == Id::cpctor && d->toParent())
+                d->toParent()->error(loc, "is not copyable because it is annotated with @disable");
+            else
+                error(loc, "is not callable because it is annotated with @disable");
+        }
+    }
+}
+
+/**********************************
+ * Determine which Module a Dsymbol is in.
+ */
+
+Module *Dsymbol::getModule()
+{
+    //printf("Dsymbol::getModule()\n");
+    TemplateDeclaration *td = getFuncTemplateDecl(this);
+    if (td)
+        return td->getModule();
+
+    Dsymbol *s = this;
+    while (s)
+    {
+        //printf("\ts = %s '%s'\n", s->kind(), s->toPrettyChars());
+        Module *m = s->isModule();
+        if (m)
+            return m;
+        s = s->parent;
+    }
+    return NULL;
+}
+
+/**********************************
+ * Determine which Module a Dsymbol is in, as far as access rights go.
+ */
+
+Module *Dsymbol::getAccessModule()
+{
+    //printf("Dsymbol::getAccessModule()\n");
+    TemplateDeclaration *td = getFuncTemplateDecl(this);
+    if (td)
+        return td->getAccessModule();
+
+    Dsymbol *s = this;
+    while (s)
+    {
+        //printf("\ts = %s '%s'\n", s->kind(), s->toPrettyChars());
+        Module *m = s->isModule();
+        if (m)
+            return m;
+        TemplateInstance *ti = s->isTemplateInstance();
+        if (ti && ti->isnested)
+            /* Because of local template instantiation, the parent isn't where the access
+             * rights come from - it's the template declaration
+             */
+            s = ti->tempdecl;
+        else
+            s = s->parent;
+    }
+    return NULL;
+}
+
+/*************************************
+ */
+
+enum PROT Dsymbol::prot()
+{
+    return PROTpublic;
+}
+
+/*************************************
+ * Do syntax copy of an array of Dsymbol's.
+ */
+
+
+Dsymbols *Dsymbol::arraySyntaxCopy(Dsymbols *a)
+{
+
+    Dsymbols *b = NULL;
+    if (a)
+    {
+        b = a->copy();
+        for (size_t i = 0; i < b->dim; i++)
+        {
+            Dsymbol *s = (*b)[i];
+
+            s = s->syntaxCopy(NULL);
+            (*b)[i] = s;
+        }
+    }
+    return b;
+}
+
+
+/****************************************
+ * Add documentation comment to Dsymbol.
+ * Ignore NULL comments.
+ */
+
+void Dsymbol::addComment(unsigned char *comment)
+{
+    //if (comment)
+        //printf("adding comment '%s' to symbol %p '%s'\n", comment, this, toChars());
+
+    if (!this->comment)
+        this->comment = comment;
+#if 1
+    else if (comment && strcmp((char *)comment, (char *)this->comment))
+    {   // Concatenate the two
+        this->comment = Lexer::combineComments(this->comment, comment);
+    }
+#endif
+}
+
+/********************************* OverloadSet ****************************/
+
+#if DMDV2
+OverloadSet::OverloadSet()
+    : Dsymbol()
+{
+}
+
+void OverloadSet::push(Dsymbol *s)
+{
+    a.push(s);
+}
+
+const char *OverloadSet::kind()
+{
+    return "overloadset";
+}
+#endif
+
+
+/********************************* ScopeDsymbol ****************************/
+
+ScopeDsymbol::ScopeDsymbol()
+    : Dsymbol()
+{
+    members = NULL;
+    symtab = NULL;
+    imports = NULL;
+    prots = NULL;
+}
+
+ScopeDsymbol::ScopeDsymbol(Identifier *id)
+    : Dsymbol(id)
+{
+    members = NULL;
+    symtab = NULL;
+    imports = NULL;
+    prots = NULL;
+}
+
+Dsymbol *ScopeDsymbol::syntaxCopy(Dsymbol *s)
+{
+    //printf("ScopeDsymbol::syntaxCopy('%s')\n", toChars());
+
+    ScopeDsymbol *sd;
+    if (s)
+        sd = (ScopeDsymbol *)s;
+    else
+        sd = new ScopeDsymbol(ident);
+    sd->members = arraySyntaxCopy(members);
+    return sd;
+}
+
+Dsymbol *ScopeDsymbol::search(Loc loc, Identifier *ident, int flags)
+{
+    //printf("%s->ScopeDsymbol::search(ident='%s', flags=x%x)\n", toChars(), ident->toChars(), flags);
+    //if (strcmp(ident->toChars(),"c") == 0) *(char*)0=0;
+
+    // Look in symbols declared in this module
+    Dsymbol *s = symtab ? symtab->lookup(ident) : NULL;
+    //printf("\ts = %p, imports = %p, %d\n", s, imports, imports ? imports->dim : 0);
+    // hide the aliases generated by selective or renamed private imports
+    if (s && flags & 1)
+        if (AliasDeclaration* ad = s->isAliasDeclaration())
+	    // may be a private alias to a function that is overloaded. these
+	    // are sorted out during overload resolution, accept them here
+	    if (ad->importprot == PROTprivate && !ad->aliassym->isFuncAliasDeclaration())
+		s = NULL;
+
+    if (s)
+    {
+        //printf("\ts = '%s.%s'\n",toChars(),s->toChars());
+    }
+    else if (imports)
+    {
+        OverloadSet *a = NULL;
+
+        // Look in imported modules
+        for (size_t i = 0; i < imports->dim; i++)
+        {   Dsymbol *ss = (*imports)[i];
+            Dsymbol *s2;
+
+            // If private import, don't search it
+            if (flags & 1 && prots[i] == PROTprivate)
+                continue;
+
+            //printf("\tscanning import '%s', prots = %d, isModule = %p, isImport = %p\n", ss->toChars(), prots[i], ss->isModule(), ss->isImport());
+            /* Don't find private members if ss is a module
+             */
+            s2 = ss->search(loc, ident, ss->isModule() ? 1 : 0);
+            if (!s)
+                s = s2;
+            else if (s2 && s != s2)
+            {
+                if (s->toAlias() == s2->toAlias())
+                {
+                    /* After following aliases, we found the same
+                     * symbol, so it's not an ambiguity.  But if one
+                     * alias is deprecated or less accessible, prefer
+                     * the other.
+                     */
+                    if (s->isDeprecated() ||
+                        s2->prot() > s->prot() && s2->prot() != PROTnone)
+                        s = s2;
+                }
+                else
+                {
+                    /* Two imports of the same module should be regarded as
+                     * the same.
+                     */
+                    Import *i1 = s->isImport();
+                    Import *i2 = s2->isImport();
+                    if (!(i1 && i2 &&
+                          (i1->mod == i2->mod ||
+                           (!i1->parent->isImport() && !i2->parent->isImport() &&
+                            i1->ident->equals(i2->ident))
+                          )
+                         )
+                       )
+                    {
+                        /* If both s2 and s are overloadable (though we only
+                         * need to check s once)
+                         */
+                        if (s2->isOverloadable() && (a || s->isOverloadable()))
+                        {   if (!a)
+                                a = new OverloadSet();
+                            /* Don't add to a[] if s2 is alias of previous sym
+                             */
+                            for (size_t j = 0; j < a->a.dim; j++)
+                            {   Dsymbol *s3 = a->a[j];
+                                if (s2->toAlias() == s3->toAlias())
+                                {
+                                    if (s3->isDeprecated() ||
+                                        s2->prot() > s3->prot() && s2->prot() != PROTnone)
+                                        a->a[j] = s2;
+                                    goto Lcontinue;
+                                }
+                            }
+                            a->push(s2);
+                        Lcontinue:
+                            continue;
+                        }
+                        if (flags & 4)          // if return NULL on ambiguity
+                            return NULL;
+                        if (!(flags & 2))
+                            ScopeDsymbol::multiplyDefined(loc, s, s2);
+                        break;
+                    }
+                }
+            }
+        }
+
+        /* Build special symbol if we had multiple finds
+         */
+        if (a)
+        {   assert(s);
+            a->push(s);
+            s = a;
+        }
+
+        if (s)
+        {
+            Declaration *d = s->isDeclaration();
+            if (d && d->protection == PROTprivate &&
+                !d->parent->isTemplateMixin() &&
+                !(flags & 2))
+                error(loc, "%s is private", d->toPrettyChars());
+        }
+    }
+    return s;
+}
+
+void ScopeDsymbol::importScope(Dsymbol *s, enum PROT protection)
+{
+    //printf("%s->ScopeDsymbol::importScope(%s, %d)\n", toChars(), s->toChars(), protection);
+
+    // No circular or redundant import's
+    if (s != this)
+    {
+        if (!imports)
+            imports = new Dsymbols();
+        else
+        {
+            for (size_t i = 0; i < imports->dim; i++)
+            {   Dsymbol *ss = (*imports)[i];
+                if (ss == s)                    // if already imported
+                {
+                    if (protection > prots[i])
+                        prots[i] = protection;  // upgrade access
+                    return;
+                }
+            }
+        }
+        imports->push(s);
+        prots = (unsigned char *)mem.realloc(prots, imports->dim * sizeof(prots[0]));
+        prots[imports->dim - 1] = protection;
+    }
+}
+
+int ScopeDsymbol::isforwardRef()
+{
+    return (members == NULL);
+}
+
+void ScopeDsymbol::defineRef(Dsymbol *s)
+{
+    ScopeDsymbol *ss;
+
+    ss = s->isScopeDsymbol();
+    members = ss->members;
+    ss->members = NULL;
+}
+
+void ScopeDsymbol::multiplyDefined(Loc loc, Dsymbol *s1, Dsymbol *s2)
+{
+#if 0
+    printf("ScopeDsymbol::multiplyDefined()\n");
+    printf("s1 = %p, '%s' kind = '%s', parent = %s\n", s1, s1->toChars(), s1->kind(), s1->parent ? s1->parent->toChars() : "");
+    printf("s2 = %p, '%s' kind = '%s', parent = %s\n", s2, s2->toChars(), s2->kind(), s2->parent ? s2->parent->toChars() : "");
+#endif
+    if (loc.filename)
+    {   ::error(loc, "%s at %s conflicts with %s at %s",
+            s1->toPrettyChars(),
+            s1->locToChars(),
+            s2->toPrettyChars(),
+            s2->locToChars());
+    }
+    else
+    {
+        s1->error(loc, "conflicts with %s %s at %s",
+            s2->kind(),
+            s2->toPrettyChars(),
+            s2->locToChars());
+    }
+}
+
+Dsymbol *ScopeDsymbol::nameCollision(Dsymbol *s)
+{
+    Dsymbol *sprev;
+
+    // Look to see if we are defining a forward referenced symbol
+
+    sprev = symtab->lookup(s->ident);
+    assert(sprev);
+    if (s->equals(sprev))               // if the same symbol
+    {
+        if (s->isforwardRef())          // if second declaration is a forward reference
+            return sprev;
+        if (sprev->isforwardRef())
+        {
+            sprev->defineRef(s);        // copy data from s into sprev
+            return sprev;
+        }
+    }
+    multiplyDefined(0, s, sprev);
+    return sprev;
+}
+
+const char *ScopeDsymbol::kind()
+{
+    return "ScopeDsymbol";
+}
+
+Dsymbol *ScopeDsymbol::symtabInsert(Dsymbol *s)
+{
+    return symtab->insert(s);
+}
+
+/****************************************
+ * Return true if any of the members are static ctors or static dtors, or if
+ * any members have members that are.
+ */
+
+bool ScopeDsymbol::hasStaticCtorOrDtor()
+{
+    if (members)
+    {
+        for (size_t i = 0; i < members->dim; i++)
+        {   Dsymbol *member = (*members)[i];
+
+            if (member->hasStaticCtorOrDtor())
+                return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+/***************************************
+ * Determine number of Dsymbols, folding in AttribDeclaration members.
+ */
+
+#if DMDV2
+static int dimDg(void *ctx, size_t n, Dsymbol *)
+{
+    ++*(size_t *)ctx;
+    return 0;
+}
+
+size_t ScopeDsymbol::dim(Dsymbols *members)
+{
+    size_t n = 0;
+    foreach(NULL, members, &dimDg, &n);
+    return n;
+}
+#endif
+
+/***************************************
+ * Get nth Dsymbol, folding in AttribDeclaration members.
+ * Returns:
+ *      Dsymbol*        nth Dsymbol
+ *      NULL            not found, *pn gets incremented by the number
+ *                      of Dsymbols
+ */
+
+#if DMDV2
+struct GetNthSymbolCtx
+{
+    size_t nth;
+    Dsymbol *sym;
+};
+
+static int getNthSymbolDg(void *ctx, size_t n, Dsymbol *sym)
+{
+    GetNthSymbolCtx *p = (GetNthSymbolCtx *)ctx;
+    if (n == p->nth)
+    {   p->sym = sym;
+        return 1;
+    }
+    return 0;
+}
+
+Dsymbol *ScopeDsymbol::getNth(Dsymbols *members, size_t nth, size_t *pn)
+{
+    GetNthSymbolCtx ctx = { nth, NULL };
+    int res = foreach(NULL, members, &getNthSymbolDg, &ctx);
+    return res ? ctx.sym : NULL;
+}
+#endif
+
+/***************************************
+ * Expands attribute declarations in members in depth first
+ * order. Calls dg(void *ctx, size_t symidx, Dsymbol *sym) for each
+ * member.
+ * If dg returns !=0, stops and returns that value else returns 0.
+ * Use this function to avoid the O(N + N^2/2) complexity of
+ * calculating dim and calling N times getNth.
+ */
+
+#if DMDV2
+int ScopeDsymbol::foreach(Scope *sc, Dsymbols *members, ScopeDsymbol::ForeachDg dg, void *ctx, size_t *pn)
+{
+    assert(dg);
+    if (!members)
+        return 0;
+
+    size_t n = pn ? *pn : 0; // take over index
+    int result = 0;
+    for (size_t i = 0; i < members->dim; i++)
+    {   Dsymbol *s = (*members)[i];
+
+        if (AttribDeclaration *a = s->isAttribDeclaration())
+            result = foreach(sc, a->include(sc, NULL), dg, ctx, &n);
+        else if (TemplateMixin *tm = s->isTemplateMixin())
+            result = foreach(sc, tm->members, dg, ctx, &n);
+        else if (s->isTemplateInstance())
+            ;
+        else
+            result = dg(ctx, n++, s);
+
+        if (result)
+            break;
+    }
+
+    if (pn)
+        *pn = n; // update index
+    return result;
+}
+#endif
+
+/*******************************************
+ * Look for member of the form:
+ *      const(MemberInfo)[] getMembers(string);
+ * Returns NULL if not found
+ */
+
+#if DMDV2
+FuncDeclaration *ScopeDsymbol::findGetMembers()
+{
+    Dsymbol *s = search_function(this, Id::getmembers);
+    FuncDeclaration *fdx = s ? s->isFuncDeclaration() : NULL;
+
+#if 0  // Finish
+    static TypeFunction *tfgetmembers;
+
+    if (!tfgetmembers)
+    {
+        Scope sc;
+        Parameters *arguments = new Parameters;
+        Parameters *arg = new Parameter(STCin, Type::tchar->constOf()->arrayOf(), NULL, NULL);
+        arguments->push(arg);
+
+        Type *tret = NULL;
+        tfgetmembers = new TypeFunction(arguments, tret, 0, LINKd);
+        tfgetmembers = (TypeFunction *)tfgetmembers->semantic(0, &sc);
+    }
+    if (fdx)
+        fdx = fdx->overloadExactMatch(tfgetmembers);
+#endif
+    if (fdx && fdx->isVirtual())
+        fdx = NULL;
+
+    return fdx;
+}
+#endif
+
+
+/****************************** WithScopeSymbol ******************************/
+
+WithScopeSymbol::WithScopeSymbol(WithStatement *withstate)
+    : ScopeDsymbol()
+{
+    this->withstate = withstate;
+}
+
+Dsymbol *WithScopeSymbol::search(Loc loc, Identifier *ident, int flags)
+{
+    // Acts as proxy to the with class declaration
+    return withstate->exp->type->toDsymbol(NULL)->search(loc, ident, 0);
+}
+
+/****************************** ArrayScopeSymbol ******************************/
+
+ArrayScopeSymbol::ArrayScopeSymbol(Scope *sc, Expression *e)
+    : ScopeDsymbol()
+{
+    assert(e->op == TOKindex || e->op == TOKslice || e->op == TOKarray);
+    exp = e;
+    type = NULL;
+    td = NULL;
+    this->sc = sc;
+}
+
+ArrayScopeSymbol::ArrayScopeSymbol(Scope *sc, TypeTuple *t)
+    : ScopeDsymbol()
+{
+    exp = NULL;
+    type = t;
+    td = NULL;
+    this->sc = sc;
+}
+
+ArrayScopeSymbol::ArrayScopeSymbol(Scope *sc, TupleDeclaration *s)
+    : ScopeDsymbol()
+{
+    exp = NULL;
+    type = NULL;
+    td = s;
+    this->sc = sc;
+}
+
+Dsymbol *ArrayScopeSymbol::search(Loc loc, Identifier *ident, int flags)
+{
+    //printf("ArrayScopeSymbol::search('%s', flags = %d)\n", ident->toChars(), flags);
+    if (ident == Id::length || ident == Id::dollar)
+    {   VarDeclaration **pvar;
+        Expression *ce;
+
+        if (ident == Id::length && !global.params.useDeprecated)
+            error("using 'length' inside [ ] is deprecated, use '$' instead");
+
+    L1:
+
+        if (td)
+        {   /* $ gives the number of elements in the tuple
+             */
+            VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
+            Expression *e = new IntegerExp(0, td->objects->dim, Type::tsize_t);
+            v->init = new ExpInitializer(0, e);
+            v->storage_class |= STCstatic | STCconst;
+            v->semantic(sc);
+            return v;
+        }
+
+        if (type)
+        {   /* $ gives the number of type entries in the type tuple
+             */
+            VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
+            Expression *e = new IntegerExp(0, type->arguments->dim, Type::tsize_t);
+            v->init = new ExpInitializer(0, e);
+            v->storage_class |= STCstatic | STCconst;
+            v->semantic(sc);
+            return v;
+        }
+
+        if (exp->op == TOKindex)
+        {   /* array[index] where index is some function of $
+             */
+            IndexExp *ie = (IndexExp *)exp;
+
+            pvar = &ie->lengthVar;
+            ce = ie->e1;
+        }
+        else if (exp->op == TOKslice)
+        {   /* array[lwr .. upr] where lwr or upr is some function of $
+             */
+            SliceExp *se = (SliceExp *)exp;
+
+            pvar = &se->lengthVar;
+            ce = se->e1;
+        }
+        else if (exp->op == TOKarray)
+        {   /* array[e0, e1, e2, e3] where e0, e1, e2 are some function of $
+             * $ is a opDollar!(dim)() where dim is the dimension(0,1,2,...)
+             */
+            ArrayExp *ae = (ArrayExp *)exp;
+            AggregateDeclaration *ad = NULL;
+
+            Type *t = ae->e1->type->toBasetype();
+            if (t->ty == Tclass)
+            {
+                ad = ((TypeClass *)t)->sym;
+            }
+            else if (t->ty == Tstruct)
+            {
+                ad = ((TypeStruct *)t)->sym;
+            }
+            assert(ad);
+
+            Dsymbol *dsym = search_function(ad, Id::opDollar);
+            if (!dsym)  // no dollar exists -- search in higher scope
+                return NULL;
+            VarDeclaration *v = ae->lengthVar;
+            if (!v)
+            {   // $ is lazily initialized. Create it now.
+                TemplateDeclaration *td = dsym->isTemplateDeclaration();
+                if (td)
+                {   // Instantiate opDollar!(dim) with the index as a template argument
+                    Objects *tdargs = new Objects();
+                    tdargs->setDim(1);
+
+                    Expression *x = new IntegerExp(0, ae->currentDimension, Type::tsize_t);
+                    x = x->semantic(sc);
+                    tdargs->data[0] = x;
+
+                    //TemplateInstance *ti = new TemplateInstance(loc, td, tdargs);
+                    //ti->semantic(sc);
+
+                    DotTemplateInstanceExp *dte = new DotTemplateInstanceExp(loc, ae->e1, td->ident, tdargs);
+
+                    v = new VarDeclaration(loc, NULL, Id::dollar, new ExpInitializer(0, dte));
+                }
+                else
+                {   /* opDollar exists, but it's a function, not a template.
+                     * This is acceptable ONLY for single-dimension indexing.
+                     * Note that it's impossible to have both template & function opDollar,
+                     * because both take no arguments.
+                     */
+                    if (ae->arguments->dim != 1) {
+                        ae->error("%s only defines opDollar for one dimension", ad->toChars());
+                        return NULL;
+                    }
+                    FuncDeclaration *fd = dsym->isFuncDeclaration();
+                    assert(fd);
+                    Expression * x = new DotVarExp(loc, ae->e1, fd);
+
+                    v = new VarDeclaration(loc, NULL, Id::dollar, new ExpInitializer(0, x));
+                }
+                v->semantic(sc);
+                ae->lengthVar = v;
+            }
+            return v;
+        }
+        else
+            /* Didn't find $, look in enclosing scope(s).
+             */
+            return NULL;
+
+        /* If we are indexing into an array that is really a type
+         * tuple, rewrite this as an index into a type tuple and
+         * try again.
+         */
+        if (ce->op == TOKtype)
+        {
+            Type *t = ((TypeExp *)ce)->type;
+            if (t->ty == Ttuple)
+            {   type = (TypeTuple *)t;
+                goto L1;
+            }
+        }
+
+        /* *pvar is lazily initialized, so if we refer to $
+         * multiple times, it gets set only once.
+         */
+        if (!*pvar)             // if not already initialized
+        {   /* Create variable v and set it to the value of $
+             */
+            VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
+            if (ce->op == TOKtuple)
+            {   /* It is for an expression tuple, so the
+                 * length will be a const.
+                 */
+                Expression *e = new IntegerExp(0, ((TupleExp *)ce)->exps->dim, Type::tsize_t);
+                v->init = new ExpInitializer(0, e);
+                v->storage_class |= STCstatic | STCconst;
+            }
+            else
+            {   /* For arrays, $ will either be a compile-time constant
+                 * (in which case its value in set during constant-folding),
+                 * or a variable (in which case an expression is created in
+                 * toir.c).
+                 */
+                VoidInitializer *e = new VoidInitializer(0);
+                e->type = Type::tsize_t;
+                v->init = e;
+            }
+            *pvar = v;
+        }
+        (*pvar)->semantic(sc);
+        return (*pvar);
+    }
+    return NULL;
+}
+
+
+/****************************** DsymbolTable ******************************/
+
+DsymbolTable::DsymbolTable()
+{
+#if STRINGTABLE
+    tab = new StringTable;
+    tab->init();
+#else
+    tab = NULL;
+#endif
+}
+
+DsymbolTable::~DsymbolTable()
+{
+#if STRINGTABLE
+    delete tab;
+#endif
+}
+
+Dsymbol *DsymbolTable::lookup(Identifier *ident)
+{
+#if STRINGTABLE
+#ifdef DEBUG
+    assert(ident);
+    assert(tab);
+#endif
+    //printf("DsymbolTable::lookup(%s)\n", (char*)ident->string);
+    StringValue *sv = tab->lookup((char*)ident->string, ident->len);
+    return (Dsymbol *)(sv ? sv->ptrvalue : NULL);
+#else
+    //printf("DsymbolTable::lookup(%s)\n", (char*)ident->string);
+    return (Dsymbol *)_aaGetRvalue(tab, ident);
+#endif
+}
+
+Dsymbol *DsymbolTable::insert(Dsymbol *s)
+{
+    //printf("DsymbolTable::insert(this = %p, '%s')\n", this, s->ident->toChars());
+    Identifier *ident = s->ident;
+#if STRINGTABLE
+#ifdef DEBUG
+    assert(ident);
+    assert(tab);
+#endif
+    StringValue *sv = tab->insert(ident->toChars(), ident->len);
+    if (!sv)
+        return NULL;            // already in table
+    sv->ptrvalue = s;
+    return s;
+#else
+    Dsymbol **ps = (Dsymbol **)_aaGet(&tab, ident);
+    if (*ps)
+        return NULL;            // already in table
+    *ps = s;
+    return s;
+#endif
+}
+
+Dsymbol *DsymbolTable::insert(Identifier *ident, Dsymbol *s)
+{
+    //printf("DsymbolTable::insert()\n");
+#if STRINGTABLE
+    StringValue *sv = tab->insert(ident->toChars(), ident->len);
+    if (!sv)
+        return NULL;            // already in table
+    sv->ptrvalue = s;
+    return s;
+#else
+    Dsymbol **ps = (Dsymbol **)_aaGet(&tab, ident);
+    if (*ps)
+        return NULL;            // already in table
+    *ps = s;
+    return s;
+#endif
+}
+
+Dsymbol *DsymbolTable::update(Dsymbol *s)
+{
+    Identifier *ident = s->ident;
+#if STRINGTABLE
+    StringValue *sv = tab->update(ident->toChars(), ident->len);
+    sv->ptrvalue = s;
+    return s;
+#else
+    Dsymbol **ps = (Dsymbol **)_aaGet(&tab, ident);
+    *ps = s;
+    return s;
+#endif
+}
+
+
+
+
diff --git a/dmd2/dsymbol.h b/dmd2/dsymbol.h
index b895d9a2..850b880a 100644
--- a/dmd2/dsymbol.h
+++ b/dmd2/dsymbol.h
@@ -1,396 +1,396 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2012 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-#ifndef DMD_DSYMBOL_H
-#define DMD_DSYMBOL_H
-
-#ifdef __DMC__
-#pragma once
-#endif /* __DMC__ */
-
-#include "root.h"
-#include "stringtable.h"
-
-#include "mars.h"
-#include "arraytypes.h"
-
-#if IN_LLVM
-#if defined(_MSC_VER)
-#undef min
-#undef max
-#endif
-#include "../ir/irdsymbol.h"
-#endif
-
-struct Identifier;
-struct Scope;
-struct DsymbolTable;
-struct Declaration;
-struct ThisDeclaration;
-struct TupleDeclaration;
-struct TypedefDeclaration;
-struct AliasDeclaration;
-struct AggregateDeclaration;
-struct EnumDeclaration;
-struct ClassDeclaration;
-struct InterfaceDeclaration;
-struct StructDeclaration;
-struct UnionDeclaration;
-struct FuncDeclaration;
-struct FuncAliasDeclaration;
-struct FuncLiteralDeclaration;
-struct CtorDeclaration;
-struct PostBlitDeclaration;
-struct DtorDeclaration;
-struct StaticCtorDeclaration;
-struct StaticDtorDeclaration;
-struct SharedStaticCtorDeclaration;
-struct SharedStaticDtorDeclaration;
-struct InvariantDeclaration;
-struct UnitTestDeclaration;
-struct NewDeclaration;
-struct VarDeclaration;
-struct AttribDeclaration;
-#if IN_DMD
-struct Symbol;
-#endif
-struct Package;
-struct Module;
-struct Import;
-struct Type;
-struct TypeTuple;
-struct WithStatement;
-struct LabelDsymbol;
-struct ScopeDsymbol;
-struct TemplateDeclaration;
-struct TemplateInstance;
-struct TemplateMixin;
-struct EnumMember;
-struct ScopeDsymbol;
-struct WithScopeSymbol;
-struct ArrayScopeSymbol;
-struct StaticStructInitDeclaration;
-struct Expression;
-struct DeleteDeclaration;
-struct HdrGenState;
-struct OverloadSet;
-struct AA;
-#if TARGET_NET
-struct PragmaScope;
-#endif
-#if IN_LLVM
-struct TypeInfoDeclaration;
-struct ClassInfoDeclaration;
-#endif
-
-#if IN_GCC
-union tree_node;
-typedef union tree_node TYPE;
-#else
-struct TYPE;
-#endif
-
-#if IN_LLVM
-class Ir;
-class IrSymbol;
-namespace llvm
-{
-    class Value;
-}
-#endif
-#if IN_DMD
-// Back end
-struct Classsym;
-#endif
-
-enum PROT
-{
-    PROTundefined,
-    PROTnone,           // no access
-    PROTprivate,
-    PROTpackage,
-    PROTprotected,
-    PROTpublic,
-    PROTexport,
-};
-
-/* State of symbol in winding its way through the passes of the compiler
- */
-enum PASS
-{
-    PASSinit,           // initial state
-    PASSsemantic,       // semantic() started
-    PASSsemanticdone,   // semantic() done
-    PASSsemantic2,      // semantic2() run
-    PASSsemantic3,      // semantic3() started
-    PASSsemantic3done,  // semantic3() done
-    PASSobj,            // toObjFile() run
-};
-
-typedef int (*Dsymbol_apply_ft_t)(Dsymbol *, void *);
-
-struct Dsymbol : Object
-{
-    Identifier *ident;
-    Identifier *c_ident;
-    Dsymbol *parent;
-#if IN_DMD
-    Symbol *csym;               // symbol for code generator
-    Symbol *isym;               // import version of csym
-#endif
-    unsigned char *comment;     // documentation comment for this Dsymbol
-    Loc loc;                    // where defined
-    Scope *scope;               // !=NULL means context to use for semantic()
-    bool errors;                // this symbol failed to pass semantic()
-
-    Dsymbol();
-    Dsymbol(Identifier *);
-    char *toChars();
-    char *locToChars();
-    int equals(Object *o);
-    int isAnonymous();
-    void error(Loc loc, const char *format, ...) IS_PRINTF(3);
-    void error(const char *format, ...) IS_PRINTF(2);
-    void verror(Loc loc, const char *format, va_list ap);
-    void checkDeprecated(Loc loc, Scope *sc);
-    Module *getModule();        // module where declared
-    Module *getAccessModule();
-    Dsymbol *pastMixin();
-    Dsymbol *toParent();
-    Dsymbol *toParent2();
-    TemplateInstance *inTemplateInstance();
-    TemplateInstance *isSpeculative();
-
-    int dyncast() { return DYNCAST_DSYMBOL; }   // kludge for template.isSymbol()
-
-    static Dsymbols *arraySyntaxCopy(Dsymbols *a);
-
-    virtual const char *toPrettyChars();
-    virtual const char *kind();
-    virtual Dsymbol *toAlias();                 // resolve real symbol
-    virtual int apply(Dsymbol_apply_ft_t fp, void *param);
-    virtual int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
-    virtual void setScope(Scope *sc);
-    virtual void importAll(Scope *sc);
-    virtual void semantic0(Scope *sc);
-    virtual void semantic(Scope *sc);
-    virtual void semantic2(Scope *sc);
-    virtual void semantic3(Scope *sc);
-    virtual void inlineScan();
-    virtual Dsymbol *search(Loc loc, Identifier *ident, int flags);
-    Dsymbol *search_correct(Identifier *id);
-    Dsymbol *searchX(Loc loc, Scope *sc, Identifier *id);
-    virtual int overloadInsert(Dsymbol *s);
-    char *toHChars();
-    virtual void toHBuffer(OutBuffer *buf, HdrGenState *hgs);
-    virtual void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    virtual void toDocBuffer(OutBuffer *buf);
-    virtual void toJsonBuffer(OutBuffer *buf);
-    virtual unsigned size(Loc loc);
-    virtual int isforwardRef();
-    virtual void defineRef(Dsymbol *s);
-    virtual AggregateDeclaration *isThis();     // is a 'this' required to access the member
-    AggregateDeclaration *isAggregateMember();  // are we a member of an aggregate?
-    ClassDeclaration *isClassMember();          // are we a member of a class?
-    virtual int isExport();                     // is Dsymbol exported?
-    virtual int isImportedSymbol();             // is Dsymbol imported?
-    virtual int isDeprecated();                 // is Dsymbol deprecated?
-#if DMDV2
-    virtual int isOverloadable();
-    virtual int hasOverloads();
-#endif
-    virtual LabelDsymbol *isLabel();            // is this a LabelDsymbol?
-    virtual AggregateDeclaration *isMember();   // is this symbol a member of an AggregateDeclaration?
-    virtual Type *getType();                    // is this a type?
-    virtual char *mangle();
-    virtual int needThis();                     // need a 'this' pointer?
-    virtual enum PROT prot();
-    virtual Dsymbol *syntaxCopy(Dsymbol *s);    // copy only syntax trees
-    virtual int oneMember(Dsymbol **ps, Identifier *ident);
-    static int oneMembers(Dsymbols *members, Dsymbol **ps, Identifier *ident = NULL);
-    virtual void setFieldOffset(AggregateDeclaration *ad, unsigned *poffset, bool isunion);
-    virtual int hasPointers();
-    virtual bool hasStaticCtorOrDtor();
-    virtual void addLocalClass(ClassDeclarations *) { }
-    virtual void checkCtorConstInit() { }
-
-    virtual void addComment(unsigned char *comment);
-    virtual void emitComment(Scope *sc);
-    void emitDitto(Scope *sc);
-
-#if IN_DMD
-    // Backend
-
-    virtual Symbol *toSymbol();                 // to backend symbol
-    virtual void toObjFile(int multiobj);                       // compile to .obj file
-    virtual int cvMember(unsigned char *p);     // emit cv debug info for member
-
-    Symbol *toImport();                         // to backend import symbol
-    static Symbol *toImport(Symbol *s);         // to backend import symbol
-
-    Symbol *toSymbolX(const char *prefix, int sclass, TYPE *t, const char *suffix);     // helper
-#endif
-
-    // Eliminate need for dynamic_cast
-    virtual Package *isPackage() { return NULL; }
-    virtual Module *isModule() { return NULL; }
-    virtual EnumMember *isEnumMember() { return NULL; }
-    virtual TemplateDeclaration *isTemplateDeclaration() { return NULL; }
-    virtual TemplateInstance *isTemplateInstance() { return NULL; }
-    virtual TemplateMixin *isTemplateMixin() { return NULL; }
-    virtual Declaration *isDeclaration() { return NULL; }
-    virtual ThisDeclaration *isThisDeclaration() { return NULL; }
-    virtual TupleDeclaration *isTupleDeclaration() { return NULL; }
-    virtual TypedefDeclaration *isTypedefDeclaration() { return NULL; }
-    virtual AliasDeclaration *isAliasDeclaration() { return NULL; }
-    virtual AggregateDeclaration *isAggregateDeclaration() { return NULL; }
-    virtual FuncDeclaration *isFuncDeclaration() { return NULL; }
-    virtual FuncAliasDeclaration *isFuncAliasDeclaration() { return NULL; }
-    virtual FuncLiteralDeclaration *isFuncLiteralDeclaration() { return NULL; }
-    virtual CtorDeclaration *isCtorDeclaration() { return NULL; }
-    virtual PostBlitDeclaration *isPostBlitDeclaration() { return NULL; }
-    virtual DtorDeclaration *isDtorDeclaration() { return NULL; }
-    virtual StaticCtorDeclaration *isStaticCtorDeclaration() { return NULL; }
-    virtual StaticDtorDeclaration *isStaticDtorDeclaration() { return NULL; }
-    virtual SharedStaticCtorDeclaration *isSharedStaticCtorDeclaration() { return NULL; }
-    virtual SharedStaticDtorDeclaration *isSharedStaticDtorDeclaration() { return NULL; }
-    virtual InvariantDeclaration *isInvariantDeclaration() { return NULL; }
-    virtual UnitTestDeclaration *isUnitTestDeclaration() { return NULL; }
-    virtual NewDeclaration *isNewDeclaration() { return NULL; }
-    virtual VarDeclaration *isVarDeclaration() { return NULL; }
-    virtual ClassDeclaration *isClassDeclaration() { return NULL; }
-    virtual StructDeclaration *isStructDeclaration() { return NULL; }
-    virtual UnionDeclaration *isUnionDeclaration() { return NULL; }
-    virtual InterfaceDeclaration *isInterfaceDeclaration() { return NULL; }
-    virtual ScopeDsymbol *isScopeDsymbol() { return NULL; }
-    virtual WithScopeSymbol *isWithScopeSymbol() { return NULL; }
-    virtual ArrayScopeSymbol *isArrayScopeSymbol() { return NULL; }
-    virtual Import *isImport() { return NULL; }
-    virtual EnumDeclaration *isEnumDeclaration() { return NULL; }
-    virtual DeleteDeclaration *isDeleteDeclaration() { return NULL; }
-    virtual StaticStructInitDeclaration *isStaticStructInitDeclaration() { return NULL; }
-    virtual AttribDeclaration *isAttribDeclaration() { return NULL; }
-    virtual OverloadSet *isOverloadSet() { return NULL; }
-    virtual TypeInfoDeclaration* isTypeInfoDeclaration() { return NULL; }
-    virtual ClassInfoDeclaration* isClassInfoDeclaration() { return NULL; }
-#if TARGET_NET
-    virtual PragmaScope* isPragmaScope() { return NULL; }
-#endif
-#if IN_LLVM
-    /// Codegen traversal
-    virtual void codegen(Ir* ir);
-
-    // llvm stuff
-    int llvmInternal;
-
-    IrDsymbol ir;
-    IrSymbol* irsym;
-#endif
-};
-
-// Dsymbol that generates a scope
-
-struct ScopeDsymbol : Dsymbol
-{
-    Dsymbols *members;          // all Dsymbol's in this scope
-    DsymbolTable *symtab;       // members[] sorted into table
-
-    Dsymbols *imports;          // imported Dsymbol's
-    unsigned char *prots;       // array of PROT, one for each import
-
-    ScopeDsymbol();
-    ScopeDsymbol(Identifier *id);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    Dsymbol *search(Loc loc, Identifier *ident, int flags);
-    void importScope(Dsymbol *s, enum PROT protection);
-    int isforwardRef();
-    void defineRef(Dsymbol *s);
-    static void multiplyDefined(Loc loc, Dsymbol *s1, Dsymbol *s2);
-    Dsymbol *nameCollision(Dsymbol *s);
-    const char *kind();
-    FuncDeclaration *findGetMembers();
-    virtual Dsymbol *symtabInsert(Dsymbol *s);
-    bool hasStaticCtorOrDtor();
-
-    void emitMemberComments(Scope *sc);
-
-    static size_t dim(Dsymbols *members);
-    static Dsymbol *getNth(Dsymbols *members, size_t nth, size_t *pn = NULL);
-
-    typedef int (*ForeachDg)(void *ctx, size_t idx, Dsymbol *s);
-    static int foreach(Scope *sc, Dsymbols *members, ForeachDg dg, void *ctx, size_t *pn=NULL);
-
-    ScopeDsymbol *isScopeDsymbol() { return this; }
-};
-
-// With statement scope
-
-struct WithScopeSymbol : ScopeDsymbol
-{
-    WithStatement *withstate;
-
-    WithScopeSymbol(WithStatement *withstate);
-    Dsymbol *search(Loc loc, Identifier *ident, int flags);
-
-    WithScopeSymbol *isWithScopeSymbol() { return this; }
-};
-
-// Array Index/Slice scope
-
-struct ArrayScopeSymbol : ScopeDsymbol
-{
-    Expression *exp;    // IndexExp or SliceExp
-    TypeTuple *type;    // for tuple[length]
-    TupleDeclaration *td;       // for tuples of objects
-    Scope *sc;
-
-    ArrayScopeSymbol(Scope *sc, Expression *e);
-    ArrayScopeSymbol(Scope *sc, TypeTuple *t);
-    ArrayScopeSymbol(Scope *sc, TupleDeclaration *td);
-    Dsymbol *search(Loc loc, Identifier *ident, int flags);
-
-    ArrayScopeSymbol *isArrayScopeSymbol() { return this; }
-};
-
-// Overload Sets
-
-#if DMDV2
-struct OverloadSet : Dsymbol
-{
-    Dsymbols a;         // array of Dsymbols
-
-    OverloadSet();
-    void push(Dsymbol *s);
-    OverloadSet *isOverloadSet() { return this; }
-    const char *kind();
-};
-#endif
-
-// Table of Dsymbol's
-
-struct DsymbolTable : Object
-{
-    AA *tab;
-
-    DsymbolTable();
-    ~DsymbolTable();
-
-    // Look up Identifier. Return Dsymbol if found, NULL if not.
-    Dsymbol *lookup(Identifier *ident);
-
-    // Insert Dsymbol in table. Return NULL if already there.
-    Dsymbol *insert(Dsymbol *s);
-
-    // Look for Dsymbol in table. If there, return it. If not, insert s and return that.
-    Dsymbol *update(Dsymbol *s);
-    Dsymbol *insert(Identifier *ident, Dsymbol *s);     // when ident and s are not the same
-};
-
-#endif /* DMD_DSYMBOL_H */
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2012 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+#ifndef DMD_DSYMBOL_H
+#define DMD_DSYMBOL_H
+
+#ifdef __DMC__
+#pragma once
+#endif /* __DMC__ */
+
+#include "root.h"
+#include "stringtable.h"
+
+#include "mars.h"
+#include "arraytypes.h"
+
+#if IN_LLVM
+#if defined(_MSC_VER)
+#undef min
+#undef max
+#endif
+#include "../ir/irdsymbol.h"
+#endif
+
+struct Identifier;
+struct Scope;
+struct DsymbolTable;
+struct Declaration;
+struct ThisDeclaration;
+struct TupleDeclaration;
+struct TypedefDeclaration;
+struct AliasDeclaration;
+struct AggregateDeclaration;
+struct EnumDeclaration;
+struct ClassDeclaration;
+struct InterfaceDeclaration;
+struct StructDeclaration;
+struct UnionDeclaration;
+struct FuncDeclaration;
+struct FuncAliasDeclaration;
+struct FuncLiteralDeclaration;
+struct CtorDeclaration;
+struct PostBlitDeclaration;
+struct DtorDeclaration;
+struct StaticCtorDeclaration;
+struct StaticDtorDeclaration;
+struct SharedStaticCtorDeclaration;
+struct SharedStaticDtorDeclaration;
+struct InvariantDeclaration;
+struct UnitTestDeclaration;
+struct NewDeclaration;
+struct VarDeclaration;
+struct AttribDeclaration;
+#if IN_DMD
+struct Symbol;
+#endif
+struct Package;
+struct Module;
+struct Import;
+struct Type;
+struct TypeTuple;
+struct WithStatement;
+struct LabelDsymbol;
+struct ScopeDsymbol;
+struct TemplateDeclaration;
+struct TemplateInstance;
+struct TemplateMixin;
+struct EnumMember;
+struct ScopeDsymbol;
+struct WithScopeSymbol;
+struct ArrayScopeSymbol;
+struct StaticStructInitDeclaration;
+struct Expression;
+struct DeleteDeclaration;
+struct HdrGenState;
+struct OverloadSet;
+struct AA;
+#if TARGET_NET
+struct PragmaScope;
+#endif
+#if IN_LLVM
+struct TypeInfoDeclaration;
+struct ClassInfoDeclaration;
+#endif
+
+#if IN_GCC
+union tree_node;
+typedef union tree_node TYPE;
+#else
+struct TYPE;
+#endif
+
+#if IN_LLVM
+class Ir;
+class IrSymbol;
+namespace llvm
+{
+    class Value;
+}
+#endif
+#if IN_DMD
+// Back end
+struct Classsym;
+#endif
+
+enum PROT
+{
+    PROTundefined,
+    PROTnone,           // no access
+    PROTprivate,
+    PROTpackage,
+    PROTprotected,
+    PROTpublic,
+    PROTexport,
+};
+
+/* State of symbol in winding its way through the passes of the compiler
+ */
+enum PASS
+{
+    PASSinit,           // initial state
+    PASSsemantic,       // semantic() started
+    PASSsemanticdone,   // semantic() done
+    PASSsemantic2,      // semantic2() run
+    PASSsemantic3,      // semantic3() started
+    PASSsemantic3done,  // semantic3() done
+    PASSobj,            // toObjFile() run
+};
+
+typedef int (*Dsymbol_apply_ft_t)(Dsymbol *, void *);
+
+struct Dsymbol : Object
+{
+    Identifier *ident;
+    Identifier *c_ident;
+    Dsymbol *parent;
+#if IN_DMD
+    Symbol *csym;               // symbol for code generator
+    Symbol *isym;               // import version of csym
+#endif
+    unsigned char *comment;     // documentation comment for this Dsymbol
+    Loc loc;                    // where defined
+    Scope *scope;               // !=NULL means context to use for semantic()
+    bool errors;                // this symbol failed to pass semantic()
+
+    Dsymbol();
+    Dsymbol(Identifier *);
+    char *toChars();
+    char *locToChars();
+    int equals(Object *o);
+    int isAnonymous();
+    void error(Loc loc, const char *format, ...) IS_PRINTF(3);
+    void error(const char *format, ...) IS_PRINTF(2);
+    void verror(Loc loc, const char *format, va_list ap);
+    void checkDeprecated(Loc loc, Scope *sc);
+    Module *getModule();        // module where declared
+    Module *getAccessModule();
+    Dsymbol *pastMixin();
+    Dsymbol *toParent();
+    Dsymbol *toParent2();
+    TemplateInstance *inTemplateInstance();
+    TemplateInstance *isSpeculative();
+
+    int dyncast() { return DYNCAST_DSYMBOL; }   // kludge for template.isSymbol()
+
+    static Dsymbols *arraySyntaxCopy(Dsymbols *a);
+
+    virtual const char *toPrettyChars();
+    virtual const char *kind();
+    virtual Dsymbol *toAlias();                 // resolve real symbol
+    virtual int apply(Dsymbol_apply_ft_t fp, void *param);
+    virtual int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
+    virtual void setScope(Scope *sc);
+    virtual void importAll(Scope *sc);
+    virtual void semantic0(Scope *sc);
+    virtual void semantic(Scope *sc);
+    virtual void semantic2(Scope *sc);
+    virtual void semantic3(Scope *sc);
+    virtual void inlineScan();
+    virtual Dsymbol *search(Loc loc, Identifier *ident, int flags);
+    Dsymbol *search_correct(Identifier *id);
+    Dsymbol *searchX(Loc loc, Scope *sc, Identifier *id);
+    virtual int overloadInsert(Dsymbol *s);
+    char *toHChars();
+    virtual void toHBuffer(OutBuffer *buf, HdrGenState *hgs);
+    virtual void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+    virtual void toDocBuffer(OutBuffer *buf);
+    virtual void toJsonBuffer(OutBuffer *buf);
+    virtual unsigned size(Loc loc);
+    virtual int isforwardRef();
+    virtual void defineRef(Dsymbol *s);
+    virtual AggregateDeclaration *isThis();     // is a 'this' required to access the member
+    AggregateDeclaration *isAggregateMember();  // are we a member of an aggregate?
+    ClassDeclaration *isClassMember();          // are we a member of a class?
+    virtual int isExport();                     // is Dsymbol exported?
+    virtual int isImportedSymbol();             // is Dsymbol imported?
+    virtual int isDeprecated();                 // is Dsymbol deprecated?
+#if DMDV2
+    virtual int isOverloadable();
+    virtual int hasOverloads();
+#endif
+    virtual LabelDsymbol *isLabel();            // is this a LabelDsymbol?
+    virtual AggregateDeclaration *isMember();   // is this symbol a member of an AggregateDeclaration?
+    virtual Type *getType();                    // is this a type?
+    virtual char *mangle();
+    virtual int needThis();                     // need a 'this' pointer?
+    virtual enum PROT prot();
+    virtual Dsymbol *syntaxCopy(Dsymbol *s);    // copy only syntax trees
+    virtual int oneMember(Dsymbol **ps, Identifier *ident);
+    static int oneMembers(Dsymbols *members, Dsymbol **ps, Identifier *ident = NULL);
+    virtual void setFieldOffset(AggregateDeclaration *ad, unsigned *poffset, bool isunion);
+    virtual int hasPointers();
+    virtual bool hasStaticCtorOrDtor();
+    virtual void addLocalClass(ClassDeclarations *) { }
+    virtual void checkCtorConstInit() { }
+
+    virtual void addComment(unsigned char *comment);
+    virtual void emitComment(Scope *sc);
+    void emitDitto(Scope *sc);
+
+#if IN_DMD
+    // Backend
+
+    virtual Symbol *toSymbol();                 // to backend symbol
+    virtual void toObjFile(int multiobj);                       // compile to .obj file
+    virtual int cvMember(unsigned char *p);     // emit cv debug info for member
+
+    Symbol *toImport();                         // to backend import symbol
+    static Symbol *toImport(Symbol *s);         // to backend import symbol
+
+    Symbol *toSymbolX(const char *prefix, int sclass, TYPE *t, const char *suffix);     // helper
+#endif
+
+    // Eliminate need for dynamic_cast
+    virtual Package *isPackage() { return NULL; }
+    virtual Module *isModule() { return NULL; }
+    virtual EnumMember *isEnumMember() { return NULL; }
+    virtual TemplateDeclaration *isTemplateDeclaration() { return NULL; }
+    virtual TemplateInstance *isTemplateInstance() { return NULL; }
+    virtual TemplateMixin *isTemplateMixin() { return NULL; }
+    virtual Declaration *isDeclaration() { return NULL; }
+    virtual ThisDeclaration *isThisDeclaration() { return NULL; }
+    virtual TupleDeclaration *isTupleDeclaration() { return NULL; }
+    virtual TypedefDeclaration *isTypedefDeclaration() { return NULL; }
+    virtual AliasDeclaration *isAliasDeclaration() { return NULL; }
+    virtual AggregateDeclaration *isAggregateDeclaration() { return NULL; }
+    virtual FuncDeclaration *isFuncDeclaration() { return NULL; }
+    virtual FuncAliasDeclaration *isFuncAliasDeclaration() { return NULL; }
+    virtual FuncLiteralDeclaration *isFuncLiteralDeclaration() { return NULL; }
+    virtual CtorDeclaration *isCtorDeclaration() { return NULL; }
+    virtual PostBlitDeclaration *isPostBlitDeclaration() { return NULL; }
+    virtual DtorDeclaration *isDtorDeclaration() { return NULL; }
+    virtual StaticCtorDeclaration *isStaticCtorDeclaration() { return NULL; }
+    virtual StaticDtorDeclaration *isStaticDtorDeclaration() { return NULL; }
+    virtual SharedStaticCtorDeclaration *isSharedStaticCtorDeclaration() { return NULL; }
+    virtual SharedStaticDtorDeclaration *isSharedStaticDtorDeclaration() { return NULL; }
+    virtual InvariantDeclaration *isInvariantDeclaration() { return NULL; }
+    virtual UnitTestDeclaration *isUnitTestDeclaration() { return NULL; }
+    virtual NewDeclaration *isNewDeclaration() { return NULL; }
+    virtual VarDeclaration *isVarDeclaration() { return NULL; }
+    virtual ClassDeclaration *isClassDeclaration() { return NULL; }
+    virtual StructDeclaration *isStructDeclaration() { return NULL; }
+    virtual UnionDeclaration *isUnionDeclaration() { return NULL; }
+    virtual InterfaceDeclaration *isInterfaceDeclaration() { return NULL; }
+    virtual ScopeDsymbol *isScopeDsymbol() { return NULL; }
+    virtual WithScopeSymbol *isWithScopeSymbol() { return NULL; }
+    virtual ArrayScopeSymbol *isArrayScopeSymbol() { return NULL; }
+    virtual Import *isImport() { return NULL; }
+    virtual EnumDeclaration *isEnumDeclaration() { return NULL; }
+    virtual DeleteDeclaration *isDeleteDeclaration() { return NULL; }
+    virtual StaticStructInitDeclaration *isStaticStructInitDeclaration() { return NULL; }
+    virtual AttribDeclaration *isAttribDeclaration() { return NULL; }
+    virtual OverloadSet *isOverloadSet() { return NULL; }
+    virtual TypeInfoDeclaration* isTypeInfoDeclaration() { return NULL; }
+    virtual ClassInfoDeclaration* isClassInfoDeclaration() { return NULL; }
+#if TARGET_NET
+    virtual PragmaScope* isPragmaScope() { return NULL; }
+#endif
+#if IN_LLVM
+    /// Codegen traversal
+    virtual void codegen(Ir* ir);
+
+    // llvm stuff
+    int llvmInternal;
+
+    IrDsymbol ir;
+    IrSymbol* irsym;
+#endif
+};
+
+// Dsymbol that generates a scope
+
+struct ScopeDsymbol : Dsymbol
+{
+    Dsymbols *members;          // all Dsymbol's in this scope
+    DsymbolTable *symtab;       // members[] sorted into table
+
+    Dsymbols *imports;          // imported Dsymbol's
+    unsigned char *prots;       // array of PROT, one for each import
+
+    ScopeDsymbol();
+    ScopeDsymbol(Identifier *id);
+    Dsymbol *syntaxCopy(Dsymbol *s);
+    Dsymbol *search(Loc loc, Identifier *ident, int flags);
+    void importScope(Dsymbol *s, enum PROT protection);
+    int isforwardRef();
+    void defineRef(Dsymbol *s);
+    static void multiplyDefined(Loc loc, Dsymbol *s1, Dsymbol *s2);
+    Dsymbol *nameCollision(Dsymbol *s);
+    const char *kind();
+    FuncDeclaration *findGetMembers();
+    virtual Dsymbol *symtabInsert(Dsymbol *s);
+    bool hasStaticCtorOrDtor();
+
+    void emitMemberComments(Scope *sc);
+
+    static size_t dim(Dsymbols *members);
+    static Dsymbol *getNth(Dsymbols *members, size_t nth, size_t *pn = NULL);
+
+    typedef int (*ForeachDg)(void *ctx, size_t idx, Dsymbol *s);
+    static int foreach(Scope *sc, Dsymbols *members, ForeachDg dg, void *ctx, size_t *pn=NULL);
+
+    ScopeDsymbol *isScopeDsymbol() { return this; }
+};
+
+// With statement scope
+
+struct WithScopeSymbol : ScopeDsymbol
+{
+    WithStatement *withstate;
+
+    WithScopeSymbol(WithStatement *withstate);
+    Dsymbol *search(Loc loc, Identifier *ident, int flags);
+
+    WithScopeSymbol *isWithScopeSymbol() { return this; }
+};
+
+// Array Index/Slice scope
+
+struct ArrayScopeSymbol : ScopeDsymbol
+{
+    Expression *exp;    // IndexExp or SliceExp
+    TypeTuple *type;    // for tuple[length]
+    TupleDeclaration *td;       // for tuples of objects
+    Scope *sc;
+
+    ArrayScopeSymbol(Scope *sc, Expression *e);
+    ArrayScopeSymbol(Scope *sc, TypeTuple *t);
+    ArrayScopeSymbol(Scope *sc, TupleDeclaration *td);
+    Dsymbol *search(Loc loc, Identifier *ident, int flags);
+
+    ArrayScopeSymbol *isArrayScopeSymbol() { return this; }
+};
+
+// Overload Sets
+
+#if DMDV2
+struct OverloadSet : Dsymbol
+{
+    Dsymbols a;         // array of Dsymbols
+
+    OverloadSet();
+    void push(Dsymbol *s);
+    OverloadSet *isOverloadSet() { return this; }
+    const char *kind();
+};
+#endif
+
+// Table of Dsymbol's
+
+struct DsymbolTable : Object
+{
+    AA *tab;
+
+    DsymbolTable();
+    ~DsymbolTable();
+
+    // Look up Identifier. Return Dsymbol if found, NULL if not.
+    Dsymbol *lookup(Identifier *ident);
+
+    // Insert Dsymbol in table. Return NULL if already there.
+    Dsymbol *insert(Dsymbol *s);
+
+    // Look for Dsymbol in table. If there, return it. If not, insert s and return that.
+    Dsymbol *update(Dsymbol *s);
+    Dsymbol *insert(Identifier *ident, Dsymbol *s);     // when ident and s are not the same
+};
+
+#endif /* DMD_DSYMBOL_H */
diff --git a/dmd2/gpl.txt b/dmd2/gpl.txt
index cc468912..43cd72c3 100644
--- a/dmd2/gpl.txt
+++ b/dmd2/gpl.txt
@@ -1,248 +1,248 @@
-		    GNU GENERAL PUBLIC LICENSE
-		     Version 1, February 1989
-
- Copyright (C) 1989 Free Software Foundation, Inc.
-                59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The license agreements of most software companies try to keep users
-at the mercy of those companies.  By contrast, our General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  The
-General Public License applies to the Free Software Foundation's
-software and to any other program whose authors commit to using it.
-You can use it for your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Specifically, the General Public License is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free
-programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of a such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must tell them their rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any program or other work which
-contains a notice placed by the copyright holder saying it may be
-distributed under the terms of this General Public License.  The
-"Program", below, refers to any such program or work, and a "work based
-on the Program" means either the Program or any work containing the
-Program or a portion of it, either verbatim or with modifications.  Each
-licensee is addressed as "you".
-
-  1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-General Public License and to the absence of any warranty; and give any
-other recipients of the Program a copy of this General Public License
-along with the Program.  You may charge a fee for the physical act of
-transferring a copy.
-
-  2. You may modify your copy or copies of the Program or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
-    a) cause the modified files to carry prominent notices stating that
-    you changed the files and the date of any change; and
-
-    b) cause the whole of any work that you distribute or publish, that
-    in whole or in part contains the Program or any part thereof, either
-    with or without modifications, to be licensed at no charge to all
-    third parties under the terms of this General Public License (except
-    that you may choose to grant warranty protection to some or all
-    third parties, at your option).
-
-    c) If the modified program normally reads commands interactively when
-    run, you must cause it, when started running for such interactive use
-    in the simplest and most usual way, to print or display an
-    announcement including an appropriate copyright notice and a notice
-    that there is no warranty (or else, saying that you provide a
-    warranty) and that users may redistribute the program under these
-    conditions, and telling the user how to view a copy of this General
-    Public License.
-
-    d) You may charge a fee for the physical act of transferring a
-    copy, and you may at your option offer warranty protection in
-    exchange for a fee.
-
-Mere aggregation of another independent work with the Program (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
-  3. You may copy and distribute the Program (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
-    a) accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    b) accompany it with a written offer, valid for at least three
-    years, to give any third party free (except for a nominal charge
-    for the cost of distribution) a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    c) accompany it with the information you received as to where the
-    corresponding source code may be obtained.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it.  For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
-  4. You may not copy, modify, sublicense, distribute or transfer the
-Program except as expressly provided under this General Public License.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Program is void, and will automatically terminate your rights to use
-the Program under this License.  However, parties who have received
-copies, or rights to use copies, from you under this General Public
-License will not have their licenses terminated so long as such parties
-remain in full compliance.
-
-  5. By copying, distributing or modifying the Program (or any work based
-on the Program) you indicate your acceptance of this license to do so,
-and all its terms and conditions.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these
-terms and conditions.  You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein.
-
-  7. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of the license which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-the license, you may choose any version ever published by the Free Software
-Foundation.
-
-  8. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to humanity, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-  To do so, attach the following notices to the program.  It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software Foundation,
-    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19xx name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  program `Gnomovision' (a program to direct compilers to make passes
-  at assemblers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-That's all there is to it!
+		    GNU GENERAL PUBLIC LICENSE
+		     Version 1, February 1989
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+                59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The license agreements of most software companies try to keep users
+at the mercy of those companies.  By contrast, our General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  The
+General Public License applies to the Free Software Foundation's
+software and to any other program whose authors commit to using it.
+You can use it for your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Specifically, the General Public License is designed to make
+sure that you have the freedom to give away or sell copies of free
+software, that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of a such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must tell them their rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License.  The
+"Program", below, refers to any such program or work, and a "work based
+on the Program" means either the Program or any work containing the
+Program or a portion of it, either verbatim or with modifications.  Each
+licensee is addressed as "you".
+
+  1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
+General Public License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this General Public License
+along with the Program.  You may charge a fee for the physical act of
+transferring a copy.
+
+  2. You may modify your copy or copies of the Program or any portion of
+it, and copy and distribute such modifications under the terms of Paragraph
+1 above, provided that you also do the following:
+
+    a) cause the modified files to carry prominent notices stating that
+    you changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish, that
+    in whole or in part contains the Program or any part thereof, either
+    with or without modifications, to be licensed at no charge to all
+    third parties under the terms of this General Public License (except
+    that you may choose to grant warranty protection to some or all
+    third parties, at your option).
+
+    c) If the modified program normally reads commands interactively when
+    run, you must cause it, when started running for such interactive use
+    in the simplest and most usual way, to print or display an
+    announcement including an appropriate copyright notice and a notice
+    that there is no warranty (or else, saying that you provide a
+    warranty) and that users may redistribute the program under these
+    conditions, and telling the user how to view a copy of this General
+    Public License.
+
+    d) You may charge a fee for the physical act of transferring a
+    copy, and you may at your option offer warranty protection in
+    exchange for a fee.
+
+Mere aggregation of another independent work with the Program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other work under the scope of these terms.
+
+  3. You may copy and distribute the Program (or a portion or derivative of
+it, under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal charge
+    for the cost of distribution) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form alone.)
+
+Source code for a work means the preferred form of the work for making
+modifications to it.  For an executable file, complete source code means
+all the source code for all modules it contains; but, as a special
+exception, it need not include source code for modules which are standard
+libraries that accompany the operating system on which the executable
+file runs, or for standard header files or definitions files that
+accompany that operating system.
+
+  4. You may not copy, modify, sublicense, distribute or transfer the
+Program except as expressly provided under this General Public License.
+Any attempt otherwise to copy, modify, sublicense, distribute or transfer
+the Program is void, and will automatically terminate your rights to use
+the Program under this License.  However, parties who have received
+copies, or rights to use copies, from you under this General Public
+License will not have their licenses terminated so long as such parties
+remain in full compliance.
+
+  5. By copying, distributing or modifying the Program (or any work based
+on the Program) you indicate your acceptance of this license to do so,
+and all its terms and conditions.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these
+terms and conditions.  You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein.
+
+  7. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of the license which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+the license, you may choose any version ever published by the Free Software
+Foundation.
+
+  8. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to humanity, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+  To do so, attach the following notices to the program.  It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 1, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19xx name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License.  Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  program `Gnomovision' (a program to direct compilers to make passes
+  at assemblers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/dmd2/mars.c b/dmd2/mars.c
index 9ccf07d7..ea79ce2f 100644
--- a/dmd2/mars.c
+++ b/dmd2/mars.c
@@ -1,1636 +1,1636 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2012 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// https://github.com/D-Programming-Language/dmd/blob/master/src/mars.c
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <assert.h>
-#include <limits.h>
-#include <string>
-#include <cstdarg>
-
-#if POSIX
-#include <errno.h>
-#endif
-
-#include "rmem.h"
-#include "root.h"
-#if !IN_LLVM
-#include "async.h"
-#endif
-
-#include "mars.h"
-#include "module.h"
-#include "mtype.h"
-#include "id.h"
-#include "cond.h"
-#include "expression.h"
-#include "lexer.h"
-#if !IN_LLVM
-#include "lib.h"
-#include "json.h"
-#endif
-
-#if WINDOWS_SEH
-#include <windows.h>
-long __cdecl __ehfilter(LPEXCEPTION_POINTERS ep);
-#endif
-
-#if !IN_LLVM
-int response_expand(int *pargc, char ***pargv);
-void browse(const char *url);
-void getenv_setargv(const char *envvar, int *pargc, char** *pargv);
-
-void obj_start(char *srcfile);
-void obj_end(Library *library, File *objfile);
-#endif
-
-void printCtfePerformanceStats();
-
-Global global;
-
-Global::Global()
-{
-    mars_ext = "d";
-    sym_ext  = "d";
-    hdr_ext  = "di";
-    doc_ext  = "html";
-    ddoc_ext = "ddoc";
-    json_ext = "json";
-    map_ext  = "map";
-
-#if IN_LLVM
-    ll_ext  = "ll";
-    bc_ext  = "bc";
-    s_ext   = "s";
-    obj_ext = "o";
-#if _WIN32
-    obj_ext_alt = "obj";
-#endif
-#else
-#if TARGET_WINDOS
-    obj_ext  = "obj";
-#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-    obj_ext  = "o";
-#elif TARGET_NET
-#else
-#error "fix this"
-#endif
-
-#if TARGET_WINDOS
-    lib_ext  = "lib";
-#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-    lib_ext  = "a";
-#elif TARGET_NET
-#else
-#error "fix this"
-#endif
-#endif
-
-    copyright = "Copyright (c) 1999-2012 by Digital Mars";
-    written = "written by Walter Bright"
-#if TARGET_NET
-    "\nMSIL back-end (alpha release) by Cristian L. Vlasceanu and associates.";
-#endif
-    ;
-    version = "v2.059";
-#if IN_LLVM
-    ldc_version = "LDC trunk";
-    llvm_version = "LLVM "LDC_LLVM_VERSION_STRING;
-#endif
-    global.structalign = 8;
-
-    // This should only be used as a global, so the other fields are
-    // automatically initialized to zero when the program is loaded.
-    // In particular, DO NOT zero-initialize .params here (like DMD
-    // does) because command-line options initialize some of those
-    // fields to non-zero defaults, and do so from constructors that
-    // may run before this one.
-}
-
-unsigned Global::startGagging()
-{
-    ++gag;
-    return gaggedErrors;
-}
-
-bool Global::endGagging(unsigned oldGagged)
-{
-    bool anyErrs = (gaggedErrors != oldGagged);
-    --gag;
-    // Restore the original state of gagged errors; set total errors
-    // to be original errors + new ungagged errors.
-    errors -= (gaggedErrors - oldGagged);
-    gaggedErrors = oldGagged;
-    return anyErrs;
-}
-
-bool Global::isSpeculativeGagging()
-{
-    return gag && gag == speculativeGag;
-}
-
-
-char *Loc::toChars()
-{
-    OutBuffer buf;
-
-    if (filename)
-    {
-        buf.printf("%s", filename);
-    }
-
-    if (linnum)
-        buf.printf("(%d)", linnum);
-    buf.writeByte(0);
-    return (char *)buf.extractData();
-}
-
-Loc::Loc(Module *mod, unsigned linnum)
-{
-    this->linnum = linnum;
-    this->filename = mod ? mod->srcfile->toChars() : NULL;
-}
-
-bool Loc::equals(const Loc& loc)
-{
-    return linnum == loc.linnum && FileName::equals(filename, loc.filename);
-}
-
-/**************************************
- * Print error message
- */
-
-void error(Loc loc, const char *format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    verror(loc, format, ap);
-    va_end( ap );
-}
-
-void warning(Loc loc, const char *format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    vwarning(loc, format, ap);
-    va_end( ap );
-}
-
-/**************************************
- * Print supplementary message about the last error
- * Used for backtraces, etc
- */
-void errorSupplemental(Loc loc, const char *format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    verrorSupplemental(loc, format, ap);
-    va_end( ap );
-}
-
-void verror(Loc loc, const char *format, va_list ap)
-{
-    if (!global.gag)
-    {
-        char *p = loc.toChars();
-
-        if (*p)
-            fprintf(stdmsg, "%s: ", p);
-        mem.free(p);
-
-        fprintf(stdmsg, "Error: ");
-        // MS doesn't recognize %zu format
-        OutBuffer tmp;
-        tmp.vprintf(format, ap);
-#if _MSC_VER
-        fprintf(stdmsg, "%s", tmp.toChars());
-#else
-        vfprintf(stdmsg, format, ap);
-#endif
-        fprintf(stdmsg, "\n");
-        fflush(stdmsg);
-//halt();
-    }
-    else
-    {
-        global.gaggedErrors++;
-    }
-    global.errors++;
-}
-
-// Doesn't increase error count, doesn't print "Error:".
-void verrorSupplemental(Loc loc, const char *format, va_list ap)
-{
-    if (!global.gag)
-    {
-        fprintf(stdmsg, "%s:        ", loc.toChars());
-#if _MSC_VER
-        // MS doesn't recognize %zu format
-        OutBuffer tmp;
-        tmp.vprintf(format, ap);
-        fprintf(stdmsg, "%s", tmp.toChars());
-#else
-        vfprintf(stdmsg, format, ap);
-#endif
-        fprintf(stdmsg, "\n");
-        fflush(stdmsg);
-    }
-}
-
-void vwarning(Loc loc, const char *format, va_list ap)
-{
-    if (global.params.warnings && !global.gag)
-    {
-        char *p = loc.toChars();
-
-        if (*p)
-            fprintf(stdmsg, "%s: ", p);
-        mem.free(p);
-
-        fprintf(stdmsg, "Warning: ");
-#if _MSC_VER
-        // MS doesn't recognize %zu format
-        OutBuffer tmp;
-        tmp.vprintf(format, ap);
-        fprintf(stdmsg, "%s", tmp.toChars());
-#else
-        vfprintf(stdmsg, format, ap);
-#endif
-        fprintf(stdmsg, "\n");
-        fflush(stdmsg);
-//halt();
-        if (global.params.warnings == 1)
-            global.warnings++;  // warnings don't count if gagged
-    }
-}
-
-/***************************************
- * Call this after printing out fatal error messages to clean up and exit
- * the compiler.
- */
-
-void fatal()
-{
-#if 0
-    halt();
-#endif
-    exit(EXIT_FAILURE);
-}
-
-/**************************************
- * Try to stop forgetting to remove the breakpoints from
- * release builds.
- */
-void halt()
-{
-#ifdef DEBUG
-    *(volatile char*)0=0;
-#endif
-}
-
-#if !IN_LLVM
-
-extern void backend_init();
-extern void backend_term();
-
-void usage()
-{
-#if TARGET_LINUX
-    const char fpic[] ="\
-  -fPIC          generate position independent code\n\
-";
-#else
-    const char fpic[] = "";
-#endif
-    printf("DMD%s D Compiler %s\n%s %s\n",
-        sizeof(size_t) == 4 ? "32" : "64",
-        global.version, global.copyright, global.written);
-    printf("\
-Documentation: http://www.dlang.org/index.html\n\
-Usage:\n\
-  dmd files.d ... { -switch }\n\
-\n\
-  files.d        D source files\n\
-  @cmdfile       read arguments from cmdfile\n\
-  -c             do not link\n\
-  -cov           do code coverage analysis\n\
-  -D             generate documentation\n\
-  -Dddocdir      write documentation file to docdir directory\n\
-  -Dffilename    write documentation file to filename\n\
-  -d             allow deprecated features\n\
-  -debug         compile in debug code\n\
-  -debug=level   compile in debug code <= level\n\
-  -debug=ident   compile in debug code identified by ident\n\
-  -debuglib=name    set symbolic debug library to name\n\
-  -defaultlib=name  set default library to name\n\
-  -deps=filename write module dependencies to filename\n%s"
-"  -g             add symbolic debug info\n\
-  -gc            add symbolic debug info, pretend to be C\n\
-  -gs            always emit stack frame\n\
-  -H             generate 'header' file\n\
-  -Hddirectory   write 'header' file to directory\n\
-  -Hffilename    write 'header' file to filename\n\
-  --help         print help\n\
-  -Ipath         where to look for imports\n\
-  -ignore        ignore unsupported pragmas\n\
-  -inline        do function inlining\n\
-  -Jpath         where to look for string imports\n\
-  -Llinkerflag   pass linkerflag to link\n\
-  -lib           generate library rather than object files\n"
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-"  -m32           generate 32 bit code\n\
-  -m64           generate 64 bit code\n"
-#endif
-"  -man           open web browser on manual page\n\
-  -map           generate linker .map file\n\
-  -noboundscheck turns off array bounds checking for all functions\n\
-  -nofloat       do not emit reference to floating point\n\
-  -O             optimize\n\
-  -o-            do not write object file\n\
-  -odobjdir      write object & library files to directory objdir\n\
-  -offilename    name output file to filename\n\
-  -op            do not strip paths from source file\n\
-  -profile       profile runtime performance of generated code\n\
-  -property      enforce property syntax\n\
-  -quiet         suppress unnecessary messages\n\
-  -release       compile release version\n\
-  -run srcfile args...   run resulting program, passing args\n"
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-"  -shared        generate shared library\n"
-#endif
-"  -unittest      compile in unit tests\n\
-  -v             verbose\n\
-  -version=level compile in version code >= level\n\
-  -version=ident compile in version code identified by ident\n\
-  -vtls          list all variables going into thread local storage\n\
-  -w             enable warnings\n\
-  -wi            enable informational warnings\n\
-  -X             generate JSON file\n\
-  -Xffilename    write JSON file to filename\n\
-", fpic);
-}
-
-extern signed char tyalignsize[];
-
-#if _WIN32 && __DMC__
-extern "C"
-{
-    extern int _xi_a;
-    extern int _end;
-}
-#endif
-
-int tryMain(int argc, char *argv[])
-{
-    mem.init();                         // initialize storage allocator
-    mem.setStackBottom(&argv);
-#if _WIN32 && __DMC__
-    mem.addroots((char *)&_xi_a, (char *)&_end);
-#endif
-
-    Strings files;
-    Strings libmodules;
-    char *p;
-    Module *m;
-    int status = EXIT_SUCCESS;
-    int argcstart = argc;
-    int setdebuglib = 0;
-    char noboundscheck = 0;
-    const char *inifilename = NULL;
-
-#ifdef DEBUG
-    printf("DMD %s DEBUG\n", global.version);
-#endif
-
-    unittests();
-
-    // Check for malformed input
-    if (argc < 1 || !argv)
-    {
-      Largs:
-        error(0, "missing or null command line arguments");
-        fatal();
-    }
-    for (size_t i = 0; i < argc; i++)
-    {
-        if (!argv[i])
-            goto Largs;
-    }
-
-    if (response_expand(&argc,&argv))   // expand response files
-        error(0, "can't open response file");
-
-    files.reserve(argc - 1);
-
-    // Set default values
-    global.params.argv0 = argv[0];
-    global.params.link = 1;
-    global.params.useAssert = 1;
-    global.params.useInvariants = 1;
-    global.params.useIn = 1;
-    global.params.useOut = 1;
-    global.params.useArrayBounds = 2;   // default to all functions
-    global.params.useSwitchError = 1;
-    global.params.useInline = 0;
-    global.params.obj = 1;
-    global.params.Dversion = 2;
-    global.params.quiet = 1;
-
-    global.params.linkswitches = new Strings();
-    global.params.libfiles = new Strings();
-    global.params.objfiles = new Strings();
-    global.params.ddocfiles = new Strings();
-
-    // Default to -m32 for 32 bit dmd, -m64 for 64 bit dmd
-    global.params.is64bit = (sizeof(size_t) == 8);
-
-#if TARGET_WINDOS
-    global.params.is64bit = 0;
-    global.params.defaultlibname = "phobos";
-#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-    global.params.defaultlibname = "phobos2";
-#elif TARGET_NET
-#else
-#error "fix this"
-#endif
-
-    // Predefine version identifiers
-    VersionCondition::addPredefinedGlobalIdent("DigitalMars");
-
-#if TARGET_WINDOS
-    VersionCondition::addPredefinedGlobalIdent("Windows");
-    global.params.isWindows = 1;
-#if TARGET_NET
-    // TARGET_NET macro is NOT mutually-exclusive with TARGET_WINDOS
-    VersionCondition::addPredefinedGlobalIdent("D_NET");
-#endif
-#elif TARGET_LINUX
-    VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("linux");
-    global.params.isLinux = 1;
-#elif TARGET_OSX
-    VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("OSX");
-    global.params.isOSX = 1;
-
-    // For legacy compatibility
-    VersionCondition::addPredefinedGlobalIdent("darwin");
-#elif TARGET_FREEBSD
-    VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("FreeBSD");
-    global.params.isFreeBSD = 1;
-#elif TARGET_OPENBSD
-    VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("OpenBSD");
-    global.params.isFreeBSD = 1;
-#elif TARGET_SOLARIS
-    VersionCondition::addPredefinedGlobalIdent("Posix");
-    VersionCondition::addPredefinedGlobalIdent("Solaris");
-    global.params.isSolaris = 1;
-#else
-#error "fix this"
-#endif
-
-    VersionCondition::addPredefinedGlobalIdent("LittleEndian");
-    //VersionCondition::addPredefinedGlobalIdent("D_Bits");
-#if DMDV2
-    VersionCondition::addPredefinedGlobalIdent("D_Version2");
-#endif
-    VersionCondition::addPredefinedGlobalIdent("all");
-
-#if _WIN32
-    inifilename = inifile(argv[0], "sc.ini");
-#elif linux || __APPLE__ || __FreeBSD__ || __OpenBSD__ || __sun&&__SVR4
-    inifilename = inifile(argv[0], "dmd.conf");
-#else
-#error "fix this"
-#endif
-    getenv_setargv("DFLAGS", &argc, &argv);
-
-#if 0
-    for (size_t i = 0; i < argc; i++)
-    {
-        printf("argv[%d] = '%s'\n", i, argv[i]);
-    }
-#endif
-
-    for (size_t i = 1; i < argc; i++)
-    {
-        p = argv[i];
-        if (*p == '-')
-        {
-            if (strcmp(p + 1, "d") == 0)
-                global.params.useDeprecated = 1;
-            else if (strcmp(p + 1, "c") == 0)
-                global.params.link = 0;
-            else if (strcmp(p + 1, "cov") == 0)
-                global.params.cov = 1;
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-            else if (strcmp(p + 1, "shared") == 0
-#if TARGET_OSX
-                // backwards compatibility with old switch
-                || strcmp(p + 1, "dylib") == 0
-#endif
-                )
-                global.params.dll = 1;
-            else if (strcmp(p + 1, "fPIC") == 0)
-                global.params.pic = 1;
-#endif
-            else if (strcmp(p + 1, "map") == 0)
-                global.params.map = 1;
-            else if (strcmp(p + 1, "multiobj") == 0)
-                global.params.multiobj = 1;
-            else if (strcmp(p + 1, "g") == 0)
-                global.params.symdebug = 1;
-            else if (strcmp(p + 1, "gc") == 0)
-                global.params.symdebug = 2;
-            else if (strcmp(p + 1, "gs") == 0)
-                global.params.alwaysframe = 1;
-            else if (strcmp(p + 1, "gt") == 0)
-            {   error(0, "use -profile instead of -gt\n");
-                global.params.trace = 1;
-            }
-            else if (strcmp(p + 1, "m32") == 0)
-                global.params.is64bit = 0;
-            else if (strcmp(p + 1, "m64") == 0)
-                global.params.is64bit = 1;
-            else if (strcmp(p + 1, "profile") == 0)
-                global.params.trace = 1;
-            else if (strcmp(p + 1, "v") == 0)
-                global.params.verbose = 1;
-#if DMDV2
-            else if (strcmp(p + 1, "vtls") == 0)
-                global.params.vtls = 1;
-#endif
-            else if (strcmp(p + 1, "v1") == 0)
-            {
-#if DMDV1
-                global.params.Dversion = 1;
-#else
-                error(0, "use DMD 1.0 series compilers for -v1 switch");
-                break;
-#endif
-            }
-            else if (strcmp(p + 1, "w") == 0)
-                global.params.warnings = 1;
-            else if (strcmp(p + 1, "wi") == 0)
-                global.params.warnings = 2;
-            else if (strcmp(p + 1, "O") == 0)
-                global.params.optimize = 1;
-            else if (p[1] == 'o')
-            {
-                switch (p[2])
-                {
-                    case '-':
-                        global.params.obj = 0;
-                        break;
-
-                    case 'd':
-                        if (!p[3])
-                            goto Lnoarg;
-                        global.params.objdir = p + 3;
-                        break;
-
-                    case 'f':
-                        if (!p[3])
-                            goto Lnoarg;
-                        global.params.objname = p + 3;
-                        break;
-
-                    case 'p':
-                        if (p[3])
-                            goto Lerror;
-                        global.params.preservePaths = 1;
-                        break;
-
-                    case 0:
-                        error(0, "-o no longer supported, use -of or -od");
-                        break;
-
-                    default:
-                        goto Lerror;
-                }
-            }
-            else if (p[1] == 'D')
-            {   global.params.doDocComments = 1;
-                switch (p[2])
-                {
-                    case 'd':
-                        if (!p[3])
-                            goto Lnoarg;
-                        global.params.docdir = p + 3;
-                        break;
-                    case 'f':
-                        if (!p[3])
-                            goto Lnoarg;
-                        global.params.docname = p + 3;
-                        break;
-
-                    case 0:
-                        break;
-
-                    default:
-                        goto Lerror;
-                }
-            }
-            else if (p[1] == 'H')
-            {   global.params.doHdrGeneration = 1;
-                switch (p[2])
-                {
-                    case 'd':
-                        if (!p[3])
-                            goto Lnoarg;
-                        global.params.hdrdir = p + 3;
-                        break;
-
-                    case 'f':
-                        if (!p[3])
-                            goto Lnoarg;
-                        global.params.hdrname = p + 3;
-                        break;
-
-                    case 0:
-                        break;
-
-                    default:
-                        goto Lerror;
-                }
-            }
-            else if (p[1] == 'X')
-            {   global.params.doXGeneration = 1;
-                switch (p[2])
-                {
-                    case 'f':
-                        if (!p[3])
-                            goto Lnoarg;
-                        global.params.xfilename = p + 3;
-                        break;
-
-                    case 0:
-                        break;
-
-                    default:
-                        goto Lerror;
-                }
-            }
-            else if (strcmp(p + 1, "ignore") == 0)
-                global.params.ignoreUnsupportedPragmas = 1;
-            else if (strcmp(p + 1, "property") == 0)
-                global.params.enforcePropertySyntax = 1;
-            else if (strcmp(p + 1, "inline") == 0)
-                global.params.useInline = 1;
-            else if (strcmp(p + 1, "lib") == 0)
-                global.params.lib = 1;
-            else if (strcmp(p + 1, "nofloat") == 0)
-                global.params.nofloat = 1;
-            else if (strcmp(p + 1, "quiet") == 0)
-                global.params.quiet = 1;
-            else if (strcmp(p + 1, "release") == 0)
-                global.params.release = 1;
-#if DMDV2
-            else if (strcmp(p + 1, "noboundscheck") == 0)
-                noboundscheck = 1;
-#endif
-            else if (strcmp(p + 1, "unittest") == 0)
-                global.params.useUnitTests = 1;
-            else if (p[1] == 'I')
-            {
-                if (!global.params.imppath)
-                    global.params.imppath = new Strings();
-                global.params.imppath->push(p + 2);
-            }
-            else if (p[1] == 'J')
-            {
-                if (!global.params.fileImppath)
-                    global.params.fileImppath = new Strings();
-                global.params.fileImppath->push(p + 2);
-            }
-            else if (memcmp(p + 1, "debug", 5) == 0 && p[6] != 'l')
-            {
-                // Parse:
-                //      -debug
-                //      -debug=number
-                //      -debug=identifier
-                if (p[6] == '=')
-                {
-                    if (isdigit((unsigned char)p[7]))
-                    {   long level;
-
-                        errno = 0;
-                        level = strtol(p + 7, &p, 10);
-                        if (*p || errno || level > INT_MAX)
-                            goto Lerror;
-                        DebugCondition::setGlobalLevel((int)level);
-                    }
-                    else if (Lexer::isValidIdentifier(p + 7))
-                        DebugCondition::addGlobalIdent(p + 7);
-                    else
-                        goto Lerror;
-                }
-                else if (p[6])
-                    goto Lerror;
-                else
-                    global.params.debuglevel = 1;
-            }
-            else if (memcmp(p + 1, "version", 5) == 0)
-            {
-                // Parse:
-                //      -version=number
-                //      -version=identifier
-                if (p[8] == '=')
-                {
-                    if (isdigit((unsigned char)p[9]))
-                    {   long level;
-
-                        errno = 0;
-                        level = strtol(p + 9, &p, 10);
-                        if (*p || errno || level > INT_MAX)
-                            goto Lerror;
-                        VersionCondition::setGlobalLevel((int)level);
-                    }
-                    else if (Lexer::isValidIdentifier(p + 9))
-                        VersionCondition::addGlobalIdent(p + 9);
-                    else
-                        goto Lerror;
-                }
-                else
-                    goto Lerror;
-            }
-            else if (strcmp(p + 1, "-b") == 0)
-                global.params.debugb = 1;
-            else if (strcmp(p + 1, "-c") == 0)
-                global.params.debugc = 1;
-            else if (strcmp(p + 1, "-f") == 0)
-                global.params.debugf = 1;
-            else if (strcmp(p + 1, "-help") == 0)
-            {   usage();
-                exit(EXIT_SUCCESS);
-            }
-            else if (strcmp(p + 1, "-r") == 0)
-                global.params.debugr = 1;
-            else if (strcmp(p + 1, "-x") == 0)
-                global.params.debugx = 1;
-            else if (strcmp(p + 1, "-y") == 0)
-                global.params.debugy = 1;
-            else if (p[1] == 'L')
-            {
-                global.params.linkswitches->push(p + 2);
-            }
-            else if (memcmp(p + 1, "defaultlib=", 11) == 0)
-            {
-                global.params.defaultlibname = p + 1 + 11;
-            }
-            else if (memcmp(p + 1, "debuglib=", 9) == 0)
-            {
-                setdebuglib = 1;
-                global.params.debuglibname = p + 1 + 9;
-            }
-            else if (memcmp(p + 1, "deps=", 5) == 0)
-            {
-                global.params.moduleDepsFile = p + 1 + 5;
-                if (!global.params.moduleDepsFile[0])
-                    goto Lnoarg;
-                global.params.moduleDeps = new OutBuffer;
-            }
-            else if (memcmp(p + 1, "man", 3) == 0)
-            {
-#if _WIN32
-#if DMDV1
-                browse("http://www.digitalmars.com/d/1.0/dmd-windows.html");
-#else
-                browse("http://www.dlang.org/dmd-windows.html");
-#endif
-#endif
-#if linux
-#if DMDV1
-                browse("http://www.digitalmars.com/d/1.0/dmd-linux.html");
-#else
-                browse("http://www.dlang.org/dmd-linux.html");
-#endif
-#endif
-#if __APPLE__
-#if DMDV1
-                browse("http://www.digitalmars.com/d/1.0/dmd-osx.html");
-#else
-                browse("http://www.dlang.org/dmd-osx.html");
-#endif
-#endif
-#if __FreeBSD__
-#if DMDV1
-                browse("http://www.digitalmars.com/d/1.0/dmd-freebsd.html");
-#else
-                browse("http://www.dlang.org/dmd-freebsd.html");
-#endif
-#endif
-#if __OpenBSD__
-#if DMDV1
-                browse("http://www.digitalmars.com/d/1.0/dmd-openbsd.html");
-#else
-                browse("http://www.dlang.org/dmd-openbsd.html");
-#endif
-#endif
-                exit(EXIT_SUCCESS);
-            }
-            else if (strcmp(p + 1, "run") == 0)
-            {   global.params.run = 1;
-                global.params.runargs_length = ((i >= argcstart) ? argc : argcstart) - i - 1;
-                if (global.params.runargs_length)
-                {
-                    files.push(argv[i + 1]);
-                    global.params.runargs = &argv[i + 2];
-                    i += global.params.runargs_length;
-                    global.params.runargs_length--;
-                }
-                else
-                {   global.params.run = 0;
-                    goto Lnoarg;
-                }
-            }
-            else
-            {
-             Lerror:
-                error(0, "unrecognized switch '%s'", argv[i]);
-                continue;
-
-             Lnoarg:
-                error(0, "argument expected for switch '%s'", argv[i]);
-                continue;
-            }
-        }
-        else
-        {
-#if TARGET_WINDOS
-            char *ext = FileName::ext(p);
-            if (ext && FileName::compare(ext, "exe") == 0)
-            {
-                global.params.objname = p;
-                continue;
-            }
-#endif
-            files.push(p);
-        }
-    }
-    if (global.errors)
-    {
-        fatal();
-    }
-    if (files.dim == 0)
-    {   usage();
-        return EXIT_FAILURE;
-    }
-
-    if (!setdebuglib)
-        global.params.debuglibname = global.params.defaultlibname;
-
-#if TARGET_OSX
-    global.params.pic = 1;
-#endif
-
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-    if (global.params.lib && global.params.dll)
-        error(0, "cannot mix -lib and -shared\n");
-#endif
-
-    if (global.params.release)
-    {   global.params.useInvariants = 0;
-        global.params.useIn = 0;
-        global.params.useOut = 0;
-        global.params.useAssert = 0;
-        global.params.useArrayBounds = 1;
-        global.params.useSwitchError = 0;
-    }
-    if (noboundscheck)
-        global.params.useArrayBounds = 0;
-
-    if (global.params.run)
-        global.params.quiet = 1;
-
-    if (global.params.useUnitTests)
-        global.params.useAssert = 1;
-
-    if (!global.params.obj || global.params.lib)
-        global.params.link = 0;
-
-    if (global.params.link)
-    {
-        global.params.exefile = global.params.objname;
-        global.params.oneobj = 1;
-        if (global.params.objname)
-        {
-            /* Use this to name the one object file with the same
-             * name as the exe file.
-             */
-            global.params.objname = FileName::forceExt(global.params.objname, global.obj_ext)->toChars();
-
-            /* If output directory is given, use that path rather than
-             * the exe file path.
-             */
-            if (global.params.objdir)
-            {   char *name = FileName::name(global.params.objname);
-                global.params.objname = FileName::combine(global.params.objdir, name);
-            }
-        }
-    }
-    else if (global.params.lib)
-    {
-        global.params.libname = global.params.objname;
-        global.params.objname = NULL;
-
-        // Haven't investigated handling these options with multiobj
-        if (!global.params.cov && !global.params.trace
-#if 0 && TARGET_WINDOS
-            /* multiobj causes class/struct debug info to be attached to init-data,
-             * but this will not be linked into the executable, so this info is lost.
-             * Bugzilla 4014
-             */
-            && !global.params.symdebug
-#endif
-           )
-            global.params.multiobj = 1;
-    }
-    else if (global.params.run)
-    {
-        error(0, "flags conflict with -run");
-        fatal();
-    }
-    else
-    {
-        if (global.params.objname && files.dim > 1)
-        {
-            global.params.oneobj = 1;
-            //error("multiple source files, but only one .obj name");
-            //fatal();
-        }
-    }
-    if (global.params.is64bit)
-    {
-        VersionCondition::addPredefinedGlobalIdent("D_InlineAsm_X86_64");
-        VersionCondition::addPredefinedGlobalIdent("X86_64");
-        VersionCondition::addPredefinedGlobalIdent("D_LP64");
-        VersionCondition::addPredefinedGlobalIdent("D_SIMD");
-#if TARGET_WINDOS
-        VersionCondition::addPredefinedGlobalIdent("Win64");
-#endif
-    }
-    else
-    {
-        VersionCondition::addPredefinedGlobalIdent("D_InlineAsm");
-        VersionCondition::addPredefinedGlobalIdent("D_InlineAsm_X86");
-        VersionCondition::addPredefinedGlobalIdent("X86");
-#if TARGET_OSX
-        VersionCondition::addPredefinedGlobalIdent("D_SIMD");
-#endif
-#if TARGET_WINDOS
-        VersionCondition::addPredefinedGlobalIdent("Win32");
-#endif
-    }
-    if (global.params.doDocComments)
-        VersionCondition::addPredefinedGlobalIdent("D_Ddoc");
-    if (global.params.cov)
-        VersionCondition::addPredefinedGlobalIdent("D_Coverage");
-    if (global.params.pic)
-        VersionCondition::addPredefinedGlobalIdent("D_PIC");
-#if DMDV2
-    if (global.params.useUnitTests)
-        VersionCondition::addPredefinedGlobalIdent("unittest");
-#endif
-
-    // Initialization
-    Type::init();
-    Id::initialize();
-    Module::init();
-    initPrecedence();
-
-    if (global.params.verbose)
-    {   printf("binary    %s\n", argv[0]);
-        printf("version   %s\n", global.version);
-        printf("config    %s\n", inifilename ? inifilename : "(none)");
-    }
-
-    //printf("%d source files\n",files.dim);
-
-    // Build import search path
-    if (global.params.imppath)
-    {
-        for (size_t i = 0; i < global.params.imppath->dim; i++)
-        {
-            char *path = (*global.params.imppath)[i];
-            Strings *a = FileName::splitPath(path);
-
-            if (a)
-            {
-                if (!global.path)
-                    global.path = new Strings();
-                global.path->append(a);
-            }
-        }
-    }
-
-    // Build string import search path
-    if (global.params.fileImppath)
-    {
-        for (size_t i = 0; i < global.params.fileImppath->dim; i++)
-        {
-            char *path = global.params.fileImppath->tdata()[i];
-            Strings *a = FileName::splitPath(path);
-
-            if (a)
-            {
-                if (!global.filePath)
-                    global.filePath = new Strings();
-                global.filePath->append(a);
-            }
-        }
-    }
-
-    // Create Modules
-    Modules modules;
-    modules.reserve(files.dim);
-    int firstmodule = 1;
-    for (size_t i = 0; i < files.dim; i++)
-    {
-        char *ext;
-        char *name;
-
-        p = files.tdata()[i];
-
-#if _WIN32
-        // Convert / to \ so linker will work
-        for (size_t j = 0; p[j]; j++)
-        {
-            if (p[j] == '/')
-                p[j] = '\\';
-        }
-#endif
-
-        p = FileName::name(p);          // strip path
-        ext = FileName::ext(p);
-        if (ext)
-        {   /* Deduce what to do with a file based on its extension
-             */
-            if (FileName::equals(ext, global.obj_ext))
-            {
-                global.params.objfiles->push(files.tdata()[i]);
-                libmodules.push(files.tdata()[i]);
-                continue;
-            }
-
-            if (FileName::equals(ext, global.lib_ext))
-            {
-                global.params.libfiles->push(files.tdata()[i]);
-                libmodules.push(files.tdata()[i]);
-                continue;
-            }
-
-            if (strcmp(ext, global.ddoc_ext) == 0)
-            {
-                global.params.ddocfiles->push(files.tdata()[i]);
-                continue;
-            }
-
-            if (FileName::equals(ext, global.json_ext))
-            {
-                global.params.doXGeneration = 1;
-                global.params.xfilename = files.tdata()[i];
-                continue;
-            }
-
-            if (FileName::equals(ext, global.map_ext))
-            {
-                global.params.mapfile = files.tdata()[i];
-                continue;
-            }
-
-#if TARGET_WINDOS
-            if (FileName::equals(ext, "res"))
-            {
-                global.params.resfile = files.tdata()[i];
-                continue;
-            }
-
-            if (FileName::equals(ext, "def"))
-            {
-                global.params.deffile = files.tdata()[i];
-                continue;
-            }
-
-            if (FileName::equals(ext, "exe"))
-            {
-                assert(0);      // should have already been handled
-            }
-#endif
-
-            /* Examine extension to see if it is a valid
-             * D source file extension
-             */
-            if (FileName::equals(ext, global.mars_ext) ||
-                FileName::equals(ext, global.hdr_ext) ||
-                FileName::equals(ext, "dd") ||
-                FileName::equals(ext, "htm") ||
-                FileName::equals(ext, "html") ||
-                FileName::equals(ext, "xhtml"))
-            {
-                ext--;                  // skip onto '.'
-                assert(*ext == '.');
-                name = (char *)mem.malloc((ext - p) + 1);
-                memcpy(name, p, ext - p);
-                name[ext - p] = 0;              // strip extension
-
-                if (name[0] == 0 ||
-                    strcmp(name, "..") == 0 ||
-                    strcmp(name, ".") == 0)
-                {
-                Linvalid:
-                    error(0, "invalid file name '%s'", files.tdata()[i]);
-                    fatal();
-                }
-            }
-            else
-            {   error(0, "unrecognized file extension %s\n", ext);
-                fatal();
-            }
-        }
-        else
-        {   name = p;
-            if (!*name)
-                goto Linvalid;
-        }
-
-        /* At this point, name is the D source file name stripped of
-         * its path and extension.
-         */
-
-        Identifier *id = Lexer::idPool(name);
-        m = new Module(files[i], id, global.params.doDocComments, global.params.doHdrGeneration);
-        modules.push(m);
-
-        if (firstmodule)
-        {   global.params.objfiles->push(m->objfile->name->str);
-            firstmodule = 0;
-        }
-    }
-
-    // Read files
-#define ASYNCREAD 1
-#if ASYNCREAD
-    // Multi threaded
-    AsyncRead *aw = AsyncRead::create(modules.dim);
-    for (size_t i = 0; i < modules.dim; i++)
-    {
-        m = modules[i];
-        aw->addFile(m->srcfile);
-    }
-    aw->start();
-#else
-    // Single threaded
-    for (size_t i = 0; i < modules.dim; i++)
-    {
-        m = modules[i];
-        m->read(0);
-    }
-#endif
-
-    // Parse files
-    bool anydocfiles = false;
-    size_t filecount = modules.dim;
-    for (size_t filei = 0, modi = 0; filei < filecount; filei++, modi++)
-    {
-        m = modules[modi];
-        if (global.params.verbose)
-            printf("parse     %s\n", m->toChars());
-        if (!Module::rootModule)
-            Module::rootModule = m;
-        m->importedFrom = m;
-        if (!global.params.oneobj || modi == 0 || m->isDocFile)
-            m->deleteObjFile();
-#if ASYNCREAD
-        if (aw->read(filei))
-        {
-            error(0, "cannot read file %s", m->srcfile->name->toChars());
-            fatal();
-        }
-#endif
-        m->parse();
-        if (m->isDocFile)
-        {
-            anydocfiles = true;
-            m->gendocfile();
-
-            // Remove m from list of modules
-            modules.remove(modi);
-            modi--;
-
-            // Remove m's object file from list of object files
-            for (size_t j = 0; j < global.params.objfiles->dim; j++)
-            {
-                if (m->objfile->name->str == global.params.objfiles->tdata()[j])
-                {
-                    global.params.objfiles->remove(j);
-                    break;
-                }
-            }
-
-            if (global.params.objfiles->dim == 0)
-                global.params.link = 0;
-        }
-    }
-#if ASYNCREAD
-    AsyncRead::dispose(aw);
-#endif
-
-    if (anydocfiles && modules.dim &&
-        (global.params.oneobj || global.params.objname))
-    {
-        error(0, "conflicting Ddoc and obj generation options");
-        fatal();
-    }
-    if (global.errors)
-        fatal();
-    if (global.params.doHdrGeneration)
-    {
-        /* Generate 'header' import files.
-         * Since 'header' import files must be independent of command
-         * line switches and what else is imported, they are generated
-         * before any semantic analysis.
-         */
-        for (size_t i = 0; i < modules.dim; i++)
-        {
-            m = modules[i];
-            if (global.params.verbose)
-                printf("import    %s\n", m->toChars());
-            m->genhdrfile();
-        }
-    }
-    if (global.errors)
-        fatal();
-
-    // load all unconditional imports for better symbol resolving
-    for (size_t i = 0; i < modules.dim; i++)
-    {
-       m = modules[i];
-       if (global.params.verbose)
-           printf("importall %s\n", m->toChars());
-       m->importAll(0);
-    }
-    if (global.errors)
-       fatal();
-
-    backend_init();
-
-    // Do semantic analysis
-    for (size_t i = 0; i < modules.dim; i++)
-    {
-        m = modules[i];
-        if (global.params.verbose)
-            printf("semantic  %s\n", m->toChars());
-        m->semantic();
-    }
-    if (global.errors)
-        fatal();
-
-    Module::dprogress = 1;
-    Module::runDeferredSemantic();
-
-    // Do pass 2 semantic analysis
-    for (size_t i = 0; i < modules.dim; i++)
-    {
-        m = modules[i];
-        if (global.params.verbose)
-            printf("semantic2 %s\n", m->toChars());
-        m->semantic2();
-    }
-    if (global.errors)
-        fatal();
-
-    // Do pass 3 semantic analysis
-    for (size_t i = 0; i < modules.dim; i++)
-    {
-        m = modules[i];
-        if (global.params.verbose)
-            printf("semantic3 %s\n", m->toChars());
-        m->semantic3();
-    }
-    if (global.errors)
-        fatal();
-
-    if (global.params.moduleDeps != NULL)
-    {
-        assert(global.params.moduleDepsFile != NULL);
-
-        File deps(global.params.moduleDepsFile);
-        OutBuffer* ob = global.params.moduleDeps;
-        deps.setbuffer((void*)ob->data, ob->offset);
-        deps.writev();
-    }
-
-
-    // Scan for functions to inline
-    if (global.params.useInline)
-    {
-        /* The problem with useArrayBounds and useAssert is that the
-         * module being linked to may not have generated them, so if
-         * we inline functions from those modules, the symbols for them will
-         * not be found at link time.
-         */
-        if (!global.params.useArrayBounds && !global.params.useAssert)
-        {
-            // Do pass 3 semantic analysis on all imported modules,
-            // since otherwise functions in them cannot be inlined
-            for (size_t i = 0; i < Module::amodules.dim; i++)
-            {
-                m = Module::amodules[i];
-                if (global.params.verbose)
-                    printf("semantic3 %s\n", m->toChars());
-                m->semantic3();
-            }
-            if (global.errors)
-                fatal();
-        }
-
-        for (size_t i = 0; i < modules.dim; i++)
-        {
-            m = modules[i];
-            if (global.params.verbose)
-                printf("inline scan %s\n", m->toChars());
-            m->inlineScan();
-        }
-    }
-
-    // Do not attempt to generate output files if errors or warnings occurred
-    if (global.errors || global.warnings)
-        fatal();
-
-    printCtfePerformanceStats();
-
-    Library *library = NULL;
-    if (global.params.lib)
-    {
-        library = new Library();
-        library->setFilename(global.params.objdir, global.params.libname);
-
-        // Add input object and input library files to output library
-        for (size_t i = 0; i < libmodules.dim; i++)
-        {
-            char *p = libmodules[i];
-            library->addObject(p, NULL, 0);
-        }
-    }
-
-    // Generate output files
-
-    if (global.params.doXGeneration)
-        json_generate(&modules);
-
-    if (global.params.oneobj)
-    {
-        for (size_t i = 0; i < modules.dim; i++)
-        {
-            m = modules[i];
-            if (global.params.verbose)
-                printf("code      %s\n", m->toChars());
-            if (i == 0)
-                obj_start(m->srcfile->toChars());
-            m->genobjfile(0);
-            if (!global.errors && global.params.doDocComments)
-                m->gendocfile();
-        }
-        if (!global.errors && modules.dim)
-        {
-            obj_end(library, modules.tdata()[0]->objfile);
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < modules.dim; i++)
-        {
-            m = modules[i];
-            if (global.params.verbose)
-                printf("code      %s\n", m->toChars());
-            if (global.params.obj)
-            {   obj_start(m->srcfile->toChars());
-                m->genobjfile(global.params.multiobj);
-                obj_end(library, m->objfile);
-                obj_write_deferred(library);
-            }
-            if (global.errors)
-            {
-                if (!global.params.lib)
-                    m->deleteObjFile();
-            }
-            else
-            {
-                if (global.params.doDocComments)
-                    m->gendocfile();
-            }
-        }
-    }
-
-    if (global.params.lib && !global.errors)
-        library->write();
-
-    backend_term();
-    if (global.errors)
-        fatal();
-
-    if (!global.params.objfiles->dim)
-    {
-        if (global.params.link)
-            error(0, "no object files to link");
-    }
-    else
-    {
-        if (global.params.link)
-            status = runLINK();
-
-        if (global.params.run)
-        {
-            if (!status)
-            {
-                status = runProgram();
-
-                /* Delete .obj files and .exe file
-                 */
-                for (size_t i = 0; i < modules.dim; i++)
-                {
-                    Module *m = modules[i];
-                    m->deleteObjFile();
-                    if (global.params.oneobj)
-                        break;
-                }
-                deleteExeFile();
-            }
-        }
-    }
-
-    return status;
-}
-
-int main(int argc, char *argv[])
-{
-    int status = -1;
-#if WINDOWS_SEH
-  __try
-  {
-#endif
-    status = tryMain(argc, argv);
-#if WINDOWS_SEH
-  }
-  __except (__ehfilter(GetExceptionInformation()))
-  {
-    printf("Stack overflow\n");
-    fatal();
-  }
-#endif
-    return status;
-}
-
-#endif // !IN_LLVM
-
-/***********************************
- * Parse and append contents of environment variable envvar
- * to argc and argv[].
- * The string is separated into arguments, processing \ and ".
- */
-
-void getenv_setargv(const char *envvar, int *pargc, char** *pargv)
-{
-    char *p;
-
-    int instring;
-    int slash;
-    char c;
-
-    char *env = getenv(envvar);
-    if (!env)
-        return;
-
-    env = mem.strdup(env);      // create our own writable copy
-
-    int argc = *pargc;
-    Strings *argv = new Strings();
-    argv->setDim(argc);
-
-    int argc_left = 0;
-    for (int i = 0; i < argc; i++) {
-        if (!strcmp((*pargv)[i], "-run") || !strcmp((*pargv)[i], "--run")) {
-            // HACK: set flag to indicate we saw '-run' here
-            global.params.run = true;
-            // Don't eat -run yet so the program arguments don't get changed
-            argc_left = argc - i;
-            argc = i;
-            *pargv = &(*pargv)[i];
-            argv->setDim(i);
-            break;
-        } else {
-        }
-    }
-    // HACK to stop required values from command line being drawn from DFLAGS
-    argv->push((char*)"");
-    argc++;
-
-    size_t j = 1;               // leave argv[0] alone
-    while (1)
-    {
-        int wildcard = 1;       // do wildcard expansion
-        switch (*env)
-        {
-            case ' ':
-            case '\t':
-                env++;
-                break;
-
-            case 0:
-                goto Ldone;
-
-            case '"':
-                wildcard = 0;
-            default:
-                argv->push(env);                // append
-                //argv->insert(j, env);         // insert at position j
-                j++;
-                argc++;
-                p = env;
-                slash = 0;
-                instring = 0;
-                c = 0;
-
-                while (1)
-                {
-                    c = *env++;
-                    switch (c)
-                    {
-                        case '"':
-                            p -= (slash >> 1);
-                            if (slash & 1)
-                            {   p--;
-                                goto Laddc;
-                            }
-                            instring ^= 1;
-                            slash = 0;
-                            continue;
-
-                        case ' ':
-                        case '\t':
-                            if (instring)
-                                goto Laddc;
-                            *p = 0;
-                            //if (wildcard)
-                                //wildcardexpand();     // not implemented
-                            break;
-
-                        case '\\':
-                            slash++;
-                            *p++ = c;
-                            continue;
-
-                        case 0:
-                            *p = 0;
-                            //if (wildcard)
-                                //wildcardexpand();     // not implemented
-                            goto Ldone;
-
-                        default:
-                        Laddc:
-                            slash = 0;
-                            *p++ = c;
-                            continue;
-                    }
-                    break;
-                }
-        }
-    }
-
-Ldone:
-    assert(argc == argv->dim);
-    argv->reserve(argc_left);
-    for (int i = 0; i < argc_left; i++)
-        argv->data[argc++] = (void *)(*pargv)[i];
-
-    *pargc = argc;
-    *pargv = argv->tdata();
-}
-
-#if WINDOWS_SEH
-
-long __cdecl __ehfilter(LPEXCEPTION_POINTERS ep)
-{
-    //printf("%x\n", ep->ExceptionRecord->ExceptionCode);
-    if (ep->ExceptionRecord->ExceptionCode == STATUS_STACK_OVERFLOW)
-    {
-#if 1 //ndef DEBUG
-        return EXCEPTION_EXECUTE_HANDLER;
-#endif
-    }
-    return EXCEPTION_CONTINUE_SEARCH;
-}
-
-#endif
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2012 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// https://github.com/D-Programming-Language/dmd/blob/master/src/mars.c
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <assert.h>
+#include <limits.h>
+#include <string>
+#include <cstdarg>
+
+#if POSIX
+#include <errno.h>
+#endif
+
+#include "rmem.h"
+#include "root.h"
+#if !IN_LLVM
+#include "async.h"
+#endif
+
+#include "mars.h"
+#include "module.h"
+#include "mtype.h"
+#include "id.h"
+#include "cond.h"
+#include "expression.h"
+#include "lexer.h"
+#if !IN_LLVM
+#include "lib.h"
+#include "json.h"
+#endif
+
+#if WINDOWS_SEH
+#include <windows.h>
+long __cdecl __ehfilter(LPEXCEPTION_POINTERS ep);
+#endif
+
+#if !IN_LLVM
+int response_expand(int *pargc, char ***pargv);
+void browse(const char *url);
+void getenv_setargv(const char *envvar, int *pargc, char** *pargv);
+
+void obj_start(char *srcfile);
+void obj_end(Library *library, File *objfile);
+#endif
+
+void printCtfePerformanceStats();
+
+Global global;
+
+Global::Global()
+{
+    mars_ext = "d";
+    sym_ext  = "d";
+    hdr_ext  = "di";
+    doc_ext  = "html";
+    ddoc_ext = "ddoc";
+    json_ext = "json";
+    map_ext  = "map";
+
+#if IN_LLVM
+    ll_ext  = "ll";
+    bc_ext  = "bc";
+    s_ext   = "s";
+    obj_ext = "o";
+#if _WIN32
+    obj_ext_alt = "obj";
+#endif
+#else
+#if TARGET_WINDOS
+    obj_ext  = "obj";
+#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+    obj_ext  = "o";
+#elif TARGET_NET
+#else
+#error "fix this"
+#endif
+
+#if TARGET_WINDOS
+    lib_ext  = "lib";
+#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+    lib_ext  = "a";
+#elif TARGET_NET
+#else
+#error "fix this"
+#endif
+#endif
+
+    copyright = "Copyright (c) 1999-2012 by Digital Mars";
+    written = "written by Walter Bright"
+#if TARGET_NET
+    "\nMSIL back-end (alpha release) by Cristian L. Vlasceanu and associates.";
+#endif
+    ;
+    version = "v2.059";
+#if IN_LLVM
+    ldc_version = "LDC trunk";
+    llvm_version = "LLVM "LDC_LLVM_VERSION_STRING;
+#endif
+    global.structalign = 8;
+
+    // This should only be used as a global, so the other fields are
+    // automatically initialized to zero when the program is loaded.
+    // In particular, DO NOT zero-initialize .params here (like DMD
+    // does) because command-line options initialize some of those
+    // fields to non-zero defaults, and do so from constructors that
+    // may run before this one.
+}
+
+unsigned Global::startGagging()
+{
+    ++gag;
+    return gaggedErrors;
+}
+
+bool Global::endGagging(unsigned oldGagged)
+{
+    bool anyErrs = (gaggedErrors != oldGagged);
+    --gag;
+    // Restore the original state of gagged errors; set total errors
+    // to be original errors + new ungagged errors.
+    errors -= (gaggedErrors - oldGagged);
+    gaggedErrors = oldGagged;
+    return anyErrs;
+}
+
+bool Global::isSpeculativeGagging()
+{
+    return gag && gag == speculativeGag;
+}
+
+
+char *Loc::toChars()
+{
+    OutBuffer buf;
+
+    if (filename)
+    {
+        buf.printf("%s", filename);
+    }
+
+    if (linnum)
+        buf.printf("(%d)", linnum);
+    buf.writeByte(0);
+    return (char *)buf.extractData();
+}
+
+Loc::Loc(Module *mod, unsigned linnum)
+{
+    this->linnum = linnum;
+    this->filename = mod ? mod->srcfile->toChars() : NULL;
+}
+
+bool Loc::equals(const Loc& loc)
+{
+    return linnum == loc.linnum && FileName::equals(filename, loc.filename);
+}
+
+/**************************************
+ * Print error message
+ */
+
+void error(Loc loc, const char *format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    verror(loc, format, ap);
+    va_end( ap );
+}
+
+void warning(Loc loc, const char *format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    vwarning(loc, format, ap);
+    va_end( ap );
+}
+
+/**************************************
+ * Print supplementary message about the last error
+ * Used for backtraces, etc
+ */
+void errorSupplemental(Loc loc, const char *format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    verrorSupplemental(loc, format, ap);
+    va_end( ap );
+}
+
+void verror(Loc loc, const char *format, va_list ap)
+{
+    if (!global.gag)
+    {
+        char *p = loc.toChars();
+
+        if (*p)
+            fprintf(stdmsg, "%s: ", p);
+        mem.free(p);
+
+        fprintf(stdmsg, "Error: ");
+        // MS doesn't recognize %zu format
+        OutBuffer tmp;
+        tmp.vprintf(format, ap);
+#if _MSC_VER
+        fprintf(stdmsg, "%s", tmp.toChars());
+#else
+        vfprintf(stdmsg, format, ap);
+#endif
+        fprintf(stdmsg, "\n");
+        fflush(stdmsg);
+//halt();
+    }
+    else
+    {
+        global.gaggedErrors++;
+    }
+    global.errors++;
+}
+
+// Doesn't increase error count, doesn't print "Error:".
+void verrorSupplemental(Loc loc, const char *format, va_list ap)
+{
+    if (!global.gag)
+    {
+        fprintf(stdmsg, "%s:        ", loc.toChars());
+#if _MSC_VER
+        // MS doesn't recognize %zu format
+        OutBuffer tmp;
+        tmp.vprintf(format, ap);
+        fprintf(stdmsg, "%s", tmp.toChars());
+#else
+        vfprintf(stdmsg, format, ap);
+#endif
+        fprintf(stdmsg, "\n");
+        fflush(stdmsg);
+    }
+}
+
+void vwarning(Loc loc, const char *format, va_list ap)
+{
+    if (global.params.warnings && !global.gag)
+    {
+        char *p = loc.toChars();
+
+        if (*p)
+            fprintf(stdmsg, "%s: ", p);
+        mem.free(p);
+
+        fprintf(stdmsg, "Warning: ");
+#if _MSC_VER
+        // MS doesn't recognize %zu format
+        OutBuffer tmp;
+        tmp.vprintf(format, ap);
+        fprintf(stdmsg, "%s", tmp.toChars());
+#else
+        vfprintf(stdmsg, format, ap);
+#endif
+        fprintf(stdmsg, "\n");
+        fflush(stdmsg);
+//halt();
+        if (global.params.warnings == 1)
+            global.warnings++;  // warnings don't count if gagged
+    }
+}
+
+/***************************************
+ * Call this after printing out fatal error messages to clean up and exit
+ * the compiler.
+ */
+
+void fatal()
+{
+#if 0
+    halt();
+#endif
+    exit(EXIT_FAILURE);
+}
+
+/**************************************
+ * Try to stop forgetting to remove the breakpoints from
+ * release builds.
+ */
+void halt()
+{
+#ifdef DEBUG
+    *(volatile char*)0=0;
+#endif
+}
+
+#if !IN_LLVM
+
+extern void backend_init();
+extern void backend_term();
+
+void usage()
+{
+#if TARGET_LINUX
+    const char fpic[] ="\
+  -fPIC          generate position independent code\n\
+";
+#else
+    const char fpic[] = "";
+#endif
+    printf("DMD%s D Compiler %s\n%s %s\n",
+        sizeof(size_t) == 4 ? "32" : "64",
+        global.version, global.copyright, global.written);
+    printf("\
+Documentation: http://www.dlang.org/index.html\n\
+Usage:\n\
+  dmd files.d ... { -switch }\n\
+\n\
+  files.d        D source files\n\
+  @cmdfile       read arguments from cmdfile\n\
+  -c             do not link\n\
+  -cov           do code coverage analysis\n\
+  -D             generate documentation\n\
+  -Dddocdir      write documentation file to docdir directory\n\
+  -Dffilename    write documentation file to filename\n\
+  -d             allow deprecated features\n\
+  -debug         compile in debug code\n\
+  -debug=level   compile in debug code <= level\n\
+  -debug=ident   compile in debug code identified by ident\n\
+  -debuglib=name    set symbolic debug library to name\n\
+  -defaultlib=name  set default library to name\n\
+  -deps=filename write module dependencies to filename\n%s"
+"  -g             add symbolic debug info\n\
+  -gc            add symbolic debug info, pretend to be C\n\
+  -gs            always emit stack frame\n\
+  -H             generate 'header' file\n\
+  -Hddirectory   write 'header' file to directory\n\
+  -Hffilename    write 'header' file to filename\n\
+  --help         print help\n\
+  -Ipath         where to look for imports\n\
+  -ignore        ignore unsupported pragmas\n\
+  -inline        do function inlining\n\
+  -Jpath         where to look for string imports\n\
+  -Llinkerflag   pass linkerflag to link\n\
+  -lib           generate library rather than object files\n"
+#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+"  -m32           generate 32 bit code\n\
+  -m64           generate 64 bit code\n"
+#endif
+"  -man           open web browser on manual page\n\
+  -map           generate linker .map file\n\
+  -noboundscheck turns off array bounds checking for all functions\n\
+  -nofloat       do not emit reference to floating point\n\
+  -O             optimize\n\
+  -o-            do not write object file\n\
+  -odobjdir      write object & library files to directory objdir\n\
+  -offilename    name output file to filename\n\
+  -op            do not strip paths from source file\n\
+  -profile       profile runtime performance of generated code\n\
+  -property      enforce property syntax\n\
+  -quiet         suppress unnecessary messages\n\
+  -release       compile release version\n\
+  -run srcfile args...   run resulting program, passing args\n"
+#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+"  -shared        generate shared library\n"
+#endif
+"  -unittest      compile in unit tests\n\
+  -v             verbose\n\
+  -version=level compile in version code >= level\n\
+  -version=ident compile in version code identified by ident\n\
+  -vtls          list all variables going into thread local storage\n\
+  -w             enable warnings\n\
+  -wi            enable informational warnings\n\
+  -X             generate JSON file\n\
+  -Xffilename    write JSON file to filename\n\
+", fpic);
+}
+
+extern signed char tyalignsize[];
+
+#if _WIN32 && __DMC__
+extern "C"
+{
+    extern int _xi_a;
+    extern int _end;
+}
+#endif
+
+int tryMain(int argc, char *argv[])
+{
+    mem.init();                         // initialize storage allocator
+    mem.setStackBottom(&argv);
+#if _WIN32 && __DMC__
+    mem.addroots((char *)&_xi_a, (char *)&_end);
+#endif
+
+    Strings files;
+    Strings libmodules;
+    char *p;
+    Module *m;
+    int status = EXIT_SUCCESS;
+    int argcstart = argc;
+    int setdebuglib = 0;
+    char noboundscheck = 0;
+    const char *inifilename = NULL;
+
+#ifdef DEBUG
+    printf("DMD %s DEBUG\n", global.version);
+#endif
+
+    unittests();
+
+    // Check for malformed input
+    if (argc < 1 || !argv)
+    {
+      Largs:
+        error(0, "missing or null command line arguments");
+        fatal();
+    }
+    for (size_t i = 0; i < argc; i++)
+    {
+        if (!argv[i])
+            goto Largs;
+    }
+
+    if (response_expand(&argc,&argv))   // expand response files
+        error(0, "can't open response file");
+
+    files.reserve(argc - 1);
+
+    // Set default values
+    global.params.argv0 = argv[0];
+    global.params.link = 1;
+    global.params.useAssert = 1;
+    global.params.useInvariants = 1;
+    global.params.useIn = 1;
+    global.params.useOut = 1;
+    global.params.useArrayBounds = 2;   // default to all functions
+    global.params.useSwitchError = 1;
+    global.params.useInline = 0;
+    global.params.obj = 1;
+    global.params.Dversion = 2;
+    global.params.quiet = 1;
+
+    global.params.linkswitches = new Strings();
+    global.params.libfiles = new Strings();
+    global.params.objfiles = new Strings();
+    global.params.ddocfiles = new Strings();
+
+    // Default to -m32 for 32 bit dmd, -m64 for 64 bit dmd
+    global.params.is64bit = (sizeof(size_t) == 8);
+
+#if TARGET_WINDOS
+    global.params.is64bit = 0;
+    global.params.defaultlibname = "phobos";
+#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+    global.params.defaultlibname = "phobos2";
+#elif TARGET_NET
+#else
+#error "fix this"
+#endif
+
+    // Predefine version identifiers
+    VersionCondition::addPredefinedGlobalIdent("DigitalMars");
+
+#if TARGET_WINDOS
+    VersionCondition::addPredefinedGlobalIdent("Windows");
+    global.params.isWindows = 1;
+#if TARGET_NET
+    // TARGET_NET macro is NOT mutually-exclusive with TARGET_WINDOS
+    VersionCondition::addPredefinedGlobalIdent("D_NET");
+#endif
+#elif TARGET_LINUX
+    VersionCondition::addPredefinedGlobalIdent("Posix");
+    VersionCondition::addPredefinedGlobalIdent("linux");
+    global.params.isLinux = 1;
+#elif TARGET_OSX
+    VersionCondition::addPredefinedGlobalIdent("Posix");
+    VersionCondition::addPredefinedGlobalIdent("OSX");
+    global.params.isOSX = 1;
+
+    // For legacy compatibility
+    VersionCondition::addPredefinedGlobalIdent("darwin");
+#elif TARGET_FREEBSD
+    VersionCondition::addPredefinedGlobalIdent("Posix");
+    VersionCondition::addPredefinedGlobalIdent("FreeBSD");
+    global.params.isFreeBSD = 1;
+#elif TARGET_OPENBSD
+    VersionCondition::addPredefinedGlobalIdent("Posix");
+    VersionCondition::addPredefinedGlobalIdent("OpenBSD");
+    global.params.isFreeBSD = 1;
+#elif TARGET_SOLARIS
+    VersionCondition::addPredefinedGlobalIdent("Posix");
+    VersionCondition::addPredefinedGlobalIdent("Solaris");
+    global.params.isSolaris = 1;
+#else
+#error "fix this"
+#endif
+
+    VersionCondition::addPredefinedGlobalIdent("LittleEndian");
+    //VersionCondition::addPredefinedGlobalIdent("D_Bits");
+#if DMDV2
+    VersionCondition::addPredefinedGlobalIdent("D_Version2");
+#endif
+    VersionCondition::addPredefinedGlobalIdent("all");
+
+#if _WIN32
+    inifilename = inifile(argv[0], "sc.ini");
+#elif linux || __APPLE__ || __FreeBSD__ || __OpenBSD__ || __sun&&__SVR4
+    inifilename = inifile(argv[0], "dmd.conf");
+#else
+#error "fix this"
+#endif
+    getenv_setargv("DFLAGS", &argc, &argv);
+
+#if 0
+    for (size_t i = 0; i < argc; i++)
+    {
+        printf("argv[%d] = '%s'\n", i, argv[i]);
+    }
+#endif
+
+    for (size_t i = 1; i < argc; i++)
+    {
+        p = argv[i];
+        if (*p == '-')
+        {
+            if (strcmp(p + 1, "d") == 0)
+                global.params.useDeprecated = 1;
+            else if (strcmp(p + 1, "c") == 0)
+                global.params.link = 0;
+            else if (strcmp(p + 1, "cov") == 0)
+                global.params.cov = 1;
+#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+            else if (strcmp(p + 1, "shared") == 0
+#if TARGET_OSX
+                // backwards compatibility with old switch
+                || strcmp(p + 1, "dylib") == 0
+#endif
+                )
+                global.params.dll = 1;
+            else if (strcmp(p + 1, "fPIC") == 0)
+                global.params.pic = 1;
+#endif
+            else if (strcmp(p + 1, "map") == 0)
+                global.params.map = 1;
+            else if (strcmp(p + 1, "multiobj") == 0)
+                global.params.multiobj = 1;
+            else if (strcmp(p + 1, "g") == 0)
+                global.params.symdebug = 1;
+            else if (strcmp(p + 1, "gc") == 0)
+                global.params.symdebug = 2;
+            else if (strcmp(p + 1, "gs") == 0)
+                global.params.alwaysframe = 1;
+            else if (strcmp(p + 1, "gt") == 0)
+            {   error(0, "use -profile instead of -gt\n");
+                global.params.trace = 1;
+            }
+            else if (strcmp(p + 1, "m32") == 0)
+                global.params.is64bit = 0;
+            else if (strcmp(p + 1, "m64") == 0)
+                global.params.is64bit = 1;
+            else if (strcmp(p + 1, "profile") == 0)
+                global.params.trace = 1;
+            else if (strcmp(p + 1, "v") == 0)
+                global.params.verbose = 1;
+#if DMDV2
+            else if (strcmp(p + 1, "vtls") == 0)
+                global.params.vtls = 1;
+#endif
+            else if (strcmp(p + 1, "v1") == 0)
+            {
+#if DMDV1
+                global.params.Dversion = 1;
+#else
+                error(0, "use DMD 1.0 series compilers for -v1 switch");
+                break;
+#endif
+            }
+            else if (strcmp(p + 1, "w") == 0)
+                global.params.warnings = 1;
+            else if (strcmp(p + 1, "wi") == 0)
+                global.params.warnings = 2;
+            else if (strcmp(p + 1, "O") == 0)
+                global.params.optimize = 1;
+            else if (p[1] == 'o')
+            {
+                switch (p[2])
+                {
+                    case '-':
+                        global.params.obj = 0;
+                        break;
+
+                    case 'd':
+                        if (!p[3])
+                            goto Lnoarg;
+                        global.params.objdir = p + 3;
+                        break;
+
+                    case 'f':
+                        if (!p[3])
+                            goto Lnoarg;
+                        global.params.objname = p + 3;
+                        break;
+
+                    case 'p':
+                        if (p[3])
+                            goto Lerror;
+                        global.params.preservePaths = 1;
+                        break;
+
+                    case 0:
+                        error(0, "-o no longer supported, use -of or -od");
+                        break;
+
+                    default:
+                        goto Lerror;
+                }
+            }
+            else if (p[1] == 'D')
+            {   global.params.doDocComments = 1;
+                switch (p[2])
+                {
+                    case 'd':
+                        if (!p[3])
+                            goto Lnoarg;
+                        global.params.docdir = p + 3;
+                        break;
+                    case 'f':
+                        if (!p[3])
+                            goto Lnoarg;
+                        global.params.docname = p + 3;
+                        break;
+
+                    case 0:
+                        break;
+
+                    default:
+                        goto Lerror;
+                }
+            }
+            else if (p[1] == 'H')
+            {   global.params.doHdrGeneration = 1;
+                switch (p[2])
+                {
+                    case 'd':
+                        if (!p[3])
+                            goto Lnoarg;
+                        global.params.hdrdir = p + 3;
+                        break;
+
+                    case 'f':
+                        if (!p[3])
+                            goto Lnoarg;
+                        global.params.hdrname = p + 3;
+                        break;
+
+                    case 0:
+                        break;
+
+                    default:
+                        goto Lerror;
+                }
+            }
+            else if (p[1] == 'X')
+            {   global.params.doXGeneration = 1;
+                switch (p[2])
+                {
+                    case 'f':
+                        if (!p[3])
+                            goto Lnoarg;
+                        global.params.xfilename = p + 3;
+                        break;
+
+                    case 0:
+                        break;
+
+                    default:
+                        goto Lerror;
+                }
+            }
+            else if (strcmp(p + 1, "ignore") == 0)
+                global.params.ignoreUnsupportedPragmas = 1;
+            else if (strcmp(p + 1, "property") == 0)
+                global.params.enforcePropertySyntax = 1;
+            else if (strcmp(p + 1, "inline") == 0)
+                global.params.useInline = 1;
+            else if (strcmp(p + 1, "lib") == 0)
+                global.params.lib = 1;
+            else if (strcmp(p + 1, "nofloat") == 0)
+                global.params.nofloat = 1;
+            else if (strcmp(p + 1, "quiet") == 0)
+                global.params.quiet = 1;
+            else if (strcmp(p + 1, "release") == 0)
+                global.params.release = 1;
+#if DMDV2
+            else if (strcmp(p + 1, "noboundscheck") == 0)
+                noboundscheck = 1;
+#endif
+            else if (strcmp(p + 1, "unittest") == 0)
+                global.params.useUnitTests = 1;
+            else if (p[1] == 'I')
+            {
+                if (!global.params.imppath)
+                    global.params.imppath = new Strings();
+                global.params.imppath->push(p + 2);
+            }
+            else if (p[1] == 'J')
+            {
+                if (!global.params.fileImppath)
+                    global.params.fileImppath = new Strings();
+                global.params.fileImppath->push(p + 2);
+            }
+            else if (memcmp(p + 1, "debug", 5) == 0 && p[6] != 'l')
+            {
+                // Parse:
+                //      -debug
+                //      -debug=number
+                //      -debug=identifier
+                if (p[6] == '=')
+                {
+                    if (isdigit((unsigned char)p[7]))
+                    {   long level;
+
+                        errno = 0;
+                        level = strtol(p + 7, &p, 10);
+                        if (*p || errno || level > INT_MAX)
+                            goto Lerror;
+                        DebugCondition::setGlobalLevel((int)level);
+                    }
+                    else if (Lexer::isValidIdentifier(p + 7))
+                        DebugCondition::addGlobalIdent(p + 7);
+                    else
+                        goto Lerror;
+                }
+                else if (p[6])
+                    goto Lerror;
+                else
+                    global.params.debuglevel = 1;
+            }
+            else if (memcmp(p + 1, "version", 5) == 0)
+            {
+                // Parse:
+                //      -version=number
+                //      -version=identifier
+                if (p[8] == '=')
+                {
+                    if (isdigit((unsigned char)p[9]))
+                    {   long level;
+
+                        errno = 0;
+                        level = strtol(p + 9, &p, 10);
+                        if (*p || errno || level > INT_MAX)
+                            goto Lerror;
+                        VersionCondition::setGlobalLevel((int)level);
+                    }
+                    else if (Lexer::isValidIdentifier(p + 9))
+                        VersionCondition::addGlobalIdent(p + 9);
+                    else
+                        goto Lerror;
+                }
+                else
+                    goto Lerror;
+            }
+            else if (strcmp(p + 1, "-b") == 0)
+                global.params.debugb = 1;
+            else if (strcmp(p + 1, "-c") == 0)
+                global.params.debugc = 1;
+            else if (strcmp(p + 1, "-f") == 0)
+                global.params.debugf = 1;
+            else if (strcmp(p + 1, "-help") == 0)
+            {   usage();
+                exit(EXIT_SUCCESS);
+            }
+            else if (strcmp(p + 1, "-r") == 0)
+                global.params.debugr = 1;
+            else if (strcmp(p + 1, "-x") == 0)
+                global.params.debugx = 1;
+            else if (strcmp(p + 1, "-y") == 0)
+                global.params.debugy = 1;
+            else if (p[1] == 'L')
+            {
+                global.params.linkswitches->push(p + 2);
+            }
+            else if (memcmp(p + 1, "defaultlib=", 11) == 0)
+            {
+                global.params.defaultlibname = p + 1 + 11;
+            }
+            else if (memcmp(p + 1, "debuglib=", 9) == 0)
+            {
+                setdebuglib = 1;
+                global.params.debuglibname = p + 1 + 9;
+            }
+            else if (memcmp(p + 1, "deps=", 5) == 0)
+            {
+                global.params.moduleDepsFile = p + 1 + 5;
+                if (!global.params.moduleDepsFile[0])
+                    goto Lnoarg;
+                global.params.moduleDeps = new OutBuffer;
+            }
+            else if (memcmp(p + 1, "man", 3) == 0)
+            {
+#if _WIN32
+#if DMDV1
+                browse("http://www.digitalmars.com/d/1.0/dmd-windows.html");
+#else
+                browse("http://www.dlang.org/dmd-windows.html");
+#endif
+#endif
+#if linux
+#if DMDV1
+                browse("http://www.digitalmars.com/d/1.0/dmd-linux.html");
+#else
+                browse("http://www.dlang.org/dmd-linux.html");
+#endif
+#endif
+#if __APPLE__
+#if DMDV1
+                browse("http://www.digitalmars.com/d/1.0/dmd-osx.html");
+#else
+                browse("http://www.dlang.org/dmd-osx.html");
+#endif
+#endif
+#if __FreeBSD__
+#if DMDV1
+                browse("http://www.digitalmars.com/d/1.0/dmd-freebsd.html");
+#else
+                browse("http://www.dlang.org/dmd-freebsd.html");
+#endif
+#endif
+#if __OpenBSD__
+#if DMDV1
+                browse("http://www.digitalmars.com/d/1.0/dmd-openbsd.html");
+#else
+                browse("http://www.dlang.org/dmd-openbsd.html");
+#endif
+#endif
+                exit(EXIT_SUCCESS);
+            }
+            else if (strcmp(p + 1, "run") == 0)
+            {   global.params.run = 1;
+                global.params.runargs_length = ((i >= argcstart) ? argc : argcstart) - i - 1;
+                if (global.params.runargs_length)
+                {
+                    files.push(argv[i + 1]);
+                    global.params.runargs = &argv[i + 2];
+                    i += global.params.runargs_length;
+                    global.params.runargs_length--;
+                }
+                else
+                {   global.params.run = 0;
+                    goto Lnoarg;
+                }
+            }
+            else
+            {
+             Lerror:
+                error(0, "unrecognized switch '%s'", argv[i]);
+                continue;
+
+             Lnoarg:
+                error(0, "argument expected for switch '%s'", argv[i]);
+                continue;
+            }
+        }
+        else
+        {
+#if TARGET_WINDOS
+            char *ext = FileName::ext(p);
+            if (ext && FileName::compare(ext, "exe") == 0)
+            {
+                global.params.objname = p;
+                continue;
+            }
+#endif
+            files.push(p);
+        }
+    }
+    if (global.errors)
+    {
+        fatal();
+    }
+    if (files.dim == 0)
+    {   usage();
+        return EXIT_FAILURE;
+    }
+
+    if (!setdebuglib)
+        global.params.debuglibname = global.params.defaultlibname;
+
+#if TARGET_OSX
+    global.params.pic = 1;
+#endif
+
+#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
+    if (global.params.lib && global.params.dll)
+        error(0, "cannot mix -lib and -shared\n");
+#endif
+
+    if (global.params.release)
+    {   global.params.useInvariants = 0;
+        global.params.useIn = 0;
+        global.params.useOut = 0;
+        global.params.useAssert = 0;
+        global.params.useArrayBounds = 1;
+        global.params.useSwitchError = 0;
+    }
+    if (noboundscheck)
+        global.params.useArrayBounds = 0;
+
+    if (global.params.run)
+        global.params.quiet = 1;
+
+    if (global.params.useUnitTests)
+        global.params.useAssert = 1;
+
+    if (!global.params.obj || global.params.lib)
+        global.params.link = 0;
+
+    if (global.params.link)
+    {
+        global.params.exefile = global.params.objname;
+        global.params.oneobj = 1;
+        if (global.params.objname)
+        {
+            /* Use this to name the one object file with the same
+             * name as the exe file.
+             */
+            global.params.objname = FileName::forceExt(global.params.objname, global.obj_ext)->toChars();
+
+            /* If output directory is given, use that path rather than
+             * the exe file path.
+             */
+            if (global.params.objdir)
+            {   char *name = FileName::name(global.params.objname);
+                global.params.objname = FileName::combine(global.params.objdir, name);
+            }
+        }
+    }
+    else if (global.params.lib)
+    {
+        global.params.libname = global.params.objname;
+        global.params.objname = NULL;
+
+        // Haven't investigated handling these options with multiobj
+        if (!global.params.cov && !global.params.trace
+#if 0 && TARGET_WINDOS
+            /* multiobj causes class/struct debug info to be attached to init-data,
+             * but this will not be linked into the executable, so this info is lost.
+             * Bugzilla 4014
+             */
+            && !global.params.symdebug
+#endif
+           )
+            global.params.multiobj = 1;
+    }
+    else if (global.params.run)
+    {
+        error(0, "flags conflict with -run");
+        fatal();
+    }
+    else
+    {
+        if (global.params.objname && files.dim > 1)
+        {
+            global.params.oneobj = 1;
+            //error("multiple source files, but only one .obj name");
+            //fatal();
+        }
+    }
+    if (global.params.is64bit)
+    {
+        VersionCondition::addPredefinedGlobalIdent("D_InlineAsm_X86_64");
+        VersionCondition::addPredefinedGlobalIdent("X86_64");
+        VersionCondition::addPredefinedGlobalIdent("D_LP64");
+        VersionCondition::addPredefinedGlobalIdent("D_SIMD");
+#if TARGET_WINDOS
+        VersionCondition::addPredefinedGlobalIdent("Win64");
+#endif
+    }
+    else
+    {
+        VersionCondition::addPredefinedGlobalIdent("D_InlineAsm");
+        VersionCondition::addPredefinedGlobalIdent("D_InlineAsm_X86");
+        VersionCondition::addPredefinedGlobalIdent("X86");
+#if TARGET_OSX
+        VersionCondition::addPredefinedGlobalIdent("D_SIMD");
+#endif
+#if TARGET_WINDOS
+        VersionCondition::addPredefinedGlobalIdent("Win32");
+#endif
+    }
+    if (global.params.doDocComments)
+        VersionCondition::addPredefinedGlobalIdent("D_Ddoc");
+    if (global.params.cov)
+        VersionCondition::addPredefinedGlobalIdent("D_Coverage");
+    if (global.params.pic)
+        VersionCondition::addPredefinedGlobalIdent("D_PIC");
+#if DMDV2
+    if (global.params.useUnitTests)
+        VersionCondition::addPredefinedGlobalIdent("unittest");
+#endif
+
+    // Initialization
+    Type::init();
+    Id::initialize();
+    Module::init();
+    initPrecedence();
+
+    if (global.params.verbose)
+    {   printf("binary    %s\n", argv[0]);
+        printf("version   %s\n", global.version);
+        printf("config    %s\n", inifilename ? inifilename : "(none)");
+    }
+
+    //printf("%d source files\n",files.dim);
+
+    // Build import search path
+    if (global.params.imppath)
+    {
+        for (size_t i = 0; i < global.params.imppath->dim; i++)
+        {
+            char *path = (*global.params.imppath)[i];
+            Strings *a = FileName::splitPath(path);
+
+            if (a)
+            {
+                if (!global.path)
+                    global.path = new Strings();
+                global.path->append(a);
+            }
+        }
+    }
+
+    // Build string import search path
+    if (global.params.fileImppath)
+    {
+        for (size_t i = 0; i < global.params.fileImppath->dim; i++)
+        {
+            char *path = global.params.fileImppath->tdata()[i];
+            Strings *a = FileName::splitPath(path);
+
+            if (a)
+            {
+                if (!global.filePath)
+                    global.filePath = new Strings();
+                global.filePath->append(a);
+            }
+        }
+    }
+
+    // Create Modules
+    Modules modules;
+    modules.reserve(files.dim);
+    int firstmodule = 1;
+    for (size_t i = 0; i < files.dim; i++)
+    {
+        char *ext;
+        char *name;
+
+        p = files.tdata()[i];
+
+#if _WIN32
+        // Convert / to \ so linker will work
+        for (size_t j = 0; p[j]; j++)
+        {
+            if (p[j] == '/')
+                p[j] = '\\';
+        }
+#endif
+
+        p = FileName::name(p);          // strip path
+        ext = FileName::ext(p);
+        if (ext)
+        {   /* Deduce what to do with a file based on its extension
+             */
+            if (FileName::equals(ext, global.obj_ext))
+            {
+                global.params.objfiles->push(files.tdata()[i]);
+                libmodules.push(files.tdata()[i]);
+                continue;
+            }
+
+            if (FileName::equals(ext, global.lib_ext))
+            {
+                global.params.libfiles->push(files.tdata()[i]);
+                libmodules.push(files.tdata()[i]);
+                continue;
+            }
+
+            if (strcmp(ext, global.ddoc_ext) == 0)
+            {
+                global.params.ddocfiles->push(files.tdata()[i]);
+                continue;
+            }
+
+            if (FileName::equals(ext, global.json_ext))
+            {
+                global.params.doXGeneration = 1;
+                global.params.xfilename = files.tdata()[i];
+                continue;
+            }
+
+            if (FileName::equals(ext, global.map_ext))
+            {
+                global.params.mapfile = files.tdata()[i];
+                continue;
+            }
+
+#if TARGET_WINDOS
+            if (FileName::equals(ext, "res"))
+            {
+                global.params.resfile = files.tdata()[i];
+                continue;
+            }
+
+            if (FileName::equals(ext, "def"))
+            {
+                global.params.deffile = files.tdata()[i];
+                continue;
+            }
+
+            if (FileName::equals(ext, "exe"))
+            {
+                assert(0);      // should have already been handled
+            }
+#endif
+
+            /* Examine extension to see if it is a valid
+             * D source file extension
+             */
+            if (FileName::equals(ext, global.mars_ext) ||
+                FileName::equals(ext, global.hdr_ext) ||
+                FileName::equals(ext, "dd") ||
+                FileName::equals(ext, "htm") ||
+                FileName::equals(ext, "html") ||
+                FileName::equals(ext, "xhtml"))
+            {
+                ext--;                  // skip onto '.'
+                assert(*ext == '.');
+                name = (char *)mem.malloc((ext - p) + 1);
+                memcpy(name, p, ext - p);
+                name[ext - p] = 0;              // strip extension
+
+                if (name[0] == 0 ||
+                    strcmp(name, "..") == 0 ||
+                    strcmp(name, ".") == 0)
+                {
+                Linvalid:
+                    error(0, "invalid file name '%s'", files.tdata()[i]);
+                    fatal();
+                }
+            }
+            else
+            {   error(0, "unrecognized file extension %s\n", ext);
+                fatal();
+            }
+        }
+        else
+        {   name = p;
+            if (!*name)
+                goto Linvalid;
+        }
+
+        /* At this point, name is the D source file name stripped of
+         * its path and extension.
+         */
+
+        Identifier *id = Lexer::idPool(name);
+        m = new Module(files[i], id, global.params.doDocComments, global.params.doHdrGeneration);
+        modules.push(m);
+
+        if (firstmodule)
+        {   global.params.objfiles->push(m->objfile->name->str);
+            firstmodule = 0;
+        }
+    }
+
+    // Read files
+#define ASYNCREAD 1
+#if ASYNCREAD
+    // Multi threaded
+    AsyncRead *aw = AsyncRead::create(modules.dim);
+    for (size_t i = 0; i < modules.dim; i++)
+    {
+        m = modules[i];
+        aw->addFile(m->srcfile);
+    }
+    aw->start();
+#else
+    // Single threaded
+    for (size_t i = 0; i < modules.dim; i++)
+    {
+        m = modules[i];
+        m->read(0);
+    }
+#endif
+
+    // Parse files
+    bool anydocfiles = false;
+    size_t filecount = modules.dim;
+    for (size_t filei = 0, modi = 0; filei < filecount; filei++, modi++)
+    {
+        m = modules[modi];
+        if (global.params.verbose)
+            printf("parse     %s\n", m->toChars());
+        if (!Module::rootModule)
+            Module::rootModule = m;
+        m->importedFrom = m;
+        if (!global.params.oneobj || modi == 0 || m->isDocFile)
+            m->deleteObjFile();
+#if ASYNCREAD
+        if (aw->read(filei))
+        {
+            error(0, "cannot read file %s", m->srcfile->name->toChars());
+            fatal();
+        }
+#endif
+        m->parse();
+        if (m->isDocFile)
+        {
+            anydocfiles = true;
+            m->gendocfile();
+
+            // Remove m from list of modules
+            modules.remove(modi);
+            modi--;
+
+            // Remove m's object file from list of object files
+            for (size_t j = 0; j < global.params.objfiles->dim; j++)
+            {
+                if (m->objfile->name->str == global.params.objfiles->tdata()[j])
+                {
+                    global.params.objfiles->remove(j);
+                    break;
+                }
+            }
+
+            if (global.params.objfiles->dim == 0)
+                global.params.link = 0;
+        }
+    }
+#if ASYNCREAD
+    AsyncRead::dispose(aw);
+#endif
+
+    if (anydocfiles && modules.dim &&
+        (global.params.oneobj || global.params.objname))
+    {
+        error(0, "conflicting Ddoc and obj generation options");
+        fatal();
+    }
+    if (global.errors)
+        fatal();
+    if (global.params.doHdrGeneration)
+    {
+        /* Generate 'header' import files.
+         * Since 'header' import files must be independent of command
+         * line switches and what else is imported, they are generated
+         * before any semantic analysis.
+         */
+        for (size_t i = 0; i < modules.dim; i++)
+        {
+            m = modules[i];
+            if (global.params.verbose)
+                printf("import    %s\n", m->toChars());
+            m->genhdrfile();
+        }
+    }
+    if (global.errors)
+        fatal();
+
+    // load all unconditional imports for better symbol resolving
+    for (size_t i = 0; i < modules.dim; i++)
+    {
+       m = modules[i];
+       if (global.params.verbose)
+           printf("importall %s\n", m->toChars());
+       m->importAll(0);
+    }
+    if (global.errors)
+       fatal();
+
+    backend_init();
+
+    // Do semantic analysis
+    for (size_t i = 0; i < modules.dim; i++)
+    {
+        m = modules[i];
+        if (global.params.verbose)
+            printf("semantic  %s\n", m->toChars());
+        m->semantic();
+    }
+    if (global.errors)
+        fatal();
+
+    Module::dprogress = 1;
+    Module::runDeferredSemantic();
+
+    // Do pass 2 semantic analysis
+    for (size_t i = 0; i < modules.dim; i++)
+    {
+        m = modules[i];
+        if (global.params.verbose)
+            printf("semantic2 %s\n", m->toChars());
+        m->semantic2();
+    }
+    if (global.errors)
+        fatal();
+
+    // Do pass 3 semantic analysis
+    for (size_t i = 0; i < modules.dim; i++)
+    {
+        m = modules[i];
+        if (global.params.verbose)
+            printf("semantic3 %s\n", m->toChars());
+        m->semantic3();
+    }
+    if (global.errors)
+        fatal();
+
+    if (global.params.moduleDeps != NULL)
+    {
+        assert(global.params.moduleDepsFile != NULL);
+
+        File deps(global.params.moduleDepsFile);
+        OutBuffer* ob = global.params.moduleDeps;
+        deps.setbuffer((void*)ob->data, ob->offset);
+        deps.writev();
+    }
+
+
+    // Scan for functions to inline
+    if (global.params.useInline)
+    {
+        /* The problem with useArrayBounds and useAssert is that the
+         * module being linked to may not have generated them, so if
+         * we inline functions from those modules, the symbols for them will
+         * not be found at link time.
+         */
+        if (!global.params.useArrayBounds && !global.params.useAssert)
+        {
+            // Do pass 3 semantic analysis on all imported modules,
+            // since otherwise functions in them cannot be inlined
+            for (size_t i = 0; i < Module::amodules.dim; i++)
+            {
+                m = Module::amodules[i];
+                if (global.params.verbose)
+                    printf("semantic3 %s\n", m->toChars());
+                m->semantic3();
+            }
+            if (global.errors)
+                fatal();
+        }
+
+        for (size_t i = 0; i < modules.dim; i++)
+        {
+            m = modules[i];
+            if (global.params.verbose)
+                printf("inline scan %s\n", m->toChars());
+            m->inlineScan();
+        }
+    }
+
+    // Do not attempt to generate output files if errors or warnings occurred
+    if (global.errors || global.warnings)
+        fatal();
+
+    printCtfePerformanceStats();
+
+    Library *library = NULL;
+    if (global.params.lib)
+    {
+        library = new Library();
+        library->setFilename(global.params.objdir, global.params.libname);
+
+        // Add input object and input library files to output library
+        for (size_t i = 0; i < libmodules.dim; i++)
+        {
+            char *p = libmodules[i];
+            library->addObject(p, NULL, 0);
+        }
+    }
+
+    // Generate output files
+
+    if (global.params.doXGeneration)
+        json_generate(&modules);
+
+    if (global.params.oneobj)
+    {
+        for (size_t i = 0; i < modules.dim; i++)
+        {
+            m = modules[i];
+            if (global.params.verbose)
+                printf("code      %s\n", m->toChars());
+            if (i == 0)
+                obj_start(m->srcfile->toChars());
+            m->genobjfile(0);
+            if (!global.errors && global.params.doDocComments)
+                m->gendocfile();
+        }
+        if (!global.errors && modules.dim)
+        {
+            obj_end(library, modules.tdata()[0]->objfile);
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < modules.dim; i++)
+        {
+            m = modules[i];
+            if (global.params.verbose)
+                printf("code      %s\n", m->toChars());
+            if (global.params.obj)
+            {   obj_start(m->srcfile->toChars());
+                m->genobjfile(global.params.multiobj);
+                obj_end(library, m->objfile);
+                obj_write_deferred(library);
+            }
+            if (global.errors)
+            {
+                if (!global.params.lib)
+                    m->deleteObjFile();
+            }
+            else
+            {
+                if (global.params.doDocComments)
+                    m->gendocfile();
+            }
+        }
+    }
+
+    if (global.params.lib && !global.errors)
+        library->write();
+
+    backend_term();
+    if (global.errors)
+        fatal();
+
+    if (!global.params.objfiles->dim)
+    {
+        if (global.params.link)
+            error(0, "no object files to link");
+    }
+    else
+    {
+        if (global.params.link)
+            status = runLINK();
+
+        if (global.params.run)
+        {
+            if (!status)
+            {
+                status = runProgram();
+
+                /* Delete .obj files and .exe file
+                 */
+                for (size_t i = 0; i < modules.dim; i++)
+                {
+                    Module *m = modules[i];
+                    m->deleteObjFile();
+                    if (global.params.oneobj)
+                        break;
+                }
+                deleteExeFile();
+            }
+        }
+    }
+
+    return status;
+}
+
+int main(int argc, char *argv[])
+{
+    int status = -1;
+#if WINDOWS_SEH
+  __try
+  {
+#endif
+    status = tryMain(argc, argv);
+#if WINDOWS_SEH
+  }
+  __except (__ehfilter(GetExceptionInformation()))
+  {
+    printf("Stack overflow\n");
+    fatal();
+  }
+#endif
+    return status;
+}
+
+#endif // !IN_LLVM
+
+/***********************************
+ * Parse and append contents of environment variable envvar
+ * to argc and argv[].
+ * The string is separated into arguments, processing \ and ".
+ */
+
+void getenv_setargv(const char *envvar, int *pargc, char** *pargv)
+{
+    char *p;
+
+    int instring;
+    int slash;
+    char c;
+
+    char *env = getenv(envvar);
+    if (!env)
+        return;
+
+    env = mem.strdup(env);      // create our own writable copy
+
+    int argc = *pargc;
+    Strings *argv = new Strings();
+    argv->setDim(argc);
+
+    int argc_left = 0;
+    for (int i = 0; i < argc; i++) {
+        if (!strcmp((*pargv)[i], "-run") || !strcmp((*pargv)[i], "--run")) {
+            // HACK: set flag to indicate we saw '-run' here
+            global.params.run = true;
+            // Don't eat -run yet so the program arguments don't get changed
+            argc_left = argc - i;
+            argc = i;
+            *pargv = &(*pargv)[i];
+            argv->setDim(i);
+            break;
+        } else {
+        }
+    }
+    // HACK to stop required values from command line being drawn from DFLAGS
+    argv->push((char*)"");
+    argc++;
+
+    size_t j = 1;               // leave argv[0] alone
+    while (1)
+    {
+        int wildcard = 1;       // do wildcard expansion
+        switch (*env)
+        {
+            case ' ':
+            case '\t':
+                env++;
+                break;
+
+            case 0:
+                goto Ldone;
+
+            case '"':
+                wildcard = 0;
+            default:
+                argv->push(env);                // append
+                //argv->insert(j, env);         // insert at position j
+                j++;
+                argc++;
+                p = env;
+                slash = 0;
+                instring = 0;
+                c = 0;
+
+                while (1)
+                {
+                    c = *env++;
+                    switch (c)
+                    {
+                        case '"':
+                            p -= (slash >> 1);
+                            if (slash & 1)
+                            {   p--;
+                                goto Laddc;
+                            }
+                            instring ^= 1;
+                            slash = 0;
+                            continue;
+
+                        case ' ':
+                        case '\t':
+                            if (instring)
+                                goto Laddc;
+                            *p = 0;
+                            //if (wildcard)
+                                //wildcardexpand();     // not implemented
+                            break;
+
+                        case '\\':
+                            slash++;
+                            *p++ = c;
+                            continue;
+
+                        case 0:
+                            *p = 0;
+                            //if (wildcard)
+                                //wildcardexpand();     // not implemented
+                            goto Ldone;
+
+                        default:
+                        Laddc:
+                            slash = 0;
+                            *p++ = c;
+                            continue;
+                    }
+                    break;
+                }
+        }
+    }
+
+Ldone:
+    assert(argc == argv->dim);
+    argv->reserve(argc_left);
+    for (int i = 0; i < argc_left; i++)
+        argv->data[argc++] = (void *)(*pargv)[i];
+
+    *pargc = argc;
+    *pargv = argv->tdata();
+}
+
+#if WINDOWS_SEH
+
+long __cdecl __ehfilter(LPEXCEPTION_POINTERS ep)
+{
+    //printf("%x\n", ep->ExceptionRecord->ExceptionCode);
+    if (ep->ExceptionRecord->ExceptionCode == STATUS_STACK_OVERFLOW)
+    {
+#if 1 //ndef DEBUG
+        return EXCEPTION_EXECUTE_HANDLER;
+#endif
+    }
+    return EXCEPTION_CONTINUE_SEARCH;
+}
+
+#endif
diff --git a/dmd2/readme.txt b/dmd2/readme.txt
index 5f2f1516..e8109070 100644
--- a/dmd2/readme.txt
+++ b/dmd2/readme.txt
@@ -1,24 +1,24 @@
-
-		The D Programming Language
-		Compiler Front End Source
-		Copyright (c) 1999-2009, by Digital Mars
-		http://www.digitalmars.com
-		All Rights Reserved
-
-
-This is the source code to the front end Digital Mars D compiler.
-It covers the lexical analysis, parsing, and semantic analysis
-of the D Programming Language defined in the documents at
-http://www.digitalmars.com/d/
-
-These sources are free, they are redistributable and modifiable
-under the terms of the GNU General Public License (attached as gpl.txt),
-or the Artistic License (attached as artistic.txt).
-
-The optimizer and code generator sources are 
-covered under a separate license, backendlicense.txt.
-
-It does not apply to anything else distributed by Digital Mars,
-including D compiler executables.
-
--Walter Bright
+
+		The D Programming Language
+		Compiler Front End Source
+		Copyright (c) 1999-2009, by Digital Mars
+		http://www.digitalmars.com
+		All Rights Reserved
+
+
+This is the source code to the front end Digital Mars D compiler.
+It covers the lexical analysis, parsing, and semantic analysis
+of the D Programming Language defined in the documents at
+http://www.digitalmars.com/d/
+
+These sources are free, they are redistributable and modifiable
+under the terms of the GNU General Public License (attached as gpl.txt),
+or the Artistic License (attached as artistic.txt).
+
+The optimizer and code generator sources are 
+covered under a separate license, backendlicense.txt.
+
+It does not apply to anything else distributed by Digital Mars,
+including D compiler executables.
+
+-Walter Bright
diff --git a/dmd2/template.c b/dmd2/template.c
index 6bf52076..2f8ce392 100644
--- a/dmd2/template.c
+++ b/dmd2/template.c
@@ -1,6441 +1,6441 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2012 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-// Handle template implementation
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "root.h"
-#include "aav.h"
-#include "rmem.h"
-#include "stringtable.h"
-#include "mars.h"
-#include "identifier.h"
-#include "mtype.h"
-#include "template.h"
-#include "init.h"
-#include "expression.h"
-#include "scope.h"
-#include "module.h"
-#include "aggregate.h"
-#include "declaration.h"
-#include "dsymbol.h"
-#include "hdrgen.h"
-#include "id.h"
-
-#if WINDOWS_SEH
-#include <windows.h>
-long __cdecl __ehfilter(LPEXCEPTION_POINTERS ep);
-#endif
-
-#define LOG     0
-
-/********************************************
- * These functions substitute for dynamic_cast. dynamic_cast does not work
- * on earlier versions of gcc.
- */
-
-Expression *isExpression(Object *o)
-{
-    //return dynamic_cast<Expression *>(o);
-    if (!o || o->dyncast() != DYNCAST_EXPRESSION)
-        return NULL;
-    return (Expression *)o;
-}
-
-Dsymbol *isDsymbol(Object *o)
-{
-    //return dynamic_cast<Dsymbol *>(o);
-    if (!o || o->dyncast() != DYNCAST_DSYMBOL)
-        return NULL;
-    return (Dsymbol *)o;
-}
-
-Type *isType(Object *o)
-{
-    //return dynamic_cast<Type *>(o);
-    if (!o || o->dyncast() != DYNCAST_TYPE)
-        return NULL;
-    return (Type *)o;
-}
-
-Tuple *isTuple(Object *o)
-{
-    //return dynamic_cast<Tuple *>(o);
-    if (!o || o->dyncast() != DYNCAST_TUPLE)
-        return NULL;
-    return (Tuple *)o;
-}
-
-/**************************************
- * Is this Object an error?
- */
-int isError(Object *o)
-{
-    Type *t = isType(o);
-    if (t)
-        return (t->ty == Terror);
-    Expression *e = isExpression(o);
-    if (e)
-        return (e->op == TOKerror);
-    Tuple *v = isTuple(o);
-    if (v)
-        return arrayObjectIsError(&v->objects);
-    return 0;
-}
-
-/**************************************
- * Are any of the Objects an error?
- */
-int arrayObjectIsError(Objects *args)
-{
-    for (size_t i = 0; i < args->dim; i++)
-    {
-        Object *o = args->tdata()[i];
-        if (isError(o))
-            return 1;
-    }
-    return 0;
-}
-
-/***********************
- * Try to get arg as a type.
- */
-
-Type *getType(Object *o)
-{
-    Type *t = isType(o);
-    if (!t)
-    {   Expression *e = isExpression(o);
-        if (e)
-            t = e->type;
-    }
-    return t;
-}
-
-Dsymbol *getDsymbol(Object *oarg)
-{
-    Dsymbol *sa;
-    Expression *ea = isExpression(oarg);
-    if (ea)
-    {   // Try to convert Expression to symbol
-        if (ea->op == TOKvar)
-            sa = ((VarExp *)ea)->var;
-        else if (ea->op == TOKfunction)
-            sa = ((FuncExp *)ea)->fd;
-        else
-            sa = NULL;
-    }
-    else
-    {   // Try to convert Type to symbol
-        Type *ta = isType(oarg);
-        if (ta)
-            sa = ta->toDsymbol(NULL);
-        else
-            sa = isDsymbol(oarg);       // if already a symbol
-    }
-    return sa;
-}
-
-/******************************
- * If o1 matches o2, return 1.
- * Else, return 0.
- */
-
-int match(Object *o1, Object *o2, TemplateDeclaration *tempdecl, Scope *sc)
-{
-    Type *t1 = isType(o1);
-    Type *t2 = isType(o2);
-    Expression *e1 = isExpression(o1);
-    Expression *e2 = isExpression(o2);
-    Dsymbol *s1 = isDsymbol(o1);
-    Dsymbol *s2 = isDsymbol(o2);
-    Tuple *u1 = isTuple(o1);
-    Tuple *u2 = isTuple(o2);
-
-    //printf("\t match t1 %p t2 %p, e1 %p e2 %p, s1 %p s2 %p, u1 %p u2 %p\n", t1,t2,e1,e2,s1,s2,u1,u2);
-
-    /* A proper implementation of the various equals() overrides
-     * should make it possible to just do o1->equals(o2), but
-     * we'll do that another day.
-     */
-
-    if (s1)
-    {
-        VarDeclaration *v1 = s1->isVarDeclaration();
-        if (v1 && v1->storage_class & STCmanifest)
-        {   ExpInitializer *ei1 = v1->init->isExpInitializer();
-            if (ei1)
-                e1 = ei1->exp, s1 = NULL;
-        }
-    }
-    if (s2)
-    {
-        VarDeclaration *v2 = s2->isVarDeclaration();
-        if (v2 && v2->storage_class & STCmanifest)
-        {   ExpInitializer *ei2 = v2->init->isExpInitializer();
-            if (ei2)
-                e2 = ei2->exp, s2 = NULL;
-        }
-    }
-
-    if (t1)
-    {
-        /* if t1 is an instance of ti, then give error
-         * about recursive expansions.
-         */
-        Dsymbol *s = t1->toDsymbol(sc);
-        if (s && s->parent)
-        {   TemplateInstance *ti1 = s->parent->isTemplateInstance();
-            if (ti1 && ti1->tempdecl == tempdecl)
-            {
-                for (Scope *sc1 = sc; sc1; sc1 = sc1->enclosing)
-                {
-                    if (sc1->scopesym == ti1)
-                    {
-                        tempdecl->error("recursive template expansion for template argument %s", t1->toChars());
-                        return 1;       // fake a match
-                    }
-                }
-            }
-        }
-
-        //printf("t1 = %s\n", t1->toChars());
-        //printf("t2 = %s\n", t2->toChars());
-        if (!t2 || !t1->equals(t2))
-            goto Lnomatch;
-    }
-    else if (e1)
-    {
-#if 0
-        if (e1 && e2)
-        {
-            printf("match %d\n", e1->equals(e2));
-            e1->print();
-            e2->print();
-            e1->type->print();
-            e2->type->print();
-        }
-#endif
-        if (!e2)
-            goto Lnomatch;
-        if (!e1->equals(e2))
-            goto Lnomatch;
-    }
-    else if (s1)
-    {
-        if (!s2 || !s1->equals(s2) || s1->parent != s2->parent)
-            goto Lnomatch;
-    }
-    else if (u1)
-    {
-        if (!u2)
-            goto Lnomatch;
-        if (u1->objects.dim != u2->objects.dim)
-            goto Lnomatch;
-        for (size_t i = 0; i < u1->objects.dim; i++)
-        {
-            if (!match(u1->objects.tdata()[i],
-                       u2->objects.tdata()[i],
-                       tempdecl, sc))
-                goto Lnomatch;
-        }
-    }
-    //printf("match\n");
-    return 1;   // match
-
-Lnomatch:
-    //printf("nomatch\n");
-    return 0;   // nomatch;
-}
-
-
-/************************************
- * Match an array of them.
- */
-int arrayObjectMatch(Objects *oa1, Objects *oa2, TemplateDeclaration *tempdecl, Scope *sc)
-{
-    if (oa1 == oa2)
-        return 1;
-    if (oa1->dim != oa2->dim)
-        return 0;
-    for (size_t j = 0; j < oa1->dim; j++)
-    {   Object *o1 = oa1->tdata()[j];
-        Object *o2 = oa2->tdata()[j];
-        if (!match(o1, o2, tempdecl, sc))
-        {
-            return 0;
-        }
-    }
-    return 1;
-}
-
-/****************************************
- * This makes a 'pretty' version of the template arguments.
- * It's analogous to genIdent() which makes a mangled version.
- */
-
-void ObjectToCBuffer(OutBuffer *buf, HdrGenState *hgs, Object *oarg)
-{
-    //printf("ObjectToCBuffer()\n");
-    Type *t = isType(oarg);
-    Expression *e = isExpression(oarg);
-    Dsymbol *s = isDsymbol(oarg);
-    Tuple *v = isTuple(oarg);
-    /* The logic of this should match what genIdent() does. The _dynamic_cast()
-     * function relies on all the pretty strings to be unique for different classes
-     * (see Bugzilla 7375).
-     * Perhaps it would be better to demangle what genIdent() does.
-     */
-    if (t)
-    {   //printf("\tt: %s ty = %d\n", t->toChars(), t->ty);
-        t->toCBuffer(buf, NULL, hgs);
-    }
-    else if (e)
-    {
-        if (e->op == TOKvar)
-            e = e->optimize(WANTvalue);         // added to fix Bugzilla 7375
-        e->toCBuffer(buf, hgs);
-    }
-    else if (s)
-    {
-        char *p = s->ident ? s->ident->toChars() : s->toChars();
-        buf->writestring(p);
-    }
-    else if (v)
-    {
-        Objects *args = &v->objects;
-        for (size_t i = 0; i < args->dim; i++)
-        {
-            if (i)
-                buf->writeByte(',');
-            Object *o = (*args)[i];
-            ObjectToCBuffer(buf, hgs, o);
-        }
-    }
-    else if (!oarg)
-    {
-        buf->writestring("NULL");
-    }
-    else
-    {
-#ifdef DEBUG
-        printf("bad Object = %p\n", oarg);
-#endif
-        assert(0);
-    }
-}
-
-#if DMDV2
-Object *objectSyntaxCopy(Object *o)
-{
-    if (!o)
-        return NULL;
-    Type *t = isType(o);
-    if (t)
-        return t->syntaxCopy();
-    Expression *e = isExpression(o);
-    if (e)
-        return e->syntaxCopy();
-    return o;
-}
-#endif
-
-
-/* ======================== TemplateDeclaration ============================= */
-
-TemplateDeclaration::TemplateDeclaration(Loc loc, Identifier *id,
-        TemplateParameters *parameters, Expression *constraint, Dsymbols *decldefs, int ismixin)
-    : ScopeDsymbol(id)
-{
-#if LOG
-    printf("TemplateDeclaration(this = %p, id = '%s')\n", this, id->toChars());
-#endif
-#if 0
-    if (parameters)
-        for (int i = 0; i < parameters->dim; i++)
-        {   TemplateParameter *tp = parameters->tdata()[i];
-            //printf("\tparameter[%d] = %p\n", i, tp);
-            TemplateTypeParameter *ttp = tp->isTemplateTypeParameter();
-
-            if (ttp)
-            {
-                printf("\tparameter[%d] = %s : %s\n", i, tp->ident->toChars(), ttp->specType ? ttp->specType->toChars() : "");
-            }
-        }
-#endif
-    this->loc = loc;
-    this->parameters = parameters;
-    this->origParameters = parameters;
-    this->constraint = constraint;
-    this->members = decldefs;
-    this->overnext = NULL;
-    this->overroot = NULL;
-    this->semanticRun = PASSinit;
-    this->onemember = NULL;
-    this->literal = 0;
-    this->ismixin = ismixin;
-    this->previous = NULL;
-
-    // Compute in advance for Ddoc's use
-    if (members)
-    {
-        Dsymbol *s;
-        if (Dsymbol::oneMembers(members, &s, ident) && s)
-        {
-            onemember = s;
-            s->parent = this;
-        }
-    }
-}
-
-Dsymbol *TemplateDeclaration::syntaxCopy(Dsymbol *)
-{
-    //printf("TemplateDeclaration::syntaxCopy()\n");
-    TemplateDeclaration *td;
-    TemplateParameters *p;
-
-    p = NULL;
-    if (parameters)
-    {
-        p = new TemplateParameters();
-        p->setDim(parameters->dim);
-        for (size_t i = 0; i < p->dim; i++)
-        {   TemplateParameter *tp = (*parameters)[i];
-            p->tdata()[i] = tp->syntaxCopy();
-        }
-    }
-    Expression *e = NULL;
-    if (constraint)
-        e = constraint->syntaxCopy();
-    Dsymbols *d = Dsymbol::arraySyntaxCopy(members);
-    td = new TemplateDeclaration(loc, ident, p, e, d, ismixin);
-
-#if IN_LLVM
-    td->intrinsicName = intrinsicName;
-#endif
-
-    return td;
-}
-
-void TemplateDeclaration::semantic(Scope *sc)
-{
-#if LOG
-    printf("TemplateDeclaration::semantic(this = %p, id = '%s')\n", this, ident->toChars());
-    printf("sc->stc = %llx\n", sc->stc);
-    printf("sc->module = %s\n", sc->module->toChars());
-#endif
-    if (semanticRun)
-        return;         // semantic() already run
-    semanticRun = PASSsemantic;
-
-    if (sc->module && sc->module->ident == Id::object && ident == Id::AssociativeArray)
-    {   Type::associativearray = this;
-    }
-
-    if (sc->func)
-    {
-#if DMDV1
-        error("cannot declare template at function scope %s", sc->func->toChars());
-#endif
-    }
-
-    if (/*global.params.useArrayBounds &&*/ sc->module)
-    {
-        // Generate this function as it may be used
-        // when template is instantiated in other modules
-        // FIXME: LDC
-        //sc->module->toModuleArray();
-    }
-
-    if (/*global.params.useAssert &&*/ sc->module)
-    {
-        // Generate this function as it may be used
-        // when template is instantiated in other modules
-        // FIXME: LDC
-        //sc->module->toModuleAssert();
-    }
-
-#if DMDV2
-    if (/*global.params.useUnitTests &&*/ sc->module)
-    {
-        // Generate this function as it may be used
-        // when template is instantiated in other modules
-        // FIXME: LDC
-        // sc->module->toModuleUnittest();
-    }
-#endif
-
-    /* Remember Scope for later instantiations, but make
-     * a copy since attributes can change.
-     */
-    if (!this->scope)
-    {   this->scope = new Scope(*sc);
-        this->scope->setNoFree();
-    }
-
-    // Set up scope for parameters
-    ScopeDsymbol *paramsym = new ScopeDsymbol();
-    paramsym->parent = sc->parent;
-    Scope *paramscope = sc->push(paramsym);
-    paramscope->parameterSpecialization = 1;
-    paramscope->stc = 0;
-
-    if (!parent)
-        parent = sc->parent;
-
-    if (global.params.doDocComments)
-    {
-        origParameters = new TemplateParameters();
-        origParameters->setDim(parameters->dim);
-        for (size_t i = 0; i < parameters->dim; i++)
-        {
-            TemplateParameter *tp = (*parameters)[i];
-            origParameters->tdata()[i] = tp->syntaxCopy();
-        }
-    }
-
-    for (size_t i = 0; i < parameters->dim; i++)
-    {
-        TemplateParameter *tp = parameters->tdata()[i];
-
-        tp->declareParameter(paramscope);
-    }
-
-    for (size_t i = 0; i < parameters->dim; i++)
-    {
-        TemplateParameter *tp = (*parameters)[i];
-
-        tp->semantic(paramscope);
-        if (i + 1 != parameters->dim && tp->isTemplateTupleParameter())
-        {   error("template tuple parameter must be last one");
-            errors = true;
-        }
-    }
-
-    paramscope->pop();
-
-    // Compute again
-    onemember = NULL;
-    if (members)
-    {
-        Dsymbol *s;
-        if (Dsymbol::oneMembers(members, &s, ident) && s)
-        {
-            onemember = s;
-            s->parent = this;
-        }
-    }
-
-    /* BUG: should check:
-     *  o no virtual functions or non-static data members of classes
-     */
-}
-
-const char *TemplateDeclaration::kind()
-{
-    return (onemember && onemember->isAggregateDeclaration())
-                ? onemember->kind()
-                : (char *)"template";
-}
-
-/**********************************
- * Overload existing TemplateDeclaration 'this' with the new one 's'.
- * Return !=0 if successful; i.e. no conflict.
- */
-
-int TemplateDeclaration::overloadInsert(Dsymbol *s)
-{
-    TemplateDeclaration **pf;
-    TemplateDeclaration *f;
-
-#if LOG
-    printf("TemplateDeclaration::overloadInsert('%s')\n", s->toChars());
-#endif
-    f = s->isTemplateDeclaration();
-    if (!f)
-        return FALSE;
-    TemplateDeclaration *pthis = this;
-    for (pf = &pthis; *pf; pf = &(*pf)->overnext)
-    {
-#if 0
-        // Conflict if TemplateParameter's match
-        // Will get caught anyway later with TemplateInstance, but
-        // should check it now.
-        TemplateDeclaration *f2 = *pf;
-
-        if (f->parameters->dim != f2->parameters->dim)
-            goto Lcontinue;
-
-        for (size_t i = 0; i < f->parameters->dim; i++)
-        {   TemplateParameter *p1 = f->parameters->tdata()[i];
-            TemplateParameter *p2 = f2->parameters->tdata()[i];
-
-            if (!p1->overloadMatch(p2))
-                goto Lcontinue;
-        }
-
-#if LOG
-        printf("\tfalse: conflict\n");
-#endif
-        return FALSE;
-
-     Lcontinue:
-        ;
-#endif
-    }
-
-    f->overroot = this;
-    *pf = f;
-#if LOG
-    printf("\ttrue: no conflict\n");
-#endif
-    return TRUE;
-}
-
-/****************************
- * Declare all the function parameters as variables
- * and add them to the scope
- */
-void TemplateDeclaration::makeParamNamesVisibleInConstraint(Scope *paramscope, Expressions *fargs)
-{
-    /* We do this ONLY if there is only one function in the template.
-     */
-    FuncDeclaration *fd = onemember && onemember->toAlias() ?
-        onemember->toAlias()->isFuncDeclaration() : NULL;
-    if (fd)
-    {
-        /*
-            Making parameters is similar to FuncDeclaration::semantic3
-         */
-        paramscope->parent = fd;
-
-        TypeFunction *tf = (TypeFunction *)fd->type->syntaxCopy();
-
-        // Shouldn't run semantic on default arguments and return type.
-        for (int i = 0; i<tf->parameters->dim; i++)
-            tf->parameters->tdata()[i]->defaultArg = NULL;
-        tf->next = NULL;
-
-        // Resolve parameter types and 'auto ref's.
-        tf->fargs = fargs;
-        tf = (TypeFunction *)tf->semantic(loc, paramscope);
-
-        Parameters *fparameters = tf->parameters;
-        int fvarargs = tf->varargs;
-
-        size_t nfparams = Parameter::dim(fparameters); // Num function parameters
-        for (size_t i = 0; i < nfparams; i++)
-        {
-            Parameter *fparam = Parameter::getNth(fparameters, i);
-            // Remove addMod same as func.d L1065 of FuncDeclaration::semantic3
-            //Type *vtype = fparam->type;
-            //if (fd->type && fd->isPure())
-            //    vtype = vtype->addMod(MODconst);
-            fparam->storageClass &= (STCin | STCout | STCref | STClazy | STCfinal | STC_TYPECTOR | STCnodtor);
-            fparam->storageClass |= STCparameter;
-            if (fvarargs == 2 && i + 1 == nfparams)
-                fparam->storageClass |= STCvariadic;
-        }
-        for (size_t i = 0; i < fparameters->dim; i++)
-        {
-            Parameter *fparam = fparameters->tdata()[i];
-            if (!fparam->ident)
-                continue;                       // don't add it, if it has no name
-            VarDeclaration *v = new VarDeclaration(loc, fparam->type, fparam->ident, NULL);
-            v->storage_class = fparam->storageClass;
-            v->semantic(paramscope);
-            if (!paramscope->insert(v))
-                error("parameter %s.%s is already defined", toChars(), v->toChars());
-            else
-                v->parent = this;
-        }
-    }
-}
-
-/***************************************
- * Given that ti is an instance of this TemplateDeclaration,
- * deduce the types of the parameters to this, and store
- * those deduced types in dedtypes[].
- * Input:
- *      flag    1: don't do semantic() because of dummy types
- *              2: don't change types in matchArg()
- * Output:
- *      dedtypes        deduced arguments
- * Return match level.
- */
-
-MATCH TemplateDeclaration::matchWithInstance(TemplateInstance *ti,
-        Objects *dedtypes, Expressions *fargs, int flag)
-{   MATCH m;
-    size_t dedtypes_dim = dedtypes->dim;
-
-#define LOGM 0
-#if LOGM
-    printf("\n+TemplateDeclaration::matchWithInstance(this = %s, ti = %s, flag = %d)\n", toChars(), ti->toChars(), flag);
-#endif
-
-#if 0
-    printf("dedtypes->dim = %d, parameters->dim = %d\n", dedtypes_dim, parameters->dim);
-    if (ti->tiargs->dim)
-        printf("ti->tiargs->dim = %d, [0] = %p\n",
-            ti->tiargs->dim,
-            ti->tiargs->tdata()[0]);
-#endif
-    dedtypes->zero();
-
-    if (errors)
-        return MATCHnomatch;
-
-    size_t parameters_dim = parameters->dim;
-    int variadic = isVariadic() != NULL;
-
-    // If more arguments than parameters, no match
-    if (ti->tiargs->dim > parameters_dim && !variadic)
-    {
-#if LOGM
-        printf(" no match: more arguments than parameters\n");
-#endif
-        return MATCHnomatch;
-    }
-
-    assert(dedtypes_dim == parameters_dim);
-    assert(dedtypes_dim >= ti->tiargs->dim || variadic);
-
-    // Set up scope for parameters
-    assert((size_t)scope > 0x10000);
-    ScopeDsymbol *paramsym = new ScopeDsymbol();
-    paramsym->parent = scope->parent;
-    Scope *paramscope = scope->push(paramsym);
-    paramscope->stc = 0;
-
-    // Attempt type deduction
-    m = MATCHexact;
-    for (size_t i = 0; i < dedtypes_dim; i++)
-    {   MATCH m2;
-        TemplateParameter *tp = parameters->tdata()[i];
-        Declaration *sparam;
-
-        //printf("\targument [%d]\n", i);
-#if LOGM
-        //printf("\targument [%d] is %s\n", i, oarg ? oarg->toChars() : "null");
-        TemplateTypeParameter *ttp = tp->isTemplateTypeParameter();
-        if (ttp)
-            printf("\tparameter[%d] is %s : %s\n", i, tp->ident->toChars(), ttp->specType ? ttp->specType->toChars() : "");
-#endif
-
-        m2 = tp->matchArg(paramscope, ti->tiargs, i, parameters, dedtypes, &sparam);
-        //printf("\tm2 = %d\n", m2);
-
-        if (m2 == MATCHnomatch)
-        {
-#if 0
-            printf("\tmatchArg() for parameter %i failed\n", i);
-#endif
-            goto Lnomatch;
-        }
-
-        if (m2 < m)
-            m = m2;
-
-        if (!flag)
-            sparam->semantic(paramscope);
-        if (!paramscope->insert(sparam))
-            goto Lnomatch;
-    }
-
-    if (!flag)
-    {
-        /* Any parameter left without a type gets the type of
-         * its corresponding arg
-         */
-        for (size_t i = 0; i < dedtypes_dim; i++)
-        {
-            if (!dedtypes->tdata()[i])
-            {   assert(i < ti->tiargs->dim);
-                dedtypes->tdata()[i] = (Type *)ti->tiargs->tdata()[i];
-            }
-        }
-    }
-
-#if DMDV2
-    if (m && constraint && !flag)
-    {   /* Check to see if constraint is satisfied.
-         */
-        makeParamNamesVisibleInConstraint(paramscope, fargs);
-        Expression *e = constraint->syntaxCopy();
-        Scope *sc = paramscope->push();
-
-        /* There's a chicken-and-egg problem here. We don't know yet if this template
-         * instantiation will be a local one (isnested is set), and we won't know until
-         * after selecting the correct template. Thus, function we're nesting inside
-         * is not on the sc scope chain, and this can cause errors in FuncDeclaration::getLevel().
-         * Workaround the problem by setting a flag to relax the checking on frame errors.
-         */
-        sc->flags |= SCOPEstaticif;
-
-        FuncDeclaration *fd = onemember && onemember->toAlias() ?
-            onemember->toAlias()->isFuncDeclaration() : NULL;
-        Dsymbol *s = parent;
-        while (s->isTemplateInstance() || s->isTemplateMixin())
-            s = s->parent;
-        AggregateDeclaration *ad = s->isAggregateDeclaration();
-        VarDeclaration *vthissave;
-        if (fd && ad)
-        {
-            vthissave = fd->vthis;
-            fd->vthis = fd->declareThis(paramscope, ad);
-        }
-
-        e = e->semantic(sc);
-
-        if (fd && fd->vthis)
-            fd->vthis = vthissave;
-
-        sc->pop();
-        e = e->optimize(WANTvalue | WANTinterpret);
-        if (e->isBool(TRUE))
-            ;
-        else if (e->isBool(FALSE))
-            goto Lnomatch;
-        else
-        {
-            e->error("constraint %s is not constant or does not evaluate to a bool", e->toChars());
-        }
-    }
-#endif
-
-#if LOGM
-    // Print out the results
-    printf("--------------------------\n");
-    printf("template %s\n", toChars());
-    printf("instance %s\n", ti->toChars());
-    if (m)
-    {
-        for (size_t i = 0; i < dedtypes_dim; i++)
-        {
-            TemplateParameter *tp = parameters->tdata()[i];
-            Object *oarg;
-
-            printf(" [%d]", i);
-
-            if (i < ti->tiargs->dim)
-                oarg = ti->tiargs->tdata()[i];
-            else
-                oarg = NULL;
-            tp->print(oarg, dedtypes->tdata()[i]);
-        }
-    }
-    else
-        goto Lnomatch;
-#endif
-
-#if LOGM
-    printf(" match = %d\n", m);
-#endif
-    goto Lret;
-
-Lnomatch:
-#if LOGM
-    printf(" no match\n");
-#endif
-    m = MATCHnomatch;
-
-Lret:
-    paramscope->pop();
-#if LOGM
-    printf("-TemplateDeclaration::matchWithInstance(this = %p, ti = %p) = %d\n", this, ti, m);
-#endif
-    return m;
-}
-
-/********************************************
- * Determine partial specialization order of 'this' vs td2.
- * Returns:
- *      match   this is at least as specialized as td2
- *      0       td2 is more specialized than this
- */
-
-MATCH TemplateDeclaration::leastAsSpecialized(TemplateDeclaration *td2, Expressions *fargs)
-{
-    /* This works by taking the template parameters to this template
-     * declaration and feeding them to td2 as if it were a template
-     * instance.
-     * If it works, then this template is at least as specialized
-     * as td2.
-     */
-
-    TemplateInstance ti(0, ident);      // create dummy template instance
-    Objects dedtypes;
-
-#define LOG_LEASTAS     0
-
-#if LOG_LEASTAS
-    printf("%s.leastAsSpecialized(%s)\n", toChars(), td2->toChars());
-#endif
-
-    // Set type arguments to dummy template instance to be types
-    // generated from the parameters to this template declaration
-    ti.tiargs = new Objects();
-    ti.tiargs->setDim(parameters->dim);
-    for (size_t i = 0; i < ti.tiargs->dim; i++)
-    {
-        TemplateParameter *tp = parameters->tdata()[i];
-
-        Object *p = (Object *)tp->dummyArg();
-        if (p)
-            ti.tiargs->tdata()[i] = p;
-        else
-            ti.tiargs->setDim(i);
-    }
-
-    // Temporary Array to hold deduced types
-    //dedtypes.setDim(parameters->dim);
-    dedtypes.setDim(td2->parameters->dim);
-
-    // Attempt a type deduction
-    MATCH m = td2->matchWithInstance(&ti, &dedtypes, fargs, 1);
-    if (m)
-    {
-        /* A non-variadic template is more specialized than a
-         * variadic one.
-         */
-        if (isVariadic() && !td2->isVariadic())
-            goto L1;
-
-#if LOG_LEASTAS
-        printf("  matches %d, so is least as specialized\n", m);
-#endif
-        return m;
-    }
-  L1:
-#if LOG_LEASTAS
-    printf("  doesn't match, so is not as specialized\n");
-#endif
-    return MATCHnomatch;
-}
-
-
-/*************************************************
- * Match function arguments against a specific template function.
- * Input:
- *      loc             instantiation location
- *      targsi          Expression/Type initial list of template arguments
- *      ethis           'this' argument if !NULL
- *      fargs           arguments to function
- * Output:
- *      dedargs         Expression/Type deduced template arguments
- * Returns:
- *      match level
- */
-
-MATCH TemplateDeclaration::deduceFunctionTemplateMatch(Scope *sc, Loc loc, Objects *targsi,
-        Expression *ethis, Expressions *fargs,
-        Objects *dedargs)
-{
-    size_t nfparams;
-    size_t nfargs;
-    size_t nargsi;              // array size of targsi
-    int fptupindex = -1;
-    int tuple_dim = 0;
-    MATCH match = MATCHexact;
-    FuncDeclaration *fd = onemember->toAlias()->isFuncDeclaration();
-    Parameters *fparameters;            // function parameter list
-    int fvarargs;                       // function varargs
-    Objects dedtypes;   // for T:T*, the dedargs is the T*, dedtypes is the T
-    unsigned wildmatch = 0;
-
-    TypeFunction *tf = (TypeFunction *)fd->type;
-
-#if 0
-    printf("\nTemplateDeclaration::deduceFunctionTemplateMatch() %s\n", toChars());
-    for (size_t i = 0; i < fargs->dim; i++)
-    {   Expression *e = fargs->tdata()[i];
-        printf("\tfarg[%d] is %s, type is %s\n", i, e->toChars(), e->type->toChars());
-    }
-    printf("fd = %s\n", fd->toChars());
-    printf("fd->type = %s\n", fd->type->toChars());
-    if (ethis)
-        printf("ethis->type = %s\n", ethis->type->toChars());
-#endif
-
-    assert((size_t)scope > 0x10000);
-
-    dedargs->setDim(parameters->dim);
-    dedargs->zero();
-
-    dedtypes.setDim(parameters->dim);
-    dedtypes.zero();
-
-    if (errors)
-        return MATCHnomatch;
-
-    // Set up scope for parameters
-    ScopeDsymbol *paramsym = new ScopeDsymbol();
-    paramsym->parent = scope->parent;
-    Scope *paramscope = scope->push(paramsym);
-    paramscope->stc = 0;
-
-    TemplateTupleParameter *tp = isVariadic();
-    int tp_is_declared = 0;
-
-#if 0
-    for (size_t i = 0; i < dedargs->dim; i++)
-    {
-        printf("\tdedarg[%d] = ", i);
-        Object *oarg = dedargs->tdata()[i];
-        if (oarg) printf("%s", oarg->toChars());
-        printf("\n");
-    }
-#endif
-
-
-    nargsi = 0;
-    if (targsi)
-    {   // Set initial template arguments
-
-        nargsi = targsi->dim;
-        size_t n = parameters->dim;
-        if (tp)
-            n--;
-        if (nargsi > n)
-        {   if (!tp)
-                goto Lnomatch;
-
-            /* The extra initial template arguments
-             * now form the tuple argument.
-             */
-            Tuple *t = new Tuple();
-            assert(parameters->dim);
-            dedargs->tdata()[parameters->dim - 1] = t;
-
-            tuple_dim = nargsi - n;
-            t->objects.setDim(tuple_dim);
-            for (size_t i = 0; i < tuple_dim; i++)
-            {
-                t->objects.tdata()[i] = targsi->tdata()[n + i];
-            }
-            declareParameter(paramscope, tp, t);
-            tp_is_declared = 1;
-        }
-        else
-            n = nargsi;
-
-        memcpy(dedargs->tdata(), targsi->tdata(), n * sizeof(*dedargs->tdata()));
-
-        for (size_t i = 0; i < n; i++)
-        {   assert(i < parameters->dim);
-            TemplateParameter *tp = parameters->tdata()[i];
-            MATCH m;
-            Declaration *sparam = NULL;
-
-            m = tp->matchArg(paramscope, dedargs, i, parameters, &dedtypes, &sparam);
-            //printf("\tdeduceType m = %d\n", m);
-            if (m == MATCHnomatch)
-                goto Lnomatch;
-            if (m < match)
-                match = m;
-
-            sparam->semantic(paramscope);
-            if (!paramscope->insert(sparam))
-                goto Lnomatch;
-        }
-    }
-#if 0
-    for (size_t i = 0; i < dedargs->dim; i++)
-    {
-        printf("\tdedarg[%d] = ", i);
-        Object *oarg = dedargs->tdata()[i];
-        if (oarg) printf("%s", oarg->toChars());
-        printf("\n");
-    }
-#endif
-
-    fparameters = fd->getParameters(&fvarargs);
-    nfparams = Parameter::dim(fparameters);     // number of function parameters
-    nfargs = fargs ? fargs->dim : 0;            // number of function arguments
-
-    /* Check for match of function arguments with variadic template
-     * parameter, such as:
-     *
-     * template Foo(T, A...) { void Foo(T t, A a); }
-     * void main() { Foo(1,2,3); }
-     */
-    if (tp)                             // if variadic
-    {
-        if (nfparams == 0 && nfargs != 0)               // if no function parameters
-        {
-            if (tp_is_declared)
-                goto L2;
-            Tuple *t = new Tuple();
-            //printf("t = %p\n", t);
-            dedargs->tdata()[parameters->dim - 1] = t;
-            declareParameter(paramscope, tp, t);
-            goto L2;
-        }
-        else if (nfargs < nfparams - 1)
-            goto L1;
-        else
-        {
-            /* Figure out which of the function parameters matches
-             * the tuple template parameter. Do this by matching
-             * type identifiers.
-             * Set the index of this function parameter to fptupindex.
-             */
-            for (fptupindex = 0; fptupindex < nfparams; fptupindex++)
-            {
-                Parameter *fparam = fparameters->tdata()[fptupindex];
-                if (fparam->type->ty != Tident)
-                    continue;
-                TypeIdentifier *tid = (TypeIdentifier *)fparam->type;
-                if (!tp->ident->equals(tid->ident) || tid->idents.dim)
-                    continue;
-
-                if (fvarargs)           // variadic function doesn't
-                    goto Lnomatch;      // go with variadic template
-
-                if (tp_is_declared)
-                    goto L2;
-
-                // Apply function parameter storage classes to parameter type
-                tid = (TypeIdentifier *)tid->addStorageClass(fparam->storageClass);
-
-                /* The types of the function arguments
-                 * now form the tuple argument.
-                 */
-                Tuple *t = new Tuple();
-                dedargs->tdata()[parameters->dim - 1] = t;
-
-                tuple_dim = nfargs - (nfparams - 1);
-                t->objects.setDim(tuple_dim);
-                for (size_t i = 0; i < tuple_dim; i++)
-                {   Expression *farg = fargs->tdata()[fptupindex + i];
-
-                    // Check invalid arguments to detect errors early.
-                    if (farg->op == TOKerror || farg->type->ty == Terror)
-                        goto Lnomatch;
-
-                    if (!(fparam->storageClass & STClazy) && farg->type->ty == Tvoid)
-                        goto Lnomatch;
-
-                    unsigned mod = farg->type->mod;
-                    Type *tt;
-                    MATCH m;
-
-                    #define X(U,T)  ((U) << 4) | (T)
-                    if (tid->mod & MODwild)
-                    {
-                        switch (X(tid->mod, mod))
-                        {
-                            case X(MODwild,              MODwild):
-                            case X(MODwild | MODshared,  MODwild | MODshared):
-                            case X(MODwild,              0):
-                            case X(MODwild,              MODconst):
-                            case X(MODwild,              MODimmutable):
-                            case X(MODwild | MODshared,  MODshared):
-                            case X(MODwild | MODshared,  MODconst | MODshared):
-
-                                if (mod & MODwild)
-                                    wildmatch |= MODwild;
-                                else if (mod == 0)
-                                    wildmatch |= MODmutable;
-                                else
-                                    wildmatch |= (mod & ~MODshared);
-                                tt = farg->type->mutableOf();
-                                m = MATCHconst;
-                                goto Lx;
-
-                            default:
-                                break;
-                        }
-                    }
-
-                    switch (X(tid->mod, mod))
-                    {
-                        case X(0, 0):
-                        case X(0, MODconst):
-                        case X(0, MODimmutable):
-                        case X(0, MODshared):
-                        case X(0, MODconst | MODshared):
-                        case X(0, MODwild):
-                        case X(0, MODwild | MODshared):
-                            // foo(U:U) T                              => T
-                            // foo(U:U) const(T)                       => const(T)
-                            // foo(U:U) immutable(T)                   => immutable(T)
-                            // foo(U:U) shared(T)                      => shared(T)
-                            // foo(U:U) const(shared(T))               => const(shared(T))
-                            // foo(U:U) wild(T)                        => wild(T)
-                            // foo(U:U) wild(shared(T))                => wild(shared(T))
-
-                            tt = farg->type;
-                            m = MATCHexact;
-                            break;
-
-                        case X(MODconst, MODconst):
-                        case X(MODimmutable, MODimmutable):
-                        case X(MODshared, MODshared):
-                        case X(MODconst | MODshared, MODconst | MODshared):
-                        case X(MODwild, MODwild):
-                        case X(MODwild | MODshared, MODwild | MODshared):
-                            // foo(U:const(U))        const(T)         => T
-                            // foo(U:immutable(U))    immutable(T)     => T
-                            // foo(U:shared(U))       shared(T)        => T
-                            // foo(U:const(shared(U)) const(shared(T)) => T
-                            // foo(U:wild(U))         wild(T)          => T
-                            // foo(U:wild(shared(U))  wild(shared(T)) => T
-
-                            tt = farg->type->mutableOf()->unSharedOf();
-                            m = MATCHexact;
-                            break;
-
-                        case X(MODconst, 0):
-                        case X(MODconst, MODimmutable):
-                        case X(MODconst, MODconst | MODshared):
-                        case X(MODconst | MODshared, MODimmutable):
-                        case X(MODconst, MODwild):
-                        case X(MODconst, MODwild | MODshared):
-                            // foo(U:const(U)) T                       => T
-                            // foo(U:const(U)) immutable(T)            => T
-                            // foo(U:const(U)) const(shared(T))        => shared(T)
-                            // foo(U:const(shared(U)) immutable(T)     => T
-                            // foo(U:const(U)) wild(shared(T))         => shared(T)
-
-                            tt = farg->type->mutableOf();
-                            m = MATCHconst;
-                            break;
-
-                        case X(MODshared, MODconst | MODshared):
-                        case X(MODconst | MODshared, MODshared):
-                        case X(MODshared, MODwild | MODshared):
-                            // foo(U:shared(U)) const(shared(T))       => const(T)
-                            // foo(U:const(shared(U)) shared(T)        => T
-                            // foo(U:shared(U)) wild(shared(T))        => wild(T)
-                            tt = farg->type->unSharedOf();
-                            m = MATCHconst;
-                            break;
-
-                        case X(MODimmutable,         0):
-                        case X(MODimmutable,         MODconst):
-                        case X(MODimmutable,         MODshared):
-                        case X(MODimmutable,         MODconst | MODshared):
-                        case X(MODconst,             MODshared):
-                        case X(MODshared,            0):
-                        case X(MODshared,            MODconst):
-                        case X(MODshared,            MODimmutable):
-                        case X(MODconst | MODshared, 0):
-                        case X(MODconst | MODshared, MODconst):
-                        case X(MODimmutable,         MODwild):
-                        case X(MODshared,            MODwild):
-                        case X(MODconst | MODshared, MODwild):
-                        case X(MODwild,              0):
-                        case X(MODwild,              MODconst):
-                        case X(MODwild,              MODimmutable):
-                        case X(MODwild,              MODshared):
-                        case X(MODwild,              MODconst | MODshared):
-                        case X(MODwild | MODshared,  0):
-                        case X(MODwild | MODshared,  MODconst):
-                        case X(MODwild | MODshared,  MODimmutable):
-                        case X(MODwild | MODshared,  MODshared):
-                        case X(MODwild | MODshared,  MODconst | MODshared):
-                        case X(MODwild | MODshared,  MODwild):
-                        case X(MODimmutable,         MODwild | MODshared):
-                        case X(MODconst | MODshared, MODwild | MODshared):
-                        case X(MODwild,              MODwild | MODshared):
-
-                            // foo(U:immutable(U)) T                   => nomatch
-                            // foo(U:immutable(U)) const(T)            => nomatch
-                            // foo(U:immutable(U)) shared(T)           => nomatch
-                            // foo(U:immutable(U)) const(shared(T))    => nomatch
-                            // foo(U:const(U)) shared(T)               => nomatch
-                            // foo(U:shared(U)) T                      => nomatch
-                            // foo(U:shared(U)) const(T)               => nomatch
-                            // foo(U:shared(U)) immutable(T)           => nomatch
-                            // foo(U:const(shared(U)) T                => nomatch
-                            // foo(U:const(shared(U)) const(T)         => nomatch
-                            // foo(U:immutable(U)) wild(T)             => nomatch
-                            // foo(U:shared(U)) wild(T)                => nomatch
-                            // foo(U:const(shared(U)) wild(T)          => nomatch
-                            // foo(U:wild(U)) T                        => nomatch
-                            // foo(U:wild(U)) const(T)                 => nomatch
-                            // foo(U:wild(U)) immutable(T)             => nomatch
-                            // foo(U:wild(U)) shared(T)                => nomatch
-                            // foo(U:wild(U)) const(shared(T))         => nomatch
-                            // foo(U:wild(shared(U)) T                 => nomatch
-                            // foo(U:wild(shared(U)) const(T)          => nomatch
-                            // foo(U:wild(shared(U)) immutable(T)      => nomatch
-                            // foo(U:wild(shared(U)) shared(T)         => nomatch
-                            // foo(U:wild(shared(U)) const(shared(T))  => nomatch
-                            // foo(U:wild(shared(U)) wild(T)           => nomatch
-                            // foo(U:immutable(U)) wild(shared(T))     => nomatch
-                            // foo(U:const(shared(U))) wild(shared(T)) => nomatch
-                            // foo(U:wild(U)) wild(shared(T))          => nomatch
-                            m = MATCHnomatch;
-                            break;
-
-                        default:
-                            assert(0);
-                    }
-                    #undef X
-
-                Lx:
-                    if (m == MATCHnomatch)
-                        goto Lnomatch;
-                    if (m < match)
-                        match = m;
-
-                    t->objects.tdata()[i] = tt;
-                }
-                declareParameter(paramscope, tp, t);
-                goto L2;
-            }
-            fptupindex = -1;
-        }
-    }
-
-L1:
-    if (nfparams == nfargs)
-        ;
-    else if (nfargs > nfparams)
-    {
-        if (fvarargs == 0)
-            goto Lnomatch;              // too many args, no match
-        match = MATCHconvert;           // match ... with a conversion
-    }
-
-L2:
-#if DMDV2
-    if (ethis)
-    {
-        // Match 'ethis' to any TemplateThisParameter's
-        for (size_t i = 0; i < parameters->dim; i++)
-        {   TemplateParameter *tp = parameters->tdata()[i];
-            TemplateThisParameter *ttp = tp->isTemplateThisParameter();
-            if (ttp)
-            {   MATCH m;
-
-                Type *t = new TypeIdentifier(0, ttp->ident);
-                m = ethis->type->deduceType(paramscope, t, parameters, &dedtypes);
-                if (!m)
-                    goto Lnomatch;
-                if (m < match)
-                    match = m;          // pick worst match
-            }
-        }
-
-        // Match attributes of ethis against attributes of fd
-        if (fd->type)
-        {
-            Type *tthis = ethis->type;
-            unsigned mod = fd->type->mod;
-            StorageClass stc = scope->stc | fd->storage_class2;
-            // Propagate parent storage class (see bug 5504)
-            Dsymbol *p = parent;
-            while (p->isTemplateDeclaration() || p->isTemplateInstance())
-                p = p->parent;
-            AggregateDeclaration *ad = p->isAggregateDeclaration();
-            if (ad)
-                stc |= ad->storage_class;
-
-            if (stc & (STCshared | STCsynchronized))
-                mod |= MODshared;
-            if (stc & STCimmutable)
-                mod |= MODimmutable;
-            if (stc & STCconst)
-                mod |= MODconst;
-            if (stc & STCwild)
-                mod |= MODwild;
-            // Fix mod
-            if (mod & MODimmutable)
-                mod = MODimmutable;
-            if (mod & MODconst)
-                mod &= ~STCwild;
-            if (tthis->mod != mod)
-            {
-                if (!MODmethodConv(tthis->mod, mod))
-                    goto Lnomatch;
-                if (MATCHconst < match)
-                    match = MATCHconst;
-            }
-        }
-    }
-#endif
-
-    // Loop through the function parameters
-    for (size_t parami = 0; parami < nfparams; parami++)
-    {
-        /* Skip over function parameters which wound up
-         * as part of a template tuple parameter.
-         */
-        if (parami == fptupindex)
-            continue;
-        /* Set i = index into function arguments
-         * Function parameters correspond to function arguments as follows.
-         * Note that tuple_dim may be zero, and there may be default or
-         * variadic arguments at the end.
-         *  arg [0..fptupindex] == param[0..fptupindex]
-         *  arg [fptupindex..fptupindex+tuple_dim] == param[fptupindex]
-         *  arg[fputupindex+dim.. ] == param[fptupindex+1.. ]
-         */
-        size_t i = parami;
-        if (fptupindex >= 0 && parami > fptupindex)
-            i += tuple_dim - 1;
-
-        Parameter *fparam = Parameter::getNth(fparameters, parami);
-
-        if (i >= nfargs)                // if not enough arguments
-        {
-            if (fparam->defaultArg)
-            {   /* Default arguments do not participate in template argument
-                 * deduction.
-                 */
-                goto Lmatch;
-            }
-        }
-        else
-        {
-            Expression *farg = fargs->tdata()[i];
-
-            // Check invalid arguments to detect errors early.
-            if (farg->op == TOKerror || farg->type->ty == Terror)
-                goto Lnomatch;
-
-Lretry:
-#if 0
-            printf("\tfarg->type   = %s\n", farg->type->toChars());
-            printf("\tfparam->type = %s\n", fparam->type->toChars());
-#endif
-            Type *argtype = farg->type;
-
-            // Apply function parameter storage classes to parameter types
-            fparam->type = fparam->type->addStorageClass(fparam->storageClass);
-
-#if DMDV2
-            /* Allow string literals which are type [] to match with [dim]
-             */
-            if (farg->op == TOKstring)
-            {   StringExp *se = (StringExp *)farg;
-                if (!se->committed && argtype->ty == Tarray &&
-                    fparam->type->toBasetype()->ty == Tsarray)
-                {
-                    argtype = new TypeSArray(argtype->nextOf(), new IntegerExp(se->loc, se->len, Type::tindex));
-                    argtype = argtype->semantic(se->loc, NULL);
-                    argtype = argtype->invariantOf();
-                }
-            }
-
-            /* Allow implicit function literals to delegate conversion
-             */
-            if (farg->op == TOKfunction)
-            {   FuncExp *fe = (FuncExp *)farg;
-                Type *tp = fparam->type;
-                Expression *e = fe->inferType(tp, 1, parameters);
-                if (!e)
-                    goto Lvarargs;
-                farg = e;
-                argtype = farg->type;
-            }
-
-            if (!(fparam->storageClass & STClazy) && argtype->ty == Tvoid)
-                goto Lnomatch;
-
-            /* Remove top const for dynamic array types and pointer types
-             */
-            if ((argtype->ty == Tarray || argtype->ty == Tpointer) &&
-                !argtype->isMutable() &&
-                (!(fparam->storageClass & STCref) ||
-                 (fparam->storageClass & STCauto) && !farg->isLvalue()))
-            {
-                argtype = argtype->mutableOf();
-            }
-#endif
-
-            if (fvarargs == 2 && i + 1 == nfparams && i + 1 < nfargs)
-                goto Lvarargs;
-
-            unsigned wm = 0;
-            MATCH m = argtype->deduceType(paramscope, fparam->type, parameters, &dedtypes, &wm);
-            //printf("\tdeduceType m = %d\n", m);
-            //printf("\twildmatch = x%x m = %d\n", wildmatch, m);
-            wildmatch |= wm;
-
-            /* If no match, see if there's a conversion to a delegate
-             */
-            if (!m)
-            {   Type *tbp = fparam->type->toBasetype();
-                Type *tba = farg->type->toBasetype();
-                AggregateDeclaration *ad;
-                if (tbp->ty == Tdelegate)
-                {
-                    TypeDelegate *td = (TypeDelegate *)fparam->type->toBasetype();
-                    TypeFunction *tf = (TypeFunction *)td->next;
-
-                    if (!tf->varargs && Parameter::dim(tf->parameters) == 0)
-                    {
-                        m = farg->type->deduceType(paramscope, tf->next, parameters, &dedtypes);
-                        if (!m && tf->next->toBasetype()->ty == Tvoid)
-                            m = MATCHconvert;
-                    }
-                    //printf("\tm2 = %d\n", m);
-                }
-                else if (tba->ty == Tclass)
-                {
-                    ad = ((TypeClass *)tba)->sym;
-                    goto Lad;
-                }
-                else if (tba->ty == Tstruct)
-                {
-                    ad = ((TypeStruct *)tba)->sym;
-            Lad:
-                    if (ad->aliasthis)
-                    {   /* If a semantic error occurs while doing alias this,
-                         * eg purity(bug 7295), just regard it as not a match.
-                         */
-                        unsigned olderrors = global.startGagging();
-                        Expression *e = resolveAliasThis(sc, farg);
-                        if (!global.endGagging(olderrors))
-                        {   farg = e;
-                            goto Lretry;
-                        }
-                    }
-                }
-            }
-
-            if (m && (fparam->storageClass & (STCref | STCauto)) == STCref)
-            {   if (!farg->isLvalue())
-                {
-                    if (farg->op == TOKstructliteral)
-                        m = MATCHconvert;
-                    else if (farg->op == TOKcall)
-                    {
-                        CallExp *ce = (CallExp *)farg;
-                        if (ce->e1->op == TOKdotvar &&
-                            ((DotVarExp *)ce->e1)->var->isCtorDeclaration())
-                        {
-                            m = MATCHconvert;
-                        }
-                        else
-                            goto Lnomatch;
-                    }
-                    else
-                        goto Lnomatch;
-                }
-            }
-            if (m && (fparam->storageClass & STCout))
-            {   if (!farg->isLvalue())
-                    goto Lnomatch;
-            }
-            if (!m && (fparam->storageClass & STClazy) && fparam->type->ty == Tvoid &&
-                    farg->type->ty != Tvoid)
-                m = MATCHconvert;
-
-            if (m)
-            {   if (m < match)
-                    match = m;          // pick worst match
-                continue;
-            }
-        }
-
-    Lvarargs:
-        /* The following code for variadic arguments closely
-         * matches TypeFunction::callMatch()
-         */
-        if (!(fvarargs == 2 && i + 1 == nfparams))
-            goto Lnomatch;
-
-        /* Check for match with function parameter T...
-         */
-        Type *tb = fparam->type->toBasetype();
-        switch (tb->ty)
-        {
-            // Perhaps we can do better with this, see TypeFunction::callMatch()
-            case Tsarray:
-            {   TypeSArray *tsa = (TypeSArray *)tb;
-                dinteger_t sz = tsa->dim->toInteger();
-                if (sz != nfargs - i)
-                    goto Lnomatch;
-            }
-            case Tarray:
-            {   TypeArray *ta = (TypeArray *)tb;
-                for (; i < nfargs; i++)
-                {
-                    Expression *arg = fargs->tdata()[i];
-                    assert(arg);
-
-                    if (arg->op == TOKfunction)
-                    {   FuncExp *fe = (FuncExp *)arg;
-                        Type *tp = tb->nextOf();
-
-                        Expression *e = fe->inferType(tp, 1, parameters);
-                        if (!e)
-                            goto Lnomatch;
-                        arg = e;
-                    }
-
-                    MATCH m;
-                    /* If lazy array of delegates,
-                     * convert arg(s) to delegate(s)
-                     */
-                    Type *tret = fparam->isLazyArray();
-                    if (tret)
-                    {
-                        if (ta->next->equals(arg->type))
-                        {   m = MATCHexact;
-                        }
-                        else
-                        {
-                            m = arg->implicitConvTo(tret);
-                            if (m == MATCHnomatch)
-                            {
-                                if (tret->toBasetype()->ty == Tvoid)
-                                    m = MATCHconvert;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        m = arg->type->deduceType(paramscope, ta->next, parameters, &dedtypes);
-                        //m = arg->implicitConvTo(ta->next);
-                    }
-                    if (m == MATCHnomatch)
-                        goto Lnomatch;
-                    if (m < match)
-                        match = m;
-                }
-                goto Lmatch;
-            }
-            case Tclass:
-            case Tident:
-                goto Lmatch;
-
-            default:
-                goto Lnomatch;
-        }
-    }
-
-Lmatch:
-
-    for (size_t i = nargsi; i < dedargs->dim; i++)
-    {
-        TemplateParameter *tparam = parameters->tdata()[i];
-        //printf("tparam[%d] = %s\n", i, tparam->ident->toChars());
-        /* For T:T*, the dedargs is the T*, dedtypes is the T
-         * But for function templates, we really need them to match
-         */
-        Object *oarg = dedargs->tdata()[i];
-        Object *oded = dedtypes.tdata()[i];
-        //printf("1dedargs[%d] = %p, dedtypes[%d] = %p\n", i, oarg, i, oded);
-        //if (oarg) printf("oarg: %s\n", oarg->toChars());
-        //if (oded) printf("oded: %s\n", oded->toChars());
-        if (!oarg)
-        {
-            if (oded)
-            {
-                if (tparam->specialization())
-                {   /* The specialization can work as long as afterwards
-                     * the oded == oarg
-                     */
-                    Declaration *sparam;
-                    dedargs->tdata()[i] = oded;
-                    MATCH m2 = tparam->matchArg(paramscope, dedargs, i, parameters, &dedtypes, &sparam);
-                    //printf("m2 = %d\n", m2);
-                    if (!m2)
-                        goto Lnomatch;
-                    if (m2 < match)
-                        match = m2;             // pick worst match
-                    if (dedtypes.tdata()[i] != oded)
-                        error("specialization not allowed for deduced parameter %s", tparam->ident->toChars());
-                }
-            }
-            else
-            {   oded = tparam->defaultArg(loc, paramscope);
-                if (!oded)
-                {
-                    if (tp &&                           // if tuple parameter and
-                        fptupindex < 0 &&               // tuple parameter was not in function parameter list and
-                        nargsi == dedargs->dim - 1)     // we're one argument short (i.e. no tuple argument)
-                    {   // make tuple argument an empty tuple
-                        oded = (Object *)new Tuple();
-                    }
-                    else
-                        goto Lnomatch;
-                }
-            }
-            declareParameter(paramscope, tparam, oded);
-            dedargs->tdata()[i] = oded;
-        }
-    }
-
-#if DMDV2
-    if (constraint)
-    {   /* Check to see if constraint is satisfied.
-         * Most of this code appears twice; this is a good candidate for refactoring.
-         */
-        makeParamNamesVisibleInConstraint(paramscope, fargs);
-        Expression *e = constraint->syntaxCopy();
-        paramscope->ignoreTemplates++;
-        paramscope->flags |= SCOPEstaticif;
-
-        /* Detect recursive attempts to instantiate this template declaration,
-         * Bugzilla 4072
-         *  void foo(T)(T x) if (is(typeof(foo(x)))) { }
-         *  static assert(!is(typeof(foo(7))));
-         * Recursive attempts are regarded as a constraint failure.
-         */
-        int nmatches = 0;
-        for (Previous *p = previous; p; p = p->prev)
-        {
-            if (arrayObjectMatch(p->dedargs, dedargs, this, sc))
-            {
-                //printf("recursive, no match p->sc=%p %p %s\n", p->sc, this, this->toChars());
-                /* It must be a subscope of p->sc, other scope chains are not recursive
-                 * instantiations.
-                 */
-                for (Scope *scx = sc; scx; scx = scx->enclosing)
-                {
-                    if (scx == p->sc)
-                        goto Lnomatch;
-                }
-            }
-            /* BUG: should also check for ref param differences
-             */
-        }
-
-        Previous pr;
-        pr.prev = previous;
-        pr.sc = paramscope;
-        pr.dedargs = dedargs;
-        previous = &pr;                 // add this to threaded list
-
-        int nerrors = global.errors;
-
-        FuncDeclaration *fd = onemember && onemember->toAlias() ?
-            onemember->toAlias()->isFuncDeclaration() : NULL;
-        Dsymbol *s = parent;
-        while (s->isTemplateInstance() || s->isTemplateMixin())
-            s = s->parent;
-        AggregateDeclaration *ad = s->isAggregateDeclaration();
-        VarDeclaration *vthissave;
-        if (fd && ad)
-        {
-            vthissave = fd->vthis;
-            fd->vthis = fd->declareThis(paramscope, ad);
-        }
-
-        e = e->semantic(paramscope);
-
-        if (fd && fd->vthis)
-            fd->vthis = vthissave;
-
-        previous = pr.prev;             // unlink from threaded list
-
-        if (nerrors != global.errors)   // if any errors from evaluating the constraint, no match
-            goto Lnomatch;
-
-        e = e->optimize(WANTvalue | WANTinterpret);
-        if (e->isBool(TRUE))
-            ;
-        else if (e->isBool(FALSE))
-            goto Lnomatch;
-        else
-        {
-            e->error("constraint %s is not constant or does not evaluate to a bool", e->toChars());
-        }
-    }
-#endif
-
-#if 0
-    for (i = 0; i < dedargs->dim; i++)
-    {   Type *t = dedargs->tdata()[i];
-        printf("\tdedargs[%d] = %d, %s\n", i, t->dyncast(), t->toChars());
-    }
-#endif
-
-    paramscope->pop();
-    //printf("\tmatch %d\n", match);
-    return match;
-
-Lnomatch:
-    paramscope->pop();
-    //printf("\tnomatch\n");
-    return MATCHnomatch;
-}
-
-/**************************************************
- * Declare template parameter tp with value o, and install it in the scope sc.
- */
-
-void TemplateDeclaration::declareParameter(Scope *sc, TemplateParameter *tp, Object *o)
-{
-    //printf("TemplateDeclaration::declareParameter('%s', o = %p)\n", tp->ident->toChars(), o);
-
-    Type *targ = isType(o);
-    Expression *ea = isExpression(o);
-    Dsymbol *sa = isDsymbol(o);
-    Tuple *va = isTuple(o);
-
-    Dsymbol *s;
-
-    // See if tp->ident already exists with a matching definition
-    Dsymbol *scopesym;
-    s = sc->search(loc, tp->ident, &scopesym);
-    if (s && scopesym == sc->scopesym)
-    {
-        TupleDeclaration *td = s->isTupleDeclaration();
-        if (va && td)
-        {   Tuple tup;
-            tup.objects = *td->objects;
-            if (match(va, &tup, this, sc))
-            {
-                return;
-            }
-        }
-    }
-
-    if (targ)
-    {
-        //printf("type %s\n", targ->toChars());
-        s = new AliasDeclaration(0, tp->ident, targ);
-    }
-    else if (sa)
-    {
-        //printf("Alias %s %s;\n", sa->ident->toChars(), tp->ident->toChars());
-        s = new AliasDeclaration(0, tp->ident, sa);
-    }
-    else if (ea)
-    {
-        // tdtypes.data[i] always matches ea here
-        Initializer *init = new ExpInitializer(loc, ea);
-        TemplateValueParameter *tvp = tp->isTemplateValueParameter();
-
-        Type *t = tvp ? tvp->valType : NULL;
-
-        VarDeclaration *v = new VarDeclaration(loc, t, tp->ident, init);
-        v->storage_class = STCmanifest;
-        s = v;
-    }
-    else if (va)
-    {
-        //printf("\ttuple\n");
-        s = new TupleDeclaration(loc, tp->ident, &va->objects);
-    }
-    else
-    {
-#ifdef DEBUG
-        o->print();
-#endif
-        assert(0);
-    }
-    if (!sc->insert(s))
-        error("declaration %s is already defined", tp->ident->toChars());
-    s->semantic(sc);
-}
-
-/**************************************
- * Determine if TemplateDeclaration is variadic.
- */
-
-TemplateTupleParameter *isVariadic(TemplateParameters *parameters)
-{   size_t dim = parameters->dim;
-    TemplateTupleParameter *tp = NULL;
-
-    if (dim)
-        tp = (parameters->tdata()[dim - 1])->isTemplateTupleParameter();
-    return tp;
-}
-
-TemplateTupleParameter *TemplateDeclaration::isVariadic()
-{
-    return ::isVariadic(parameters);
-}
-
-/***********************************
- * We can overload templates.
- */
-
-int TemplateDeclaration::isOverloadable()
-{
-    return 1;
-}
-
-/*************************************************
- * Given function arguments, figure out which template function
- * to expand, and return that function.
- * If no match, give error message and return NULL.
- * Input:
- *      sc              instantiation scope
- *      loc             instantiation location
- *      targsi          initial list of template arguments
- *      ethis           if !NULL, the 'this' pointer argument
- *      fargs           arguments to function
- *      flags           1: do not issue error message on no match, just return NULL
- */
-
-FuncDeclaration *TemplateDeclaration::deduceFunctionTemplate(Scope *sc, Loc loc,
-        Objects *targsi, Expression *ethis, Expressions *fargs, int flags)
-{
-    MATCH m_best = MATCHnomatch;
-    TemplateDeclaration *td_ambig = NULL;
-    TemplateDeclaration *td_best = NULL;
-    Objects *tdargs = new Objects();
-    TemplateInstance *ti;
-    FuncDeclaration *fd_best;
-
-#if 0
-    printf("TemplateDeclaration::deduceFunctionTemplate() %s\n", toChars());
-    printf("    targsi:\n");
-    if (targsi)
-    {   for (size_t i = 0; i < targsi->dim; i++)
-        {   Object *arg = targsi->tdata()[i];
-            printf("\t%s\n", arg->toChars());
-        }
-    }
-    printf("    fargs:\n");
-    for (size_t i = 0; i < fargs->dim; i++)
-    {   Expression *arg = fargs->tdata()[i];
-        printf("\t%s %s\n", arg->type->toChars(), arg->toChars());
-        //printf("\tty = %d\n", arg->type->ty);
-    }
-    printf("stc = %llx\n", scope->stc);
-#endif
-
-    for (TemplateDeclaration *td = this; td; td = td->overnext)
-    {
-        if (!td->semanticRun)
-        {
-            error("forward reference to template %s", td->toChars());
-            goto Lerror;
-        }
-        if (!td->onemember || !td->onemember->toAlias()->isFuncDeclaration())
-        {
-            error("is not a function template");
-            goto Lerror;
-        }
-
-        Objects dedargs;
-        FuncDeclaration *fd = NULL;
-
-        MATCH m = td->deduceFunctionTemplateMatch(sc, loc, targsi, ethis, fargs, &dedargs);
-        //printf("deduceFunctionTemplateMatch = %d\n", m);
-        if (!m)                 // if no match
-            continue;
-
-        if (m < m_best)
-            goto Ltd_best;
-        if (m > m_best)
-            goto Ltd;
-
-        {
-        // Disambiguate by picking the most specialized TemplateDeclaration
-        MATCH c1 = td->leastAsSpecialized(td_best, fargs);
-        MATCH c2 = td_best->leastAsSpecialized(td, fargs);
-        //printf("1: c1 = %d, c2 = %d\n", c1, c2);
-
-        if (c1 > c2)
-            goto Ltd;
-        else if (c1 < c2)
-            goto Ltd_best;
-        }
-
-        if (!fd_best)
-        {
-            fd_best = td_best->doHeaderInstantiation(sc, tdargs, fargs);
-            if (!fd_best)
-                goto Lerror;
-        }
-        {
-            fd = td->doHeaderInstantiation(sc, &dedargs, fargs);
-            if (!fd)
-                goto Lerror;
-        }
-        assert(fd && fd_best);
-
-        {
-        // Disambiguate by tf->callMatch
-        TypeFunction *tf1 = (TypeFunction *)fd->type;
-        TypeFunction *tf2 = (TypeFunction *)fd_best->type;
-        MATCH c1 = (MATCH) tf1->callMatch(fd->needThis() && !fd->isCtorDeclaration() ? ethis : NULL, fargs);
-        MATCH c2 = (MATCH) tf2->callMatch(fd_best->needThis() && !fd->isCtorDeclaration() ? ethis : NULL, fargs);
-        //printf("2: c1 = %d, c2 = %d\n", c1, c2);
-
-        if (c1 > c2)
-            goto Ltd;
-        if (c1 < c2)
-            goto Ltd_best;
-        }
-
-        {
-        // Disambiguate by picking the most specialized FunctionDeclaration
-        MATCH c1 = fd->leastAsSpecialized(fd_best);
-        MATCH c2 = fd_best->leastAsSpecialized(fd);
-        //printf("3: c1 = %d, c2 = %d\n", c1, c2);
-
-        if (c1 > c2)
-            goto Ltd;
-        if (c1 < c2)
-            goto Ltd_best;
-        }
-
-      Lambig:           // td_best and td are ambiguous
-        td_ambig = td;
-        continue;
-
-      Ltd_best:         // td_best is the best match so far
-        td_ambig = NULL;
-        continue;
-
-      Ltd:              // td is the new best match
-        td_ambig = NULL;
-        assert((size_t)td->scope > 0x10000);
-        td_best = td;
-        fd_best = fd;
-        m_best = m;
-        tdargs->setDim(dedargs.dim);
-        memcpy(tdargs->tdata(), dedargs.tdata(), tdargs->dim * sizeof(void *));
-        continue;
-    }
-    if (!td_best)
-    {
-        if (!(flags & 1))
-            ::error(loc, "%s %s.%s does not match any function template declaration",
-                    kind(), parent->toPrettyChars(), ident->toChars());
-        goto Lerror;
-    }
-    if (td_ambig)
-    {
-        ::error(loc, "%s %s.%s matches more than one template declaration, %s(%d):%s and %s(%d):%s",
-                kind(), parent->toPrettyChars(), ident->toChars(),
-                td_best->loc.filename,  td_best->loc.linnum,  td_best->toChars(),
-                td_ambig->loc.filename, td_ambig->loc.linnum, td_ambig->toChars());
-    }
-
-    /* The best match is td_best with arguments tdargs.
-     * Now instantiate the template.
-     */
-    assert((size_t)td_best->scope > 0x10000);
-    ti = new TemplateInstance(loc, td_best, tdargs);
-    ti->semantic(sc, fargs);
-    fd_best = ti->toAlias()->isFuncDeclaration();
-    if (!fd_best || !((TypeFunction*)fd_best->type)->callMatch(ethis, fargs, flags))
-        goto Lerror;
-
-    /* As Bugzilla 3682 shows, a template instance can be matched while instantiating
-     * that same template. Thus, the function type can be incomplete. Complete it.
-     */
-    {   TypeFunction *tf = (TypeFunction *)fd_best->type;
-        assert(tf->ty == Tfunction);
-        if (tf->next)
-            fd_best->type = tf->semantic(loc, sc);
-    }
-
-    return fd_best;
-
-  Lerror:
-#if DMDV2
-    if (!(flags & 1))
-#endif
-    {
-        HdrGenState hgs;
-
-        OutBuffer bufa;
-        Objects *args = targsi;
-        if (args)
-        {   for (size_t i = 0; i < args->dim; i++)
-            {
-                if (i)
-                    bufa.writeByte(',');
-                Object *oarg = args->tdata()[i];
-                ObjectToCBuffer(&bufa, &hgs, oarg);
-            }
-        }
-
-        OutBuffer buf;
-        argExpTypesToCBuffer(&buf, fargs, &hgs);
-        if (this->overnext)
-            ::error(loc, "%s %s.%s cannot deduce template function from argument types !(%s)(%s)",
-                    kind(), parent->toPrettyChars(), ident->toChars(),
-                    bufa.toChars(), buf.toChars());
-        else
-            error("cannot deduce template function from argument types !(%s)(%s)",
-                  bufa.toChars(), buf.toChars());
-    }
-    return NULL;
-}
-
-/*************************************************
- * Limited function template instantiation for using fd->leastAsSpecialized()
- */
-FuncDeclaration *TemplateDeclaration::doHeaderInstantiation(Scope *sc,
-        Objects *tdargs, Expressions *fargs)
-{
-    FuncDeclaration *fd = onemember->toAlias()->isFuncDeclaration();
-    if (!fd)
-        return NULL;
-
-#if 0
-    printf("doHeaderInstantiation this = %s\n", toChars());
-    for (size_t i = 0; i < tdargs->dim; ++i)
-        printf("\ttdargs[%d] = %s\n", i, ((Object *)tdargs->data[i])->toChars());
-#endif
-
-    assert((size_t)scope > 0x10000);
-    TemplateInstance *ti = new TemplateInstance(loc, this, tdargs);
-    ti->tinst = sc->tinst;
-    {
-        ti->tdtypes.setDim(ti->tempdecl->parameters->dim);
-        if (!ti->tempdecl->matchWithInstance(ti, &ti->tdtypes, fargs, 2))
-            return NULL;
-    }
-
-    ti->parent = parent;
-
-    // function body and contracts are not need
-    //fd = fd->syntaxCopy(NULL)->isFuncDeclaration();
-    fd = new FuncDeclaration(fd->loc, fd->endloc, fd->ident, fd->storage_class, fd->type->syntaxCopy());
-    fd->parent = ti;
-
-    Scope *scope = this->scope;
-
-    ti->argsym = new ScopeDsymbol();
-    ti->argsym->parent = scope->parent;
-    scope = scope->push(ti->argsym);
-
-    Scope *paramscope = scope->push();
-    paramscope->stc = 0;
-    ti->declareParameters(paramscope);
-    paramscope->pop();
-
-    {
-        TypeFunction *tf = (TypeFunction *)fd->type;
-        if (tf && tf->ty == Tfunction)
-            tf->fargs = fargs;
-    }
-
-    Scope *sc2;
-    sc2 = scope->push(ti);
-    sc2->parent = /*isnested ? sc->parent :*/ ti;
-    sc2->tinst = ti;
-
-    {
-        Scope *sc = sc2;
-        sc = sc->push();
-
-        if (fd->isCtorDeclaration())
-            sc->flags |= SCOPEctor;
-        fd->type = fd->type->semantic(fd->loc, sc);
-        sc = sc->pop();
-    }
-    //printf("\t[%s] fd->type = %s, mod = %x, ", loc.toChars(), fd->type->toChars(), fd->type->mod);
-    //printf("fd->needThis() = %d\n", fd->needThis());
-
-    sc2->pop();
-    scope->pop();
-
-    return fd;
-}
-
-bool TemplateDeclaration::hasStaticCtorOrDtor()
-{
-    return FALSE;               // don't scan uninstantiated templates
-}
-
-void TemplateDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-#if 0 // Should handle template functions for doc generation
-    if (onemember && onemember->isFuncDeclaration())
-        buf->writestring("foo ");
-#endif
-    if (hgs->ddoc)
-        buf->writestring(kind());
-    else
-        buf->writestring("template");
-    buf->writeByte(' ');
-    buf->writestring(ident->toChars());
-    buf->writeByte('(');
-    for (size_t i = 0; i < parameters->dim; i++)
-    {
-        TemplateParameter *tp = parameters->tdata()[i];
-        if (hgs->ddoc)
-            tp = origParameters->tdata()[i];
-        if (i)
-            buf->writeByte(',');
-        tp->toCBuffer(buf, hgs);
-    }
-    buf->writeByte(')');
-#if DMDV2
-    if (constraint)
-    {   buf->writestring(" if (");
-        constraint->toCBuffer(buf, hgs);
-        buf->writeByte(')');
-    }
-#endif
-
-    if (hgs->hdrgen)
-    {
-        hgs->tpltMember++;
-        buf->writenl();
-        buf->writebyte('{');
-        buf->writenl();
-        for (size_t i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = members->tdata()[i];
-            s->toCBuffer(buf, hgs);
-        }
-        buf->writebyte('}');
-        buf->writenl();
-        hgs->tpltMember--;
-    }
-}
-
-
-char *TemplateDeclaration::toChars()
-{   OutBuffer buf;
-    HdrGenState hgs;
-
-    memset(&hgs, 0, sizeof(hgs));
-    buf.writestring(ident->toChars());
-    buf.writeByte('(');
-    for (size_t i = 0; i < parameters->dim; i++)
-    {
-        TemplateParameter *tp = parameters->tdata()[i];
-        if (i)
-            buf.writeByte(',');
-        tp->toCBuffer(&buf, &hgs);
-    }
-    buf.writeByte(')');
-#if DMDV2
-    if (constraint)
-    {   buf.writestring(" if (");
-        constraint->toCBuffer(&buf, &hgs);
-        buf.writeByte(')');
-    }
-#endif
-    buf.writeByte(0);
-    return (char *)buf.extractData();
-}
-
-/* ======================== Type ============================================ */
-
-/****
- * Given an identifier, figure out which TemplateParameter it is.
- * Return -1 if not found.
- */
-
-int templateIdentifierLookup(Identifier *id, TemplateParameters *parameters)
-{
-    for (size_t i = 0; i < parameters->dim; i++)
-    {   TemplateParameter *tp = parameters->tdata()[i];
-
-        if (tp->ident->equals(id))
-            return i;
-    }
-    return -1;
-}
-
-int templateParameterLookup(Type *tparam, TemplateParameters *parameters)
-{
-    assert(tparam->ty == Tident);
-    TypeIdentifier *tident = (TypeIdentifier *)tparam;
-    //printf("\ttident = '%s'\n", tident->toChars());
-    if (tident->idents.dim == 0)
-    {
-        return templateIdentifierLookup(tident->ident, parameters);
-    }
-    return -1;
-}
-
-/* These form the heart of template argument deduction.
- * Given 'this' being the type argument to the template instance,
- * it is matched against the template declaration parameter specialization
- * 'tparam' to determine the type to be used for the parameter.
- * Example:
- *      template Foo(T:T*)      // template declaration
- *      Foo!(int*)              // template instantiation
- * Input:
- *      this = int*
- *      tparam = T*
- *      parameters = [ T:T* ]   // Array of TemplateParameter's
- * Output:
- *      dedtypes = [ int ]      // Array of Expression/Type's
- */
-
-MATCH Type::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
-        Objects *dedtypes, unsigned *wildmatch)
-{
-#if 0
-    printf("Type::deduceType()\n");
-    printf("\tthis   = %d, ", ty); print();
-    printf("\ttparam = %d, ", tparam->ty); tparam->print();
-#endif
-    if (!tparam)
-        goto Lnomatch;
-
-    if (this == tparam)
-        goto Lexact;
-
-    if (tparam->ty == Tident)
-    {
-        // Determine which parameter tparam is
-        int i = templateParameterLookup(tparam, parameters);
-        if (i == -1)
-        {
-            if (!sc)
-                goto Lnomatch;
-
-            /* Need a loc to go with the semantic routine.
-             */
-            Loc loc;
-            if (parameters->dim)
-            {
-                TemplateParameter *tp = parameters->tdata()[0];
-                loc = tp->loc;
-            }
-
-            /* BUG: what if tparam is a template instance, that
-             * has as an argument another Tident?
-             */
-            tparam = tparam->semantic(loc, sc);
-            assert(tparam->ty != Tident);
-            return deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-        }
-
-        TemplateParameter *tp = parameters->tdata()[i];
-
-        // Found the corresponding parameter tp
-        if (!tp->isTemplateTypeParameter())
-            goto Lnomatch;
-        Type *tt = this;
-        Type *at = (Type *)dedtypes->tdata()[i];
-
-        // 7*7 == 49 cases
-
-        #define X(U,T)  ((U) << 4) | (T)
-
-        if (wildmatch && (tparam->mod & MODwild))
-        {
-            switch (X(tparam->mod, mod))
-            {
-                case X(MODwild,              0):
-                case X(MODwild,              MODshared):
-                case X(MODwild,              MODconst):
-                case X(MODwild,              MODconst | MODshared):
-                case X(MODwild,              MODimmutable):
-                case X(MODwild,              MODwild):
-                case X(MODwild,              MODwild | MODshared):
-                case X(MODwild | MODshared,  MODshared):
-                case X(MODwild | MODshared,  MODconst | MODshared):
-                case X(MODwild | MODshared,  MODimmutable):
-                case X(MODwild | MODshared,  MODwild | MODshared):
-
-                    if (!at)
-                    {
-                        if (mod & MODwild)
-                            *wildmatch |= MODwild;
-                        else if (mod == 0)
-                            *wildmatch |= MODmutable;
-                        else
-                            *wildmatch |= (mod & ~MODshared);
-                        tt = mutableOf()->substWildTo(MODmutable);
-                        dedtypes->tdata()[i] = tt;
-                        goto Lconst;
-                    }
-
-                    //printf("\t> tt = %s, at = %s\n", tt->toChars(), at->toChars());
-                    //printf("\t> tt->implicitConvTo(at->constOf()) = %d\n", tt->implicitConvTo(at->constOf()));
-                    //printf("\t> at->implicitConvTo(tt->constOf()) = %d\n", at->implicitConvTo(tt->constOf()));
-
-                    if (tt->equals(at))
-                    {
-                        goto Lconst;
-                    }
-                    else if (tt->implicitConvTo(at->constOf()))
-                    {
-                        dedtypes->tdata()[i] = at->constOf()->mutableOf();
-                        *wildmatch |= MODconst;
-                        goto Lconst;
-                    }
-                    else if (at->implicitConvTo(tt->constOf()))
-                    {
-                        dedtypes->tdata()[i] = tt->constOf()->mutableOf();
-                        *wildmatch |= MODconst;
-                        goto Lconst;
-                    }
-                    goto Lnomatch;
-
-                default:
-                    break;
-            }
-        }
-
-        switch (X(tparam->mod, mod))
-        {
-            case X(0, 0):
-            case X(0, MODconst):
-            case X(0, MODimmutable):
-            case X(0, MODshared):
-            case X(0, MODconst | MODshared):
-            case X(0, MODwild):
-            case X(0, MODwild | MODshared):
-                // foo(U:U) T                              => T
-                // foo(U:U) const(T)                       => const(T)
-                // foo(U:U) immutable(T)                   => immutable(T)
-                // foo(U:U) shared(T)                      => shared(T)
-                // foo(U:U) const(shared(T))               => const(shared(T))
-                // foo(U:U) wild(T)                        => wild(T)
-                // foo(U:U) wild(shared(T))                => wild(shared(T))
-                if (!at)
-                {   dedtypes->tdata()[i] = tt;
-                    goto Lexact;
-                }
-                break;
-
-            case X(MODconst, MODconst):
-            case X(MODimmutable, MODimmutable):
-            case X(MODshared, MODshared):
-            case X(MODconst | MODshared, MODconst | MODshared):
-            case X(MODwild, MODwild):
-            case X(MODwild | MODshared, MODwild | MODshared):
-                // foo(U:const(U))        const(T)         => T
-                // foo(U:immutable(U))    immutable(T)     => T
-                // foo(U:shared(U))       shared(T)        => T
-                // foo(U:const(shared(U)) const(shared(T)) => T
-                // foo(U:wild(U))         wild(T)          => T
-                // foo(U:wild(shared(U))  wild(shared(T)) => T
-                tt = mutableOf()->unSharedOf();
-                if (!at)
-                {   dedtypes->tdata()[i] = tt;
-                    goto Lexact;
-                }
-                break;
-
-            case X(MODconst, 0):
-            case X(MODconst, MODimmutable):
-            case X(MODconst, MODconst | MODshared):
-            case X(MODconst | MODshared, MODimmutable):
-            case X(MODconst, MODwild):
-            case X(MODconst, MODwild | MODshared):
-                // foo(U:const(U)) T                       => T
-                // foo(U:const(U)) immutable(T)            => T
-                // foo(U:const(U)) const(shared(T))        => shared(T)
-                // foo(U:const(shared(U)) immutable(T)     => T
-                // foo(U:const(U)) wild(shared(T))         => shared(T)
-                tt = mutableOf();
-                if (!at)
-                {   dedtypes->tdata()[i] = tt;
-                    goto Lconst;
-                }
-                break;
-
-            case X(MODshared, MODconst | MODshared):
-            case X(MODconst | MODshared, MODshared):
-            case X(MODshared, MODwild | MODshared):
-                // foo(U:shared(U)) const(shared(T))       => const(T)
-                // foo(U:const(shared(U)) shared(T)        => T
-                // foo(U:shared(U)) wild(shared(T))        => wild(T)
-                tt = unSharedOf();
-                if (!at)
-                {   dedtypes->tdata()[i] = tt;
-                    goto Lconst;
-                }
-                break;
-
-            case X(MODconst,             MODshared):
-                // foo(U:const(U)) shared(T)       => shared(T)
-                if (!at)
-                {   (*dedtypes)[i] = tt;
-                    goto Lconst;
-                }
-                break;
-
-            case X(MODimmutable,         0):
-            case X(MODimmutable,         MODconst):
-            case X(MODimmutable,         MODshared):
-            case X(MODimmutable,         MODconst | MODshared):
-            case X(MODshared,            0):
-            case X(MODshared,            MODconst):
-            case X(MODshared,            MODimmutable):
-            case X(MODconst | MODshared, 0):
-            case X(MODconst | MODshared, MODconst):
-            case X(MODimmutable,         MODwild):
-            case X(MODshared,            MODwild):
-            case X(MODconst | MODshared, MODwild):
-            case X(MODwild,              0):
-            case X(MODwild,              MODconst):
-            case X(MODwild,              MODimmutable):
-            case X(MODwild,              MODshared):
-            case X(MODwild,              MODconst | MODshared):
-            case X(MODwild | MODshared,  0):
-            case X(MODwild | MODshared,  MODconst):
-            case X(MODwild | MODshared,  MODimmutable):
-            case X(MODwild | MODshared,  MODshared):
-            case X(MODwild | MODshared,  MODconst | MODshared):
-            case X(MODwild | MODshared,  MODwild):
-            case X(MODimmutable,         MODwild | MODshared):
-            case X(MODconst | MODshared, MODwild | MODshared):
-            case X(MODwild,              MODwild | MODshared):
-
-                // foo(U:immutable(U)) T                   => nomatch
-                // foo(U:immutable(U)) const(T)            => nomatch
-                // foo(U:immutable(U)) shared(T)           => nomatch
-                // foo(U:immutable(U)) const(shared(T))    => nomatch
-                // foo(U:const(U)) shared(T)               => nomatch
-                // foo(U:shared(U)) T                      => nomatch
-                // foo(U:shared(U)) const(T)               => nomatch
-                // foo(U:shared(U)) immutable(T)           => nomatch
-                // foo(U:const(shared(U)) T                => nomatch
-                // foo(U:const(shared(U)) const(T)         => nomatch
-                // foo(U:immutable(U)) wild(T)             => nomatch
-                // foo(U:shared(U)) wild(T)                => nomatch
-                // foo(U:const(shared(U)) wild(T)          => nomatch
-                // foo(U:wild(U)) T                        => nomatch
-                // foo(U:wild(U)) const(T)                 => nomatch
-                // foo(U:wild(U)) immutable(T)             => nomatch
-                // foo(U:wild(U)) shared(T)                => nomatch
-                // foo(U:wild(U)) const(shared(T))         => nomatch
-                // foo(U:wild(shared(U)) T                 => nomatch
-                // foo(U:wild(shared(U)) const(T)          => nomatch
-                // foo(U:wild(shared(U)) immutable(T)      => nomatch
-                // foo(U:wild(shared(U)) shared(T)         => nomatch
-                // foo(U:wild(shared(U)) const(shared(T))  => nomatch
-                // foo(U:wild(shared(U)) wild(T)           => nomatch
-                // foo(U:immutable(U)) wild(shared(T))     => nomatch
-                // foo(U:const(shared(U))) wild(shared(T)) => nomatch
-                // foo(U:wild(U)) wild(shared(T))          => nomatch
-                //if (!at)
-                    goto Lnomatch;
-                break;
-
-            default:
-                assert(0);
-        }
-        #undef X
-
-        if (tt->equals(at))
-            goto Lexact;
-        else if (tt->ty == Tclass && at->ty == Tclass)
-        {
-            return tt->implicitConvTo(at);
-        }
-        else if (tt->ty == Tsarray && at->ty == Tarray &&
-            tt->nextOf()->implicitConvTo(at->nextOf()) >= MATCHconst)
-        {
-            goto Lexact;
-        }
-        else
-            goto Lnomatch;
-    }
-    else if (tparam->ty == Ttypeof)
-    {
-        /* Need a loc to go with the semantic routine.
-         */
-        Loc loc;
-        if (parameters->dim)
-        {
-            TemplateParameter *tp = parameters->tdata()[0];
-            loc = tp->loc;
-        }
-
-        tparam = tparam->semantic(loc, sc);
-    }
-
-    if (ty != tparam->ty)
-    {
-#if DMDV2
-        // Can't instantiate AssociativeArray!() without a scope
-        if (tparam->ty == Taarray && !((TypeAArray*)tparam)->sc)
-            ((TypeAArray*)tparam)->sc = sc;
-
-        MATCH m = implicitConvTo(tparam);
-        if (m == MATCHnomatch)
-        {
-            Type *at = aliasthisOf();
-            if (at)
-                m = at->deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-        }
-        return m;
-#else
-        return implicitConvTo(tparam);
-#endif
-    }
-
-    if (nextOf())
-        return nextOf()->deduceType(sc, tparam->nextOf(), parameters, dedtypes, wildmatch);
-
-Lexact:
-    return MATCHexact;
-
-Lnomatch:
-    return MATCHnomatch;
-
-#if DMDV2
-Lconst:
-    return MATCHconst;
-#endif
-}
-
-#if DMDV2
-MATCH TypeVector::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
-        Objects *dedtypes, unsigned *wildmatch)
-{
-#if 0
-    printf("TypeVector::deduceType()\n");
-    printf("\tthis   = %d, ", ty); print();
-    printf("\ttparam = %d, ", tparam->ty); tparam->print();
-#endif
-    if (tparam->ty == Tvector)
-    {   TypeVector *tp = (TypeVector *)tparam;
-        return basetype->deduceType(sc, tp->basetype, parameters, dedtypes, wildmatch);
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-#endif
-
-#if DMDV2
-MATCH TypeDArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
-        Objects *dedtypes, unsigned *wildmatch)
-{
-#if 0
-    printf("TypeDArray::deduceType()\n");
-    printf("\tthis   = %d, ", ty); print();
-    printf("\ttparam = %d, ", tparam->ty); tparam->print();
-#endif
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-#endif
-
-MATCH TypeSArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
-        Objects *dedtypes, unsigned *wildmatch)
-{
-#if 0
-    printf("TypeSArray::deduceType()\n");
-    printf("\tthis   = %d, ", ty); print();
-    printf("\ttparam = %d, ", tparam->ty); tparam->print();
-#endif
-
-    // Extra check that array dimensions must match
-    if (tparam)
-    {
-        if (tparam->ty == Tarray)
-        {   MATCH m;
-
-            m = next->deduceType(sc, tparam->nextOf(), parameters, dedtypes, wildmatch);
-            if (m == MATCHexact)
-                m = MATCHconvert;
-            return m;
-        }
-
-        Identifier *id = NULL;
-        if (tparam->ty == Tsarray)
-        {
-            TypeSArray *tp = (TypeSArray *)tparam;
-            if (tp->dim->op == TOKvar &&
-                ((VarExp *)tp->dim)->var->storage_class & STCtemplateparameter)
-            {
-                id = ((VarExp *)tp->dim)->var->ident;
-            }
-            else if (dim->toInteger() != tp->dim->toInteger())
-                return MATCHnomatch;
-        }
-        else if (tparam->ty == Taarray)
-        {
-            TypeAArray *tp = (TypeAArray *)tparam;
-            if (tp->index->ty == Tident &&
-                ((TypeIdentifier *)tp->index)->idents.dim == 0)
-            {
-                id = ((TypeIdentifier *)tp->index)->ident;
-            }
-        }
-        if (id)
-        {
-            // This code matches code in TypeInstance::deduceType()
-            int i = templateIdentifierLookup(id, parameters);
-            if (i == -1)
-                goto Lnomatch;
-            TemplateParameter *tprm = parameters->tdata()[i];
-            TemplateValueParameter *tvp = tprm->isTemplateValueParameter();
-            if (!tvp)
-                goto Lnomatch;
-            Expression *e = (Expression *)dedtypes->tdata()[i];
-            if (e)
-            {
-                if (!dim->equals(e))
-                    goto Lnomatch;
-            }
-            else
-            {
-                Type *vt = tvp->valType->semantic(0, sc);
-                MATCH m = (MATCH)dim->implicitConvTo(vt);
-                if (!m)
-                    goto Lnomatch;
-                dedtypes->tdata()[i] = dim;
-            }
-            return next->deduceType(sc, tparam->nextOf(), parameters, dedtypes, wildmatch);
-        }
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-
-  Lnomatch:
-    return MATCHnomatch;
-}
-
-MATCH TypeAArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
-{
-#if 0
-    printf("TypeAArray::deduceType()\n");
-    printf("\tthis   = %d, ", ty); print();
-    printf("\ttparam = %d, ", tparam->ty); tparam->print();
-#endif
-
-    // Extra check that index type must match
-    if (tparam && tparam->ty == Taarray)
-    {
-        TypeAArray *tp = (TypeAArray *)tparam;
-        if (!index->deduceType(sc, tp->index, parameters, dedtypes, wildmatch))
-        {
-            return MATCHnomatch;
-        }
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-
-MATCH TypeFunction::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
-{
-    //printf("TypeFunction::deduceType()\n");
-    //printf("\tthis   = %d, ", ty); print();
-    //printf("\ttparam = %d, ", tparam->ty); tparam->print();
-
-    // Extra check that function characteristics must match
-    if (tparam && tparam->ty == Tfunction)
-    {
-        TypeFunction *tp = (TypeFunction *)tparam;
-        if (varargs != tp->varargs ||
-            linkage != tp->linkage)
-            return MATCHnomatch;
-
-        size_t nfargs = Parameter::dim(this->parameters);
-        size_t nfparams = Parameter::dim(tp->parameters);
-
-        // bug 2579 fix: Apply function parameter storage classes to parameter types
-        for (size_t i = 0; i < nfparams; i++)
-        {
-            Parameter *fparam = Parameter::getNth(tp->parameters, i);
-            fparam->type = fparam->type->addStorageClass(fparam->storageClass);
-            fparam->storageClass &= ~(STC_TYPECTOR | STCin);
-        }
-        //printf("\t-> this   = %d, ", ty); print();
-        //printf("\t-> tparam = %d, ", tparam->ty); tparam->print();
-
-        /* See if tuple match
-         */
-        if (nfparams > 0 && nfargs >= nfparams - 1)
-        {
-            /* See if 'A' of the template parameter matches 'A'
-             * of the type of the last function parameter.
-             */
-            Parameter *fparam = Parameter::getNth(tp->parameters, nfparams - 1);
-            assert(fparam);
-            assert(fparam->type);
-            if (fparam->type->ty != Tident)
-                goto L1;
-            TypeIdentifier *tid = (TypeIdentifier *)fparam->type;
-            if (tid->idents.dim)
-                goto L1;
-
-            /* Look through parameters to find tuple matching tid->ident
-             */
-            size_t tupi = 0;
-            for (; 1; tupi++)
-            {   if (tupi == parameters->dim)
-                    goto L1;
-                TemplateParameter *t = parameters->tdata()[tupi];
-                TemplateTupleParameter *tup = t->isTemplateTupleParameter();
-                if (tup && tup->ident->equals(tid->ident))
-                    break;
-            }
-
-            /* The types of the function arguments [nfparams - 1 .. nfargs]
-             * now form the tuple argument.
-             */
-            size_t tuple_dim = nfargs - (nfparams - 1);
-
-            /* See if existing tuple, and whether it matches or not
-             */
-            Object *o = dedtypes->tdata()[tupi];
-            if (o)
-            {   // Existing deduced argument must be a tuple, and must match
-                Tuple *t = isTuple(o);
-                if (!t || t->objects.dim != tuple_dim)
-                    return MATCHnomatch;
-                for (size_t i = 0; i < tuple_dim; i++)
-                {   Parameter *arg = Parameter::getNth(this->parameters, nfparams - 1 + i);
-                    if (!arg->type->equals(t->objects.tdata()[i]))
-                        return MATCHnomatch;
-                }
-            }
-            else
-            {   // Create new tuple
-                Tuple *t = new Tuple();
-                t->objects.setDim(tuple_dim);
-                for (size_t i = 0; i < tuple_dim; i++)
-                {   Parameter *arg = Parameter::getNth(this->parameters, nfparams - 1 + i);
-                    t->objects.tdata()[i] = arg->type;
-                }
-                dedtypes->tdata()[tupi] = t;
-            }
-            nfparams--; // don't consider the last parameter for type deduction
-            goto L2;
-        }
-
-    L1:
-        if (nfargs != nfparams)
-            return MATCHnomatch;
-    L2:
-        for (size_t i = 0; i < nfparams; i++)
-        {
-            Parameter *a = Parameter::getNth(this->parameters, i);
-            Parameter *ap = Parameter::getNth(tp->parameters, i);
-            if (a->storageClass != ap->storageClass ||
-                !a->type->deduceType(sc, ap->type, parameters, dedtypes, wildmatch))
-                return MATCHnomatch;
-        }
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-
-MATCH TypeIdentifier::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
-{
-    // Extra check
-    if (tparam && tparam->ty == Tident)
-    {
-        TypeIdentifier *tp = (TypeIdentifier *)tparam;
-
-        for (size_t i = 0; i < idents.dim; i++)
-        {
-            Identifier *id1 = idents.tdata()[i];
-            Identifier *id2 = tp->idents.tdata()[i];
-
-            if (!id1->equals(id2))
-                return MATCHnomatch;
-        }
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-
-MATCH TypeInstance::deduceType(Scope *sc,
-        Type *tparam, TemplateParameters *parameters,
-        Objects *dedtypes, unsigned *wildmatch)
-{
-#if 0
-    printf("TypeInstance::deduceType()\n");
-    printf("\tthis   = %d, ", ty); print();
-    printf("\ttparam = %d, ", tparam->ty); tparam->print();
-#endif
-
-    // Extra check
-    if (tparam && tparam->ty == Tinstance)
-    {
-        TypeInstance *tp = (TypeInstance *)tparam;
-
-        //printf("tempinst->tempdecl = %p\n", tempinst->tempdecl);
-        //printf("tp->tempinst->tempdecl = %p\n", tp->tempinst->tempdecl);
-        if (!tp->tempinst->tempdecl)
-        {   //printf("tp->tempinst->name = '%s'\n", tp->tempinst->name->toChars());
-            if (!tp->tempinst->name->equals(tempinst->name))
-            {
-                /* Handle case of:
-                 *  template Foo(T : sa!(T), alias sa)
-                 */
-                int i = templateIdentifierLookup(tp->tempinst->name, parameters);
-                if (i == -1)
-                {   /* Didn't find it as a parameter identifier. Try looking
-                     * it up and seeing if is an alias. See Bugzilla 1454
-                     */
-                    Dsymbol *s = tempinst->tempdecl->scope->search(0, tp->tempinst->name, NULL);
-                    if (s)
-                    {
-                        s = s->toAlias();
-                        TemplateDeclaration *td = s->isTemplateDeclaration();
-                        if (td && td == tempinst->tempdecl)
-                            goto L2;
-                    }
-                    goto Lnomatch;
-                }
-                TemplateParameter *tpx = parameters->tdata()[i];
-                // This logic duplicates tpx->matchArg()
-                TemplateAliasParameter *ta = tpx->isTemplateAliasParameter();
-                if (!ta)
-                    goto Lnomatch;
-                Object *sa = tempinst->tempdecl;
-                if (!sa)
-                    goto Lnomatch;
-                if (ta->specAlias && sa != ta->specAlias)
-                    goto Lnomatch;
-                if (dedtypes->tdata()[i])
-                {   // Must match already deduced symbol
-                    Object *s = dedtypes->tdata()[i];
-
-                    if (s != sa)
-                        goto Lnomatch;
-                }
-                dedtypes->tdata()[i] = sa;
-            }
-        }
-        else if (tempinst->tempdecl != tp->tempinst->tempdecl)
-            goto Lnomatch;
-
-      L2:
-
-        for (size_t i = 0; 1; i++)
-        {
-            //printf("\ttest: tempinst->tiargs[%d]\n", i);
-            Object *o1;
-            if (i < tempinst->tiargs->dim)
-                o1 = tempinst->tiargs->tdata()[i];
-            else if (i < tempinst->tdtypes.dim && i < tp->tempinst->tiargs->dim)
-                // Pick up default arg
-                o1 = tempinst->tdtypes.tdata()[i];
-            else
-                break;
-
-            if (i >= tp->tempinst->tiargs->dim)
-                goto Lnomatch;
-
-            Object *o2 = tp->tempinst->tiargs->tdata()[i];
-
-            Type *t1 = isType(o1);
-            Type *t2 = isType(o2);
-
-            Expression *e1 = isExpression(o1);
-            Expression *e2 = isExpression(o2);
-
-            Dsymbol *s1 = isDsymbol(o1);
-            Dsymbol *s2 = isDsymbol(o2);
-
-            Tuple *v1 = isTuple(o1);
-            Tuple *v2 = isTuple(o2);
-#if 0
-            if (t1)     printf("t1 = %s\n", t1->toChars());
-            if (t2)     printf("t2 = %s\n", t2->toChars());
-            if (e1)     printf("e1 = %s\n", e1->toChars());
-            if (e2)     printf("e2 = %s\n", e2->toChars());
-            if (s1)     printf("s1 = %s\n", s1->toChars());
-            if (s2)     printf("s2 = %s\n", s2->toChars());
-            if (v1)     printf("v1 = %s\n", v1->toChars());
-            if (v2)     printf("v2 = %s\n", v2->toChars());
-#endif
-
-            TemplateTupleParameter *ttp;
-            int j;
-            if (t2 &&
-                t2->ty == Tident &&
-                i == tp->tempinst->tiargs->dim - 1 &&
-                i == tempinst->tempdecl->parameters->dim - 1 &&
-                (ttp = tempinst->tempdecl->isVariadic()) != NULL)
-            {
-                /* Given:
-                 *  struct A(B...) {}
-                 *  alias A!(int, float) X;
-                 *  static if (!is(X Y == A!(Z), Z))
-                 * deduce that Z is a tuple(int, float)
-                 */
-
-                j = templateParameterLookup(t2, parameters);
-                if (j == -1)
-                    goto Lnomatch;
-
-                /* Create tuple from remaining args
-                 */
-                Tuple *vt = new Tuple();
-                size_t vtdim = tempinst->tiargs->dim - i;
-                vt->objects.setDim(vtdim);
-                for (size_t k = 0; k < vtdim; k++)
-                    vt->objects.tdata()[k] = tempinst->tiargs->tdata()[i + k];
-
-                Tuple *v = (Tuple *)dedtypes->tdata()[j];
-                if (v)
-                {
-                    if (!match(v, vt, tempinst->tempdecl, sc))
-                        goto Lnomatch;
-                }
-                else
-                    dedtypes->tdata()[j] = vt;
-                break; //return MATCHexact;
-            }
-
-            if (t1 && t2)
-            {
-                if (!t1->deduceType(sc, t2, parameters, dedtypes, wildmatch))
-                    goto Lnomatch;
-            }
-            else if (e1 && e2)
-            {
-                if (!e1->equals(e2))
-                {   if (e2->op == TOKvar)
-                    {
-                        /*
-                         * (T:Number!(e2), int e2)
-                         */
-                        j = templateIdentifierLookup(((VarExp *)e2)->var->ident, parameters);
-                        goto L1;
-                    }
-                    goto Lnomatch;
-                }
-            }
-            else if (e1 && t2 && t2->ty == Tident)
-            {
-                j = templateParameterLookup(t2, parameters);
-            L1:
-                if (j == -1)
-                    goto Lnomatch;
-                TemplateParameter *tp = parameters->tdata()[j];
-                // BUG: use tp->matchArg() instead of the following
-                TemplateValueParameter *tv = tp->isTemplateValueParameter();
-                if (!tv)
-                    goto Lnomatch;
-                Expression *e = (Expression *)dedtypes->tdata()[j];
-                if (e)
-                {
-                    if (!e1->equals(e))
-                        goto Lnomatch;
-                }
-                else
-                {   Type *vt = tv->valType->semantic(0, sc);
-                    MATCH m = (MATCH)e1->implicitConvTo(vt);
-                    if (!m)
-                        goto Lnomatch;
-                    dedtypes->tdata()[j] = e1;
-                }
-            }
-            else if (s1 && t2 && t2->ty == Tident)
-            {
-                j = templateParameterLookup(t2, parameters);
-                if (j == -1)
-                    goto Lnomatch;
-                TemplateParameter *tp = parameters->tdata()[j];
-                // BUG: use tp->matchArg() instead of the following
-                TemplateAliasParameter *ta = tp->isTemplateAliasParameter();
-                if (!ta)
-                    goto Lnomatch;
-                Dsymbol *s = (Dsymbol *)dedtypes->tdata()[j];
-                if (s)
-                {
-                    if (!s1->equals(s))
-                        goto Lnomatch;
-                }
-                else
-                {
-                    dedtypes->tdata()[j] = s1;
-                }
-            }
-            else if (s1 && s2)
-            {
-                if (!s1->equals(s2))
-                    goto Lnomatch;
-            }
-            // BUG: Need to handle tuple parameters
-            else
-                goto Lnomatch;
-        }
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-
-Lnomatch:
-    //printf("no match\n");
-    return MATCHnomatch;
-}
-
-MATCH TypeStruct::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
-{
-    //printf("TypeStruct::deduceType()\n");
-    //printf("\tthis->parent   = %s, ", sym->parent->toChars()); print();
-    //printf("\ttparam = %d, ", tparam->ty); tparam->print();
-
-    /* If this struct is a template struct, and we're matching
-     * it against a template instance, convert the struct type
-     * to a template instance, too, and try again.
-     */
-    TemplateInstance *ti = sym->parent->isTemplateInstance();
-
-    if (tparam && tparam->ty == Tinstance)
-    {
-        if (ti && ti->toAlias() == sym)
-        {
-            TypeInstance *t = new TypeInstance(0, ti);
-            return t->deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-        }
-
-        /* Match things like:
-         *  S!(T).foo
-         */
-        TypeInstance *tpi = (TypeInstance *)tparam;
-        if (tpi->idents.dim)
-        {   Identifier *id = tpi->idents.tdata()[tpi->idents.dim - 1];
-            if (id->dyncast() == DYNCAST_IDENTIFIER && sym->ident->equals(id))
-            {
-                Type *tparent = sym->parent->getType();
-                if (tparent)
-                {
-                    /* Slice off the .foo in S!(T).foo
-                     */
-                    tpi->idents.dim--;
-                    MATCH m = tparent->deduceType(sc, tpi, parameters, dedtypes, wildmatch);
-                    tpi->idents.dim++;
-                    return m;
-                }
-            }
-        }
-    }
-
-    // Extra check
-    if (tparam && tparam->ty == Tstruct)
-    {
-        TypeStruct *tp = (TypeStruct *)tparam;
-
-        //printf("\t%d\n", (MATCH) implicitConvTo(tp));
-        return implicitConvTo(tp);
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-
-MATCH TypeEnum::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
-{
-    // Extra check
-    if (tparam && tparam->ty == Tenum)
-    {
-        TypeEnum *tp = (TypeEnum *)tparam;
-
-        if (sym != tp->sym)
-            return MATCHnomatch;
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-
-MATCH TypeTypedef::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
-{
-    // Extra check
-    if (tparam && tparam->ty == Ttypedef)
-    {
-        TypeTypedef *tp = (TypeTypedef *)tparam;
-
-        if (sym != tp->sym)
-            return MATCHnomatch;
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-
-/* Helper for TypeClass::deduceType().
- * Classes can match with implicit conversion to a base class or interface.
- * This is complicated, because there may be more than one base class which
- * matches. In such cases, one or more parameters remain ambiguous.
- * For example,
- *
- *   interface I(X, Y) {}
- *   class C : I(uint, double), I(char, double) {}
- *   C x;
- *   foo(T, U)( I!(T, U) x)
- *
- *   deduces that U is double, but T remains ambiguous (could be char or uint).
- *
- * Given a baseclass b, and initial deduced types 'dedtypes', this function
- * tries to match tparam with b, and also tries all base interfaces of b.
- * If a match occurs, numBaseClassMatches is incremented, and the new deduced
- * types are ANDed with the current 'best' estimate for dedtypes.
- */
-void deduceBaseClassParameters(BaseClass *b,
-    Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes,
-    Objects *best, int &numBaseClassMatches)
-{
-    TemplateInstance *parti = b->base ? b->base->parent->isTemplateInstance() : NULL;
-    if (parti)
-    {
-        // Make a temporary copy of dedtypes so we don't destroy it
-        Objects *tmpdedtypes = new Objects();
-        tmpdedtypes->setDim(dedtypes->dim);
-        memcpy(tmpdedtypes->tdata(), dedtypes->tdata(), dedtypes->dim * sizeof(void *));
-
-        TypeInstance *t = new TypeInstance(0, parti);
-        MATCH m = t->deduceType(sc, tparam, parameters, tmpdedtypes);
-        if (m != MATCHnomatch)
-        {
-            // If this is the first ever match, it becomes our best estimate
-            if (numBaseClassMatches==0)
-                memcpy(best->tdata(), tmpdedtypes->tdata(), tmpdedtypes->dim * sizeof(void *));
-            else for (size_t k = 0; k < tmpdedtypes->dim; ++k)
-            {
-                // If we've found more than one possible type for a parameter,
-                // mark it as unknown.
-                if (tmpdedtypes->tdata()[k] != best->tdata()[k])
-                    best->tdata()[k] = dedtypes->tdata()[k];
-            }
-            ++numBaseClassMatches;
-        }
-    }
-    // Now recursively test the inherited interfaces
-    for (size_t j = 0; j < b->baseInterfaces_dim; ++j)
-    {
-        deduceBaseClassParameters( &(b->baseInterfaces)[j],
-            sc, tparam, parameters, dedtypes,
-            best, numBaseClassMatches);
-    }
-
-}
-
-MATCH TypeClass::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
-{
-    //printf("TypeClass::deduceType(this = %s)\n", toChars());
-
-    /* If this class is a template class, and we're matching
-     * it against a template instance, convert the class type
-     * to a template instance, too, and try again.
-     */
-    TemplateInstance *ti = sym->parent->isTemplateInstance();
-
-    if (tparam && tparam->ty == Tinstance)
-    {
-        if (ti && ti->toAlias() == sym)
-        {
-            TypeInstance *t = new TypeInstance(0, ti);
-            MATCH m = t->deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-            // Even if the match fails, there is still a chance it could match
-            // a base class.
-            if (m != MATCHnomatch)
-                return m;
-        }
-
-        /* Match things like:
-         *  S!(T).foo
-         */
-        TypeInstance *tpi = (TypeInstance *)tparam;
-        if (tpi->idents.dim)
-        {   Identifier *id = tpi->idents.tdata()[tpi->idents.dim - 1];
-            if (id->dyncast() == DYNCAST_IDENTIFIER && sym->ident->equals(id))
-            {
-                Type *tparent = sym->parent->getType();
-                if (tparent)
-                {
-                    /* Slice off the .foo in S!(T).foo
-                     */
-                    tpi->idents.dim--;
-                    MATCH m = tparent->deduceType(sc, tpi, parameters, dedtypes, wildmatch);
-                    tpi->idents.dim++;
-                    return m;
-                }
-            }
-        }
-
-        // If it matches exactly or via implicit conversion, we're done
-        MATCH m = Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-        if (m != MATCHnomatch)
-            return m;
-
-        /* There is still a chance to match via implicit conversion to
-         * a base class or interface. Because there could be more than one such
-         * match, we need to check them all.
-         */
-
-        int numBaseClassMatches = 0; // Have we found an interface match?
-
-        // Our best guess at dedtypes
-        Objects *best = new Objects();
-        best->setDim(dedtypes->dim);
-
-        ClassDeclaration *s = sym;
-        while(s && s->baseclasses->dim > 0)
-        {
-            // Test the base class
-            deduceBaseClassParameters((s->baseclasses->tdata()[0]),
-                sc, tparam, parameters, dedtypes,
-                best, numBaseClassMatches);
-
-            // Test the interfaces inherited by the base class
-            for (size_t i = 0; i < s->interfaces_dim; ++i)
-            {
-                BaseClass *b = s->interfaces[i];
-                deduceBaseClassParameters(b, sc, tparam, parameters, dedtypes,
-                    best, numBaseClassMatches);
-            }
-            s = ((s->baseclasses->tdata()[0]))->base;
-        }
-
-        if (numBaseClassMatches == 0)
-            return MATCHnomatch;
-
-        // If we got at least one match, copy the known types into dedtypes
-        memcpy(dedtypes->tdata(), best->tdata(), best->dim * sizeof(void *));
-        return MATCHconvert;
-    }
-
-    // Extra check
-    if (tparam && tparam->ty == Tclass)
-    {
-        TypeClass *tp = (TypeClass *)tparam;
-
-        //printf("\t%d\n", (MATCH) implicitConvTo(tp));
-        return implicitConvTo(tp);
-    }
-    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
-}
-
-/* ======================== TemplateParameter =============================== */
-
-TemplateParameter::TemplateParameter(Loc loc, Identifier *ident)
-{
-    this->loc = loc;
-    this->ident = ident;
-    this->sparam = NULL;
-}
-
-TemplateTypeParameter  *TemplateParameter::isTemplateTypeParameter()
-{
-    return NULL;
-}
-
-TemplateValueParameter *TemplateParameter::isTemplateValueParameter()
-{
-    return NULL;
-}
-
-TemplateAliasParameter *TemplateParameter::isTemplateAliasParameter()
-{
-    return NULL;
-}
-
-TemplateTupleParameter *TemplateParameter::isTemplateTupleParameter()
-{
-    return NULL;
-}
-
-#if DMDV2
-TemplateThisParameter  *TemplateParameter::isTemplateThisParameter()
-{
-    return NULL;
-}
-#endif
-
-/* ======================== TemplateTypeParameter =========================== */
-
-// type-parameter
-
-Type *TemplateTypeParameter::tdummy = NULL;
-
-TemplateTypeParameter::TemplateTypeParameter(Loc loc, Identifier *ident, Type *specType,
-        Type *defaultType)
-    : TemplateParameter(loc, ident)
-{
-    this->ident = ident;
-    this->specType = specType;
-    this->defaultType = defaultType;
-}
-
-TemplateTypeParameter  *TemplateTypeParameter::isTemplateTypeParameter()
-{
-    return this;
-}
-
-TemplateParameter *TemplateTypeParameter::syntaxCopy()
-{
-    TemplateTypeParameter *tp = new TemplateTypeParameter(loc, ident, specType, defaultType);
-    if (tp->specType)
-        tp->specType = specType->syntaxCopy();
-    if (defaultType)
-        tp->defaultType = defaultType->syntaxCopy();
-    return tp;
-}
-
-void TemplateTypeParameter::declareParameter(Scope *sc)
-{
-    //printf("TemplateTypeParameter::declareParameter('%s')\n", ident->toChars());
-    TypeIdentifier *ti = new TypeIdentifier(loc, ident);
-    sparam = new AliasDeclaration(loc, ident, ti);
-    if (!sc->insert(sparam))
-        error(loc, "parameter '%s' multiply defined", ident->toChars());
-}
-
-void TemplateTypeParameter::semantic(Scope *sc)
-{
-    //printf("TemplateTypeParameter::semantic('%s')\n", ident->toChars());
-    if (specType)
-    {
-        specType = specType->semantic(loc, sc);
-    }
-#if 0 // Don't do semantic() until instantiation
-    if (defaultType)
-    {
-        defaultType = defaultType->semantic(loc, sc);
-    }
-#endif
-}
-
-/****************************************
- * Determine if two TemplateParameters are the same
- * as far as TemplateDeclaration overloading goes.
- * Returns:
- *      1       match
- *      0       no match
- */
-
-int TemplateTypeParameter::overloadMatch(TemplateParameter *tp)
-{
-    TemplateTypeParameter *ttp = tp->isTemplateTypeParameter();
-
-    if (ttp)
-    {
-        if (specType != ttp->specType)
-            goto Lnomatch;
-
-        if (specType && !specType->equals(ttp->specType))
-            goto Lnomatch;
-
-        return 1;                       // match
-    }
-
-Lnomatch:
-    return 0;
-}
-
-/*******************************************
- * Match to a particular TemplateParameter.
- * Input:
- *      i               i'th argument
- *      tiargs[]        actual arguments to template instance
- *      parameters[]    template parameters
- *      dedtypes[]      deduced arguments to template instance
- *      *psparam        set to symbol declared and initialized to dedtypes[i]
- */
-
-MATCH TemplateTypeParameter::matchArg(Scope *sc, Objects *tiargs,
-        size_t i, TemplateParameters *parameters, Objects *dedtypes,
-        Declaration **psparam)
-{
-    //printf("TemplateTypeParameter::matchArg()\n");
-    Object *oarg;
-    MATCH m = MATCHexact;
-    Type *ta;
-
-    if (i < tiargs->dim)
-        oarg = tiargs->tdata()[i];
-    else
-    {   // Get default argument instead
-        oarg = defaultArg(loc, sc);
-        if (!oarg)
-        {   assert(i < dedtypes->dim);
-            // It might have already been deduced
-            oarg = dedtypes->tdata()[i];
-            if (!oarg)
-            {
-                goto Lnomatch;
-            }
-        }
-    }
-
-    ta = isType(oarg);
-    if (!ta)
-    {
-        //printf("%s %p %p %p\n", oarg->toChars(), isExpression(oarg), isDsymbol(oarg), isTuple(oarg));
-        goto Lnomatch;
-    }
-    //printf("ta is %s\n", ta->toChars());
-
-    if (specType)
-    {
-        if (!ta || ta == tdummy)
-            goto Lnomatch;
-
-        //printf("\tcalling deduceType(): ta is %s, specType is %s\n", ta->toChars(), specType->toChars());
-        MATCH m2 = ta->deduceType(sc, specType, parameters, dedtypes);
-        if (m2 == MATCHnomatch)
-        {   //printf("\tfailed deduceType\n");
-            goto Lnomatch;
-        }
-
-        if (m2 < m)
-            m = m2;
-        if (dedtypes->tdata()[i])
-            ta = (Type *)dedtypes->tdata()[i];
-    }
-    else
-    {
-        if (dedtypes->tdata()[i])
-        {   // Must match already deduced type
-            Type *t = (Type *)dedtypes->tdata()[i];
-
-            if (!t->equals(ta))
-            {   //printf("t = %s ta = %s\n", t->toChars(), ta->toChars());
-                goto Lnomatch;
-            }
-        }
-        else
-        {
-            // So that matches with specializations are better
-            m = MATCHconvert;
-        }
-    }
-    dedtypes->tdata()[i] = ta;
-
-    *psparam = new AliasDeclaration(loc, ident, ta);
-    //printf("\tm = %d\n", m);
-    return m;
-
-Lnomatch:
-    *psparam = NULL;
-    //printf("\tm = %d\n", MATCHnomatch);
-    return MATCHnomatch;
-}
-
-
-void TemplateTypeParameter::print(Object *oarg, Object *oded)
-{
-    printf(" %s\n", ident->toChars());
-
-    Type *t  = isType(oarg);
-    Type *ta = isType(oded);
-
-    assert(ta);
-
-    if (specType)
-        printf("\tSpecialization: %s\n", specType->toChars());
-    if (defaultType)
-        printf("\tDefault:        %s\n", defaultType->toChars());
-    printf("\tParameter:       %s\n", t ? t->toChars() : "NULL");
-    printf("\tDeduced Type:   %s\n", ta->toChars());
-}
-
-
-void TemplateTypeParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring(ident->toChars());
-    if (specType)
-    {
-        buf->writestring(" : ");
-        specType->toCBuffer(buf, NULL, hgs);
-    }
-    if (defaultType)
-    {
-        buf->writestring(" = ");
-        defaultType->toCBuffer(buf, NULL, hgs);
-    }
-}
-
-
-void *TemplateTypeParameter::dummyArg()
-{   Type *t;
-
-    if (specType)
-        t = specType;
-    else
-    {   // Use this for alias-parameter's too (?)
-        if (!tdummy)
-            tdummy = new TypeIdentifier(loc, ident);
-        t = tdummy;
-    }
-    return (void *)t;
-}
-
-
-Object *TemplateTypeParameter::specialization()
-{
-    return specType;
-}
-
-
-Object *TemplateTypeParameter::defaultArg(Loc loc, Scope *sc)
-{
-    Type *t;
-
-    t = defaultType;
-    if (t)
-    {
-        t = t->syntaxCopy();
-        t = t->semantic(loc, sc);
-    }
-    return t;
-}
-
-/* ======================== TemplateThisParameter =========================== */
-
-#if DMDV2
-// this-parameter
-
-TemplateThisParameter::TemplateThisParameter(Loc loc, Identifier *ident,
-        Type *specType,
-        Type *defaultType)
-    : TemplateTypeParameter(loc, ident, specType, defaultType)
-{
-}
-
-TemplateThisParameter  *TemplateThisParameter::isTemplateThisParameter()
-{
-    return this;
-}
-
-TemplateParameter *TemplateThisParameter::syntaxCopy()
-{
-    TemplateThisParameter *tp = new TemplateThisParameter(loc, ident, specType, defaultType);
-    if (tp->specType)
-        tp->specType = specType->syntaxCopy();
-    if (defaultType)
-        tp->defaultType = defaultType->syntaxCopy();
-    return tp;
-}
-
-void TemplateThisParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring("this ");
-    TemplateTypeParameter::toCBuffer(buf, hgs);
-}
-#endif
-
-/* ======================== TemplateAliasParameter ========================== */
-
-// alias-parameter
-
-Dsymbol *TemplateAliasParameter::sdummy = NULL;
-
-TemplateAliasParameter::TemplateAliasParameter(Loc loc, Identifier *ident,
-        Type *specType, Object *specAlias, Object *defaultAlias)
-    : TemplateParameter(loc, ident)
-{
-    this->ident = ident;
-    this->specType = specType;
-    this->specAlias = specAlias;
-    this->defaultAlias = defaultAlias;
-}
-
-TemplateAliasParameter *TemplateAliasParameter::isTemplateAliasParameter()
-{
-    return this;
-}
-
-TemplateParameter *TemplateAliasParameter::syntaxCopy()
-{
-    TemplateAliasParameter *tp = new TemplateAliasParameter(loc, ident, specType, specAlias, defaultAlias);
-    if (tp->specType)
-        tp->specType = specType->syntaxCopy();
-    tp->specAlias = objectSyntaxCopy(specAlias);
-    tp->defaultAlias = objectSyntaxCopy(defaultAlias);
-    return tp;
-}
-
-void TemplateAliasParameter::declareParameter(Scope *sc)
-{
-    TypeIdentifier *ti = new TypeIdentifier(loc, ident);
-    sparam = new AliasDeclaration(loc, ident, ti);
-    if (!sc->insert(sparam))
-        error(loc, "parameter '%s' multiply defined", ident->toChars());
-}
-
-Object *aliasParameterSemantic(Loc loc, Scope *sc, Object *o)
-{
-    if (o)
-    {
-        Expression *ea = isExpression(o);
-        Type *ta = isType(o);
-        if (ta)
-        {   Dsymbol *s = ta->toDsymbol(sc);
-            if (s)
-                o = s;
-            else
-                o = ta->semantic(loc, sc);
-        }
-        else if (ea)
-        {
-            ea = ea->semantic(sc);
-            o = ea->optimize(WANTvalue | WANTinterpret);
-        }
-    }
-    return o;
-}
-
-void TemplateAliasParameter::semantic(Scope *sc)
-{
-    if (specType)
-    {
-        specType = specType->semantic(loc, sc);
-    }
-    specAlias = aliasParameterSemantic(loc, sc, specAlias);
-#if 0 // Don't do semantic() until instantiation
-    if (defaultAlias)
-        defaultAlias = defaultAlias->semantic(loc, sc);
-#endif
-}
-
-int TemplateAliasParameter::overloadMatch(TemplateParameter *tp)
-{
-    TemplateAliasParameter *tap = tp->isTemplateAliasParameter();
-
-    if (tap)
-    {
-        if (specAlias != tap->specAlias)
-            goto Lnomatch;
-
-        return 1;                       // match
-    }
-
-Lnomatch:
-    return 0;
-}
-
-MATCH TemplateAliasParameter::matchArg(Scope *sc, Objects *tiargs,
-        size_t i, TemplateParameters *parameters, Objects *dedtypes,
-        Declaration **psparam)
-{
-    Object *sa;
-    Object *oarg;
-    Expression *ea;
-    Dsymbol *s;
-
-    //printf("TemplateAliasParameter::matchArg()\n");
-
-    if (i < tiargs->dim)
-        oarg = tiargs->tdata()[i];
-    else
-    {   // Get default argument instead
-        oarg = defaultArg(loc, sc);
-        if (!oarg)
-        {   assert(i < dedtypes->dim);
-            // It might have already been deduced
-            oarg = dedtypes->tdata()[i];
-            if (!oarg)
-                goto Lnomatch;
-        }
-    }
-
-    sa = getDsymbol(oarg);
-    if (sa)
-    {
-        /* specType means the alias must be a declaration with a type
-         * that matches specType.
-         */
-        if (specType)
-        {   Declaration *d = ((Dsymbol *)sa)->isDeclaration();
-            if (!d)
-                goto Lnomatch;
-            if (!d->type->equals(specType))
-                goto Lnomatch;
-        }
-    }
-    else
-    {
-        sa = oarg;
-        ea = isExpression(oarg);
-        if (ea)
-        {   if (specType)
-            {
-                if (!ea->type->equals(specType))
-                    goto Lnomatch;
-            }
-        }
-        else
-            goto Lnomatch;
-    }
-
-    if (specAlias)
-    {
-        if (sa == sdummy)
-            goto Lnomatch;
-        if (sa != specAlias)
-            goto Lnomatch;
-    }
-    else if (dedtypes->tdata()[i])
-    {   // Must match already deduced symbol
-        Object *si = dedtypes->tdata()[i];
-
-        if (!sa || si != sa)
-            goto Lnomatch;
-    }
-    dedtypes->tdata()[i] = sa;
-
-    s = isDsymbol(sa);
-    if (s)
-        *psparam = new AliasDeclaration(loc, ident, s);
-    else
-    {
-        assert(ea);
-
-        // Declare manifest constant
-        Initializer *init = new ExpInitializer(loc, ea);
-        VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
-        v->storage_class = STCmanifest;
-        v->semantic(sc);
-        *psparam = v;
-    }
-    return MATCHexact;
-
-Lnomatch:
-    *psparam = NULL;
-    //printf("\tm = %d\n", MATCHnomatch);
-    return MATCHnomatch;
-}
-
-
-void TemplateAliasParameter::print(Object *oarg, Object *oded)
-{
-    printf(" %s\n", ident->toChars());
-
-    Dsymbol *sa = isDsymbol(oded);
-    assert(sa);
-
-    printf("\tParameter alias: %s\n", sa->toChars());
-}
-
-void TemplateAliasParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring("alias ");
-    if (specType)
-    {   HdrGenState hgs1;
-        specType->toCBuffer(buf, ident, &hgs1);
-    }
-    else
-        buf->writestring(ident->toChars());
-    if (specAlias)
-    {
-        buf->writestring(" : ");
-        ObjectToCBuffer(buf, hgs, specAlias);
-    }
-    if (defaultAlias)
-    {
-        buf->writestring(" = ");
-        ObjectToCBuffer(buf, hgs, defaultAlias);
-    }
-}
-
-
-void *TemplateAliasParameter::dummyArg()
-{   Object *s;
-
-    s = specAlias;
-    if (!s)
-    {
-        if (!sdummy)
-            sdummy = new Dsymbol();
-        s = sdummy;
-    }
-    return (void*)s;
-}
-
-
-Object *TemplateAliasParameter::specialization()
-{
-    return specAlias;
-}
-
-
-Object *TemplateAliasParameter::defaultArg(Loc loc, Scope *sc)
-{
-    Object *da = defaultAlias;
-    Type *ta = isType(defaultAlias);
-    if (ta)
-    {
-       if (ta->ty == Tinstance)
-       {
-           // If the default arg is a template, instantiate for each type
-           da = ta->syntaxCopy();
-       }
-    }
-
-    Object *o = aliasParameterSemantic(loc, sc, da);
-    return o;
-}
-
-/* ======================== TemplateValueParameter ========================== */
-
-// value-parameter
-
-AA *TemplateValueParameter::edummies = NULL;
-
-TemplateValueParameter::TemplateValueParameter(Loc loc, Identifier *ident, Type *valType,
-        Expression *specValue, Expression *defaultValue)
-    : TemplateParameter(loc, ident)
-{
-    this->ident = ident;
-    this->valType = valType;
-    this->specValue = specValue;
-    this->defaultValue = defaultValue;
-}
-
-TemplateValueParameter *TemplateValueParameter::isTemplateValueParameter()
-{
-    return this;
-}
-
-TemplateParameter *TemplateValueParameter::syntaxCopy()
-{
-    TemplateValueParameter *tp =
-        new TemplateValueParameter(loc, ident, valType, specValue, defaultValue);
-    tp->valType = valType->syntaxCopy();
-    if (specValue)
-        tp->specValue = specValue->syntaxCopy();
-    if (defaultValue)
-        tp->defaultValue = defaultValue->syntaxCopy();
-    return tp;
-}
-
-void TemplateValueParameter::declareParameter(Scope *sc)
-{
-    VarDeclaration *v = new VarDeclaration(loc, valType, ident, NULL);
-    v->storage_class = STCtemplateparameter;
-    if (!sc->insert(v))
-        error(loc, "parameter '%s' multiply defined", ident->toChars());
-    sparam = v;
-}
-
-void TemplateValueParameter::semantic(Scope *sc)
-{
-    bool wasSame = (sparam->type == valType);
-    sparam->semantic(sc);
-    if (sparam->type == Type::terror && wasSame)
-    {   /* If sparam has a type error, avoid duplicate errors
-         * The simple solution of leaving that function if sparam->type == Type::terror
-         * doesn't quite work because it causes failures in xtest46 for bug 6295
-         */
-        valType = Type::terror;
-        return;
-    }
-    valType = valType->semantic(loc, sc);
-    if (!(valType->isintegral() || valType->isfloating() || valType->isString()) &&
-        valType->ty != Tident)
-    {
-        if (valType != Type::terror)
-            error(loc, "arithmetic/string type expected for value-parameter, not %s", valType->toChars());
-    }
-
-#if 0   // defer semantic analysis to arg match
-    if (specValue)
-    {   Expression *e = specValue;
-
-        e = e->semantic(sc);
-        e = e->implicitCastTo(sc, valType);
-        e = e->optimize(WANTvalue | WANTinterpret);
-        if (e->op == TOKint64 || e->op == TOKfloat64 ||
-            e->op == TOKcomplex80 || e->op == TOKnull || e->op == TOKstring)
-            specValue = e;
-        //e->toInteger();
-    }
-
-    if (defaultValue)
-    {   Expression *e = defaultValue;
-
-        e = e->semantic(sc);
-        e = e->implicitCastTo(sc, valType);
-        e = e->optimize(WANTvalue | WANTinterpret);
-        if (e->op == TOKint64)
-            defaultValue = e;
-        //e->toInteger();
-    }
-#endif
-}
-
-int TemplateValueParameter::overloadMatch(TemplateParameter *tp)
-{
-    TemplateValueParameter *tvp = tp->isTemplateValueParameter();
-
-    if (tvp)
-    {
-        if (valType != tvp->valType)
-            goto Lnomatch;
-
-        if (valType && !valType->equals(tvp->valType))
-            goto Lnomatch;
-
-        if (specValue != tvp->specValue)
-            goto Lnomatch;
-
-        return 1;                       // match
-    }
-
-Lnomatch:
-    return 0;
-}
-
-
-MATCH TemplateValueParameter::matchArg(Scope *sc,
-        Objects *tiargs, size_t i, TemplateParameters *parameters, Objects *dedtypes,
-        Declaration **psparam)
-{
-    //printf("TemplateValueParameter::matchArg()\n");
-
-    Initializer *init;
-    Declaration *sparam;
-    MATCH m = MATCHexact;
-    Expression *ei;
-    Object *oarg;
-
-    if (i < tiargs->dim)
-        oarg = tiargs->tdata()[i];
-    else
-    {   // Get default argument instead
-        oarg = defaultArg(loc, sc);
-        if (!oarg)
-        {   assert(i < dedtypes->dim);
-            // It might have already been deduced
-            oarg = dedtypes->tdata()[i];
-            if (!oarg)
-                goto Lnomatch;
-        }
-    }
-
-    ei = isExpression(oarg);
-    Type *vt;
-
-    if (!ei && oarg)
-        goto Lnomatch;
-
-    if (ei && ei->op == TOKvar)
-    {   // Resolve const variables that we had skipped earlier
-        ei = ei->optimize(WANTvalue | WANTinterpret);
-    }
-
-    //printf("\tvalType: %s, ty = %d\n", valType->toChars(), valType->ty);
-    vt = valType->semantic(0, sc);
-    //printf("ei: %s, ei->type: %s\n", ei->toChars(), ei->type->toChars());
-    //printf("vt = %s\n", vt->toChars());
-
-    if (ei->type)
-    {
-        m = (MATCH)ei->implicitConvTo(vt);
-        //printf("m: %d\n", m);
-        if (!m)
-            goto Lnomatch;
-    }
-
-    if (specValue)
-    {
-        if (!ei || _aaGetRvalue(edummies, ei->type) == ei)
-            goto Lnomatch;
-
-        Expression *e = specValue;
-
-        e = e->semantic(sc);
-        e = e->implicitCastTo(sc, vt);
-        e = e->optimize(WANTvalue | WANTinterpret);
-
-        ei = ei->syntaxCopy();
-        ei = ei->semantic(sc);
-        ei = ei->implicitCastTo(sc, vt);
-        ei = ei->optimize(WANTvalue | WANTinterpret);
-        //printf("\tei: %s, %s\n", ei->toChars(), ei->type->toChars());
-        //printf("\te : %s, %s\n", e->toChars(), e->type->toChars());
-        if (!ei->equals(e))
-            goto Lnomatch;
-    }
-    else
-    {
-        if (dedtypes->tdata()[i])
-        {   // Must match already deduced value
-            Expression *e = (Expression *)dedtypes->tdata()[i];
-
-            if (!ei || !ei->equals(e))
-                goto Lnomatch;
-        }
-        else if (m != MATCHexact)
-        {
-            ei = ei->implicitCastTo(sc, vt);
-            ei = ei->optimize(WANTvalue | WANTinterpret);
-        }
-    }
-    dedtypes->tdata()[i] = ei;
-
-    init = new ExpInitializer(loc, ei);
-    sparam = new VarDeclaration(loc, vt, ident, init);
-    sparam->storage_class = STCmanifest;
-    *psparam = sparam;
-    return m;
-
-Lnomatch:
-    //printf("\tno match\n");
-    *psparam = NULL;
-    return MATCHnomatch;
-}
-
-
-void TemplateValueParameter::print(Object *oarg, Object *oded)
-{
-    printf(" %s\n", ident->toChars());
-
-    Expression *ea = isExpression(oded);
-
-    if (specValue)
-        printf("\tSpecialization: %s\n", specValue->toChars());
-    printf("\tParameter Value: %s\n", ea ? ea->toChars() : "NULL");
-}
-
-
-void TemplateValueParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    valType->toCBuffer(buf, ident, hgs);
-    if (specValue)
-    {
-        buf->writestring(" : ");
-        specValue->toCBuffer(buf, hgs);
-    }
-    if (defaultValue)
-    {
-        buf->writestring(" = ");
-        defaultValue->toCBuffer(buf, hgs);
-    }
-}
-
-
-void *TemplateValueParameter::dummyArg()
-{   Expression *e;
-
-    e = specValue;
-    if (!e)
-    {
-        // Create a dummy value
-        Expression **pe = (Expression **)_aaGet(&edummies, valType);
-        if (!*pe)
-            *pe = valType->defaultInit();
-        e = *pe;
-    }
-    return (void *)e;
-}
-
-
-Object *TemplateValueParameter::specialization()
-{
-    return specValue;
-}
-
-
-Object *TemplateValueParameter::defaultArg(Loc loc, Scope *sc)
-{
-    Expression *e = defaultValue;
-    if (e)
-    {
-        e = e->syntaxCopy();
-        e = e->semantic(sc);
-#if DMDV2
-        e = e->resolveLoc(loc, sc);
-#endif
-    }
-    return e;
-}
-
-/* ======================== TemplateTupleParameter ========================== */
-
-// variadic-parameter
-
-TemplateTupleParameter::TemplateTupleParameter(Loc loc, Identifier *ident)
-    : TemplateParameter(loc, ident)
-{
-    this->ident = ident;
-}
-
-TemplateTupleParameter *TemplateTupleParameter::isTemplateTupleParameter()
-{
-    return this;
-}
-
-TemplateParameter *TemplateTupleParameter::syntaxCopy()
-{
-    TemplateTupleParameter *tp = new TemplateTupleParameter(loc, ident);
-    return tp;
-}
-
-void TemplateTupleParameter::declareParameter(Scope *sc)
-{
-    TypeIdentifier *ti = new TypeIdentifier(loc, ident);
-    sparam = new AliasDeclaration(loc, ident, ti);
-    if (!sc->insert(sparam))
-        error(loc, "parameter '%s' multiply defined", ident->toChars());
-}
-
-void TemplateTupleParameter::semantic(Scope *sc)
-{
-}
-
-int TemplateTupleParameter::overloadMatch(TemplateParameter *tp)
-{
-    TemplateTupleParameter *tvp = tp->isTemplateTupleParameter();
-
-    if (tvp)
-    {
-        return 1;                       // match
-    }
-
-    return 0;
-}
-
-MATCH TemplateTupleParameter::matchArg(Scope *sc, Objects *tiargs,
-        size_t i, TemplateParameters *parameters, Objects *dedtypes,
-        Declaration **psparam)
-{
-    //printf("TemplateTupleParameter::matchArg()\n");
-
-    /* The rest of the actual arguments (tiargs[]) form the match
-     * for the variadic parameter.
-     */
-    assert(i + 1 == dedtypes->dim);     // must be the last one
-    Tuple *ovar;
-
-    if (dedtypes->tdata()[i] && isTuple(dedtypes->tdata()[i]))
-        // It was already been deduced
-        ovar = isTuple(dedtypes->tdata()[i]);
-    else if (i + 1 == tiargs->dim && isTuple(tiargs->tdata()[i]))
-        ovar = isTuple(tiargs->tdata()[i]);
-    else
-    {
-        ovar = new Tuple();
-        //printf("ovar = %p\n", ovar);
-        if (i < tiargs->dim)
-        {
-            //printf("i = %d, tiargs->dim = %d\n", i, tiargs->dim);
-            ovar->objects.setDim(tiargs->dim - i);
-            for (size_t j = 0; j < ovar->objects.dim; j++)
-                ovar->objects.tdata()[j] = tiargs->tdata()[i + j];
-        }
-    }
-    *psparam = new TupleDeclaration(loc, ident, &ovar->objects);
-    dedtypes->tdata()[i] = ovar;
-    return MATCHexact;
-}
-
-
-void TemplateTupleParameter::print(Object *oarg, Object *oded)
-{
-    printf(" %s... [", ident->toChars());
-    Tuple *v = isTuple(oded);
-    assert(v);
-
-    //printf("|%d| ", v->objects.dim);
-    for (size_t i = 0; i < v->objects.dim; i++)
-    {
-        if (i)
-            printf(", ");
-
-        Object *o = v->objects.tdata()[i];
-
-        Dsymbol *sa = isDsymbol(o);
-        if (sa)
-            printf("alias: %s", sa->toChars());
-
-        Type *ta = isType(o);
-        if (ta)
-            printf("type: %s", ta->toChars());
-
-        Expression *ea = isExpression(o);
-        if (ea)
-            printf("exp: %s", ea->toChars());
-
-        assert(!isTuple(o));            // no nested Tuple arguments
-    }
-
-    printf("]\n");
-}
-
-void TemplateTupleParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring(ident->toChars());
-    buf->writestring("...");
-}
-
-
-void *TemplateTupleParameter::dummyArg()
-{
-    return NULL;
-}
-
-
-Object *TemplateTupleParameter::specialization()
-{
-    return NULL;
-}
-
-
-Object *TemplateTupleParameter::defaultArg(Loc loc, Scope *sc)
-{
-    return NULL;
-}
-
-/* ======================== TemplateInstance ================================ */
-
-TemplateInstance::TemplateInstance(Loc loc, Identifier *ident)
-    : ScopeDsymbol(NULL)
-{
-#if LOG
-    printf("TemplateInstance(this = %p, ident = '%s')\n", this, ident ? ident->toChars() : "null");
-#endif
-    this->loc = loc;
-    this->name = ident;
-    this->tiargs = NULL;
-    this->tempdecl = NULL;
-    this->inst = NULL;
-    this->tinst = NULL;
-    this->argsym = NULL;
-    this->aliasdecl = NULL;
-    this->semanticRun = PASSinit;
-    this->semantictiargsdone = 0;
-    this->withsym = NULL;
-    this->nest = 0;
-    this->havetempdecl = 0;
-    this->isnested = NULL;
-    this->speculative = 0;
-    this->ignore = true;
-
-#if IN_LLVM
-    this->emittedInModule = NULL;
-    this->tmodule = NULL;
-#endif
-}
-
-/*****************
- * This constructor is only called when we figured out which function
- * template to instantiate.
- */
-
-TemplateInstance::TemplateInstance(Loc loc, TemplateDeclaration *td, Objects *tiargs)
-    : ScopeDsymbol(NULL)
-{
-#if LOG
-    printf("TemplateInstance(this = %p, tempdecl = '%s')\n", this, td->toChars());
-#endif
-    this->loc = loc;
-    this->name = td->ident;
-    this->tiargs = tiargs;
-    this->tempdecl = td;
-    this->inst = NULL;
-    this->tinst = NULL;
-    this->argsym = NULL;
-    this->aliasdecl = NULL;
-    this->semanticRun = PASSinit;
-    this->semantictiargsdone = 1;
-    this->withsym = NULL;
-    this->nest = 0;
-    this->havetempdecl = 1;
-    this->isnested = NULL;
-    this->speculative = 0;
-    this->ignore = true;
-
-#if IN_LLVM
-    this->tinst = NULL;
-    this->emittedInModule = NULL;
-    this->tmodule = NULL;
-#endif
-
-    assert((size_t)tempdecl->scope > 0x10000);
-}
-
-
-Objects *TemplateInstance::arraySyntaxCopy(Objects *objs)
-{
-    Objects *a = NULL;
-    if (objs)
-    {   a = new Objects();
-        a->setDim(objs->dim);
-        for (size_t i = 0; i < objs->dim; i++)
-        {
-            a->tdata()[i] = objectSyntaxCopy(objs->tdata()[i]);
-        }
-    }
-    return a;
-}
-
-Dsymbol *TemplateInstance::syntaxCopy(Dsymbol *s)
-{
-    TemplateInstance *ti;
-
-    if (s)
-        ti = (TemplateInstance *)s;
-    else
-        ti = new TemplateInstance(loc, name);
-
-    ti->tiargs = arraySyntaxCopy(tiargs);
-
-    ScopeDsymbol::syntaxCopy(ti);
-    return ti;
-}
-
-
-void TemplateInstance::semantic(Scope *sc)
-{
-    semantic(sc, NULL);
-}
-
-void TemplateInstance::expandMembers(Scope *sc2)
-{
-    for (size_t i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (*members)[i];
-        s->setScope(sc2);
-    }
-    for (size_t i = 0; i < members->dim; i++)
-    {
-        Dsymbol *s = members->tdata()[i];
-        //printf("\t[%d] semantic on '%s' %p kind %s in '%s'\n", i, s->toChars(), s, s->kind(), this->toChars());
-        //printf("test: isnested = %d, sc2->parent = %s\n", isnested, sc2->parent->toChars());
-//      if (isnested)
-//          s->parent = sc->parent;
-        //printf("test3: isnested = %d, s->parent = %s\n", isnested, s->parent->toChars());
-        s->semantic(sc2);
-        //printf("test4: isnested = %d, s->parent = %s\n", isnested, s->parent->toChars());
-        sc2->module->runDeferredSemantic();
-    }
-}
-
-void TemplateInstance::tryExpandMembers(Scope *sc2)
-{
-    static int nest;
-    // extracted to a function to allow windows SEH to work without destructors in the same function
-    //printf("%d\n", nest);
-    if (++nest > 500)
-    {
-        global.gag = 0;                 // ensure error message gets printed
-        error("recursive expansion");
-        fatal();
-    }
-
-#if WINDOWS_SEH
-    if(nest == 1)
-    {
-        // do not catch at every nesting level, because generating the output error might cause more stack
-        //  errors in the __except block otherwise
-        __try
-        {
-            expandMembers(sc2);
-        }
-        __except (__ehfilter(GetExceptionInformation()))
-        {
-            global.gag = 0;                     // ensure error message gets printed
-            error("recursive expansion");
-            fatal();
-        }
-    }
-    else
-#endif
-        expandMembers(sc2);
-    nest--;
-}
-
-void TemplateInstance::trySemantic3(Scope *sc2)
-{
-    // extracted to a function to allow windows SEH to work without destructors in the same function
-    static int nest;
-    if (++nest > 300)
-    {
-        global.gag = 0;            // ensure error message gets printed
-        error("recursive expansion");
-        fatal();
-    }
-#if WINDOWS_SEH
-    if(nest == 1)
-    {
-        // do not catch at every nesting level, because generating the output error might cause more stack
-        //  errors in the __except block otherwise
-        __try
-        {
-            semantic3(sc2);
-        }
-        __except (__ehfilter(GetExceptionInformation()))
-        {
-            global.gag = 0;            // ensure error message gets printed
-            error("recursive expansion");
-            fatal();
-        }
-    }
-    else
-#endif
-        semantic3(sc2);
-
-    --nest;
-}
-
-void TemplateInstance::semantic(Scope *sc, Expressions *fargs)
-{
-    //printf("TemplateInstance::semantic('%s', this=%p, gag = %d, sc = %p)\n", toChars(), this, global.gag, sc);
-#if LOG
-    printf("\n+TemplateInstance::semantic('%s', this=%p)\n", toChars(), this);
-#endif
-    if (inst)           // if semantic() was already run
-    {
-#if LOG
-        printf("-TemplateInstance::semantic('%s', this=%p) already run\n", inst->toChars(), inst);
-#endif
-        return;
-    }
-    
-    if (!sc->ignoreTemplates)
-        ignore = false;
-
-
-    // get the enclosing template instance from the scope tinst
-    tinst = sc->tinst;
-
-    if (semanticRun != PASSinit)
-    {
-#if LOG
-        printf("Recursive template expansion\n");
-#endif
-        error(loc, "recursive template expansion");
-//      inst = this;
-        return;
-    }
-    semanticRun = PASSsemantic;
-#if IN_LLVM
-    // get the enclosing template instance from the scope tinst
-    tinst = sc->tinst;
-
-    // get the module of the outermost enclosing instantiation
-    if (tinst)
-	tmodule = tinst->tmodule;
-    else
-	tmodule = sc->module;
-    //printf("%s in %s\n", toChars(), tmodule->toChars());
-#endif
-
-#if LOG
-    printf("\tdo semantic\n");
-#endif
-    if (havetempdecl)
-    {
-        assert((size_t)tempdecl->scope > 0x10000);
-        // Deduce tdtypes
-        tdtypes.setDim(tempdecl->parameters->dim);
-        if (!tempdecl->matchWithInstance(this, &tdtypes, fargs, 2))
-        {
-            error("incompatible arguments for template instantiation");
-            inst = this;
-            return;
-        }
-    }
-    else
-    {
-        /* Run semantic on each argument, place results in tiargs[]
-         * (if we havetempdecl, then tiargs is already evaluated)
-         */
-        semanticTiargs(sc);
-        if (arrayObjectIsError(tiargs))
-        {   inst = this;
-            //printf("error return %p, %d\n", tempdecl, global.errors);
-            return;             // error recovery
-        }
-        unsigned errs = global.errors;
-        tempdecl = findTemplateDeclaration(sc);
-        if (tempdecl)
-            tempdecl = findBestMatch(sc, fargs);
-        if (!tempdecl || (errs != global.errors))
-        {   inst = this;
-            //printf("error return %p, %d\n", tempdecl, global.errors);
-            return;             // error recovery
-        }
-    }
-
-    // If tempdecl is a mixin, disallow it
-    if (tempdecl->ismixin)
-        error("mixin templates are not regular templates");
-
-    hasNestedArgs(tiargs);
-
-    /* See if there is an existing TemplateInstantiation that already
-     * implements the typeargs. If so, just refer to that one instead.
-     */
-
-    for (size_t i = 0; i < tempdecl->instances.dim; i++)
-    {
-        TemplateInstance *ti = tempdecl->instances.tdata()[i];
-#if LOG
-        printf("\t%s: checking for match with instance %d (%p): '%s'\n", toChars(), i, ti, ti->toChars());
-#endif
-        assert(tdtypes.dim == ti->tdtypes.dim);
-
-        // Nesting must match
-        if (isnested != ti->isnested)
-        {
-            //printf("test2 isnested %s ti->isnested %s\n", isnested ? isnested->toChars() : "", ti->isnested ? ti->isnested->toChars() : "");
-            continue;
-        }
-        //printf("parent = %s, ti->parent = %s\n", tempdecl->parent->toPrettyChars(), ti->parent->toPrettyChars());
-
-        if (!arrayObjectMatch(&tdtypes, &ti->tdtypes, tempdecl, sc))
-            goto L1;
-
-        /* Template functions may have different instantiations based on
-         * "auto ref" parameters.
-         */
-        if (fargs)
-        {
-            FuncDeclaration *fd = ti->toAlias()->isFuncDeclaration();
-            if (fd)
-            {
-                Parameters *fparameters = fd->getParameters(NULL);
-                size_t nfparams = Parameter::dim(fparameters); // Num function parameters
-                for (size_t j = 0; j < nfparams && j < fargs->dim; j++)
-                {   Parameter *fparam = Parameter::getNth(fparameters, j);
-                    Expression *farg = fargs->tdata()[j];
-                    if (fparam->storageClass & STCauto)         // if "auto ref"
-                    {
-                        if (farg->isLvalue())
-                        {   if (!(fparam->storageClass & STCref))
-                                goto L1;                        // auto ref's don't match
-                        }
-                        else
-                        {   if (fparam->storageClass & STCref)
-                                goto L1;                        // auto ref's don't match
-                        }
-                    }
-                }
-            }
-        }
-
-        // It's a match
-        inst = ti;
-        parent = ti->parent;
-
-        // If both this and the previous instantiation were speculative,
-        // use the number of errors that happened last time.
-        if (inst->speculative && global.gag)
-        {
-            global.errors += inst->errors;
-            global.gaggedErrors += inst->errors;
-        }
-
-        // If the first instantiation was speculative, but this is not:
-        if (inst->speculative && !global.gag)
-        {
-            // If the first instantiation had failed, re-run semantic,
-            // so that error messages are shown.
-            if (inst->errors)
-                goto L1;
-            // It had succeeded, mark it is a non-speculative instantiation,
-            // and reuse it.
-            inst->speculative = 0;
-        }
-
-#if LOG
-        printf("\tit's a match with instance %p, %d\n", inst, inst->semanticRun);
-#endif
-        return;
-
-     L1:
-        ;
-    }
-
-    /* So, we need to implement 'this' instance.
-     */
-#if LOG
-    printf("\timplement template instance %s '%s'\n", tempdecl->parent->toChars(), toChars());
-    printf("\ttempdecl %s\n", tempdecl->toChars());
-#endif
-    unsigned errorsave = global.errors;
-    inst = this;
-    // Mark as speculative if we are instantiated from inside is(typeof())
-    if (global.gag && sc->speculative)
-        speculative = 1;
-
-    int tempdecl_instance_idx = tempdecl->instances.dim;
-    tempdecl->instances.push(this);
-    parent = tempdecl->parent;
-    //printf("parent = '%s'\n", parent->kind());
-
-    ident = genIdent(tiargs);         // need an identifier for name mangling purposes.
-
-#if 1
-    if (isnested)
-        parent = isnested;
-#endif
-    //printf("parent = '%s'\n", parent->kind());
-
-    // Add 'this' to the enclosing scope's members[] so the semantic routines
-    // will get called on the instance members. Store the place we added it to
-    // in target_symbol_list(_idx) so we can remove it later if we encounter
-    // an error.
-#if 1
-    int dosemantic3 = 0;
-    Dsymbols *target_symbol_list = NULL;
-    int target_symbol_list_idx;
-
-    if (!sc->parameterSpecialization)
-    {   Dsymbols *a;
-
-        Scope *scx = sc;
-#if 0
-        for (scx = sc; scx; scx = scx->enclosing)
-            if (scx->scopesym)
-                break;
-#endif
-
-        //if (scx && scx->scopesym) printf("3: scx is %s %s\n", scx->scopesym->kind(), scx->scopesym->toChars());
-        if (scx && scx->scopesym &&
-            scx->scopesym->members && !scx->scopesym->isTemplateMixin()
-#if 0 // removed because it bloated compile times
-            /* The problem is if A imports B, and B imports A, and both A
-             * and B instantiate the same template, does the compilation of A
-             * or the compilation of B do the actual instantiation?
-             *
-             * see bugzilla 2500.
-             */
-            && !scx->module->selfImports()
-#endif
-           )
-        {
-            //printf("\t1: adding to %s %s\n", scx->scopesym->kind(), scx->scopesym->toChars());
-            a = scx->scopesym->members;
-        }
-        else
-        {   Module *m = sc->module->importedFrom;
-            //printf("\t2: adding to module %s instead of module %s\n", m->toChars(), sc->module->toChars());
-            a = m->members;
-            if (m->semanticRun >= 3)
-            {
-                dosemantic3 = 1;
-            }
-        }
-        for (int i = 0; 1; i++)
-        {
-            if (i == a->dim)
-            {
-                target_symbol_list = a;
-                target_symbol_list_idx = i;
-                a->push(this);
-                break;
-            }
-            if (this == a->tdata()[i])  // if already in Array
-                break;
-        }
-    }
-#endif
-
-    // Copy the syntax trees from the TemplateDeclaration
-    members = Dsymbol::arraySyntaxCopy(tempdecl->members);
-
-    // Create our own scope for the template parameters
-    Scope *scope = tempdecl->scope;
-    if (!tempdecl->semanticRun)
-    {
-        error("template instantiation %s forward references template declaration %s\n", toChars(), tempdecl->toChars());
-        return;
-    }
-
-#if LOG
-    printf("\tcreate scope for template parameters '%s'\n", toChars());
-#endif
-    argsym = new ScopeDsymbol();
-    argsym->parent = scope->parent;
-    scope = scope->push(argsym);
-//    scope->stc = 0;
-
-    // Declare each template parameter as an alias for the argument type
-    Scope *paramscope = scope->push();
-    paramscope->stc = 0;
-    declareParameters(paramscope);
-    paramscope->pop();
-
-    // Add members of template instance to template instance symbol table
-//    parent = scope->scopesym;
-    symtab = new DsymbolTable();
-    int memnum = 0;
-    for (size_t i = 0; i < members->dim; i++)
-    {
-        Dsymbol *s = members->tdata()[i];
-#if LOG
-        printf("\t[%d] adding member '%s' %p kind %s to '%s', memnum = %d\n", i, s->toChars(), s, s->kind(), this->toChars(), memnum);
-#endif
-        memnum |= s->addMember(scope, this, memnum);
-    }
-#if LOG
-    printf("adding members done\n");
-#endif
-
-    /* See if there is only one member of template instance, and that
-     * member has the same name as the template instance.
-     * If so, this template instance becomes an alias for that member.
-     */
-    //printf("members->dim = %d\n", members->dim);
-    if (members->dim)
-    {
-        Dsymbol *s;
-        if (Dsymbol::oneMembers(members, &s, tempdecl->ident) && s)
-        {
-            //printf("s->kind = '%s'\n", s->kind());
-            //s->print();
-            //printf("'%s', '%s'\n", s->ident->toChars(), tempdecl->ident->toChars());
-            //printf("setting aliasdecl\n");
-            aliasdecl = new AliasDeclaration(loc, s->ident, s);
-
-#if IN_LLVM
-                // LDC propagate internal information
-                if (tempdecl->llvmInternal) {
-                    s->llvmInternal = tempdecl->llvmInternal;
-                    if (FuncDeclaration* fd = s->isFuncDeclaration()) {
-                        fd->intrinsicName = tempdecl->intrinsicName;
-                    }
-                }
-#endif
-        }
-    }
-
-    /* If function template declaration
-     */
-    if (fargs && aliasdecl)
-    {
-        FuncDeclaration *fd = aliasdecl->toAlias()->isFuncDeclaration();
-        if (fd)
-        {
-            /* Transmit fargs to type so that TypeFunction::semantic() can
-             * resolve any "auto ref" storage classes.
-             */
-            TypeFunction *tf = (TypeFunction *)fd->type;
-            if (tf && tf->ty == Tfunction)
-                tf->fargs = fargs;
-        }
-    }
-
-    // Do semantic() analysis on template instance members
-#if LOG
-    printf("\tdo semantic() on template instance members '%s'\n", toChars());
-#endif
-    Scope *sc2;
-    sc2 = scope->push(this);
-    //printf("isnested = %d, sc->parent = %s\n", isnested, sc->parent->toChars());
-    sc2->parent = /*isnested ? sc->parent :*/ this;
-    sc2->tinst = this;
-
-    tryExpandMembers(sc2);
-
-    semanticRun = PASSsemanticdone;
-
-    /* If any of the instantiation members didn't get semantic() run
-     * on them due to forward references, we cannot run semantic2()
-     * or semantic3() yet.
-     */
-    for (size_t i = 0; i < Module::deferred.dim; i++)
-    {   Dsymbol *sd = Module::deferred.tdata()[i];
-
-        if (sd->parent == this)
-        {
-        //printf("deferred %s %s\n", sd->parent->toChars(), sd->toChars());
-            AggregateDeclaration *ad = sd->isAggregateDeclaration();
-            if (ad)
-                ad->deferred = this;
-            goto Laftersemantic;
-        }
-    }
-
-    /* ConditionalDeclaration may introduce eponymous declaration,
-     * so we should find it once again after semantic.
-     */
-    if (members->dim)
-    {
-        Dsymbol *s;
-        if (Dsymbol::oneMembers(members, &s, tempdecl->ident) && s)
-        {
-            if (!aliasdecl || aliasdecl->toAlias() != s)
-            {
-                //printf("s->kind = '%s'\n", s->kind());
-                //s->print();
-                //printf("'%s', '%s'\n", s->ident->toChars(), tempdecl->ident->toChars());
-                //printf("setting aliasdecl 2\n");
-                aliasdecl = new AliasDeclaration(loc, s->ident, s);
-            }
-        }
-        else if (aliasdecl)
-            aliasdecl = NULL;
-    }
-
-    /* The problem is when to parse the initializer for a variable.
-     * Perhaps VarDeclaration::semantic() should do it like it does
-     * for initializers inside a function.
-     */
-//    if (sc->parent->isFuncDeclaration())
-
-        /* BUG 782: this has problems if the classes this depends on
-         * are forward referenced. Find a way to defer semantic()
-         * on this template.
-         */
-        semantic2(sc2);
-
-    if (sc->func || dosemantic3)
-    {
-        trySemantic3(sc2);
-    }
-
-  Laftersemantic:
-    sc2->pop();
-
-    scope->pop();
-
-    // Give additional context info if error occurred during instantiation
-    if (global.errors != errorsave)
-    {
-        error(loc, "error instantiating");
-        if (tinst)
-        {   tinst->printInstantiationTrace();
-        }
-        errors = 1;
-        if (global.gag)
-        {
-            // Errors are gagged, so remove the template instance from the
-            // instance/symbol lists we added it to and reset our state to
-            // finish clean and so we can try to instantiate it again later
-            // (see bugzilla 4302 and 6602).
-            tempdecl->instances.remove(tempdecl_instance_idx);
-            if (target_symbol_list)
-            {
-                // Because we added 'this' in the last position above, we
-                // should be able to remove it without messing other indices up.
-                assert(target_symbol_list->tdata()[target_symbol_list_idx] == this);
-                target_symbol_list->remove(target_symbol_list_idx);
-            }
-            semanticRun = PASSinit;
-            inst = NULL;
-        }
-    }
-
-#if LOG
-    printf("-TemplateInstance::semantic('%s', this=%p)\n", toChars(), this);
-#endif
-}
-
-
-void TemplateInstance::semanticTiargs(Scope *sc)
-{
-    //printf("+TemplateInstance::semanticTiargs() %s\n", toChars());
-    if (semantictiargsdone)
-        return;
-    semantictiargsdone = 1;
-    semanticTiargs(loc, sc, tiargs, 0);
-}
-
-/**********************************
- * Input:
- *      flags   1: replace const variables with their initializers
- */
-
-void TemplateInstance::semanticTiargs(Loc loc, Scope *sc, Objects *tiargs, int flags)
-{
-    // Run semantic on each argument, place results in tiargs[]
-    //printf("+TemplateInstance::semanticTiargs()\n");
-    if (!tiargs)
-        return;
-    for (size_t j = 0; j < tiargs->dim; j++)
-    {
-        Object *o = tiargs->tdata()[j];
-        Type *ta = isType(o);
-        Expression *ea = isExpression(o);
-        Dsymbol *sa = isDsymbol(o);
-
-        //printf("1: tiargs->tdata()[%d] = %p, %p, %p, ea=%p, ta=%p\n", j, o, isDsymbol(o), isTuple(o), ea, ta);
-        if (ta)
-        {
-            //printf("type %s\n", ta->toChars());
-            // It might really be an Expression or an Alias
-            ta->resolve(loc, sc, &ea, &ta, &sa);
-            if (ea)
-            {
-                ea = ea->semantic(sc);
-                /* This test is to skip substituting a const var with
-                 * its initializer. The problem is the initializer won't
-                 * match with an 'alias' parameter. Instead, do the
-                 * const substitution in TemplateValueParameter::matchArg().
-                 */
-                if (flags & 1) // only used by __traits, must not interpret the args
-                    ea = ea->optimize(WANTvalue);
-                else if (ea->op != TOKvar)
-                    ea = ea->optimize(WANTvalue | WANTinterpret);
-                tiargs->tdata()[j] = ea;
-            }
-            else if (sa)
-            {
-              Ldsym:
-                tiargs->tdata()[j] = sa;
-                TupleDeclaration *d = sa->toAlias()->isTupleDeclaration();
-                if (d)
-                {
-                    size_t dim = d->objects->dim;
-                    tiargs->remove(j);
-                    tiargs->insert(j, d->objects);
-                    j--;
-                }
-            }
-            else if (ta)
-            {
-              Ltype:
-                if (ta->ty == Ttuple)
-                {   // Expand tuple
-                    TypeTuple *tt = (TypeTuple *)ta;
-                    size_t dim = tt->arguments->dim;
-                    tiargs->remove(j);
-                    if (dim)
-                    {   tiargs->reserve(dim);
-                        for (size_t i = 0; i < dim; i++)
-                        {   Parameter *arg = tt->arguments->tdata()[i];
-                            tiargs->insert(j + i, arg->type);
-                        }
-                    }
-                    j--;
-                }
-                else
-                    tiargs->tdata()[j] = ta;
-            }
-            else
-            {
-                assert(global.errors);
-                tiargs->tdata()[j] = Type::terror;
-            }
-        }
-        else if (ea)
-        {
-            if (!ea)
-            {   assert(global.errors);
-                ea = new ErrorExp();
-            }
-            assert(ea);
-            ea = ea->semantic(sc);
-            if (flags & 1) // only used by __traits, must not interpret the args
-                ea = ea->optimize(WANTvalue);
-            else if (ea->op != TOKvar && ea->op != TOKtuple)
-                ea = ea->optimize(WANTvalue | WANTinterpret);
-            tiargs->tdata()[j] = ea;
-            if (ea->op == TOKtype)
-            {   ta = ea->type;
-                goto Ltype;
-            }
-            if (ea->op == TOKimport)
-            {   sa = ((ScopeExp *)ea)->sds;
-                goto Ldsym;
-            }
-            if (ea->op == TOKtuple)
-            {   // Expand tuple
-                TupleExp *te = (TupleExp *)ea;
-                size_t dim = te->exps->dim;
-                tiargs->remove(j);
-                if (dim)
-                {   tiargs->reserve(dim);
-                    for (size_t i = 0; i < dim; i++)
-                        tiargs->insert(j + i, te->exps->tdata()[i]);
-                }
-                j--;
-            }
-        }
-        else if (sa)
-        {
-            TemplateDeclaration *td = sa->isTemplateDeclaration();
-            if (td && !td->semanticRun && td->literal)
-                td->semantic(sc);
-        }
-        else
-        {
-            assert(0);
-        }
-        //printf("1: tiargs->tdata()[%d] = %p\n", j, tiargs->tdata()[j]);
-    }
-#if 0
-    printf("-TemplateInstance::semanticTiargs()\n");
-    for (size_t j = 0; j < tiargs->dim; j++)
-    {
-        Object *o = tiargs->tdata()[j];
-        Type *ta = isType(o);
-        Expression *ea = isExpression(o);
-        Dsymbol *sa = isDsymbol(o);
-        Tuple *va = isTuple(o);
-
-        printf("\ttiargs[%d] = ta %p, ea %p, sa %p, va %p\n", j, ta, ea, sa, va);
-    }
-#endif
-}
-
-/**********************************************
- * Find template declaration corresponding to template instance.
- */
-
-TemplateDeclaration *TemplateInstance::findTemplateDeclaration(Scope *sc)
-{
-    //printf("TemplateInstance::findTemplateDeclaration() %s\n", toChars());
-    if (!tempdecl)
-    {
-        /* Given:
-         *    foo!( ... )
-         * figure out which TemplateDeclaration foo refers to.
-         */
-        Dsymbol *s;
-        Dsymbol *scopesym;
-        Identifier *id;
-
-        id = name;
-        s = sc->search(loc, id, &scopesym);
-        if (!s)
-        {
-            s = sc->search_correct(id);
-            if (s)
-                error("template '%s' is not defined, did you mean %s?", id->toChars(), s->toChars());
-            else
-                error("template '%s' is not defined", id->toChars());
-            return NULL;
-        }
-
-        /* If an OverloadSet, look for a unique member that is a template declaration
-         */
-        OverloadSet *os = s->isOverloadSet();
-        if (os)
-        {   s = NULL;
-            for (size_t i = 0; i < os->a.dim; i++)
-            {   Dsymbol *s2 = os->a.tdata()[i];
-                if (s2->isTemplateDeclaration())
-                {
-                    if (s)
-                        error("ambiguous template declaration %s and %s", s->toPrettyChars(), s2->toPrettyChars());
-                    s = s2;
-                }
-            }
-            if (!s)
-            {   error("template '%s' is not defined", id->toChars());
-                return NULL;
-            }
-        }
-
-#if LOG
-        printf("It's an instance of '%s' kind '%s'\n", s->toChars(), s->kind());
-        if (s->parent)
-            printf("s->parent = '%s'\n", s->parent->toChars());
-#endif
-        withsym = scopesym->isWithScopeSymbol();
-
-        /* We might have found an alias within a template when
-         * we really want the template.
-         */
-        TemplateInstance *ti;
-        if (s->parent &&
-            (ti = s->parent->isTemplateInstance()) != NULL)
-        {
-            if (ti->tempdecl && ti->tempdecl->ident == id)
-            {
-                /* This is so that one can refer to the enclosing
-                 * template, even if it has the same name as a member
-                 * of the template, if it has a !(arguments)
-                 */
-                tempdecl = ti->tempdecl;
-                if (tempdecl->overroot)         // if not start of overloaded list of TemplateDeclaration's
-                    tempdecl = tempdecl->overroot; // then get the start
-                s = tempdecl;
-            }
-        }
-
-        s = s->toAlias();
-
-        /* It should be a TemplateDeclaration, not some other symbol
-         */
-        tempdecl = s->isTemplateDeclaration();
-        if (!tempdecl)
-        {
-            if (!s->parent && global.errors)
-                return NULL;
-            if (!s->parent && s->getType())
-            {   Dsymbol *s2 = s->getType()->toDsymbol(sc);
-                if (!s2)
-                {
-                    error("%s is not a template declaration, it is a %s", id->toChars(), s->kind());
-                    return NULL;
-                }
-                s = s2;
-            }
-#ifdef DEBUG
-            //if (!s->parent) printf("s = %s %s\n", s->kind(), s->toChars());
-#endif
-            //assert(s->parent);
-            TemplateInstance *ti = s->parent ? s->parent->isTemplateInstance() : NULL;
-            if (ti &&
-                (ti->name == id ||
-                 ti->toAlias()->ident == id)
-                &&
-                ti->tempdecl)
-            {
-                /* This is so that one can refer to the enclosing
-                 * template, even if it has the same name as a member
-                 * of the template, if it has a !(arguments)
-                 */
-                tempdecl = ti->tempdecl;
-                if (tempdecl->overroot)         // if not start of overloaded list of TemplateDeclaration's
-                    tempdecl = tempdecl->overroot; // then get the start
-            }
-            else
-            {
-                error("%s is not a template declaration, it is a %s", id->toChars(), s->kind());
-                return NULL;
-            }
-        }
-    }
-    else
-        assert(tempdecl->isTemplateDeclaration());
-    return tempdecl;
-}
-
-TemplateDeclaration *TemplateInstance::findBestMatch(Scope *sc, Expressions *fargs)
-{
-    /* Since there can be multiple TemplateDeclaration's with the same
-     * name, look for the best match.
-     */
-    TemplateDeclaration *td_ambig = NULL;
-    TemplateDeclaration *td_best = NULL;
-    MATCH m_best = MATCHnomatch;
-    Objects dedtypes;
-
-#if LOG
-    printf("TemplateInstance::findBestMatch()\n");
-#endif
-    // First look for forward references
-    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
-    {
-        if (!td->semanticRun)
-        {
-            if (td->scope)
-            {   // Try to fix forward reference
-                td->semantic(td->scope);
-            }
-            if (!td->semanticRun)
-            {
-                error("%s forward references template declaration %s\n", toChars(), td->toChars());
-                return NULL;
-            }
-        }
-    }
-
-    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
-    {
-        MATCH m;
-
-//if (tiargs->dim) printf("2: tiargs->dim = %d, data[0] = %p\n", tiargs->dim, tiargs->tdata()[0]);
-
-        // If more arguments than parameters,
-        // then this is no match.
-        if (td->parameters->dim < tiargs->dim)
-        {
-            if (!td->isVariadic())
-                continue;
-        }
-
-        dedtypes.setDim(td->parameters->dim);
-        dedtypes.zero();
-        assert(td->semanticRun);
-        m = td->matchWithInstance(this, &dedtypes, fargs, 0);
-        //printf("matchWithInstance = %d\n", m);
-        if (!m)                 // no match at all
-            continue;
-
-        if (m < m_best)
-            goto Ltd_best;
-        if (m > m_best)
-            goto Ltd;
-
-        {
-        // Disambiguate by picking the most specialized TemplateDeclaration
-        MATCH c1 = td->leastAsSpecialized(td_best, fargs);
-        MATCH c2 = td_best->leastAsSpecialized(td, fargs);
-        //printf("c1 = %d, c2 = %d\n", c1, c2);
-
-        if (c1 > c2)
-            goto Ltd;
-        else if (c1 < c2)
-            goto Ltd_best;
-        else
-            goto Lambig;
-        }
-
-      Lambig:           // td_best and td are ambiguous
-        td_ambig = td;
-        continue;
-
-      Ltd_best:         // td_best is the best match so far
-        td_ambig = NULL;
-        continue;
-
-      Ltd:              // td is the new best match
-        td_ambig = NULL;
-        td_best = td;
-        m_best = m;
-        tdtypes.setDim(dedtypes.dim);
-        memcpy(tdtypes.tdata(), dedtypes.tdata(), tdtypes.dim * sizeof(void *));
-        continue;
-    }
-
-    if (!td_best)
-    {
-        if (tempdecl && !tempdecl->overnext)
-            // Only one template, so we can give better error message
-            error("%s does not match template declaration %s", toChars(), tempdecl->toChars());
-        else
-            ::error(loc, "%s %s.%s does not match any template declaration",
-                    tempdecl->kind(), tempdecl->parent->toPrettyChars(), tempdecl->ident->toChars());
-        return NULL;
-    }
-    if (td_ambig)
-    {
-        ::error(loc, "%s %s.%s matches more than one template declaration, %s(%d):%s and %s(%d):%s",
-                td_best->kind(), td_best->parent->toPrettyChars(), td_best->ident->toChars(),
-                td_best->loc.filename,  td_best->loc.linnum,  td_best->toChars(),
-                td_ambig->loc.filename, td_ambig->loc.linnum, td_ambig->toChars());
-    }
-
-    /* The best match is td_best
-     */
-    tempdecl = td_best;
-
-#if 0
-    /* Cast any value arguments to be same type as value parameter
-     */
-    for (size_t i = 0; i < tiargs->dim; i++)
-    {   Object *o = tiargs->tdata()[i];
-        Expression *ea = isExpression(o);       // value argument
-        TemplateParameter *tp = tempdecl->parameters->tdata()[i];
-        assert(tp);
-        TemplateValueParameter *tvp = tp->isTemplateValueParameter();
-        if (tvp)
-        {
-            assert(ea);
-            ea = ea->castTo(tvp->valType);
-            ea = ea->optimize(WANTvalue | WANTinterpret);
-            tiargs->tdata()[i] = (Object *)ea;
-        }
-    }
-#endif
-
-#if LOG
-    printf("\tIt's a match with template declaration '%s'\n", tempdecl->toChars());
-#endif
-    return tempdecl;
-}
-
-
-/*****************************************
- * Determines if a TemplateInstance will need a nested
- * generation of the TemplateDeclaration.
- */
-
-int TemplateInstance::hasNestedArgs(Objects *args)
-{   int nested = 0;
-    //printf("TemplateInstance::hasNestedArgs('%s')\n", tempdecl->ident->toChars());
-
-    /* A nested instance happens when an argument references a local
-     * symbol that is on the stack.
-     */
-    for (size_t i = 0; i < args->dim; i++)
-    {   Object *o = args->tdata()[i];
-        Expression *ea = isExpression(o);
-        Dsymbol *sa = isDsymbol(o);
-        Tuple *va = isTuple(o);
-        if (ea)
-        {
-            if (ea->op == TOKvar)
-            {
-                sa = ((VarExp *)ea)->var;
-                goto Lsa;
-            }
-            if (ea->op == TOKthis)
-            {
-                sa = ((ThisExp *)ea)->var;
-                goto Lsa;
-            }
-            if (ea->op == TOKfunction)
-            {
-                sa = ((FuncExp *)ea)->fd;
-                goto Lsa;
-            }
-        }
-        else if (sa)
-        {
-          Lsa:
-            TemplateDeclaration *td = sa->isTemplateDeclaration();
-            Declaration *d = sa->isDeclaration();
-            if ((td && td->literal) ||
-                (d && !d->isDataseg() &&
-#if DMDV2
-                 !(d->storage_class & STCmanifest) &&
-#endif
-                 (!d->isFuncDeclaration() || d->isFuncDeclaration()->isNested()) &&
-                 !isTemplateMixin()
-                ))
-            {
-                // if module level template
-                if (tempdecl->toParent()->isModule())
-                {   Dsymbol *dparent = sa->toParent();
-                    if (!isnested)
-                        isnested = dparent;
-                    else if (isnested != dparent)
-                    {
-                        /* Select the more deeply nested of the two.
-                         * Error if one is not nested inside the other.
-                         */
-                        for (Dsymbol *p = isnested; p; p = p->parent)
-                        {
-                            if (p == dparent)
-                                goto L1;        // isnested is most nested
-                        }
-                        for (Dsymbol *p = dparent; p; p = p->parent)
-                        {
-                            if (p == isnested)
-                            {   isnested = dparent;
-                                goto L1;        // dparent is most nested
-                            }
-                        }
-                        error("%s is nested in both %s and %s",
-                                toChars(), isnested->toChars(), dparent->toChars());
-                    }
-                  L1:
-                    //printf("\tnested inside %s\n", isnested->toChars());
-                    nested |= 1;
-                }
-                else
-                    error("cannot use local '%s' as parameter to non-global template %s", sa->toChars(), tempdecl->toChars());
-            }
-        }
-        else if (va)
-        {
-            nested |= hasNestedArgs(&va->objects);
-        }
-    }
-    return nested;
-}
-
-/****************************************
- * This instance needs an identifier for name mangling purposes.
- * Create one by taking the template declaration name and adding
- * the type signature for it.
- */
-
-Identifier *TemplateInstance::genIdent(Objects *args)
-{   OutBuffer buf;
-
-    //printf("TemplateInstance::genIdent('%s')\n", tempdecl->ident->toChars());
-    char *id = tempdecl->ident->toChars();
-    buf.printf("__T%llu%s", (ulonglong)strlen(id), id);
-    for (size_t i = 0; i < args->dim; i++)
-    {   Object *o = args->tdata()[i];
-        Type *ta = isType(o);
-        Expression *ea = isExpression(o);
-        Dsymbol *sa = isDsymbol(o);
-        Tuple *va = isTuple(o);
-        //printf("\to [%d] %p ta %p ea %p sa %p va %p\n", i, o, ta, ea, sa, va);
-        if (ta)
-        {
-            buf.writeByte('T');
-            if (ta->deco)
-                buf.writestring(ta->deco);
-            else
-            {
-#ifdef DEBUG
-                if (!global.errors)
-                    printf("ta = %d, %s\n", ta->ty, ta->toChars());
-#endif
-                assert(global.errors);
-            }
-        }
-        else if (ea)
-        {
-            // Don't interpret it yet, it might actually be an alias
-            ea = ea->optimize(WANTvalue);
-            if (ea->op == TOKvar)
-            {
-                sa = ((VarExp *)ea)->var;
-                ea = NULL;
-                goto Lsa;
-            }
-            if (ea->op == TOKthis)
-            {
-                sa = ((ThisExp *)ea)->var;
-                ea = NULL;
-                goto Lsa;
-            }
-            if (ea->op == TOKfunction)
-            {
-                sa = ((FuncExp *)ea)->fd;
-                ea = NULL;
-                goto Lsa;
-            }
-            buf.writeByte('V');
-            if (ea->op == TOKtuple)
-            {   ea->error("tuple is not a valid template value argument");
-                continue;
-            }
-            // Now that we know it is not an alias, we MUST obtain a value
-            unsigned olderr = global.errors;
-            ea = ea->optimize(WANTvalue | WANTinterpret);
-            if (ea->op == TOKerror || olderr != global.errors)
-                continue;
-#if 1
-            /* Use deco that matches what it would be for a function parameter
-             */
-            buf.writestring(ea->type->deco);
-#else
-            // Use type of parameter, not type of argument
-            TemplateParameter *tp = tempdecl->parameters->tdata()[i];
-            assert(tp);
-            TemplateValueParameter *tvp = tp->isTemplateValueParameter();
-            assert(tvp);
-            buf.writestring(tvp->valType->deco);
-#endif
-            ea->toMangleBuffer(&buf);
-        }
-        else if (sa)
-        {
-          Lsa:
-            buf.writeByte('S');
-            Declaration *d = sa->isDeclaration();
-            if (d && (!d->type || !d->type->deco))
-            {   error("forward reference of %s", d->toChars());
-                continue;
-            }
-#if 0
-            VarDeclaration *v = sa->isVarDeclaration();
-            if (v && v->storage_class & STCmanifest)
-            {   ExpInitializer *ei = v->init->isExpInitializer();
-                if (ei)
-                {
-                    ea = ei->exp;
-                    goto Lea;
-                }
-            }
-#endif
-            const char *p = sa->mangle();
-
-            /* Bugzilla 3043: if the first character of p is a digit this
-             * causes ambiguity issues because the digits of the two numbers are adjacent.
-             * Current demanglers resolve this by trying various places to separate the
-             * numbers until one gets a successful demangle.
-             * Unfortunately, fixing this ambiguity will break existing binary
-             * compatibility and the demanglers, so we'll leave it as is.
-             */
-            buf.printf("%llu%s", (ulonglong)strlen(p), p);
-        }
-        else if (va)
-        {
-            assert(i + 1 == args->dim);         // must be last one
-            args = &va->objects;
-            i = -1;
-        }
-        else
-            assert(0);
-    }
-    buf.writeByte('Z');
-    id = buf.toChars();
-    //buf.data = NULL;                          // we can free the string after call to idPool()
-    //printf("\tgenIdent = %s\n", id);
-    return Lexer::idPool(id);
-}
-
-
-/****************************************************
- * Declare parameters of template instance, initialize them with the
- * template instance arguments.
- */
-
-void TemplateInstance::declareParameters(Scope *sc)
-{
-    //printf("TemplateInstance::declareParameters()\n");
-    for (size_t i = 0; i < tdtypes.dim; i++)
-    {
-        TemplateParameter *tp = tempdecl->parameters->tdata()[i];
-        //Object *o = tiargs->tdata()[i];
-        Object *o = tdtypes.tdata()[i];          // initializer for tp
-
-        //printf("\ttdtypes[%d] = %p\n", i, o);
-        tempdecl->declareParameter(sc, tp, o);
-    }
-}
-
-/*****************************************************
- * Determine if template instance is really a template function,
- * and that template function needs to infer types from the function
- * arguments.
- */
-
-int TemplateInstance::needsTypeInference(Scope *sc)
-{
-    //printf("TemplateInstance::needsTypeInference() %s\n", toChars());
-    if (!tempdecl)
-        tempdecl = findTemplateDeclaration(sc);
-    int multipleMatches = FALSE;
-    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
-    {
-        /* If any of the overloaded template declarations need inference,
-         * then return TRUE
-         */
-        FuncDeclaration *fd;
-        if (!td->onemember ||
-            (fd = td->onemember->toAlias()->isFuncDeclaration()) == NULL ||
-            fd->type->ty != Tfunction)
-        {
-            /* Not a template function, therefore type inference is not possible.
-             */
-            //printf("false\n");
-            return FALSE;
-        }
-
-        for (size_t i = 0; i < td->parameters->dim; i++)
-            if (td->parameters->tdata()[i]->isTemplateThisParameter())
-                return TRUE;
-
-        /* Determine if the instance arguments, tiargs, are all that is necessary
-         * to instantiate the template.
-         */
-        //printf("tp = %p, td->parameters->dim = %d, tiargs->dim = %d\n", tp, td->parameters->dim, tiargs->dim);
-        TypeFunction *fdtype = (TypeFunction *)fd->type;
-        if (Parameter::dim(fdtype->parameters))
-        {
-            TemplateParameter *tp = td->isVariadic();
-            if (tp && td->parameters->dim > 1)
-                return TRUE;
-
-            if (tiargs->dim < td->parameters->dim)
-            {   // Can remain tiargs be filled by default arguments?
-                for (size_t i = tiargs->dim; i < td->parameters->dim; i++)
-                {   tp = (*td->parameters)[i];
-                    if (TemplateTypeParameter *ttp = tp->isTemplateTypeParameter())
-                    {   if (!ttp->defaultType)
-                            return TRUE;
-                    }
-                    else if (TemplateAliasParameter *tap = tp->isTemplateAliasParameter())
-                    {   if (!tap->defaultAlias)
-                            return TRUE;
-                    }
-                    else if (TemplateValueParameter *tvp = tp->isTemplateValueParameter())
-                    {   if (!tvp->defaultValue)
-                            return TRUE;
-                    }
-                }
-            }
-        }
-        /* If there is more than one function template which matches, we may
-         * need type inference (see Bugzilla 4430)
-         */
-        if (td != tempdecl)
-            multipleMatches = TRUE;
-    }
-    //printf("false\n");
-    return multipleMatches;
-}
-
-void TemplateInstance::semantic2(Scope *sc)
-{   int i;
-
-    if (semanticRun >= PASSsemantic2)
-        return;
-    semanticRun = PASSsemantic2;
-#if LOG
-    printf("+TemplateInstance::semantic2('%s')\n", toChars());
-#endif
-    if (!errors && members)
-    {
-        sc = tempdecl->scope;
-        assert(sc);
-        sc = sc->push(argsym);
-        sc = sc->push(this);
-        sc->tinst = this;
-        for (i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = members->tdata()[i];
-#if LOG
-printf("\tmember '%s', kind = '%s'\n", s->toChars(), s->kind());
-#endif
-            s->semantic2(sc);
-        }
-        sc = sc->pop();
-        sc->pop();
-    }
-#if LOG
-    printf("-TemplateInstance::semantic2('%s')\n", toChars());
-#endif
-}
-
-void TemplateInstance::semantic3(Scope *sc)
-{
-#if LOG
-    printf("TemplateInstance::semantic3('%s'), semanticRun = %d\n", toChars(), semanticRun);
-#endif
-//if (toChars()[0] == 'D') *(char*)0=0;
-    if (semanticRun >= PASSsemantic3)
-        return;
-    semanticRun = PASSsemantic3;
-    if (!errors && members)
-    {
-        sc = tempdecl->scope;
-        sc = sc->push(argsym);
-        sc = sc->push(this);
-        sc->tinst = this;
-        if (ignore)
-            sc->ignoreTemplates++;
-        int oldgag = global.gag;
-        int olderrors = global.errors;
-        /* If this is a speculative instantiation, gag errors.
-         * Future optimisation: If the results are actually needed, errors
-         * would already be gagged, so we don't really need to run semantic
-         * on the members.
-         */
-        if (speculative && !oldgag)
-            olderrors = global.startGagging();
-        for (size_t i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = members->tdata()[i];
-            s->semantic3(sc);
-            if (speculative && global.errors != olderrors)
-                break;
-        }
-        if (speculative && !oldgag)
-        {   // If errors occurred, this instantiation failed
-            errors += global.errors - olderrors;
-            global.endGagging(olderrors);
-        }
-        sc = sc->pop();
-        sc->pop();
-    }
-}
-
-#if IN_DMD
-
-/**************************************
- * Given an error instantiating the TemplateInstance,
- * give the nested TemplateInstance instantiations that got
- * us here. Those are a list threaded into the nested scopes.
- */
-void TemplateInstance::printInstantiationTrace()
-{
-    if (global.gag)
-        return;
-
-    const unsigned max_shown = 6;
-    const char format[] = "instantiated from here: %s";
-
-    // determine instantiation depth and number of recursive instantiations
-    int n_instantiations = 1;
-    int n_totalrecursions = 0;
-    for (TemplateInstance *cur = this; cur; cur = cur->tinst)
-    {
-        ++n_instantiations;
-        // If two instantiations use the same declaration, they are recursive.
-        // (this works even if they are instantiated from different places in the
-        // same template).
-        // In principle, we could also check for multiple-template recursion, but it's
-        // probably not worthwhile.
-        if (cur->tinst && cur->tempdecl && cur->tinst->tempdecl
-            && cur->tempdecl->loc.equals(cur->tinst->tempdecl->loc))
-            ++n_totalrecursions;
-    }
-
-    // show full trace only if it's short or verbose is on
-    if (n_instantiations <= max_shown || global.params.verbose)
-    {
-        for (TemplateInstance *cur = this; cur; cur = cur->tinst)
-        {
-            errorSupplemental(cur->loc, format, cur->toChars());
-        }
-    }
-    else if (n_instantiations - n_totalrecursions <= max_shown)
-    {
-        // By collapsing recursive instantiations into a single line,
-        // we can stay under the limit.
-        int recursionDepth=0;
-        for (TemplateInstance *cur = this; cur; cur = cur->tinst)
-        {
-            if (cur->tinst && cur->tempdecl && cur->tinst->tempdecl
-                    && cur->tempdecl->loc.equals(cur->tinst->tempdecl->loc))
-            {
-                ++recursionDepth;
-            }
-            else
-            {
-                if (recursionDepth)
-                    errorSupplemental(cur->loc, "%d recursive instantiations from here: %s", recursionDepth+2, cur->toChars());
-                else
-                    errorSupplemental(cur->loc, format, cur->toChars());
-                recursionDepth = 0;
-            }
-        }
-    }
-    else
-    {
-        // Even after collapsing the recursions, the depth is too deep.
-        // Just display the first few and last few instantiations.
-        unsigned i = 0;
-        for (TemplateInstance *cur = this; cur; cur = cur->tinst)
-        {
-            if (i == max_shown / 2)
-                errorSupplemental(cur->loc, "... (%d instantiations, -v to show) ...", n_instantiations - max_shown);
-
-            if (i < max_shown / 2 ||
-                i >= n_instantiations - max_shown + max_shown / 2)
-                errorSupplemental(cur->loc, format, cur->toChars());
-            ++i;
-        }
-    }
-}
-
-void TemplateInstance::toObjFile(int multiobj)
-{
-#if LOG
-    printf("TemplateInstance::toObjFile('%s', this = %p)\n", toChars(), this);
-#endif
-    if (!errors && members)
-    {
-        if (multiobj)
-            // Append to list of object files to be written later
-            obj_append(this);
-        else
-        {
-            for (size_t i = 0; i < members->dim; i++)
-            {
-                Dsymbol *s = members->tdata()[i];
-                s->toObjFile(multiobj);
-            }
-        }
-    }
-}
-
-#endif
-
-void TemplateInstance::inlineScan()
-{
-#if LOG
-    printf("TemplateInstance::inlineScan('%s')\n", toChars());
-#endif
-    if (!errors && members)
-    {
-        for (size_t i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = members->tdata()[i];
-            s->inlineScan();
-        }
-    }
-}
-
-void TemplateInstance::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    int i;
-
-    Identifier *id = name;
-    buf->writestring(id->toChars());
-    buf->writestring("!(");
-    if (nest)
-        buf->writestring("...");
-    else
-    {
-        nest++;
-        Objects *args = tiargs;
-        for (i = 0; i < args->dim; i++)
-        {
-            if (i)
-                buf->writeByte(',');
-            Object *oarg = (*args)[i];
-            ObjectToCBuffer(buf, hgs, oarg);
-        }
-        nest--;
-    }
-    buf->writeByte(')');
-}
-
-
-Dsymbol *TemplateInstance::toAlias()
-{
-#if LOG
-    printf("TemplateInstance::toAlias()\n");
-#endif
-    if (!inst)
-    {
-        // Maybe we can resolve it
-        if (scope)
-        {
-            /* Anything that affects scope->offset must be
-             * done in lexical order. Fwd ref error if it is affected, otherwise allow.
-             */
-            unsigned offset = scope->offset;
-            Scope *sc = scope;
-            semantic(scope);
-//            if (offset != sc->offset)
-//                inst = NULL;            // trigger fwd ref error
-        }
-        if (!inst)
-        {   error("cannot resolve forward reference");
-            errors = 1;
-            return this;
-        }
-    }
-
-    if (inst != this)
-        return inst->toAlias();
-
-    if (aliasdecl)
-    {
-        return aliasdecl->toAlias();
-    }
-
-    return inst;
-}
-
-AliasDeclaration *TemplateInstance::isAliasDeclaration()
-{
-    return aliasdecl;
-}
-
-const char *TemplateInstance::kind()
-{
-    return "template instance";
-}
-
-int TemplateInstance::oneMember(Dsymbol **ps, Identifier *ident)
-{
-    *ps = NULL;
-    return TRUE;
-}
-
-char *TemplateInstance::toChars()
-{
-    OutBuffer buf;
-    HdrGenState hgs;
-    char *s;
-
-    toCBuffer(&buf, &hgs);
-    s = buf.toChars();
-    buf.data = NULL;
-    return s;
-}
-
-#if IN_LLVM
-
-void TemplateInstance::printInstantiationTrace()
-{
-    if(global.gag)
-	return;
-
-    const int max_shown = 6;
-
-    // determine instantiation depth
-    int n_instantiations = 1;
-    TemplateInstance* cur = this;
-    while(cur = cur->tinst)
-	++n_instantiations;
-
-    // show full trace only if it's short or verbose is on
-    if(n_instantiations <= max_shown || global.params.verbose)
-    {
-	cur = this;
-	while(cur)
-	{
-	    fprintf(stdmsg,"    instantiatied in %s: %s\n", cur->loc.toChars(), cur->toChars());
-	    cur = cur->tinst;
-	}
-    }
-    else
-    {
-	cur = this;
-	size_t i = 0;
-	for(; i < max_shown/2; ++i, cur = cur->tinst)
-	    fprintf(stdmsg,"    instantiatied in %s: %s\n", cur->loc.toChars(), cur->toChars());
-	fprintf(stdmsg,"    ... (%d instantiations, -v to show) ...\n", n_instantiations - max_shown);
-	for(; i < n_instantiations - max_shown + max_shown/2; ++i, cur = cur->tinst) 
-	{}
-	for(; i < n_instantiations; ++i, cur = cur->tinst) 
-	    fprintf(stdmsg,"    instantiatied in %s: %s\n", cur->loc.toChars(), cur->toChars());
-    }
-}
-
-#endif
-
-/* ======================== TemplateMixin ================================ */
-
-TemplateMixin::TemplateMixin(Loc loc, Identifier *ident, Type *tqual,
-        Identifiers *idents, Objects *tiargs)
-        : TemplateInstance(loc, idents->tdata()[idents->dim - 1])
-{
-    //printf("TemplateMixin(ident = '%s')\n", ident ? ident->toChars() : "");
-    this->ident = ident;
-    this->tqual = tqual;
-    this->idents = idents;
-    this->tiargs = tiargs ? tiargs : new Objects();
-}
-
-Dsymbol *TemplateMixin::syntaxCopy(Dsymbol *s)
-{   TemplateMixin *tm;
-
-    Identifiers *ids = new Identifiers();
-    ids->setDim(idents->dim);
-    for (size_t i = 0; i < idents->dim; i++)
-    {   // Matches TypeQualified::syntaxCopyHelper()
-        Identifier *id = idents->tdata()[i];
-        if (id->dyncast() == DYNCAST_DSYMBOL)
-        {
-            TemplateInstance *ti = (TemplateInstance *)id;
-
-            ti = (TemplateInstance *)ti->syntaxCopy(NULL);
-            id = (Identifier *)ti;
-        }
-        ids->tdata()[i] = id;
-    }
-
-    tm = new TemplateMixin(loc, ident,
-                (Type *)(tqual ? tqual->syntaxCopy() : NULL),
-                ids, tiargs);
-    TemplateInstance::syntaxCopy(tm);
-    return tm;
-}
-
-void TemplateMixin::semantic(Scope *sc)
-{
-#if LOG
-    printf("+TemplateMixin::semantic('%s', this=%p)\n", toChars(), this);
-    fflush(stdout);
-#endif
-    if (semanticRun)
-    {
-        // This for when a class/struct contains mixin members, and
-        // is done over because of forward references
-        if (parent && toParent()->isAggregateDeclaration())
-            semanticRun = PASSsemantic;            // do over
-        else
-        {
-#if LOG
-            printf("\tsemantic done\n");
-#endif
-            return;
-        }
-    }
-    if (!semanticRun)
-        semanticRun = PASSsemantic;
-#if LOG
-    printf("\tdo semantic\n");
-#endif
-
-#if !IN_LLVM && !IN_GCC
-    // dont know what this is
-    util_progress();
-#endif
-
-    Scope *scx = NULL;
-    if (scope)
-    {   sc = scope;
-        scx = scope;            // save so we don't make redundant copies
-        scope = NULL;
-    }
-
-    // Follow qualifications to find the TemplateDeclaration
-    if (!tempdecl)
-    {   Dsymbol *s;
-        size_t i;
-        Identifier *id;
-
-        if (tqual)
-        {   s = tqual->toDsymbol(sc);
-            i = 0;
-        }
-        else
-        {
-            i = 1;
-            id = idents->tdata()[0];
-            switch (id->dyncast())
-            {
-                case DYNCAST_IDENTIFIER:
-                    s = sc->search(loc, id, NULL);
-                    break;
-
-                case DYNCAST_DSYMBOL:
-                {
-                    TemplateInstance *ti = (TemplateInstance *)id;
-                    ti->semantic(sc);
-                    s = ti;
-                    break;
-                }
-                default:
-                    assert(0);
-            }
-        }
-
-        for (; i < idents->dim; i++)
-        {
-            if (!s)
-                break;
-            id = idents->tdata()[i];
-            s = s->searchX(loc, sc, id);
-        }
-        if (!s)
-        {
-            error("is not defined");
-            inst = this;
-            return;
-        }
-        tempdecl = s->toAlias()->isTemplateDeclaration();
-        if (!tempdecl)
-        {
-            error("%s isn't a template", s->toChars());
-            inst = this;
-            return;
-        }
-    }
-
-    // Look for forward reference
-    assert(tempdecl);
-    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
-    {
-        if (!td->semanticRun)
-        {
-            /* Cannot handle forward references if mixin is a struct member,
-             * because addField must happen during struct's semantic, not
-             * during the mixin semantic.
-             * runDeferred will re-run mixin's semantic outside of the struct's
-             * semantic.
-             */
-            semanticRun = PASSinit;
-            AggregateDeclaration *ad = toParent()->isAggregateDeclaration();
-            if (ad)
-                ad->sizeok = SIZEOKfwd;
-            else
-            {
-                // Forward reference
-                //printf("forward reference - deferring\n");
-                scope = scx ? scx : new Scope(*sc);
-                scope->setNoFree();
-                scope->module->addDeferredSemantic(this);
-            }
-            return;
-        }
-    }
-
-    // Run semantic on each argument, place results in tiargs[]
-    semanticTiargs(sc);
-    if (errors || arrayObjectIsError(tiargs))
-        return;
-
-    tempdecl = findBestMatch(sc, NULL);
-    if (!tempdecl)
-    {   inst = this;
-        return;         // error recovery
-    }
-
-    if (!ident)
-        ident = genIdent(tiargs);
-
-    inst = this;
-    parent = sc->parent;
-
-    /* Detect recursive mixin instantiations.
-     */
-    for (Dsymbol *s = parent; s; s = s->parent)
-    {
-        //printf("\ts = '%s'\n", s->toChars());
-        TemplateMixin *tm = s->isTemplateMixin();
-        if (!tm || tempdecl != tm->tempdecl)
-            continue;
-
-        /* Different argument list lengths happen with variadic args
-         */
-        if (tiargs->dim != tm->tiargs->dim)
-            continue;
-
-        for (size_t i = 0; i < tiargs->dim; i++)
-        {   Object *o = (*tiargs)[i];
-            Type *ta = isType(o);
-            Expression *ea = isExpression(o);
-            Dsymbol *sa = isDsymbol(o);
-            Object *tmo = (*tm->tiargs)[i];
-            if (ta)
-            {
-                Type *tmta = isType(tmo);
-                if (!tmta)
-                    goto Lcontinue;
-                if (!ta->equals(tmta))
-                    goto Lcontinue;
-            }
-            else if (ea)
-            {   Expression *tme = isExpression(tmo);
-                if (!tme || !ea->equals(tme))
-                    goto Lcontinue;
-            }
-            else if (sa)
-            {
-                Dsymbol *tmsa = isDsymbol(tmo);
-                if (sa != tmsa)
-                    goto Lcontinue;
-            }
-            else
-                assert(0);
-        }
-        error("recursive mixin instantiation");
-        return;
-
-    Lcontinue:
-        continue;
-    }
-
-    // Copy the syntax trees from the TemplateDeclaration
-    members = Dsymbol::arraySyntaxCopy(tempdecl->members);
-    if (!members)
-        return;
-
-    symtab = new DsymbolTable();
-
-    for (Scope *sce = sc; 1; sce = sce->enclosing)
-    {
-        ScopeDsymbol *sds = (ScopeDsymbol *)sce->scopesym;
-        if (sds)
-        {
-            sds->importScope(this, PROTpublic);
-            break;
-        }
-    }
-
-#if LOG
-    printf("\tcreate scope for template parameters '%s'\n", toChars());
-#endif
-    Scope *scy = sc;
-    scy = sc->push(this);
-    scy->parent = this;
-
-    argsym = new ScopeDsymbol();
-    argsym->parent = scy->parent;
-    Scope *argscope = scy->push(argsym);
-
-    unsigned errorsave = global.errors;
-
-    // Declare each template parameter as an alias for the argument type
-    declareParameters(argscope);
-
-    // Add members to enclosing scope, as well as this scope
-    for (size_t i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (*members)[i];
-        s->addMember(argscope, this, i);
-        //sc->insert(s);
-        //printf("sc->parent = %p, sc->scopesym = %p\n", sc->parent, sc->scopesym);
-        //printf("s->parent = %s\n", s->parent->toChars());
-    }
-
-    // Do semantic() analysis on template instance members
-#if LOG
-    printf("\tdo semantic() on template instance members '%s'\n", toChars());
-#endif
-    Scope *sc2;
-    sc2 = argscope->push(this);
-    sc2->offset = sc->offset;
-
-    static int nest;
-    //printf("%d\n", nest);
-    if (++nest > 500)
-    {
-        global.gag = 0;                 // ensure error message gets printed
-        error("recursive expansion");
-        fatal();
-    }
-
-    for (size_t i = 0; i < members->dim; i++)
-    {
-        Dsymbol *s = (*members)[i];
-        s->semantic(sc2);
-    }
-
-    nest--;
-
-    sc->offset = sc2->offset;
-
-    /* The problem is when to parse the initializer for a variable.
-     * Perhaps VarDeclaration::semantic() should do it like it does
-     * for initializers inside a function.
-     */
-//    if (sc->parent->isFuncDeclaration())
-
-        semantic2(sc2);
-
-    if (sc->func)
-    {
-        semantic3(sc2);
-    }
-
-    // Give additional context info if error occurred during instantiation
-    if (global.errors != errorsave)
-    {
-        error("error instantiating");
-    }
-
-    sc2->pop();
-
-    argscope->pop();
-
-//    if (!isAnonymous())
-    {
-        scy->pop();
-    }
-#if LOG
-    printf("-TemplateMixin::semantic('%s', this=%p)\n", toChars(), this);
-#endif
-}
-
-void TemplateMixin::semantic2(Scope *sc)
-{
-    if (semanticRun >= PASSsemantic2)
-        return;
-    semanticRun = PASSsemantic2;
-#if LOG
-    printf("+TemplateMixin::semantic2('%s')\n", toChars());
-#endif
-    if (members)
-    {
-        assert(sc);
-        sc = sc->push(argsym);
-        sc = sc->push(this);
-        for (size_t i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = (*members)[i];
-#if LOG
-            printf("\tmember '%s', kind = '%s'\n", s->toChars(), s->kind());
-#endif
-            s->semantic2(sc);
-        }
-        sc = sc->pop();
-        sc->pop();
-    }
-#if LOG
-    printf("-TemplateMixin::semantic2('%s')\n", toChars());
-#endif
-}
-
-void TemplateMixin::semantic3(Scope *sc)
-{
-    if (semanticRun >= PASSsemantic3)
-        return;
-    semanticRun = PASSsemantic3;
-#if LOG
-    printf("TemplateMixin::semantic3('%s')\n", toChars());
-#endif
-    if (members)
-    {
-        sc = sc->push(argsym);
-        sc = sc->push(this);
-        for (size_t i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = members->tdata()[i];
-            s->semantic3(sc);
-        }
-        sc = sc->pop();
-        sc->pop();
-    }
-}
-
-void TemplateMixin::inlineScan()
-{
-    TemplateInstance::inlineScan();
-}
-
-const char *TemplateMixin::kind()
-{
-    return "mixin";
-}
-
-int TemplateMixin::oneMember(Dsymbol **ps, Identifier *ident)
-{
-    return Dsymbol::oneMember(ps, ident);
-}
-
-int TemplateMixin::apply(Dsymbol_apply_ft_t fp, void *param)
-{
-    if (members)
-    {
-        for (size_t i = 0; i < members->dim; i++)
-        {   Dsymbol *s = (*members)[i];
-            if (s)
-            {
-                if (s->apply(fp, param))
-                    return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-int TemplateMixin::hasPointers()
-{
-    //printf("TemplateMixin::hasPointers() %s\n", toChars());
-
-    if (members)
-        for (size_t i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = (*members)[i];
-            //printf(" s = %s %s\n", s->kind(), s->toChars());
-            if (s->hasPointers())
-            {
-                return 1;
-            }
-        }
-    return 0;
-}
-
-void TemplateMixin::setFieldOffset(AggregateDeclaration *ad, unsigned *poffset, bool isunion)
-{
-    if (members)
-    {
-        for (size_t i = 0; i < members->dim; i++)
-        {   Dsymbol *s = (*members)[i];
-            s->setFieldOffset(ad, poffset, isunion);
-        }
-    }
-}
-
-char *TemplateMixin::toChars()
-{
-    OutBuffer buf;
-    HdrGenState hgs;
-    char *s;
-
-    TemplateInstance::toCBuffer(&buf, &hgs);
-    s = buf.toChars();
-    buf.data = NULL;
-    return s;
-}
-
-void TemplateMixin::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring("mixin ");
-
-    for (size_t i = 0; i < idents->dim; i++)
-    {   Identifier *id = idents->tdata()[i];
-
-        if (i)
-            buf->writeByte('.');
-        buf->writestring(id->toChars());
-    }
-    buf->writestring("!(");
-    if (tiargs)
-    {
-        for (size_t i = 0; i < tiargs->dim; i++)
-        {   if (i)
-                buf->writebyte(',');
-            Object *oarg = tiargs->tdata()[i];
-            Type *t = isType(oarg);
-            Expression *e = isExpression(oarg);
-            Dsymbol *s = isDsymbol(oarg);
-            if (t)
-                t->toCBuffer(buf, NULL, hgs);
-            else if (e)
-                e->toCBuffer(buf, hgs);
-            else if (s)
-            {
-                char *p = s->ident ? s->ident->toChars() : s->toChars();
-                buf->writestring(p);
-            }
-            else if (!oarg)
-            {
-                buf->writestring("NULL");
-            }
-            else
-            {
-                assert(0);
-            }
-        }
-    }
-    buf->writebyte(')');
-    if (ident)
-    {
-        buf->writebyte(' ');
-        buf->writestring(ident->toChars());
-    }
-    buf->writebyte(';');
-    buf->writenl();
-}
-
-
-#if IN_DMD
-void TemplateMixin::toObjFile(int multiobj)
-{
-    //printf("TemplateMixin::toObjFile('%s')\n", toChars());
-    TemplateInstance::toObjFile(multiobj);
-}
-#endif
-
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2012 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+// Handle template implementation
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "root.h"
+#include "aav.h"
+#include "rmem.h"
+#include "stringtable.h"
+#include "mars.h"
+#include "identifier.h"
+#include "mtype.h"
+#include "template.h"
+#include "init.h"
+#include "expression.h"
+#include "scope.h"
+#include "module.h"
+#include "aggregate.h"
+#include "declaration.h"
+#include "dsymbol.h"
+#include "hdrgen.h"
+#include "id.h"
+
+#if WINDOWS_SEH
+#include <windows.h>
+long __cdecl __ehfilter(LPEXCEPTION_POINTERS ep);
+#endif
+
+#define LOG     0
+
+/********************************************
+ * These functions substitute for dynamic_cast. dynamic_cast does not work
+ * on earlier versions of gcc.
+ */
+
+Expression *isExpression(Object *o)
+{
+    //return dynamic_cast<Expression *>(o);
+    if (!o || o->dyncast() != DYNCAST_EXPRESSION)
+        return NULL;
+    return (Expression *)o;
+}
+
+Dsymbol *isDsymbol(Object *o)
+{
+    //return dynamic_cast<Dsymbol *>(o);
+    if (!o || o->dyncast() != DYNCAST_DSYMBOL)
+        return NULL;
+    return (Dsymbol *)o;
+}
+
+Type *isType(Object *o)
+{
+    //return dynamic_cast<Type *>(o);
+    if (!o || o->dyncast() != DYNCAST_TYPE)
+        return NULL;
+    return (Type *)o;
+}
+
+Tuple *isTuple(Object *o)
+{
+    //return dynamic_cast<Tuple *>(o);
+    if (!o || o->dyncast() != DYNCAST_TUPLE)
+        return NULL;
+    return (Tuple *)o;
+}
+
+/**************************************
+ * Is this Object an error?
+ */
+int isError(Object *o)
+{
+    Type *t = isType(o);
+    if (t)
+        return (t->ty == Terror);
+    Expression *e = isExpression(o);
+    if (e)
+        return (e->op == TOKerror);
+    Tuple *v = isTuple(o);
+    if (v)
+        return arrayObjectIsError(&v->objects);
+    return 0;
+}
+
+/**************************************
+ * Are any of the Objects an error?
+ */
+int arrayObjectIsError(Objects *args)
+{
+    for (size_t i = 0; i < args->dim; i++)
+    {
+        Object *o = args->tdata()[i];
+        if (isError(o))
+            return 1;
+    }
+    return 0;
+}
+
+/***********************
+ * Try to get arg as a type.
+ */
+
+Type *getType(Object *o)
+{
+    Type *t = isType(o);
+    if (!t)
+    {   Expression *e = isExpression(o);
+        if (e)
+            t = e->type;
+    }
+    return t;
+}
+
+Dsymbol *getDsymbol(Object *oarg)
+{
+    Dsymbol *sa;
+    Expression *ea = isExpression(oarg);
+    if (ea)
+    {   // Try to convert Expression to symbol
+        if (ea->op == TOKvar)
+            sa = ((VarExp *)ea)->var;
+        else if (ea->op == TOKfunction)
+            sa = ((FuncExp *)ea)->fd;
+        else
+            sa = NULL;
+    }
+    else
+    {   // Try to convert Type to symbol
+        Type *ta = isType(oarg);
+        if (ta)
+            sa = ta->toDsymbol(NULL);
+        else
+            sa = isDsymbol(oarg);       // if already a symbol
+    }
+    return sa;
+}
+
+/******************************
+ * If o1 matches o2, return 1.
+ * Else, return 0.
+ */
+
+int match(Object *o1, Object *o2, TemplateDeclaration *tempdecl, Scope *sc)
+{
+    Type *t1 = isType(o1);
+    Type *t2 = isType(o2);
+    Expression *e1 = isExpression(o1);
+    Expression *e2 = isExpression(o2);
+    Dsymbol *s1 = isDsymbol(o1);
+    Dsymbol *s2 = isDsymbol(o2);
+    Tuple *u1 = isTuple(o1);
+    Tuple *u2 = isTuple(o2);
+
+    //printf("\t match t1 %p t2 %p, e1 %p e2 %p, s1 %p s2 %p, u1 %p u2 %p\n", t1,t2,e1,e2,s1,s2,u1,u2);
+
+    /* A proper implementation of the various equals() overrides
+     * should make it possible to just do o1->equals(o2), but
+     * we'll do that another day.
+     */
+
+    if (s1)
+    {
+        VarDeclaration *v1 = s1->isVarDeclaration();
+        if (v1 && v1->storage_class & STCmanifest)
+        {   ExpInitializer *ei1 = v1->init->isExpInitializer();
+            if (ei1)
+                e1 = ei1->exp, s1 = NULL;
+        }
+    }
+    if (s2)
+    {
+        VarDeclaration *v2 = s2->isVarDeclaration();
+        if (v2 && v2->storage_class & STCmanifest)
+        {   ExpInitializer *ei2 = v2->init->isExpInitializer();
+            if (ei2)
+                e2 = ei2->exp, s2 = NULL;
+        }
+    }
+
+    if (t1)
+    {
+        /* if t1 is an instance of ti, then give error
+         * about recursive expansions.
+         */
+        Dsymbol *s = t1->toDsymbol(sc);
+        if (s && s->parent)
+        {   TemplateInstance *ti1 = s->parent->isTemplateInstance();
+            if (ti1 && ti1->tempdecl == tempdecl)
+            {
+                for (Scope *sc1 = sc; sc1; sc1 = sc1->enclosing)
+                {
+                    if (sc1->scopesym == ti1)
+                    {
+                        tempdecl->error("recursive template expansion for template argument %s", t1->toChars());
+                        return 1;       // fake a match
+                    }
+                }
+            }
+        }
+
+        //printf("t1 = %s\n", t1->toChars());
+        //printf("t2 = %s\n", t2->toChars());
+        if (!t2 || !t1->equals(t2))
+            goto Lnomatch;
+    }
+    else if (e1)
+    {
+#if 0
+        if (e1 && e2)
+        {
+            printf("match %d\n", e1->equals(e2));
+            e1->print();
+            e2->print();
+            e1->type->print();
+            e2->type->print();
+        }
+#endif
+        if (!e2)
+            goto Lnomatch;
+        if (!e1->equals(e2))
+            goto Lnomatch;
+    }
+    else if (s1)
+    {
+        if (!s2 || !s1->equals(s2) || s1->parent != s2->parent)
+            goto Lnomatch;
+    }
+    else if (u1)
+    {
+        if (!u2)
+            goto Lnomatch;
+        if (u1->objects.dim != u2->objects.dim)
+            goto Lnomatch;
+        for (size_t i = 0; i < u1->objects.dim; i++)
+        {
+            if (!match(u1->objects.tdata()[i],
+                       u2->objects.tdata()[i],
+                       tempdecl, sc))
+                goto Lnomatch;
+        }
+    }
+    //printf("match\n");
+    return 1;   // match
+
+Lnomatch:
+    //printf("nomatch\n");
+    return 0;   // nomatch;
+}
+
+
+/************************************
+ * Match an array of them.
+ */
+int arrayObjectMatch(Objects *oa1, Objects *oa2, TemplateDeclaration *tempdecl, Scope *sc)
+{
+    if (oa1 == oa2)
+        return 1;
+    if (oa1->dim != oa2->dim)
+        return 0;
+    for (size_t j = 0; j < oa1->dim; j++)
+    {   Object *o1 = oa1->tdata()[j];
+        Object *o2 = oa2->tdata()[j];
+        if (!match(o1, o2, tempdecl, sc))
+        {
+            return 0;
+        }
+    }
+    return 1;
+}
+
+/****************************************
+ * This makes a 'pretty' version of the template arguments.
+ * It's analogous to genIdent() which makes a mangled version.
+ */
+
+void ObjectToCBuffer(OutBuffer *buf, HdrGenState *hgs, Object *oarg)
+{
+    //printf("ObjectToCBuffer()\n");
+    Type *t = isType(oarg);
+    Expression *e = isExpression(oarg);
+    Dsymbol *s = isDsymbol(oarg);
+    Tuple *v = isTuple(oarg);
+    /* The logic of this should match what genIdent() does. The _dynamic_cast()
+     * function relies on all the pretty strings to be unique for different classes
+     * (see Bugzilla 7375).
+     * Perhaps it would be better to demangle what genIdent() does.
+     */
+    if (t)
+    {   //printf("\tt: %s ty = %d\n", t->toChars(), t->ty);
+        t->toCBuffer(buf, NULL, hgs);
+    }
+    else if (e)
+    {
+        if (e->op == TOKvar)
+            e = e->optimize(WANTvalue);         // added to fix Bugzilla 7375
+        e->toCBuffer(buf, hgs);
+    }
+    else if (s)
+    {
+        char *p = s->ident ? s->ident->toChars() : s->toChars();
+        buf->writestring(p);
+    }
+    else if (v)
+    {
+        Objects *args = &v->objects;
+        for (size_t i = 0; i < args->dim; i++)
+        {
+            if (i)
+                buf->writeByte(',');
+            Object *o = (*args)[i];
+            ObjectToCBuffer(buf, hgs, o);
+        }
+    }
+    else if (!oarg)
+    {
+        buf->writestring("NULL");
+    }
+    else
+    {
+#ifdef DEBUG
+        printf("bad Object = %p\n", oarg);
+#endif
+        assert(0);
+    }
+}
+
+#if DMDV2
+Object *objectSyntaxCopy(Object *o)
+{
+    if (!o)
+        return NULL;
+    Type *t = isType(o);
+    if (t)
+        return t->syntaxCopy();
+    Expression *e = isExpression(o);
+    if (e)
+        return e->syntaxCopy();
+    return o;
+}
+#endif
+
+
+/* ======================== TemplateDeclaration ============================= */
+
+TemplateDeclaration::TemplateDeclaration(Loc loc, Identifier *id,
+        TemplateParameters *parameters, Expression *constraint, Dsymbols *decldefs, int ismixin)
+    : ScopeDsymbol(id)
+{
+#if LOG
+    printf("TemplateDeclaration(this = %p, id = '%s')\n", this, id->toChars());
+#endif
+#if 0
+    if (parameters)
+        for (int i = 0; i < parameters->dim; i++)
+        {   TemplateParameter *tp = parameters->tdata()[i];
+            //printf("\tparameter[%d] = %p\n", i, tp);
+            TemplateTypeParameter *ttp = tp->isTemplateTypeParameter();
+
+            if (ttp)
+            {
+                printf("\tparameter[%d] = %s : %s\n", i, tp->ident->toChars(), ttp->specType ? ttp->specType->toChars() : "");
+            }
+        }
+#endif
+    this->loc = loc;
+    this->parameters = parameters;
+    this->origParameters = parameters;
+    this->constraint = constraint;
+    this->members = decldefs;
+    this->overnext = NULL;
+    this->overroot = NULL;
+    this->semanticRun = PASSinit;
+    this->onemember = NULL;
+    this->literal = 0;
+    this->ismixin = ismixin;
+    this->previous = NULL;
+
+    // Compute in advance for Ddoc's use
+    if (members)
+    {
+        Dsymbol *s;
+        if (Dsymbol::oneMembers(members, &s, ident) && s)
+        {
+            onemember = s;
+            s->parent = this;
+        }
+    }
+}
+
+Dsymbol *TemplateDeclaration::syntaxCopy(Dsymbol *)
+{
+    //printf("TemplateDeclaration::syntaxCopy()\n");
+    TemplateDeclaration *td;
+    TemplateParameters *p;
+
+    p = NULL;
+    if (parameters)
+    {
+        p = new TemplateParameters();
+        p->setDim(parameters->dim);
+        for (size_t i = 0; i < p->dim; i++)
+        {   TemplateParameter *tp = (*parameters)[i];
+            p->tdata()[i] = tp->syntaxCopy();
+        }
+    }
+    Expression *e = NULL;
+    if (constraint)
+        e = constraint->syntaxCopy();
+    Dsymbols *d = Dsymbol::arraySyntaxCopy(members);
+    td = new TemplateDeclaration(loc, ident, p, e, d, ismixin);
+
+#if IN_LLVM
+    td->intrinsicName = intrinsicName;
+#endif
+
+    return td;
+}
+
+void TemplateDeclaration::semantic(Scope *sc)
+{
+#if LOG
+    printf("TemplateDeclaration::semantic(this = %p, id = '%s')\n", this, ident->toChars());
+    printf("sc->stc = %llx\n", sc->stc);
+    printf("sc->module = %s\n", sc->module->toChars());
+#endif
+    if (semanticRun)
+        return;         // semantic() already run
+    semanticRun = PASSsemantic;
+
+    if (sc->module && sc->module->ident == Id::object && ident == Id::AssociativeArray)
+    {   Type::associativearray = this;
+    }
+
+    if (sc->func)
+    {
+#if DMDV1
+        error("cannot declare template at function scope %s", sc->func->toChars());
+#endif
+    }
+
+    if (/*global.params.useArrayBounds &&*/ sc->module)
+    {
+        // Generate this function as it may be used
+        // when template is instantiated in other modules
+        // FIXME: LDC
+        //sc->module->toModuleArray();
+    }
+
+    if (/*global.params.useAssert &&*/ sc->module)
+    {
+        // Generate this function as it may be used
+        // when template is instantiated in other modules
+        // FIXME: LDC
+        //sc->module->toModuleAssert();
+    }
+
+#if DMDV2
+    if (/*global.params.useUnitTests &&*/ sc->module)
+    {
+        // Generate this function as it may be used
+        // when template is instantiated in other modules
+        // FIXME: LDC
+        // sc->module->toModuleUnittest();
+    }
+#endif
+
+    /* Remember Scope for later instantiations, but make
+     * a copy since attributes can change.
+     */
+    if (!this->scope)
+    {   this->scope = new Scope(*sc);
+        this->scope->setNoFree();
+    }
+
+    // Set up scope for parameters
+    ScopeDsymbol *paramsym = new ScopeDsymbol();
+    paramsym->parent = sc->parent;
+    Scope *paramscope = sc->push(paramsym);
+    paramscope->parameterSpecialization = 1;
+    paramscope->stc = 0;
+
+    if (!parent)
+        parent = sc->parent;
+
+    if (global.params.doDocComments)
+    {
+        origParameters = new TemplateParameters();
+        origParameters->setDim(parameters->dim);
+        for (size_t i = 0; i < parameters->dim; i++)
+        {
+            TemplateParameter *tp = (*parameters)[i];
+            origParameters->tdata()[i] = tp->syntaxCopy();
+        }
+    }
+
+    for (size_t i = 0; i < parameters->dim; i++)
+    {
+        TemplateParameter *tp = parameters->tdata()[i];
+
+        tp->declareParameter(paramscope);
+    }
+
+    for (size_t i = 0; i < parameters->dim; i++)
+    {
+        TemplateParameter *tp = (*parameters)[i];
+
+        tp->semantic(paramscope);
+        if (i + 1 != parameters->dim && tp->isTemplateTupleParameter())
+        {   error("template tuple parameter must be last one");
+            errors = true;
+        }
+    }
+
+    paramscope->pop();
+
+    // Compute again
+    onemember = NULL;
+    if (members)
+    {
+        Dsymbol *s;
+        if (Dsymbol::oneMembers(members, &s, ident) && s)
+        {
+            onemember = s;
+            s->parent = this;
+        }
+    }
+
+    /* BUG: should check:
+     *  o no virtual functions or non-static data members of classes
+     */
+}
+
+const char *TemplateDeclaration::kind()
+{
+    return (onemember && onemember->isAggregateDeclaration())
+                ? onemember->kind()
+                : (char *)"template";
+}
+
+/**********************************
+ * Overload existing TemplateDeclaration 'this' with the new one 's'.
+ * Return !=0 if successful; i.e. no conflict.
+ */
+
+int TemplateDeclaration::overloadInsert(Dsymbol *s)
+{
+    TemplateDeclaration **pf;
+    TemplateDeclaration *f;
+
+#if LOG
+    printf("TemplateDeclaration::overloadInsert('%s')\n", s->toChars());
+#endif
+    f = s->isTemplateDeclaration();
+    if (!f)
+        return FALSE;
+    TemplateDeclaration *pthis = this;
+    for (pf = &pthis; *pf; pf = &(*pf)->overnext)
+    {
+#if 0
+        // Conflict if TemplateParameter's match
+        // Will get caught anyway later with TemplateInstance, but
+        // should check it now.
+        TemplateDeclaration *f2 = *pf;
+
+        if (f->parameters->dim != f2->parameters->dim)
+            goto Lcontinue;
+
+        for (size_t i = 0; i < f->parameters->dim; i++)
+        {   TemplateParameter *p1 = f->parameters->tdata()[i];
+            TemplateParameter *p2 = f2->parameters->tdata()[i];
+
+            if (!p1->overloadMatch(p2))
+                goto Lcontinue;
+        }
+
+#if LOG
+        printf("\tfalse: conflict\n");
+#endif
+        return FALSE;
+
+     Lcontinue:
+        ;
+#endif
+    }
+
+    f->overroot = this;
+    *pf = f;
+#if LOG
+    printf("\ttrue: no conflict\n");
+#endif
+    return TRUE;
+}
+
+/****************************
+ * Declare all the function parameters as variables
+ * and add them to the scope
+ */
+void TemplateDeclaration::makeParamNamesVisibleInConstraint(Scope *paramscope, Expressions *fargs)
+{
+    /* We do this ONLY if there is only one function in the template.
+     */
+    FuncDeclaration *fd = onemember && onemember->toAlias() ?
+        onemember->toAlias()->isFuncDeclaration() : NULL;
+    if (fd)
+    {
+        /*
+            Making parameters is similar to FuncDeclaration::semantic3
+         */
+        paramscope->parent = fd;
+
+        TypeFunction *tf = (TypeFunction *)fd->type->syntaxCopy();
+
+        // Shouldn't run semantic on default arguments and return type.
+        for (int i = 0; i<tf->parameters->dim; i++)
+            tf->parameters->tdata()[i]->defaultArg = NULL;
+        tf->next = NULL;
+
+        // Resolve parameter types and 'auto ref's.
+        tf->fargs = fargs;
+        tf = (TypeFunction *)tf->semantic(loc, paramscope);
+
+        Parameters *fparameters = tf->parameters;
+        int fvarargs = tf->varargs;
+
+        size_t nfparams = Parameter::dim(fparameters); // Num function parameters
+        for (size_t i = 0; i < nfparams; i++)
+        {
+            Parameter *fparam = Parameter::getNth(fparameters, i);
+            // Remove addMod same as func.d L1065 of FuncDeclaration::semantic3
+            //Type *vtype = fparam->type;
+            //if (fd->type && fd->isPure())
+            //    vtype = vtype->addMod(MODconst);
+            fparam->storageClass &= (STCin | STCout | STCref | STClazy | STCfinal | STC_TYPECTOR | STCnodtor);
+            fparam->storageClass |= STCparameter;
+            if (fvarargs == 2 && i + 1 == nfparams)
+                fparam->storageClass |= STCvariadic;
+        }
+        for (size_t i = 0; i < fparameters->dim; i++)
+        {
+            Parameter *fparam = fparameters->tdata()[i];
+            if (!fparam->ident)
+                continue;                       // don't add it, if it has no name
+            VarDeclaration *v = new VarDeclaration(loc, fparam->type, fparam->ident, NULL);
+            v->storage_class = fparam->storageClass;
+            v->semantic(paramscope);
+            if (!paramscope->insert(v))
+                error("parameter %s.%s is already defined", toChars(), v->toChars());
+            else
+                v->parent = this;
+        }
+    }
+}
+
+/***************************************
+ * Given that ti is an instance of this TemplateDeclaration,
+ * deduce the types of the parameters to this, and store
+ * those deduced types in dedtypes[].
+ * Input:
+ *      flag    1: don't do semantic() because of dummy types
+ *              2: don't change types in matchArg()
+ * Output:
+ *      dedtypes        deduced arguments
+ * Return match level.
+ */
+
+MATCH TemplateDeclaration::matchWithInstance(TemplateInstance *ti,
+        Objects *dedtypes, Expressions *fargs, int flag)
+{   MATCH m;
+    size_t dedtypes_dim = dedtypes->dim;
+
+#define LOGM 0
+#if LOGM
+    printf("\n+TemplateDeclaration::matchWithInstance(this = %s, ti = %s, flag = %d)\n", toChars(), ti->toChars(), flag);
+#endif
+
+#if 0
+    printf("dedtypes->dim = %d, parameters->dim = %d\n", dedtypes_dim, parameters->dim);
+    if (ti->tiargs->dim)
+        printf("ti->tiargs->dim = %d, [0] = %p\n",
+            ti->tiargs->dim,
+            ti->tiargs->tdata()[0]);
+#endif
+    dedtypes->zero();
+
+    if (errors)
+        return MATCHnomatch;
+
+    size_t parameters_dim = parameters->dim;
+    int variadic = isVariadic() != NULL;
+
+    // If more arguments than parameters, no match
+    if (ti->tiargs->dim > parameters_dim && !variadic)
+    {
+#if LOGM
+        printf(" no match: more arguments than parameters\n");
+#endif
+        return MATCHnomatch;
+    }
+
+    assert(dedtypes_dim == parameters_dim);
+    assert(dedtypes_dim >= ti->tiargs->dim || variadic);
+
+    // Set up scope for parameters
+    assert((size_t)scope > 0x10000);
+    ScopeDsymbol *paramsym = new ScopeDsymbol();
+    paramsym->parent = scope->parent;
+    Scope *paramscope = scope->push(paramsym);
+    paramscope->stc = 0;
+
+    // Attempt type deduction
+    m = MATCHexact;
+    for (size_t i = 0; i < dedtypes_dim; i++)
+    {   MATCH m2;
+        TemplateParameter *tp = parameters->tdata()[i];
+        Declaration *sparam;
+
+        //printf("\targument [%d]\n", i);
+#if LOGM
+        //printf("\targument [%d] is %s\n", i, oarg ? oarg->toChars() : "null");
+        TemplateTypeParameter *ttp = tp->isTemplateTypeParameter();
+        if (ttp)
+            printf("\tparameter[%d] is %s : %s\n", i, tp->ident->toChars(), ttp->specType ? ttp->specType->toChars() : "");
+#endif
+
+        m2 = tp->matchArg(paramscope, ti->tiargs, i, parameters, dedtypes, &sparam);
+        //printf("\tm2 = %d\n", m2);
+
+        if (m2 == MATCHnomatch)
+        {
+#if 0
+            printf("\tmatchArg() for parameter %i failed\n", i);
+#endif
+            goto Lnomatch;
+        }
+
+        if (m2 < m)
+            m = m2;
+
+        if (!flag)
+            sparam->semantic(paramscope);
+        if (!paramscope->insert(sparam))
+            goto Lnomatch;
+    }
+
+    if (!flag)
+    {
+        /* Any parameter left without a type gets the type of
+         * its corresponding arg
+         */
+        for (size_t i = 0; i < dedtypes_dim; i++)
+        {
+            if (!dedtypes->tdata()[i])
+            {   assert(i < ti->tiargs->dim);
+                dedtypes->tdata()[i] = (Type *)ti->tiargs->tdata()[i];
+            }
+        }
+    }
+
+#if DMDV2
+    if (m && constraint && !flag)
+    {   /* Check to see if constraint is satisfied.
+         */
+        makeParamNamesVisibleInConstraint(paramscope, fargs);
+        Expression *e = constraint->syntaxCopy();
+        Scope *sc = paramscope->push();
+
+        /* There's a chicken-and-egg problem here. We don't know yet if this template
+         * instantiation will be a local one (isnested is set), and we won't know until
+         * after selecting the correct template. Thus, function we're nesting inside
+         * is not on the sc scope chain, and this can cause errors in FuncDeclaration::getLevel().
+         * Workaround the problem by setting a flag to relax the checking on frame errors.
+         */
+        sc->flags |= SCOPEstaticif;
+
+        FuncDeclaration *fd = onemember && onemember->toAlias() ?
+            onemember->toAlias()->isFuncDeclaration() : NULL;
+        Dsymbol *s = parent;
+        while (s->isTemplateInstance() || s->isTemplateMixin())
+            s = s->parent;
+        AggregateDeclaration *ad = s->isAggregateDeclaration();
+        VarDeclaration *vthissave;
+        if (fd && ad)
+        {
+            vthissave = fd->vthis;
+            fd->vthis = fd->declareThis(paramscope, ad);
+        }
+
+        e = e->semantic(sc);
+
+        if (fd && fd->vthis)
+            fd->vthis = vthissave;
+
+        sc->pop();
+        e = e->optimize(WANTvalue | WANTinterpret);
+        if (e->isBool(TRUE))
+            ;
+        else if (e->isBool(FALSE))
+            goto Lnomatch;
+        else
+        {
+            e->error("constraint %s is not constant or does not evaluate to a bool", e->toChars());
+        }
+    }
+#endif
+
+#if LOGM
+    // Print out the results
+    printf("--------------------------\n");
+    printf("template %s\n", toChars());
+    printf("instance %s\n", ti->toChars());
+    if (m)
+    {
+        for (size_t i = 0; i < dedtypes_dim; i++)
+        {
+            TemplateParameter *tp = parameters->tdata()[i];
+            Object *oarg;
+
+            printf(" [%d]", i);
+
+            if (i < ti->tiargs->dim)
+                oarg = ti->tiargs->tdata()[i];
+            else
+                oarg = NULL;
+            tp->print(oarg, dedtypes->tdata()[i]);
+        }
+    }
+    else
+        goto Lnomatch;
+#endif
+
+#if LOGM
+    printf(" match = %d\n", m);
+#endif
+    goto Lret;
+
+Lnomatch:
+#if LOGM
+    printf(" no match\n");
+#endif
+    m = MATCHnomatch;
+
+Lret:
+    paramscope->pop();
+#if LOGM
+    printf("-TemplateDeclaration::matchWithInstance(this = %p, ti = %p) = %d\n", this, ti, m);
+#endif
+    return m;
+}
+
+/********************************************
+ * Determine partial specialization order of 'this' vs td2.
+ * Returns:
+ *      match   this is at least as specialized as td2
+ *      0       td2 is more specialized than this
+ */
+
+MATCH TemplateDeclaration::leastAsSpecialized(TemplateDeclaration *td2, Expressions *fargs)
+{
+    /* This works by taking the template parameters to this template
+     * declaration and feeding them to td2 as if it were a template
+     * instance.
+     * If it works, then this template is at least as specialized
+     * as td2.
+     */
+
+    TemplateInstance ti(0, ident);      // create dummy template instance
+    Objects dedtypes;
+
+#define LOG_LEASTAS     0
+
+#if LOG_LEASTAS
+    printf("%s.leastAsSpecialized(%s)\n", toChars(), td2->toChars());
+#endif
+
+    // Set type arguments to dummy template instance to be types
+    // generated from the parameters to this template declaration
+    ti.tiargs = new Objects();
+    ti.tiargs->setDim(parameters->dim);
+    for (size_t i = 0; i < ti.tiargs->dim; i++)
+    {
+        TemplateParameter *tp = parameters->tdata()[i];
+
+        Object *p = (Object *)tp->dummyArg();
+        if (p)
+            ti.tiargs->tdata()[i] = p;
+        else
+            ti.tiargs->setDim(i);
+    }
+
+    // Temporary Array to hold deduced types
+    //dedtypes.setDim(parameters->dim);
+    dedtypes.setDim(td2->parameters->dim);
+
+    // Attempt a type deduction
+    MATCH m = td2->matchWithInstance(&ti, &dedtypes, fargs, 1);
+    if (m)
+    {
+        /* A non-variadic template is more specialized than a
+         * variadic one.
+         */
+        if (isVariadic() && !td2->isVariadic())
+            goto L1;
+
+#if LOG_LEASTAS
+        printf("  matches %d, so is least as specialized\n", m);
+#endif
+        return m;
+    }
+  L1:
+#if LOG_LEASTAS
+    printf("  doesn't match, so is not as specialized\n");
+#endif
+    return MATCHnomatch;
+}
+
+
+/*************************************************
+ * Match function arguments against a specific template function.
+ * Input:
+ *      loc             instantiation location
+ *      targsi          Expression/Type initial list of template arguments
+ *      ethis           'this' argument if !NULL
+ *      fargs           arguments to function
+ * Output:
+ *      dedargs         Expression/Type deduced template arguments
+ * Returns:
+ *      match level
+ */
+
+MATCH TemplateDeclaration::deduceFunctionTemplateMatch(Scope *sc, Loc loc, Objects *targsi,
+        Expression *ethis, Expressions *fargs,
+        Objects *dedargs)
+{
+    size_t nfparams;
+    size_t nfargs;
+    size_t nargsi;              // array size of targsi
+    int fptupindex = -1;
+    int tuple_dim = 0;
+    MATCH match = MATCHexact;
+    FuncDeclaration *fd = onemember->toAlias()->isFuncDeclaration();
+    Parameters *fparameters;            // function parameter list
+    int fvarargs;                       // function varargs
+    Objects dedtypes;   // for T:T*, the dedargs is the T*, dedtypes is the T
+    unsigned wildmatch = 0;
+
+    TypeFunction *tf = (TypeFunction *)fd->type;
+
+#if 0
+    printf("\nTemplateDeclaration::deduceFunctionTemplateMatch() %s\n", toChars());
+    for (size_t i = 0; i < fargs->dim; i++)
+    {   Expression *e = fargs->tdata()[i];
+        printf("\tfarg[%d] is %s, type is %s\n", i, e->toChars(), e->type->toChars());
+    }
+    printf("fd = %s\n", fd->toChars());
+    printf("fd->type = %s\n", fd->type->toChars());
+    if (ethis)
+        printf("ethis->type = %s\n", ethis->type->toChars());
+#endif
+
+    assert((size_t)scope > 0x10000);
+
+    dedargs->setDim(parameters->dim);
+    dedargs->zero();
+
+    dedtypes.setDim(parameters->dim);
+    dedtypes.zero();
+
+    if (errors)
+        return MATCHnomatch;
+
+    // Set up scope for parameters
+    ScopeDsymbol *paramsym = new ScopeDsymbol();
+    paramsym->parent = scope->parent;
+    Scope *paramscope = scope->push(paramsym);
+    paramscope->stc = 0;
+
+    TemplateTupleParameter *tp = isVariadic();
+    int tp_is_declared = 0;
+
+#if 0
+    for (size_t i = 0; i < dedargs->dim; i++)
+    {
+        printf("\tdedarg[%d] = ", i);
+        Object *oarg = dedargs->tdata()[i];
+        if (oarg) printf("%s", oarg->toChars());
+        printf("\n");
+    }
+#endif
+
+
+    nargsi = 0;
+    if (targsi)
+    {   // Set initial template arguments
+
+        nargsi = targsi->dim;
+        size_t n = parameters->dim;
+        if (tp)
+            n--;
+        if (nargsi > n)
+        {   if (!tp)
+                goto Lnomatch;
+
+            /* The extra initial template arguments
+             * now form the tuple argument.
+             */
+            Tuple *t = new Tuple();
+            assert(parameters->dim);
+            dedargs->tdata()[parameters->dim - 1] = t;
+
+            tuple_dim = nargsi - n;
+            t->objects.setDim(tuple_dim);
+            for (size_t i = 0; i < tuple_dim; i++)
+            {
+                t->objects.tdata()[i] = targsi->tdata()[n + i];
+            }
+            declareParameter(paramscope, tp, t);
+            tp_is_declared = 1;
+        }
+        else
+            n = nargsi;
+
+        memcpy(dedargs->tdata(), targsi->tdata(), n * sizeof(*dedargs->tdata()));
+
+        for (size_t i = 0; i < n; i++)
+        {   assert(i < parameters->dim);
+            TemplateParameter *tp = parameters->tdata()[i];
+            MATCH m;
+            Declaration *sparam = NULL;
+
+            m = tp->matchArg(paramscope, dedargs, i, parameters, &dedtypes, &sparam);
+            //printf("\tdeduceType m = %d\n", m);
+            if (m == MATCHnomatch)
+                goto Lnomatch;
+            if (m < match)
+                match = m;
+
+            sparam->semantic(paramscope);
+            if (!paramscope->insert(sparam))
+                goto Lnomatch;
+        }
+    }
+#if 0
+    for (size_t i = 0; i < dedargs->dim; i++)
+    {
+        printf("\tdedarg[%d] = ", i);
+        Object *oarg = dedargs->tdata()[i];
+        if (oarg) printf("%s", oarg->toChars());
+        printf("\n");
+    }
+#endif
+
+    fparameters = fd->getParameters(&fvarargs);
+    nfparams = Parameter::dim(fparameters);     // number of function parameters
+    nfargs = fargs ? fargs->dim : 0;            // number of function arguments
+
+    /* Check for match of function arguments with variadic template
+     * parameter, such as:
+     *
+     * template Foo(T, A...) { void Foo(T t, A a); }
+     * void main() { Foo(1,2,3); }
+     */
+    if (tp)                             // if variadic
+    {
+        if (nfparams == 0 && nfargs != 0)               // if no function parameters
+        {
+            if (tp_is_declared)
+                goto L2;
+            Tuple *t = new Tuple();
+            //printf("t = %p\n", t);
+            dedargs->tdata()[parameters->dim - 1] = t;
+            declareParameter(paramscope, tp, t);
+            goto L2;
+        }
+        else if (nfargs < nfparams - 1)
+            goto L1;
+        else
+        {
+            /* Figure out which of the function parameters matches
+             * the tuple template parameter. Do this by matching
+             * type identifiers.
+             * Set the index of this function parameter to fptupindex.
+             */
+            for (fptupindex = 0; fptupindex < nfparams; fptupindex++)
+            {
+                Parameter *fparam = fparameters->tdata()[fptupindex];
+                if (fparam->type->ty != Tident)
+                    continue;
+                TypeIdentifier *tid = (TypeIdentifier *)fparam->type;
+                if (!tp->ident->equals(tid->ident) || tid->idents.dim)
+                    continue;
+
+                if (fvarargs)           // variadic function doesn't
+                    goto Lnomatch;      // go with variadic template
+
+                if (tp_is_declared)
+                    goto L2;
+
+                // Apply function parameter storage classes to parameter type
+                tid = (TypeIdentifier *)tid->addStorageClass(fparam->storageClass);
+
+                /* The types of the function arguments
+                 * now form the tuple argument.
+                 */
+                Tuple *t = new Tuple();
+                dedargs->tdata()[parameters->dim - 1] = t;
+
+                tuple_dim = nfargs - (nfparams - 1);
+                t->objects.setDim(tuple_dim);
+                for (size_t i = 0; i < tuple_dim; i++)
+                {   Expression *farg = fargs->tdata()[fptupindex + i];
+
+                    // Check invalid arguments to detect errors early.
+                    if (farg->op == TOKerror || farg->type->ty == Terror)
+                        goto Lnomatch;
+
+                    if (!(fparam->storageClass & STClazy) && farg->type->ty == Tvoid)
+                        goto Lnomatch;
+
+                    unsigned mod = farg->type->mod;
+                    Type *tt;
+                    MATCH m;
+
+                    #define X(U,T)  ((U) << 4) | (T)
+                    if (tid->mod & MODwild)
+                    {
+                        switch (X(tid->mod, mod))
+                        {
+                            case X(MODwild,              MODwild):
+                            case X(MODwild | MODshared,  MODwild | MODshared):
+                            case X(MODwild,              0):
+                            case X(MODwild,              MODconst):
+                            case X(MODwild,              MODimmutable):
+                            case X(MODwild | MODshared,  MODshared):
+                            case X(MODwild | MODshared,  MODconst | MODshared):
+
+                                if (mod & MODwild)
+                                    wildmatch |= MODwild;
+                                else if (mod == 0)
+                                    wildmatch |= MODmutable;
+                                else
+                                    wildmatch |= (mod & ~MODshared);
+                                tt = farg->type->mutableOf();
+                                m = MATCHconst;
+                                goto Lx;
+
+                            default:
+                                break;
+                        }
+                    }
+
+                    switch (X(tid->mod, mod))
+                    {
+                        case X(0, 0):
+                        case X(0, MODconst):
+                        case X(0, MODimmutable):
+                        case X(0, MODshared):
+                        case X(0, MODconst | MODshared):
+                        case X(0, MODwild):
+                        case X(0, MODwild | MODshared):
+                            // foo(U:U) T                              => T
+                            // foo(U:U) const(T)                       => const(T)
+                            // foo(U:U) immutable(T)                   => immutable(T)
+                            // foo(U:U) shared(T)                      => shared(T)
+                            // foo(U:U) const(shared(T))               => const(shared(T))
+                            // foo(U:U) wild(T)                        => wild(T)
+                            // foo(U:U) wild(shared(T))                => wild(shared(T))
+
+                            tt = farg->type;
+                            m = MATCHexact;
+                            break;
+
+                        case X(MODconst, MODconst):
+                        case X(MODimmutable, MODimmutable):
+                        case X(MODshared, MODshared):
+                        case X(MODconst | MODshared, MODconst | MODshared):
+                        case X(MODwild, MODwild):
+                        case X(MODwild | MODshared, MODwild | MODshared):
+                            // foo(U:const(U))        const(T)         => T
+                            // foo(U:immutable(U))    immutable(T)     => T
+                            // foo(U:shared(U))       shared(T)        => T
+                            // foo(U:const(shared(U)) const(shared(T)) => T
+                            // foo(U:wild(U))         wild(T)          => T
+                            // foo(U:wild(shared(U))  wild(shared(T)) => T
+
+                            tt = farg->type->mutableOf()->unSharedOf();
+                            m = MATCHexact;
+                            break;
+
+                        case X(MODconst, 0):
+                        case X(MODconst, MODimmutable):
+                        case X(MODconst, MODconst | MODshared):
+                        case X(MODconst | MODshared, MODimmutable):
+                        case X(MODconst, MODwild):
+                        case X(MODconst, MODwild | MODshared):
+                            // foo(U:const(U)) T                       => T
+                            // foo(U:const(U)) immutable(T)            => T
+                            // foo(U:const(U)) const(shared(T))        => shared(T)
+                            // foo(U:const(shared(U)) immutable(T)     => T
+                            // foo(U:const(U)) wild(shared(T))         => shared(T)
+
+                            tt = farg->type->mutableOf();
+                            m = MATCHconst;
+                            break;
+
+                        case X(MODshared, MODconst | MODshared):
+                        case X(MODconst | MODshared, MODshared):
+                        case X(MODshared, MODwild | MODshared):
+                            // foo(U:shared(U)) const(shared(T))       => const(T)
+                            // foo(U:const(shared(U)) shared(T)        => T
+                            // foo(U:shared(U)) wild(shared(T))        => wild(T)
+                            tt = farg->type->unSharedOf();
+                            m = MATCHconst;
+                            break;
+
+                        case X(MODimmutable,         0):
+                        case X(MODimmutable,         MODconst):
+                        case X(MODimmutable,         MODshared):
+                        case X(MODimmutable,         MODconst | MODshared):
+                        case X(MODconst,             MODshared):
+                        case X(MODshared,            0):
+                        case X(MODshared,            MODconst):
+                        case X(MODshared,            MODimmutable):
+                        case X(MODconst | MODshared, 0):
+                        case X(MODconst | MODshared, MODconst):
+                        case X(MODimmutable,         MODwild):
+                        case X(MODshared,            MODwild):
+                        case X(MODconst | MODshared, MODwild):
+                        case X(MODwild,              0):
+                        case X(MODwild,              MODconst):
+                        case X(MODwild,              MODimmutable):
+                        case X(MODwild,              MODshared):
+                        case X(MODwild,              MODconst | MODshared):
+                        case X(MODwild | MODshared,  0):
+                        case X(MODwild | MODshared,  MODconst):
+                        case X(MODwild | MODshared,  MODimmutable):
+                        case X(MODwild | MODshared,  MODshared):
+                        case X(MODwild | MODshared,  MODconst | MODshared):
+                        case X(MODwild | MODshared,  MODwild):
+                        case X(MODimmutable,         MODwild | MODshared):
+                        case X(MODconst | MODshared, MODwild | MODshared):
+                        case X(MODwild,              MODwild | MODshared):
+
+                            // foo(U:immutable(U)) T                   => nomatch
+                            // foo(U:immutable(U)) const(T)            => nomatch
+                            // foo(U:immutable(U)) shared(T)           => nomatch
+                            // foo(U:immutable(U)) const(shared(T))    => nomatch
+                            // foo(U:const(U)) shared(T)               => nomatch
+                            // foo(U:shared(U)) T                      => nomatch
+                            // foo(U:shared(U)) const(T)               => nomatch
+                            // foo(U:shared(U)) immutable(T)           => nomatch
+                            // foo(U:const(shared(U)) T                => nomatch
+                            // foo(U:const(shared(U)) const(T)         => nomatch
+                            // foo(U:immutable(U)) wild(T)             => nomatch
+                            // foo(U:shared(U)) wild(T)                => nomatch
+                            // foo(U:const(shared(U)) wild(T)          => nomatch
+                            // foo(U:wild(U)) T                        => nomatch
+                            // foo(U:wild(U)) const(T)                 => nomatch
+                            // foo(U:wild(U)) immutable(T)             => nomatch
+                            // foo(U:wild(U)) shared(T)                => nomatch
+                            // foo(U:wild(U)) const(shared(T))         => nomatch
+                            // foo(U:wild(shared(U)) T                 => nomatch
+                            // foo(U:wild(shared(U)) const(T)          => nomatch
+                            // foo(U:wild(shared(U)) immutable(T)      => nomatch
+                            // foo(U:wild(shared(U)) shared(T)         => nomatch
+                            // foo(U:wild(shared(U)) const(shared(T))  => nomatch
+                            // foo(U:wild(shared(U)) wild(T)           => nomatch
+                            // foo(U:immutable(U)) wild(shared(T))     => nomatch
+                            // foo(U:const(shared(U))) wild(shared(T)) => nomatch
+                            // foo(U:wild(U)) wild(shared(T))          => nomatch
+                            m = MATCHnomatch;
+                            break;
+
+                        default:
+                            assert(0);
+                    }
+                    #undef X
+
+                Lx:
+                    if (m == MATCHnomatch)
+                        goto Lnomatch;
+                    if (m < match)
+                        match = m;
+
+                    t->objects.tdata()[i] = tt;
+                }
+                declareParameter(paramscope, tp, t);
+                goto L2;
+            }
+            fptupindex = -1;
+        }
+    }
+
+L1:
+    if (nfparams == nfargs)
+        ;
+    else if (nfargs > nfparams)
+    {
+        if (fvarargs == 0)
+            goto Lnomatch;              // too many args, no match
+        match = MATCHconvert;           // match ... with a conversion
+    }
+
+L2:
+#if DMDV2
+    if (ethis)
+    {
+        // Match 'ethis' to any TemplateThisParameter's
+        for (size_t i = 0; i < parameters->dim; i++)
+        {   TemplateParameter *tp = parameters->tdata()[i];
+            TemplateThisParameter *ttp = tp->isTemplateThisParameter();
+            if (ttp)
+            {   MATCH m;
+
+                Type *t = new TypeIdentifier(0, ttp->ident);
+                m = ethis->type->deduceType(paramscope, t, parameters, &dedtypes);
+                if (!m)
+                    goto Lnomatch;
+                if (m < match)
+                    match = m;          // pick worst match
+            }
+        }
+
+        // Match attributes of ethis against attributes of fd
+        if (fd->type)
+        {
+            Type *tthis = ethis->type;
+            unsigned mod = fd->type->mod;
+            StorageClass stc = scope->stc | fd->storage_class2;
+            // Propagate parent storage class (see bug 5504)
+            Dsymbol *p = parent;
+            while (p->isTemplateDeclaration() || p->isTemplateInstance())
+                p = p->parent;
+            AggregateDeclaration *ad = p->isAggregateDeclaration();
+            if (ad)
+                stc |= ad->storage_class;
+
+            if (stc & (STCshared | STCsynchronized))
+                mod |= MODshared;
+            if (stc & STCimmutable)
+                mod |= MODimmutable;
+            if (stc & STCconst)
+                mod |= MODconst;
+            if (stc & STCwild)
+                mod |= MODwild;
+            // Fix mod
+            if (mod & MODimmutable)
+                mod = MODimmutable;
+            if (mod & MODconst)
+                mod &= ~STCwild;
+            if (tthis->mod != mod)
+            {
+                if (!MODmethodConv(tthis->mod, mod))
+                    goto Lnomatch;
+                if (MATCHconst < match)
+                    match = MATCHconst;
+            }
+        }
+    }
+#endif
+
+    // Loop through the function parameters
+    for (size_t parami = 0; parami < nfparams; parami++)
+    {
+        /* Skip over function parameters which wound up
+         * as part of a template tuple parameter.
+         */
+        if (parami == fptupindex)
+            continue;
+        /* Set i = index into function arguments
+         * Function parameters correspond to function arguments as follows.
+         * Note that tuple_dim may be zero, and there may be default or
+         * variadic arguments at the end.
+         *  arg [0..fptupindex] == param[0..fptupindex]
+         *  arg [fptupindex..fptupindex+tuple_dim] == param[fptupindex]
+         *  arg[fputupindex+dim.. ] == param[fptupindex+1.. ]
+         */
+        size_t i = parami;
+        if (fptupindex >= 0 && parami > fptupindex)
+            i += tuple_dim - 1;
+
+        Parameter *fparam = Parameter::getNth(fparameters, parami);
+
+        if (i >= nfargs)                // if not enough arguments
+        {
+            if (fparam->defaultArg)
+            {   /* Default arguments do not participate in template argument
+                 * deduction.
+                 */
+                goto Lmatch;
+            }
+        }
+        else
+        {
+            Expression *farg = fargs->tdata()[i];
+
+            // Check invalid arguments to detect errors early.
+            if (farg->op == TOKerror || farg->type->ty == Terror)
+                goto Lnomatch;
+
+Lretry:
+#if 0
+            printf("\tfarg->type   = %s\n", farg->type->toChars());
+            printf("\tfparam->type = %s\n", fparam->type->toChars());
+#endif
+            Type *argtype = farg->type;
+
+            // Apply function parameter storage classes to parameter types
+            fparam->type = fparam->type->addStorageClass(fparam->storageClass);
+
+#if DMDV2
+            /* Allow string literals which are type [] to match with [dim]
+             */
+            if (farg->op == TOKstring)
+            {   StringExp *se = (StringExp *)farg;
+                if (!se->committed && argtype->ty == Tarray &&
+                    fparam->type->toBasetype()->ty == Tsarray)
+                {
+                    argtype = new TypeSArray(argtype->nextOf(), new IntegerExp(se->loc, se->len, Type::tindex));
+                    argtype = argtype->semantic(se->loc, NULL);
+                    argtype = argtype->invariantOf();
+                }
+            }
+
+            /* Allow implicit function literals to delegate conversion
+             */
+            if (farg->op == TOKfunction)
+            {   FuncExp *fe = (FuncExp *)farg;
+                Type *tp = fparam->type;
+                Expression *e = fe->inferType(tp, 1, parameters);
+                if (!e)
+                    goto Lvarargs;
+                farg = e;
+                argtype = farg->type;
+            }
+
+            if (!(fparam->storageClass & STClazy) && argtype->ty == Tvoid)
+                goto Lnomatch;
+
+            /* Remove top const for dynamic array types and pointer types
+             */
+            if ((argtype->ty == Tarray || argtype->ty == Tpointer) &&
+                !argtype->isMutable() &&
+                (!(fparam->storageClass & STCref) ||
+                 (fparam->storageClass & STCauto) && !farg->isLvalue()))
+            {
+                argtype = argtype->mutableOf();
+            }
+#endif
+
+            if (fvarargs == 2 && i + 1 == nfparams && i + 1 < nfargs)
+                goto Lvarargs;
+
+            unsigned wm = 0;
+            MATCH m = argtype->deduceType(paramscope, fparam->type, parameters, &dedtypes, &wm);
+            //printf("\tdeduceType m = %d\n", m);
+            //printf("\twildmatch = x%x m = %d\n", wildmatch, m);
+            wildmatch |= wm;
+
+            /* If no match, see if there's a conversion to a delegate
+             */
+            if (!m)
+            {   Type *tbp = fparam->type->toBasetype();
+                Type *tba = farg->type->toBasetype();
+                AggregateDeclaration *ad;
+                if (tbp->ty == Tdelegate)
+                {
+                    TypeDelegate *td = (TypeDelegate *)fparam->type->toBasetype();
+                    TypeFunction *tf = (TypeFunction *)td->next;
+
+                    if (!tf->varargs && Parameter::dim(tf->parameters) == 0)
+                    {
+                        m = farg->type->deduceType(paramscope, tf->next, parameters, &dedtypes);
+                        if (!m && tf->next->toBasetype()->ty == Tvoid)
+                            m = MATCHconvert;
+                    }
+                    //printf("\tm2 = %d\n", m);
+                }
+                else if (tba->ty == Tclass)
+                {
+                    ad = ((TypeClass *)tba)->sym;
+                    goto Lad;
+                }
+                else if (tba->ty == Tstruct)
+                {
+                    ad = ((TypeStruct *)tba)->sym;
+            Lad:
+                    if (ad->aliasthis)
+                    {   /* If a semantic error occurs while doing alias this,
+                         * eg purity(bug 7295), just regard it as not a match.
+                         */
+                        unsigned olderrors = global.startGagging();
+                        Expression *e = resolveAliasThis(sc, farg);
+                        if (!global.endGagging(olderrors))
+                        {   farg = e;
+                            goto Lretry;
+                        }
+                    }
+                }
+            }
+
+            if (m && (fparam->storageClass & (STCref | STCauto)) == STCref)
+            {   if (!farg->isLvalue())
+                {
+                    if (farg->op == TOKstructliteral)
+                        m = MATCHconvert;
+                    else if (farg->op == TOKcall)
+                    {
+                        CallExp *ce = (CallExp *)farg;
+                        if (ce->e1->op == TOKdotvar &&
+                            ((DotVarExp *)ce->e1)->var->isCtorDeclaration())
+                        {
+                            m = MATCHconvert;
+                        }
+                        else
+                            goto Lnomatch;
+                    }
+                    else
+                        goto Lnomatch;
+                }
+            }
+            if (m && (fparam->storageClass & STCout))
+            {   if (!farg->isLvalue())
+                    goto Lnomatch;
+            }
+            if (!m && (fparam->storageClass & STClazy) && fparam->type->ty == Tvoid &&
+                    farg->type->ty != Tvoid)
+                m = MATCHconvert;
+
+            if (m)
+            {   if (m < match)
+                    match = m;          // pick worst match
+                continue;
+            }
+        }
+
+    Lvarargs:
+        /* The following code for variadic arguments closely
+         * matches TypeFunction::callMatch()
+         */
+        if (!(fvarargs == 2 && i + 1 == nfparams))
+            goto Lnomatch;
+
+        /* Check for match with function parameter T...
+         */
+        Type *tb = fparam->type->toBasetype();
+        switch (tb->ty)
+        {
+            // Perhaps we can do better with this, see TypeFunction::callMatch()
+            case Tsarray:
+            {   TypeSArray *tsa = (TypeSArray *)tb;
+                dinteger_t sz = tsa->dim->toInteger();
+                if (sz != nfargs - i)
+                    goto Lnomatch;
+            }
+            case Tarray:
+            {   TypeArray *ta = (TypeArray *)tb;
+                for (; i < nfargs; i++)
+                {
+                    Expression *arg = fargs->tdata()[i];
+                    assert(arg);
+
+                    if (arg->op == TOKfunction)
+                    {   FuncExp *fe = (FuncExp *)arg;
+                        Type *tp = tb->nextOf();
+
+                        Expression *e = fe->inferType(tp, 1, parameters);
+                        if (!e)
+                            goto Lnomatch;
+                        arg = e;
+                    }
+
+                    MATCH m;
+                    /* If lazy array of delegates,
+                     * convert arg(s) to delegate(s)
+                     */
+                    Type *tret = fparam->isLazyArray();
+                    if (tret)
+                    {
+                        if (ta->next->equals(arg->type))
+                        {   m = MATCHexact;
+                        }
+                        else
+                        {
+                            m = arg->implicitConvTo(tret);
+                            if (m == MATCHnomatch)
+                            {
+                                if (tret->toBasetype()->ty == Tvoid)
+                                    m = MATCHconvert;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        m = arg->type->deduceType(paramscope, ta->next, parameters, &dedtypes);
+                        //m = arg->implicitConvTo(ta->next);
+                    }
+                    if (m == MATCHnomatch)
+                        goto Lnomatch;
+                    if (m < match)
+                        match = m;
+                }
+                goto Lmatch;
+            }
+            case Tclass:
+            case Tident:
+                goto Lmatch;
+
+            default:
+                goto Lnomatch;
+        }
+    }
+
+Lmatch:
+
+    for (size_t i = nargsi; i < dedargs->dim; i++)
+    {
+        TemplateParameter *tparam = parameters->tdata()[i];
+        //printf("tparam[%d] = %s\n", i, tparam->ident->toChars());
+        /* For T:T*, the dedargs is the T*, dedtypes is the T
+         * But for function templates, we really need them to match
+         */
+        Object *oarg = dedargs->tdata()[i];
+        Object *oded = dedtypes.tdata()[i];
+        //printf("1dedargs[%d] = %p, dedtypes[%d] = %p\n", i, oarg, i, oded);
+        //if (oarg) printf("oarg: %s\n", oarg->toChars());
+        //if (oded) printf("oded: %s\n", oded->toChars());
+        if (!oarg)
+        {
+            if (oded)
+            {
+                if (tparam->specialization())
+                {   /* The specialization can work as long as afterwards
+                     * the oded == oarg
+                     */
+                    Declaration *sparam;
+                    dedargs->tdata()[i] = oded;
+                    MATCH m2 = tparam->matchArg(paramscope, dedargs, i, parameters, &dedtypes, &sparam);
+                    //printf("m2 = %d\n", m2);
+                    if (!m2)
+                        goto Lnomatch;
+                    if (m2 < match)
+                        match = m2;             // pick worst match
+                    if (dedtypes.tdata()[i] != oded)
+                        error("specialization not allowed for deduced parameter %s", tparam->ident->toChars());
+                }
+            }
+            else
+            {   oded = tparam->defaultArg(loc, paramscope);
+                if (!oded)
+                {
+                    if (tp &&                           // if tuple parameter and
+                        fptupindex < 0 &&               // tuple parameter was not in function parameter list and
+                        nargsi == dedargs->dim - 1)     // we're one argument short (i.e. no tuple argument)
+                    {   // make tuple argument an empty tuple
+                        oded = (Object *)new Tuple();
+                    }
+                    else
+                        goto Lnomatch;
+                }
+            }
+            declareParameter(paramscope, tparam, oded);
+            dedargs->tdata()[i] = oded;
+        }
+    }
+
+#if DMDV2
+    if (constraint)
+    {   /* Check to see if constraint is satisfied.
+         * Most of this code appears twice; this is a good candidate for refactoring.
+         */
+        makeParamNamesVisibleInConstraint(paramscope, fargs);
+        Expression *e = constraint->syntaxCopy();
+        paramscope->ignoreTemplates++;
+        paramscope->flags |= SCOPEstaticif;
+
+        /* Detect recursive attempts to instantiate this template declaration,
+         * Bugzilla 4072
+         *  void foo(T)(T x) if (is(typeof(foo(x)))) { }
+         *  static assert(!is(typeof(foo(7))));
+         * Recursive attempts are regarded as a constraint failure.
+         */
+        int nmatches = 0;
+        for (Previous *p = previous; p; p = p->prev)
+        {
+            if (arrayObjectMatch(p->dedargs, dedargs, this, sc))
+            {
+                //printf("recursive, no match p->sc=%p %p %s\n", p->sc, this, this->toChars());
+                /* It must be a subscope of p->sc, other scope chains are not recursive
+                 * instantiations.
+                 */
+                for (Scope *scx = sc; scx; scx = scx->enclosing)
+                {
+                    if (scx == p->sc)
+                        goto Lnomatch;
+                }
+            }
+            /* BUG: should also check for ref param differences
+             */
+        }
+
+        Previous pr;
+        pr.prev = previous;
+        pr.sc = paramscope;
+        pr.dedargs = dedargs;
+        previous = &pr;                 // add this to threaded list
+
+        int nerrors = global.errors;
+
+        FuncDeclaration *fd = onemember && onemember->toAlias() ?
+            onemember->toAlias()->isFuncDeclaration() : NULL;
+        Dsymbol *s = parent;
+        while (s->isTemplateInstance() || s->isTemplateMixin())
+            s = s->parent;
+        AggregateDeclaration *ad = s->isAggregateDeclaration();
+        VarDeclaration *vthissave;
+        if (fd && ad)
+        {
+            vthissave = fd->vthis;
+            fd->vthis = fd->declareThis(paramscope, ad);
+        }
+
+        e = e->semantic(paramscope);
+
+        if (fd && fd->vthis)
+            fd->vthis = vthissave;
+
+        previous = pr.prev;             // unlink from threaded list
+
+        if (nerrors != global.errors)   // if any errors from evaluating the constraint, no match
+            goto Lnomatch;
+
+        e = e->optimize(WANTvalue | WANTinterpret);
+        if (e->isBool(TRUE))
+            ;
+        else if (e->isBool(FALSE))
+            goto Lnomatch;
+        else
+        {
+            e->error("constraint %s is not constant or does not evaluate to a bool", e->toChars());
+        }
+    }
+#endif
+
+#if 0
+    for (i = 0; i < dedargs->dim; i++)
+    {   Type *t = dedargs->tdata()[i];
+        printf("\tdedargs[%d] = %d, %s\n", i, t->dyncast(), t->toChars());
+    }
+#endif
+
+    paramscope->pop();
+    //printf("\tmatch %d\n", match);
+    return match;
+
+Lnomatch:
+    paramscope->pop();
+    //printf("\tnomatch\n");
+    return MATCHnomatch;
+}
+
+/**************************************************
+ * Declare template parameter tp with value o, and install it in the scope sc.
+ */
+
+void TemplateDeclaration::declareParameter(Scope *sc, TemplateParameter *tp, Object *o)
+{
+    //printf("TemplateDeclaration::declareParameter('%s', o = %p)\n", tp->ident->toChars(), o);
+
+    Type *targ = isType(o);
+    Expression *ea = isExpression(o);
+    Dsymbol *sa = isDsymbol(o);
+    Tuple *va = isTuple(o);
+
+    Dsymbol *s;
+
+    // See if tp->ident already exists with a matching definition
+    Dsymbol *scopesym;
+    s = sc->search(loc, tp->ident, &scopesym);
+    if (s && scopesym == sc->scopesym)
+    {
+        TupleDeclaration *td = s->isTupleDeclaration();
+        if (va && td)
+        {   Tuple tup;
+            tup.objects = *td->objects;
+            if (match(va, &tup, this, sc))
+            {
+                return;
+            }
+        }
+    }
+
+    if (targ)
+    {
+        //printf("type %s\n", targ->toChars());
+        s = new AliasDeclaration(0, tp->ident, targ);
+    }
+    else if (sa)
+    {
+        //printf("Alias %s %s;\n", sa->ident->toChars(), tp->ident->toChars());
+        s = new AliasDeclaration(0, tp->ident, sa);
+    }
+    else if (ea)
+    {
+        // tdtypes.data[i] always matches ea here
+        Initializer *init = new ExpInitializer(loc, ea);
+        TemplateValueParameter *tvp = tp->isTemplateValueParameter();
+
+        Type *t = tvp ? tvp->valType : NULL;
+
+        VarDeclaration *v = new VarDeclaration(loc, t, tp->ident, init);
+        v->storage_class = STCmanifest;
+        s = v;
+    }
+    else if (va)
+    {
+        //printf("\ttuple\n");
+        s = new TupleDeclaration(loc, tp->ident, &va->objects);
+    }
+    else
+    {
+#ifdef DEBUG
+        o->print();
+#endif
+        assert(0);
+    }
+    if (!sc->insert(s))
+        error("declaration %s is already defined", tp->ident->toChars());
+    s->semantic(sc);
+}
+
+/**************************************
+ * Determine if TemplateDeclaration is variadic.
+ */
+
+TemplateTupleParameter *isVariadic(TemplateParameters *parameters)
+{   size_t dim = parameters->dim;
+    TemplateTupleParameter *tp = NULL;
+
+    if (dim)
+        tp = (parameters->tdata()[dim - 1])->isTemplateTupleParameter();
+    return tp;
+}
+
+TemplateTupleParameter *TemplateDeclaration::isVariadic()
+{
+    return ::isVariadic(parameters);
+}
+
+/***********************************
+ * We can overload templates.
+ */
+
+int TemplateDeclaration::isOverloadable()
+{
+    return 1;
+}
+
+/*************************************************
+ * Given function arguments, figure out which template function
+ * to expand, and return that function.
+ * If no match, give error message and return NULL.
+ * Input:
+ *      sc              instantiation scope
+ *      loc             instantiation location
+ *      targsi          initial list of template arguments
+ *      ethis           if !NULL, the 'this' pointer argument
+ *      fargs           arguments to function
+ *      flags           1: do not issue error message on no match, just return NULL
+ */
+
+FuncDeclaration *TemplateDeclaration::deduceFunctionTemplate(Scope *sc, Loc loc,
+        Objects *targsi, Expression *ethis, Expressions *fargs, int flags)
+{
+    MATCH m_best = MATCHnomatch;
+    TemplateDeclaration *td_ambig = NULL;
+    TemplateDeclaration *td_best = NULL;
+    Objects *tdargs = new Objects();
+    TemplateInstance *ti;
+    FuncDeclaration *fd_best;
+
+#if 0
+    printf("TemplateDeclaration::deduceFunctionTemplate() %s\n", toChars());
+    printf("    targsi:\n");
+    if (targsi)
+    {   for (size_t i = 0; i < targsi->dim; i++)
+        {   Object *arg = targsi->tdata()[i];
+            printf("\t%s\n", arg->toChars());
+        }
+    }
+    printf("    fargs:\n");
+    for (size_t i = 0; i < fargs->dim; i++)
+    {   Expression *arg = fargs->tdata()[i];
+        printf("\t%s %s\n", arg->type->toChars(), arg->toChars());
+        //printf("\tty = %d\n", arg->type->ty);
+    }
+    printf("stc = %llx\n", scope->stc);
+#endif
+
+    for (TemplateDeclaration *td = this; td; td = td->overnext)
+    {
+        if (!td->semanticRun)
+        {
+            error("forward reference to template %s", td->toChars());
+            goto Lerror;
+        }
+        if (!td->onemember || !td->onemember->toAlias()->isFuncDeclaration())
+        {
+            error("is not a function template");
+            goto Lerror;
+        }
+
+        Objects dedargs;
+        FuncDeclaration *fd = NULL;
+
+        MATCH m = td->deduceFunctionTemplateMatch(sc, loc, targsi, ethis, fargs, &dedargs);
+        //printf("deduceFunctionTemplateMatch = %d\n", m);
+        if (!m)                 // if no match
+            continue;
+
+        if (m < m_best)
+            goto Ltd_best;
+        if (m > m_best)
+            goto Ltd;
+
+        {
+        // Disambiguate by picking the most specialized TemplateDeclaration
+        MATCH c1 = td->leastAsSpecialized(td_best, fargs);
+        MATCH c2 = td_best->leastAsSpecialized(td, fargs);
+        //printf("1: c1 = %d, c2 = %d\n", c1, c2);
+
+        if (c1 > c2)
+            goto Ltd;
+        else if (c1 < c2)
+            goto Ltd_best;
+        }
+
+        if (!fd_best)
+        {
+            fd_best = td_best->doHeaderInstantiation(sc, tdargs, fargs);
+            if (!fd_best)
+                goto Lerror;
+        }
+        {
+            fd = td->doHeaderInstantiation(sc, &dedargs, fargs);
+            if (!fd)
+                goto Lerror;
+        }
+        assert(fd && fd_best);
+
+        {
+        // Disambiguate by tf->callMatch
+        TypeFunction *tf1 = (TypeFunction *)fd->type;
+        TypeFunction *tf2 = (TypeFunction *)fd_best->type;
+        MATCH c1 = (MATCH) tf1->callMatch(fd->needThis() && !fd->isCtorDeclaration() ? ethis : NULL, fargs);
+        MATCH c2 = (MATCH) tf2->callMatch(fd_best->needThis() && !fd->isCtorDeclaration() ? ethis : NULL, fargs);
+        //printf("2: c1 = %d, c2 = %d\n", c1, c2);
+
+        if (c1 > c2)
+            goto Ltd;
+        if (c1 < c2)
+            goto Ltd_best;
+        }
+
+        {
+        // Disambiguate by picking the most specialized FunctionDeclaration
+        MATCH c1 = fd->leastAsSpecialized(fd_best);
+        MATCH c2 = fd_best->leastAsSpecialized(fd);
+        //printf("3: c1 = %d, c2 = %d\n", c1, c2);
+
+        if (c1 > c2)
+            goto Ltd;
+        if (c1 < c2)
+            goto Ltd_best;
+        }
+
+      Lambig:           // td_best and td are ambiguous
+        td_ambig = td;
+        continue;
+
+      Ltd_best:         // td_best is the best match so far
+        td_ambig = NULL;
+        continue;
+
+      Ltd:              // td is the new best match
+        td_ambig = NULL;
+        assert((size_t)td->scope > 0x10000);
+        td_best = td;
+        fd_best = fd;
+        m_best = m;
+        tdargs->setDim(dedargs.dim);
+        memcpy(tdargs->tdata(), dedargs.tdata(), tdargs->dim * sizeof(void *));
+        continue;
+    }
+    if (!td_best)
+    {
+        if (!(flags & 1))
+            ::error(loc, "%s %s.%s does not match any function template declaration",
+                    kind(), parent->toPrettyChars(), ident->toChars());
+        goto Lerror;
+    }
+    if (td_ambig)
+    {
+        ::error(loc, "%s %s.%s matches more than one template declaration, %s(%d):%s and %s(%d):%s",
+                kind(), parent->toPrettyChars(), ident->toChars(),
+                td_best->loc.filename,  td_best->loc.linnum,  td_best->toChars(),
+                td_ambig->loc.filename, td_ambig->loc.linnum, td_ambig->toChars());
+    }
+
+    /* The best match is td_best with arguments tdargs.
+     * Now instantiate the template.
+     */
+    assert((size_t)td_best->scope > 0x10000);
+    ti = new TemplateInstance(loc, td_best, tdargs);
+    ti->semantic(sc, fargs);
+    fd_best = ti->toAlias()->isFuncDeclaration();
+    if (!fd_best || !((TypeFunction*)fd_best->type)->callMatch(ethis, fargs, flags))
+        goto Lerror;
+
+    /* As Bugzilla 3682 shows, a template instance can be matched while instantiating
+     * that same template. Thus, the function type can be incomplete. Complete it.
+     */
+    {   TypeFunction *tf = (TypeFunction *)fd_best->type;
+        assert(tf->ty == Tfunction);
+        if (tf->next)
+            fd_best->type = tf->semantic(loc, sc);
+    }
+
+    return fd_best;
+
+  Lerror:
+#if DMDV2
+    if (!(flags & 1))
+#endif
+    {
+        HdrGenState hgs;
+
+        OutBuffer bufa;
+        Objects *args = targsi;
+        if (args)
+        {   for (size_t i = 0; i < args->dim; i++)
+            {
+                if (i)
+                    bufa.writeByte(',');
+                Object *oarg = args->tdata()[i];
+                ObjectToCBuffer(&bufa, &hgs, oarg);
+            }
+        }
+
+        OutBuffer buf;
+        argExpTypesToCBuffer(&buf, fargs, &hgs);
+        if (this->overnext)
+            ::error(loc, "%s %s.%s cannot deduce template function from argument types !(%s)(%s)",
+                    kind(), parent->toPrettyChars(), ident->toChars(),
+                    bufa.toChars(), buf.toChars());
+        else
+            error("cannot deduce template function from argument types !(%s)(%s)",
+                  bufa.toChars(), buf.toChars());
+    }
+    return NULL;
+}
+
+/*************************************************
+ * Limited function template instantiation for using fd->leastAsSpecialized()
+ */
+FuncDeclaration *TemplateDeclaration::doHeaderInstantiation(Scope *sc,
+        Objects *tdargs, Expressions *fargs)
+{
+    FuncDeclaration *fd = onemember->toAlias()->isFuncDeclaration();
+    if (!fd)
+        return NULL;
+
+#if 0
+    printf("doHeaderInstantiation this = %s\n", toChars());
+    for (size_t i = 0; i < tdargs->dim; ++i)
+        printf("\ttdargs[%d] = %s\n", i, ((Object *)tdargs->data[i])->toChars());
+#endif
+
+    assert((size_t)scope > 0x10000);
+    TemplateInstance *ti = new TemplateInstance(loc, this, tdargs);
+    ti->tinst = sc->tinst;
+    {
+        ti->tdtypes.setDim(ti->tempdecl->parameters->dim);
+        if (!ti->tempdecl->matchWithInstance(ti, &ti->tdtypes, fargs, 2))
+            return NULL;
+    }
+
+    ti->parent = parent;
+
+    // function body and contracts are not need
+    //fd = fd->syntaxCopy(NULL)->isFuncDeclaration();
+    fd = new FuncDeclaration(fd->loc, fd->endloc, fd->ident, fd->storage_class, fd->type->syntaxCopy());
+    fd->parent = ti;
+
+    Scope *scope = this->scope;
+
+    ti->argsym = new ScopeDsymbol();
+    ti->argsym->parent = scope->parent;
+    scope = scope->push(ti->argsym);
+
+    Scope *paramscope = scope->push();
+    paramscope->stc = 0;
+    ti->declareParameters(paramscope);
+    paramscope->pop();
+
+    {
+        TypeFunction *tf = (TypeFunction *)fd->type;
+        if (tf && tf->ty == Tfunction)
+            tf->fargs = fargs;
+    }
+
+    Scope *sc2;
+    sc2 = scope->push(ti);
+    sc2->parent = /*isnested ? sc->parent :*/ ti;
+    sc2->tinst = ti;
+
+    {
+        Scope *sc = sc2;
+        sc = sc->push();
+
+        if (fd->isCtorDeclaration())
+            sc->flags |= SCOPEctor;
+        fd->type = fd->type->semantic(fd->loc, sc);
+        sc = sc->pop();
+    }
+    //printf("\t[%s] fd->type = %s, mod = %x, ", loc.toChars(), fd->type->toChars(), fd->type->mod);
+    //printf("fd->needThis() = %d\n", fd->needThis());
+
+    sc2->pop();
+    scope->pop();
+
+    return fd;
+}
+
+bool TemplateDeclaration::hasStaticCtorOrDtor()
+{
+    return FALSE;               // don't scan uninstantiated templates
+}
+
+void TemplateDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+#if 0 // Should handle template functions for doc generation
+    if (onemember && onemember->isFuncDeclaration())
+        buf->writestring("foo ");
+#endif
+    if (hgs->ddoc)
+        buf->writestring(kind());
+    else
+        buf->writestring("template");
+    buf->writeByte(' ');
+    buf->writestring(ident->toChars());
+    buf->writeByte('(');
+    for (size_t i = 0; i < parameters->dim; i++)
+    {
+        TemplateParameter *tp = parameters->tdata()[i];
+        if (hgs->ddoc)
+            tp = origParameters->tdata()[i];
+        if (i)
+            buf->writeByte(',');
+        tp->toCBuffer(buf, hgs);
+    }
+    buf->writeByte(')');
+#if DMDV2
+    if (constraint)
+    {   buf->writestring(" if (");
+        constraint->toCBuffer(buf, hgs);
+        buf->writeByte(')');
+    }
+#endif
+
+    if (hgs->hdrgen)
+    {
+        hgs->tpltMember++;
+        buf->writenl();
+        buf->writebyte('{');
+        buf->writenl();
+        for (size_t i = 0; i < members->dim; i++)
+        {
+            Dsymbol *s = members->tdata()[i];
+            s->toCBuffer(buf, hgs);
+        }
+        buf->writebyte('}');
+        buf->writenl();
+        hgs->tpltMember--;
+    }
+}
+
+
+char *TemplateDeclaration::toChars()
+{   OutBuffer buf;
+    HdrGenState hgs;
+
+    memset(&hgs, 0, sizeof(hgs));
+    buf.writestring(ident->toChars());
+    buf.writeByte('(');
+    for (size_t i = 0; i < parameters->dim; i++)
+    {
+        TemplateParameter *tp = parameters->tdata()[i];
+        if (i)
+            buf.writeByte(',');
+        tp->toCBuffer(&buf, &hgs);
+    }
+    buf.writeByte(')');
+#if DMDV2
+    if (constraint)
+    {   buf.writestring(" if (");
+        constraint->toCBuffer(&buf, &hgs);
+        buf.writeByte(')');
+    }
+#endif
+    buf.writeByte(0);
+    return (char *)buf.extractData();
+}
+
+/* ======================== Type ============================================ */
+
+/****
+ * Given an identifier, figure out which TemplateParameter it is.
+ * Return -1 if not found.
+ */
+
+int templateIdentifierLookup(Identifier *id, TemplateParameters *parameters)
+{
+    for (size_t i = 0; i < parameters->dim; i++)
+    {   TemplateParameter *tp = parameters->tdata()[i];
+
+        if (tp->ident->equals(id))
+            return i;
+    }
+    return -1;
+}
+
+int templateParameterLookup(Type *tparam, TemplateParameters *parameters)
+{
+    assert(tparam->ty == Tident);
+    TypeIdentifier *tident = (TypeIdentifier *)tparam;
+    //printf("\ttident = '%s'\n", tident->toChars());
+    if (tident->idents.dim == 0)
+    {
+        return templateIdentifierLookup(tident->ident, parameters);
+    }
+    return -1;
+}
+
+/* These form the heart of template argument deduction.
+ * Given 'this' being the type argument to the template instance,
+ * it is matched against the template declaration parameter specialization
+ * 'tparam' to determine the type to be used for the parameter.
+ * Example:
+ *      template Foo(T:T*)      // template declaration
+ *      Foo!(int*)              // template instantiation
+ * Input:
+ *      this = int*
+ *      tparam = T*
+ *      parameters = [ T:T* ]   // Array of TemplateParameter's
+ * Output:
+ *      dedtypes = [ int ]      // Array of Expression/Type's
+ */
+
+MATCH Type::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
+        Objects *dedtypes, unsigned *wildmatch)
+{
+#if 0
+    printf("Type::deduceType()\n");
+    printf("\tthis   = %d, ", ty); print();
+    printf("\ttparam = %d, ", tparam->ty); tparam->print();
+#endif
+    if (!tparam)
+        goto Lnomatch;
+
+    if (this == tparam)
+        goto Lexact;
+
+    if (tparam->ty == Tident)
+    {
+        // Determine which parameter tparam is
+        int i = templateParameterLookup(tparam, parameters);
+        if (i == -1)
+        {
+            if (!sc)
+                goto Lnomatch;
+
+            /* Need a loc to go with the semantic routine.
+             */
+            Loc loc;
+            if (parameters->dim)
+            {
+                TemplateParameter *tp = parameters->tdata()[0];
+                loc = tp->loc;
+            }
+
+            /* BUG: what if tparam is a template instance, that
+             * has as an argument another Tident?
+             */
+            tparam = tparam->semantic(loc, sc);
+            assert(tparam->ty != Tident);
+            return deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+        }
+
+        TemplateParameter *tp = parameters->tdata()[i];
+
+        // Found the corresponding parameter tp
+        if (!tp->isTemplateTypeParameter())
+            goto Lnomatch;
+        Type *tt = this;
+        Type *at = (Type *)dedtypes->tdata()[i];
+
+        // 7*7 == 49 cases
+
+        #define X(U,T)  ((U) << 4) | (T)
+
+        if (wildmatch && (tparam->mod & MODwild))
+        {
+            switch (X(tparam->mod, mod))
+            {
+                case X(MODwild,              0):
+                case X(MODwild,              MODshared):
+                case X(MODwild,              MODconst):
+                case X(MODwild,              MODconst | MODshared):
+                case X(MODwild,              MODimmutable):
+                case X(MODwild,              MODwild):
+                case X(MODwild,              MODwild | MODshared):
+                case X(MODwild | MODshared,  MODshared):
+                case X(MODwild | MODshared,  MODconst | MODshared):
+                case X(MODwild | MODshared,  MODimmutable):
+                case X(MODwild | MODshared,  MODwild | MODshared):
+
+                    if (!at)
+                    {
+                        if (mod & MODwild)
+                            *wildmatch |= MODwild;
+                        else if (mod == 0)
+                            *wildmatch |= MODmutable;
+                        else
+                            *wildmatch |= (mod & ~MODshared);
+                        tt = mutableOf()->substWildTo(MODmutable);
+                        dedtypes->tdata()[i] = tt;
+                        goto Lconst;
+                    }
+
+                    //printf("\t> tt = %s, at = %s\n", tt->toChars(), at->toChars());
+                    //printf("\t> tt->implicitConvTo(at->constOf()) = %d\n", tt->implicitConvTo(at->constOf()));
+                    //printf("\t> at->implicitConvTo(tt->constOf()) = %d\n", at->implicitConvTo(tt->constOf()));
+
+                    if (tt->equals(at))
+                    {
+                        goto Lconst;
+                    }
+                    else if (tt->implicitConvTo(at->constOf()))
+                    {
+                        dedtypes->tdata()[i] = at->constOf()->mutableOf();
+                        *wildmatch |= MODconst;
+                        goto Lconst;
+                    }
+                    else if (at->implicitConvTo(tt->constOf()))
+                    {
+                        dedtypes->tdata()[i] = tt->constOf()->mutableOf();
+                        *wildmatch |= MODconst;
+                        goto Lconst;
+                    }
+                    goto Lnomatch;
+
+                default:
+                    break;
+            }
+        }
+
+        switch (X(tparam->mod, mod))
+        {
+            case X(0, 0):
+            case X(0, MODconst):
+            case X(0, MODimmutable):
+            case X(0, MODshared):
+            case X(0, MODconst | MODshared):
+            case X(0, MODwild):
+            case X(0, MODwild | MODshared):
+                // foo(U:U) T                              => T
+                // foo(U:U) const(T)                       => const(T)
+                // foo(U:U) immutable(T)                   => immutable(T)
+                // foo(U:U) shared(T)                      => shared(T)
+                // foo(U:U) const(shared(T))               => const(shared(T))
+                // foo(U:U) wild(T)                        => wild(T)
+                // foo(U:U) wild(shared(T))                => wild(shared(T))
+                if (!at)
+                {   dedtypes->tdata()[i] = tt;
+                    goto Lexact;
+                }
+                break;
+
+            case X(MODconst, MODconst):
+            case X(MODimmutable, MODimmutable):
+            case X(MODshared, MODshared):
+            case X(MODconst | MODshared, MODconst | MODshared):
+            case X(MODwild, MODwild):
+            case X(MODwild | MODshared, MODwild | MODshared):
+                // foo(U:const(U))        const(T)         => T
+                // foo(U:immutable(U))    immutable(T)     => T
+                // foo(U:shared(U))       shared(T)        => T
+                // foo(U:const(shared(U)) const(shared(T)) => T
+                // foo(U:wild(U))         wild(T)          => T
+                // foo(U:wild(shared(U))  wild(shared(T)) => T
+                tt = mutableOf()->unSharedOf();
+                if (!at)
+                {   dedtypes->tdata()[i] = tt;
+                    goto Lexact;
+                }
+                break;
+
+            case X(MODconst, 0):
+            case X(MODconst, MODimmutable):
+            case X(MODconst, MODconst | MODshared):
+            case X(MODconst | MODshared, MODimmutable):
+            case X(MODconst, MODwild):
+            case X(MODconst, MODwild | MODshared):
+                // foo(U:const(U)) T                       => T
+                // foo(U:const(U)) immutable(T)            => T
+                // foo(U:const(U)) const(shared(T))        => shared(T)
+                // foo(U:const(shared(U)) immutable(T)     => T
+                // foo(U:const(U)) wild(shared(T))         => shared(T)
+                tt = mutableOf();
+                if (!at)
+                {   dedtypes->tdata()[i] = tt;
+                    goto Lconst;
+                }
+                break;
+
+            case X(MODshared, MODconst | MODshared):
+            case X(MODconst | MODshared, MODshared):
+            case X(MODshared, MODwild | MODshared):
+                // foo(U:shared(U)) const(shared(T))       => const(T)
+                // foo(U:const(shared(U)) shared(T)        => T
+                // foo(U:shared(U)) wild(shared(T))        => wild(T)
+                tt = unSharedOf();
+                if (!at)
+                {   dedtypes->tdata()[i] = tt;
+                    goto Lconst;
+                }
+                break;
+
+            case X(MODconst,             MODshared):
+                // foo(U:const(U)) shared(T)       => shared(T)
+                if (!at)
+                {   (*dedtypes)[i] = tt;
+                    goto Lconst;
+                }
+                break;
+
+            case X(MODimmutable,         0):
+            case X(MODimmutable,         MODconst):
+            case X(MODimmutable,         MODshared):
+            case X(MODimmutable,         MODconst | MODshared):
+            case X(MODshared,            0):
+            case X(MODshared,            MODconst):
+            case X(MODshared,            MODimmutable):
+            case X(MODconst | MODshared, 0):
+            case X(MODconst | MODshared, MODconst):
+            case X(MODimmutable,         MODwild):
+            case X(MODshared,            MODwild):
+            case X(MODconst | MODshared, MODwild):
+            case X(MODwild,              0):
+            case X(MODwild,              MODconst):
+            case X(MODwild,              MODimmutable):
+            case X(MODwild,              MODshared):
+            case X(MODwild,              MODconst | MODshared):
+            case X(MODwild | MODshared,  0):
+            case X(MODwild | MODshared,  MODconst):
+            case X(MODwild | MODshared,  MODimmutable):
+            case X(MODwild | MODshared,  MODshared):
+            case X(MODwild | MODshared,  MODconst | MODshared):
+            case X(MODwild | MODshared,  MODwild):
+            case X(MODimmutable,         MODwild | MODshared):
+            case X(MODconst | MODshared, MODwild | MODshared):
+            case X(MODwild,              MODwild | MODshared):
+
+                // foo(U:immutable(U)) T                   => nomatch
+                // foo(U:immutable(U)) const(T)            => nomatch
+                // foo(U:immutable(U)) shared(T)           => nomatch
+                // foo(U:immutable(U)) const(shared(T))    => nomatch
+                // foo(U:const(U)) shared(T)               => nomatch
+                // foo(U:shared(U)) T                      => nomatch
+                // foo(U:shared(U)) const(T)               => nomatch
+                // foo(U:shared(U)) immutable(T)           => nomatch
+                // foo(U:const(shared(U)) T                => nomatch
+                // foo(U:const(shared(U)) const(T)         => nomatch
+                // foo(U:immutable(U)) wild(T)             => nomatch
+                // foo(U:shared(U)) wild(T)                => nomatch
+                // foo(U:const(shared(U)) wild(T)          => nomatch
+                // foo(U:wild(U)) T                        => nomatch
+                // foo(U:wild(U)) const(T)                 => nomatch
+                // foo(U:wild(U)) immutable(T)             => nomatch
+                // foo(U:wild(U)) shared(T)                => nomatch
+                // foo(U:wild(U)) const(shared(T))         => nomatch
+                // foo(U:wild(shared(U)) T                 => nomatch
+                // foo(U:wild(shared(U)) const(T)          => nomatch
+                // foo(U:wild(shared(U)) immutable(T)      => nomatch
+                // foo(U:wild(shared(U)) shared(T)         => nomatch
+                // foo(U:wild(shared(U)) const(shared(T))  => nomatch
+                // foo(U:wild(shared(U)) wild(T)           => nomatch
+                // foo(U:immutable(U)) wild(shared(T))     => nomatch
+                // foo(U:const(shared(U))) wild(shared(T)) => nomatch
+                // foo(U:wild(U)) wild(shared(T))          => nomatch
+                //if (!at)
+                    goto Lnomatch;
+                break;
+
+            default:
+                assert(0);
+        }
+        #undef X
+
+        if (tt->equals(at))
+            goto Lexact;
+        else if (tt->ty == Tclass && at->ty == Tclass)
+        {
+            return tt->implicitConvTo(at);
+        }
+        else if (tt->ty == Tsarray && at->ty == Tarray &&
+            tt->nextOf()->implicitConvTo(at->nextOf()) >= MATCHconst)
+        {
+            goto Lexact;
+        }
+        else
+            goto Lnomatch;
+    }
+    else if (tparam->ty == Ttypeof)
+    {
+        /* Need a loc to go with the semantic routine.
+         */
+        Loc loc;
+        if (parameters->dim)
+        {
+            TemplateParameter *tp = parameters->tdata()[0];
+            loc = tp->loc;
+        }
+
+        tparam = tparam->semantic(loc, sc);
+    }
+
+    if (ty != tparam->ty)
+    {
+#if DMDV2
+        // Can't instantiate AssociativeArray!() without a scope
+        if (tparam->ty == Taarray && !((TypeAArray*)tparam)->sc)
+            ((TypeAArray*)tparam)->sc = sc;
+
+        MATCH m = implicitConvTo(tparam);
+        if (m == MATCHnomatch)
+        {
+            Type *at = aliasthisOf();
+            if (at)
+                m = at->deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+        }
+        return m;
+#else
+        return implicitConvTo(tparam);
+#endif
+    }
+
+    if (nextOf())
+        return nextOf()->deduceType(sc, tparam->nextOf(), parameters, dedtypes, wildmatch);
+
+Lexact:
+    return MATCHexact;
+
+Lnomatch:
+    return MATCHnomatch;
+
+#if DMDV2
+Lconst:
+    return MATCHconst;
+#endif
+}
+
+#if DMDV2
+MATCH TypeVector::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
+        Objects *dedtypes, unsigned *wildmatch)
+{
+#if 0
+    printf("TypeVector::deduceType()\n");
+    printf("\tthis   = %d, ", ty); print();
+    printf("\ttparam = %d, ", tparam->ty); tparam->print();
+#endif
+    if (tparam->ty == Tvector)
+    {   TypeVector *tp = (TypeVector *)tparam;
+        return basetype->deduceType(sc, tp->basetype, parameters, dedtypes, wildmatch);
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+#endif
+
+#if DMDV2
+MATCH TypeDArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
+        Objects *dedtypes, unsigned *wildmatch)
+{
+#if 0
+    printf("TypeDArray::deduceType()\n");
+    printf("\tthis   = %d, ", ty); print();
+    printf("\ttparam = %d, ", tparam->ty); tparam->print();
+#endif
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+#endif
+
+MATCH TypeSArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
+        Objects *dedtypes, unsigned *wildmatch)
+{
+#if 0
+    printf("TypeSArray::deduceType()\n");
+    printf("\tthis   = %d, ", ty); print();
+    printf("\ttparam = %d, ", tparam->ty); tparam->print();
+#endif
+
+    // Extra check that array dimensions must match
+    if (tparam)
+    {
+        if (tparam->ty == Tarray)
+        {   MATCH m;
+
+            m = next->deduceType(sc, tparam->nextOf(), parameters, dedtypes, wildmatch);
+            if (m == MATCHexact)
+                m = MATCHconvert;
+            return m;
+        }
+
+        Identifier *id = NULL;
+        if (tparam->ty == Tsarray)
+        {
+            TypeSArray *tp = (TypeSArray *)tparam;
+            if (tp->dim->op == TOKvar &&
+                ((VarExp *)tp->dim)->var->storage_class & STCtemplateparameter)
+            {
+                id = ((VarExp *)tp->dim)->var->ident;
+            }
+            else if (dim->toInteger() != tp->dim->toInteger())
+                return MATCHnomatch;
+        }
+        else if (tparam->ty == Taarray)
+        {
+            TypeAArray *tp = (TypeAArray *)tparam;
+            if (tp->index->ty == Tident &&
+                ((TypeIdentifier *)tp->index)->idents.dim == 0)
+            {
+                id = ((TypeIdentifier *)tp->index)->ident;
+            }
+        }
+        if (id)
+        {
+            // This code matches code in TypeInstance::deduceType()
+            int i = templateIdentifierLookup(id, parameters);
+            if (i == -1)
+                goto Lnomatch;
+            TemplateParameter *tprm = parameters->tdata()[i];
+            TemplateValueParameter *tvp = tprm->isTemplateValueParameter();
+            if (!tvp)
+                goto Lnomatch;
+            Expression *e = (Expression *)dedtypes->tdata()[i];
+            if (e)
+            {
+                if (!dim->equals(e))
+                    goto Lnomatch;
+            }
+            else
+            {
+                Type *vt = tvp->valType->semantic(0, sc);
+                MATCH m = (MATCH)dim->implicitConvTo(vt);
+                if (!m)
+                    goto Lnomatch;
+                dedtypes->tdata()[i] = dim;
+            }
+            return next->deduceType(sc, tparam->nextOf(), parameters, dedtypes, wildmatch);
+        }
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+
+  Lnomatch:
+    return MATCHnomatch;
+}
+
+MATCH TypeAArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
+{
+#if 0
+    printf("TypeAArray::deduceType()\n");
+    printf("\tthis   = %d, ", ty); print();
+    printf("\ttparam = %d, ", tparam->ty); tparam->print();
+#endif
+
+    // Extra check that index type must match
+    if (tparam && tparam->ty == Taarray)
+    {
+        TypeAArray *tp = (TypeAArray *)tparam;
+        if (!index->deduceType(sc, tp->index, parameters, dedtypes, wildmatch))
+        {
+            return MATCHnomatch;
+        }
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+
+MATCH TypeFunction::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
+{
+    //printf("TypeFunction::deduceType()\n");
+    //printf("\tthis   = %d, ", ty); print();
+    //printf("\ttparam = %d, ", tparam->ty); tparam->print();
+
+    // Extra check that function characteristics must match
+    if (tparam && tparam->ty == Tfunction)
+    {
+        TypeFunction *tp = (TypeFunction *)tparam;
+        if (varargs != tp->varargs ||
+            linkage != tp->linkage)
+            return MATCHnomatch;
+
+        size_t nfargs = Parameter::dim(this->parameters);
+        size_t nfparams = Parameter::dim(tp->parameters);
+
+        // bug 2579 fix: Apply function parameter storage classes to parameter types
+        for (size_t i = 0; i < nfparams; i++)
+        {
+            Parameter *fparam = Parameter::getNth(tp->parameters, i);
+            fparam->type = fparam->type->addStorageClass(fparam->storageClass);
+            fparam->storageClass &= ~(STC_TYPECTOR | STCin);
+        }
+        //printf("\t-> this   = %d, ", ty); print();
+        //printf("\t-> tparam = %d, ", tparam->ty); tparam->print();
+
+        /* See if tuple match
+         */
+        if (nfparams > 0 && nfargs >= nfparams - 1)
+        {
+            /* See if 'A' of the template parameter matches 'A'
+             * of the type of the last function parameter.
+             */
+            Parameter *fparam = Parameter::getNth(tp->parameters, nfparams - 1);
+            assert(fparam);
+            assert(fparam->type);
+            if (fparam->type->ty != Tident)
+                goto L1;
+            TypeIdentifier *tid = (TypeIdentifier *)fparam->type;
+            if (tid->idents.dim)
+                goto L1;
+
+            /* Look through parameters to find tuple matching tid->ident
+             */
+            size_t tupi = 0;
+            for (; 1; tupi++)
+            {   if (tupi == parameters->dim)
+                    goto L1;
+                TemplateParameter *t = parameters->tdata()[tupi];
+                TemplateTupleParameter *tup = t->isTemplateTupleParameter();
+                if (tup && tup->ident->equals(tid->ident))
+                    break;
+            }
+
+            /* The types of the function arguments [nfparams - 1 .. nfargs]
+             * now form the tuple argument.
+             */
+            size_t tuple_dim = nfargs - (nfparams - 1);
+
+            /* See if existing tuple, and whether it matches or not
+             */
+            Object *o = dedtypes->tdata()[tupi];
+            if (o)
+            {   // Existing deduced argument must be a tuple, and must match
+                Tuple *t = isTuple(o);
+                if (!t || t->objects.dim != tuple_dim)
+                    return MATCHnomatch;
+                for (size_t i = 0; i < tuple_dim; i++)
+                {   Parameter *arg = Parameter::getNth(this->parameters, nfparams - 1 + i);
+                    if (!arg->type->equals(t->objects.tdata()[i]))
+                        return MATCHnomatch;
+                }
+            }
+            else
+            {   // Create new tuple
+                Tuple *t = new Tuple();
+                t->objects.setDim(tuple_dim);
+                for (size_t i = 0; i < tuple_dim; i++)
+                {   Parameter *arg = Parameter::getNth(this->parameters, nfparams - 1 + i);
+                    t->objects.tdata()[i] = arg->type;
+                }
+                dedtypes->tdata()[tupi] = t;
+            }
+            nfparams--; // don't consider the last parameter for type deduction
+            goto L2;
+        }
+
+    L1:
+        if (nfargs != nfparams)
+            return MATCHnomatch;
+    L2:
+        for (size_t i = 0; i < nfparams; i++)
+        {
+            Parameter *a = Parameter::getNth(this->parameters, i);
+            Parameter *ap = Parameter::getNth(tp->parameters, i);
+            if (a->storageClass != ap->storageClass ||
+                !a->type->deduceType(sc, ap->type, parameters, dedtypes, wildmatch))
+                return MATCHnomatch;
+        }
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+
+MATCH TypeIdentifier::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
+{
+    // Extra check
+    if (tparam && tparam->ty == Tident)
+    {
+        TypeIdentifier *tp = (TypeIdentifier *)tparam;
+
+        for (size_t i = 0; i < idents.dim; i++)
+        {
+            Identifier *id1 = idents.tdata()[i];
+            Identifier *id2 = tp->idents.tdata()[i];
+
+            if (!id1->equals(id2))
+                return MATCHnomatch;
+        }
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+
+MATCH TypeInstance::deduceType(Scope *sc,
+        Type *tparam, TemplateParameters *parameters,
+        Objects *dedtypes, unsigned *wildmatch)
+{
+#if 0
+    printf("TypeInstance::deduceType()\n");
+    printf("\tthis   = %d, ", ty); print();
+    printf("\ttparam = %d, ", tparam->ty); tparam->print();
+#endif
+
+    // Extra check
+    if (tparam && tparam->ty == Tinstance)
+    {
+        TypeInstance *tp = (TypeInstance *)tparam;
+
+        //printf("tempinst->tempdecl = %p\n", tempinst->tempdecl);
+        //printf("tp->tempinst->tempdecl = %p\n", tp->tempinst->tempdecl);
+        if (!tp->tempinst->tempdecl)
+        {   //printf("tp->tempinst->name = '%s'\n", tp->tempinst->name->toChars());
+            if (!tp->tempinst->name->equals(tempinst->name))
+            {
+                /* Handle case of:
+                 *  template Foo(T : sa!(T), alias sa)
+                 */
+                int i = templateIdentifierLookup(tp->tempinst->name, parameters);
+                if (i == -1)
+                {   /* Didn't find it as a parameter identifier. Try looking
+                     * it up and seeing if is an alias. See Bugzilla 1454
+                     */
+                    Dsymbol *s = tempinst->tempdecl->scope->search(0, tp->tempinst->name, NULL);
+                    if (s)
+                    {
+                        s = s->toAlias();
+                        TemplateDeclaration *td = s->isTemplateDeclaration();
+                        if (td && td == tempinst->tempdecl)
+                            goto L2;
+                    }
+                    goto Lnomatch;
+                }
+                TemplateParameter *tpx = parameters->tdata()[i];
+                // This logic duplicates tpx->matchArg()
+                TemplateAliasParameter *ta = tpx->isTemplateAliasParameter();
+                if (!ta)
+                    goto Lnomatch;
+                Object *sa = tempinst->tempdecl;
+                if (!sa)
+                    goto Lnomatch;
+                if (ta->specAlias && sa != ta->specAlias)
+                    goto Lnomatch;
+                if (dedtypes->tdata()[i])
+                {   // Must match already deduced symbol
+                    Object *s = dedtypes->tdata()[i];
+
+                    if (s != sa)
+                        goto Lnomatch;
+                }
+                dedtypes->tdata()[i] = sa;
+            }
+        }
+        else if (tempinst->tempdecl != tp->tempinst->tempdecl)
+            goto Lnomatch;
+
+      L2:
+
+        for (size_t i = 0; 1; i++)
+        {
+            //printf("\ttest: tempinst->tiargs[%d]\n", i);
+            Object *o1;
+            if (i < tempinst->tiargs->dim)
+                o1 = tempinst->tiargs->tdata()[i];
+            else if (i < tempinst->tdtypes.dim && i < tp->tempinst->tiargs->dim)
+                // Pick up default arg
+                o1 = tempinst->tdtypes.tdata()[i];
+            else
+                break;
+
+            if (i >= tp->tempinst->tiargs->dim)
+                goto Lnomatch;
+
+            Object *o2 = tp->tempinst->tiargs->tdata()[i];
+
+            Type *t1 = isType(o1);
+            Type *t2 = isType(o2);
+
+            Expression *e1 = isExpression(o1);
+            Expression *e2 = isExpression(o2);
+
+            Dsymbol *s1 = isDsymbol(o1);
+            Dsymbol *s2 = isDsymbol(o2);
+
+            Tuple *v1 = isTuple(o1);
+            Tuple *v2 = isTuple(o2);
+#if 0
+            if (t1)     printf("t1 = %s\n", t1->toChars());
+            if (t2)     printf("t2 = %s\n", t2->toChars());
+            if (e1)     printf("e1 = %s\n", e1->toChars());
+            if (e2)     printf("e2 = %s\n", e2->toChars());
+            if (s1)     printf("s1 = %s\n", s1->toChars());
+            if (s2)     printf("s2 = %s\n", s2->toChars());
+            if (v1)     printf("v1 = %s\n", v1->toChars());
+            if (v2)     printf("v2 = %s\n", v2->toChars());
+#endif
+
+            TemplateTupleParameter *ttp;
+            int j;
+            if (t2 &&
+                t2->ty == Tident &&
+                i == tp->tempinst->tiargs->dim - 1 &&
+                i == tempinst->tempdecl->parameters->dim - 1 &&
+                (ttp = tempinst->tempdecl->isVariadic()) != NULL)
+            {
+                /* Given:
+                 *  struct A(B...) {}
+                 *  alias A!(int, float) X;
+                 *  static if (!is(X Y == A!(Z), Z))
+                 * deduce that Z is a tuple(int, float)
+                 */
+
+                j = templateParameterLookup(t2, parameters);
+                if (j == -1)
+                    goto Lnomatch;
+
+                /* Create tuple from remaining args
+                 */
+                Tuple *vt = new Tuple();
+                size_t vtdim = tempinst->tiargs->dim - i;
+                vt->objects.setDim(vtdim);
+                for (size_t k = 0; k < vtdim; k++)
+                    vt->objects.tdata()[k] = tempinst->tiargs->tdata()[i + k];
+
+                Tuple *v = (Tuple *)dedtypes->tdata()[j];
+                if (v)
+                {
+                    if (!match(v, vt, tempinst->tempdecl, sc))
+                        goto Lnomatch;
+                }
+                else
+                    dedtypes->tdata()[j] = vt;
+                break; //return MATCHexact;
+            }
+
+            if (t1 && t2)
+            {
+                if (!t1->deduceType(sc, t2, parameters, dedtypes, wildmatch))
+                    goto Lnomatch;
+            }
+            else if (e1 && e2)
+            {
+                if (!e1->equals(e2))
+                {   if (e2->op == TOKvar)
+                    {
+                        /*
+                         * (T:Number!(e2), int e2)
+                         */
+                        j = templateIdentifierLookup(((VarExp *)e2)->var->ident, parameters);
+                        goto L1;
+                    }
+                    goto Lnomatch;
+                }
+            }
+            else if (e1 && t2 && t2->ty == Tident)
+            {
+                j = templateParameterLookup(t2, parameters);
+            L1:
+                if (j == -1)
+                    goto Lnomatch;
+                TemplateParameter *tp = parameters->tdata()[j];
+                // BUG: use tp->matchArg() instead of the following
+                TemplateValueParameter *tv = tp->isTemplateValueParameter();
+                if (!tv)
+                    goto Lnomatch;
+                Expression *e = (Expression *)dedtypes->tdata()[j];
+                if (e)
+                {
+                    if (!e1->equals(e))
+                        goto Lnomatch;
+                }
+                else
+                {   Type *vt = tv->valType->semantic(0, sc);
+                    MATCH m = (MATCH)e1->implicitConvTo(vt);
+                    if (!m)
+                        goto Lnomatch;
+                    dedtypes->tdata()[j] = e1;
+                }
+            }
+            else if (s1 && t2 && t2->ty == Tident)
+            {
+                j = templateParameterLookup(t2, parameters);
+                if (j == -1)
+                    goto Lnomatch;
+                TemplateParameter *tp = parameters->tdata()[j];
+                // BUG: use tp->matchArg() instead of the following
+                TemplateAliasParameter *ta = tp->isTemplateAliasParameter();
+                if (!ta)
+                    goto Lnomatch;
+                Dsymbol *s = (Dsymbol *)dedtypes->tdata()[j];
+                if (s)
+                {
+                    if (!s1->equals(s))
+                        goto Lnomatch;
+                }
+                else
+                {
+                    dedtypes->tdata()[j] = s1;
+                }
+            }
+            else if (s1 && s2)
+            {
+                if (!s1->equals(s2))
+                    goto Lnomatch;
+            }
+            // BUG: Need to handle tuple parameters
+            else
+                goto Lnomatch;
+        }
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+
+Lnomatch:
+    //printf("no match\n");
+    return MATCHnomatch;
+}
+
+MATCH TypeStruct::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
+{
+    //printf("TypeStruct::deduceType()\n");
+    //printf("\tthis->parent   = %s, ", sym->parent->toChars()); print();
+    //printf("\ttparam = %d, ", tparam->ty); tparam->print();
+
+    /* If this struct is a template struct, and we're matching
+     * it against a template instance, convert the struct type
+     * to a template instance, too, and try again.
+     */
+    TemplateInstance *ti = sym->parent->isTemplateInstance();
+
+    if (tparam && tparam->ty == Tinstance)
+    {
+        if (ti && ti->toAlias() == sym)
+        {
+            TypeInstance *t = new TypeInstance(0, ti);
+            return t->deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+        }
+
+        /* Match things like:
+         *  S!(T).foo
+         */
+        TypeInstance *tpi = (TypeInstance *)tparam;
+        if (tpi->idents.dim)
+        {   Identifier *id = tpi->idents.tdata()[tpi->idents.dim - 1];
+            if (id->dyncast() == DYNCAST_IDENTIFIER && sym->ident->equals(id))
+            {
+                Type *tparent = sym->parent->getType();
+                if (tparent)
+                {
+                    /* Slice off the .foo in S!(T).foo
+                     */
+                    tpi->idents.dim--;
+                    MATCH m = tparent->deduceType(sc, tpi, parameters, dedtypes, wildmatch);
+                    tpi->idents.dim++;
+                    return m;
+                }
+            }
+        }
+    }
+
+    // Extra check
+    if (tparam && tparam->ty == Tstruct)
+    {
+        TypeStruct *tp = (TypeStruct *)tparam;
+
+        //printf("\t%d\n", (MATCH) implicitConvTo(tp));
+        return implicitConvTo(tp);
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+
+MATCH TypeEnum::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
+{
+    // Extra check
+    if (tparam && tparam->ty == Tenum)
+    {
+        TypeEnum *tp = (TypeEnum *)tparam;
+
+        if (sym != tp->sym)
+            return MATCHnomatch;
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+
+MATCH TypeTypedef::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
+{
+    // Extra check
+    if (tparam && tparam->ty == Ttypedef)
+    {
+        TypeTypedef *tp = (TypeTypedef *)tparam;
+
+        if (sym != tp->sym)
+            return MATCHnomatch;
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+
+/* Helper for TypeClass::deduceType().
+ * Classes can match with implicit conversion to a base class or interface.
+ * This is complicated, because there may be more than one base class which
+ * matches. In such cases, one or more parameters remain ambiguous.
+ * For example,
+ *
+ *   interface I(X, Y) {}
+ *   class C : I(uint, double), I(char, double) {}
+ *   C x;
+ *   foo(T, U)( I!(T, U) x)
+ *
+ *   deduces that U is double, but T remains ambiguous (could be char or uint).
+ *
+ * Given a baseclass b, and initial deduced types 'dedtypes', this function
+ * tries to match tparam with b, and also tries all base interfaces of b.
+ * If a match occurs, numBaseClassMatches is incremented, and the new deduced
+ * types are ANDed with the current 'best' estimate for dedtypes.
+ */
+void deduceBaseClassParameters(BaseClass *b,
+    Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes,
+    Objects *best, int &numBaseClassMatches)
+{
+    TemplateInstance *parti = b->base ? b->base->parent->isTemplateInstance() : NULL;
+    if (parti)
+    {
+        // Make a temporary copy of dedtypes so we don't destroy it
+        Objects *tmpdedtypes = new Objects();
+        tmpdedtypes->setDim(dedtypes->dim);
+        memcpy(tmpdedtypes->tdata(), dedtypes->tdata(), dedtypes->dim * sizeof(void *));
+
+        TypeInstance *t = new TypeInstance(0, parti);
+        MATCH m = t->deduceType(sc, tparam, parameters, tmpdedtypes);
+        if (m != MATCHnomatch)
+        {
+            // If this is the first ever match, it becomes our best estimate
+            if (numBaseClassMatches==0)
+                memcpy(best->tdata(), tmpdedtypes->tdata(), tmpdedtypes->dim * sizeof(void *));
+            else for (size_t k = 0; k < tmpdedtypes->dim; ++k)
+            {
+                // If we've found more than one possible type for a parameter,
+                // mark it as unknown.
+                if (tmpdedtypes->tdata()[k] != best->tdata()[k])
+                    best->tdata()[k] = dedtypes->tdata()[k];
+            }
+            ++numBaseClassMatches;
+        }
+    }
+    // Now recursively test the inherited interfaces
+    for (size_t j = 0; j < b->baseInterfaces_dim; ++j)
+    {
+        deduceBaseClassParameters( &(b->baseInterfaces)[j],
+            sc, tparam, parameters, dedtypes,
+            best, numBaseClassMatches);
+    }
+
+}
+
+MATCH TypeClass::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes, unsigned *wildmatch)
+{
+    //printf("TypeClass::deduceType(this = %s)\n", toChars());
+
+    /* If this class is a template class, and we're matching
+     * it against a template instance, convert the class type
+     * to a template instance, too, and try again.
+     */
+    TemplateInstance *ti = sym->parent->isTemplateInstance();
+
+    if (tparam && tparam->ty == Tinstance)
+    {
+        if (ti && ti->toAlias() == sym)
+        {
+            TypeInstance *t = new TypeInstance(0, ti);
+            MATCH m = t->deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+            // Even if the match fails, there is still a chance it could match
+            // a base class.
+            if (m != MATCHnomatch)
+                return m;
+        }
+
+        /* Match things like:
+         *  S!(T).foo
+         */
+        TypeInstance *tpi = (TypeInstance *)tparam;
+        if (tpi->idents.dim)
+        {   Identifier *id = tpi->idents.tdata()[tpi->idents.dim - 1];
+            if (id->dyncast() == DYNCAST_IDENTIFIER && sym->ident->equals(id))
+            {
+                Type *tparent = sym->parent->getType();
+                if (tparent)
+                {
+                    /* Slice off the .foo in S!(T).foo
+                     */
+                    tpi->idents.dim--;
+                    MATCH m = tparent->deduceType(sc, tpi, parameters, dedtypes, wildmatch);
+                    tpi->idents.dim++;
+                    return m;
+                }
+            }
+        }
+
+        // If it matches exactly or via implicit conversion, we're done
+        MATCH m = Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+        if (m != MATCHnomatch)
+            return m;
+
+        /* There is still a chance to match via implicit conversion to
+         * a base class or interface. Because there could be more than one such
+         * match, we need to check them all.
+         */
+
+        int numBaseClassMatches = 0; // Have we found an interface match?
+
+        // Our best guess at dedtypes
+        Objects *best = new Objects();
+        best->setDim(dedtypes->dim);
+
+        ClassDeclaration *s = sym;
+        while(s && s->baseclasses->dim > 0)
+        {
+            // Test the base class
+            deduceBaseClassParameters((s->baseclasses->tdata()[0]),
+                sc, tparam, parameters, dedtypes,
+                best, numBaseClassMatches);
+
+            // Test the interfaces inherited by the base class
+            for (size_t i = 0; i < s->interfaces_dim; ++i)
+            {
+                BaseClass *b = s->interfaces[i];
+                deduceBaseClassParameters(b, sc, tparam, parameters, dedtypes,
+                    best, numBaseClassMatches);
+            }
+            s = ((s->baseclasses->tdata()[0]))->base;
+        }
+
+        if (numBaseClassMatches == 0)
+            return MATCHnomatch;
+
+        // If we got at least one match, copy the known types into dedtypes
+        memcpy(dedtypes->tdata(), best->tdata(), best->dim * sizeof(void *));
+        return MATCHconvert;
+    }
+
+    // Extra check
+    if (tparam && tparam->ty == Tclass)
+    {
+        TypeClass *tp = (TypeClass *)tparam;
+
+        //printf("\t%d\n", (MATCH) implicitConvTo(tp));
+        return implicitConvTo(tp);
+    }
+    return Type::deduceType(sc, tparam, parameters, dedtypes, wildmatch);
+}
+
+/* ======================== TemplateParameter =============================== */
+
+TemplateParameter::TemplateParameter(Loc loc, Identifier *ident)
+{
+    this->loc = loc;
+    this->ident = ident;
+    this->sparam = NULL;
+}
+
+TemplateTypeParameter  *TemplateParameter::isTemplateTypeParameter()
+{
+    return NULL;
+}
+
+TemplateValueParameter *TemplateParameter::isTemplateValueParameter()
+{
+    return NULL;
+}
+
+TemplateAliasParameter *TemplateParameter::isTemplateAliasParameter()
+{
+    return NULL;
+}
+
+TemplateTupleParameter *TemplateParameter::isTemplateTupleParameter()
+{
+    return NULL;
+}
+
+#if DMDV2
+TemplateThisParameter  *TemplateParameter::isTemplateThisParameter()
+{
+    return NULL;
+}
+#endif
+
+/* ======================== TemplateTypeParameter =========================== */
+
+// type-parameter
+
+Type *TemplateTypeParameter::tdummy = NULL;
+
+TemplateTypeParameter::TemplateTypeParameter(Loc loc, Identifier *ident, Type *specType,
+        Type *defaultType)
+    : TemplateParameter(loc, ident)
+{
+    this->ident = ident;
+    this->specType = specType;
+    this->defaultType = defaultType;
+}
+
+TemplateTypeParameter  *TemplateTypeParameter::isTemplateTypeParameter()
+{
+    return this;
+}
+
+TemplateParameter *TemplateTypeParameter::syntaxCopy()
+{
+    TemplateTypeParameter *tp = new TemplateTypeParameter(loc, ident, specType, defaultType);
+    if (tp->specType)
+        tp->specType = specType->syntaxCopy();
+    if (defaultType)
+        tp->defaultType = defaultType->syntaxCopy();
+    return tp;
+}
+
+void TemplateTypeParameter::declareParameter(Scope *sc)
+{
+    //printf("TemplateTypeParameter::declareParameter('%s')\n", ident->toChars());
+    TypeIdentifier *ti = new TypeIdentifier(loc, ident);
+    sparam = new AliasDeclaration(loc, ident, ti);
+    if (!sc->insert(sparam))
+        error(loc, "parameter '%s' multiply defined", ident->toChars());
+}
+
+void TemplateTypeParameter::semantic(Scope *sc)
+{
+    //printf("TemplateTypeParameter::semantic('%s')\n", ident->toChars());
+    if (specType)
+    {
+        specType = specType->semantic(loc, sc);
+    }
+#if 0 // Don't do semantic() until instantiation
+    if (defaultType)
+    {
+        defaultType = defaultType->semantic(loc, sc);
+    }
+#endif
+}
+
+/****************************************
+ * Determine if two TemplateParameters are the same
+ * as far as TemplateDeclaration overloading goes.
+ * Returns:
+ *      1       match
+ *      0       no match
+ */
+
+int TemplateTypeParameter::overloadMatch(TemplateParameter *tp)
+{
+    TemplateTypeParameter *ttp = tp->isTemplateTypeParameter();
+
+    if (ttp)
+    {
+        if (specType != ttp->specType)
+            goto Lnomatch;
+
+        if (specType && !specType->equals(ttp->specType))
+            goto Lnomatch;
+
+        return 1;                       // match
+    }
+
+Lnomatch:
+    return 0;
+}
+
+/*******************************************
+ * Match to a particular TemplateParameter.
+ * Input:
+ *      i               i'th argument
+ *      tiargs[]        actual arguments to template instance
+ *      parameters[]    template parameters
+ *      dedtypes[]      deduced arguments to template instance
+ *      *psparam        set to symbol declared and initialized to dedtypes[i]
+ */
+
+MATCH TemplateTypeParameter::matchArg(Scope *sc, Objects *tiargs,
+        size_t i, TemplateParameters *parameters, Objects *dedtypes,
+        Declaration **psparam)
+{
+    //printf("TemplateTypeParameter::matchArg()\n");
+    Object *oarg;
+    MATCH m = MATCHexact;
+    Type *ta;
+
+    if (i < tiargs->dim)
+        oarg = tiargs->tdata()[i];
+    else
+    {   // Get default argument instead
+        oarg = defaultArg(loc, sc);
+        if (!oarg)
+        {   assert(i < dedtypes->dim);
+            // It might have already been deduced
+            oarg = dedtypes->tdata()[i];
+            if (!oarg)
+            {
+                goto Lnomatch;
+            }
+        }
+    }
+
+    ta = isType(oarg);
+    if (!ta)
+    {
+        //printf("%s %p %p %p\n", oarg->toChars(), isExpression(oarg), isDsymbol(oarg), isTuple(oarg));
+        goto Lnomatch;
+    }
+    //printf("ta is %s\n", ta->toChars());
+
+    if (specType)
+    {
+        if (!ta || ta == tdummy)
+            goto Lnomatch;
+
+        //printf("\tcalling deduceType(): ta is %s, specType is %s\n", ta->toChars(), specType->toChars());
+        MATCH m2 = ta->deduceType(sc, specType, parameters, dedtypes);
+        if (m2 == MATCHnomatch)
+        {   //printf("\tfailed deduceType\n");
+            goto Lnomatch;
+        }
+
+        if (m2 < m)
+            m = m2;
+        if (dedtypes->tdata()[i])
+            ta = (Type *)dedtypes->tdata()[i];
+    }
+    else
+    {
+        if (dedtypes->tdata()[i])
+        {   // Must match already deduced type
+            Type *t = (Type *)dedtypes->tdata()[i];
+
+            if (!t->equals(ta))
+            {   //printf("t = %s ta = %s\n", t->toChars(), ta->toChars());
+                goto Lnomatch;
+            }
+        }
+        else
+        {
+            // So that matches with specializations are better
+            m = MATCHconvert;
+        }
+    }
+    dedtypes->tdata()[i] = ta;
+
+    *psparam = new AliasDeclaration(loc, ident, ta);
+    //printf("\tm = %d\n", m);
+    return m;
+
+Lnomatch:
+    *psparam = NULL;
+    //printf("\tm = %d\n", MATCHnomatch);
+    return MATCHnomatch;
+}
+
+
+void TemplateTypeParameter::print(Object *oarg, Object *oded)
+{
+    printf(" %s\n", ident->toChars());
+
+    Type *t  = isType(oarg);
+    Type *ta = isType(oded);
+
+    assert(ta);
+
+    if (specType)
+        printf("\tSpecialization: %s\n", specType->toChars());
+    if (defaultType)
+        printf("\tDefault:        %s\n", defaultType->toChars());
+    printf("\tParameter:       %s\n", t ? t->toChars() : "NULL");
+    printf("\tDeduced Type:   %s\n", ta->toChars());
+}
+
+
+void TemplateTypeParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring(ident->toChars());
+    if (specType)
+    {
+        buf->writestring(" : ");
+        specType->toCBuffer(buf, NULL, hgs);
+    }
+    if (defaultType)
+    {
+        buf->writestring(" = ");
+        defaultType->toCBuffer(buf, NULL, hgs);
+    }
+}
+
+
+void *TemplateTypeParameter::dummyArg()
+{   Type *t;
+
+    if (specType)
+        t = specType;
+    else
+    {   // Use this for alias-parameter's too (?)
+        if (!tdummy)
+            tdummy = new TypeIdentifier(loc, ident);
+        t = tdummy;
+    }
+    return (void *)t;
+}
+
+
+Object *TemplateTypeParameter::specialization()
+{
+    return specType;
+}
+
+
+Object *TemplateTypeParameter::defaultArg(Loc loc, Scope *sc)
+{
+    Type *t;
+
+    t = defaultType;
+    if (t)
+    {
+        t = t->syntaxCopy();
+        t = t->semantic(loc, sc);
+    }
+    return t;
+}
+
+/* ======================== TemplateThisParameter =========================== */
+
+#if DMDV2
+// this-parameter
+
+TemplateThisParameter::TemplateThisParameter(Loc loc, Identifier *ident,
+        Type *specType,
+        Type *defaultType)
+    : TemplateTypeParameter(loc, ident, specType, defaultType)
+{
+}
+
+TemplateThisParameter  *TemplateThisParameter::isTemplateThisParameter()
+{
+    return this;
+}
+
+TemplateParameter *TemplateThisParameter::syntaxCopy()
+{
+    TemplateThisParameter *tp = new TemplateThisParameter(loc, ident, specType, defaultType);
+    if (tp->specType)
+        tp->specType = specType->syntaxCopy();
+    if (defaultType)
+        tp->defaultType = defaultType->syntaxCopy();
+    return tp;
+}
+
+void TemplateThisParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("this ");
+    TemplateTypeParameter::toCBuffer(buf, hgs);
+}
+#endif
+
+/* ======================== TemplateAliasParameter ========================== */
+
+// alias-parameter
+
+Dsymbol *TemplateAliasParameter::sdummy = NULL;
+
+TemplateAliasParameter::TemplateAliasParameter(Loc loc, Identifier *ident,
+        Type *specType, Object *specAlias, Object *defaultAlias)
+    : TemplateParameter(loc, ident)
+{
+    this->ident = ident;
+    this->specType = specType;
+    this->specAlias = specAlias;
+    this->defaultAlias = defaultAlias;
+}
+
+TemplateAliasParameter *TemplateAliasParameter::isTemplateAliasParameter()
+{
+    return this;
+}
+
+TemplateParameter *TemplateAliasParameter::syntaxCopy()
+{
+    TemplateAliasParameter *tp = new TemplateAliasParameter(loc, ident, specType, specAlias, defaultAlias);
+    if (tp->specType)
+        tp->specType = specType->syntaxCopy();
+    tp->specAlias = objectSyntaxCopy(specAlias);
+    tp->defaultAlias = objectSyntaxCopy(defaultAlias);
+    return tp;
+}
+
+void TemplateAliasParameter::declareParameter(Scope *sc)
+{
+    TypeIdentifier *ti = new TypeIdentifier(loc, ident);
+    sparam = new AliasDeclaration(loc, ident, ti);
+    if (!sc->insert(sparam))
+        error(loc, "parameter '%s' multiply defined", ident->toChars());
+}
+
+Object *aliasParameterSemantic(Loc loc, Scope *sc, Object *o)
+{
+    if (o)
+    {
+        Expression *ea = isExpression(o);
+        Type *ta = isType(o);
+        if (ta)
+        {   Dsymbol *s = ta->toDsymbol(sc);
+            if (s)
+                o = s;
+            else
+                o = ta->semantic(loc, sc);
+        }
+        else if (ea)
+        {
+            ea = ea->semantic(sc);
+            o = ea->optimize(WANTvalue | WANTinterpret);
+        }
+    }
+    return o;
+}
+
+void TemplateAliasParameter::semantic(Scope *sc)
+{
+    if (specType)
+    {
+        specType = specType->semantic(loc, sc);
+    }
+    specAlias = aliasParameterSemantic(loc, sc, specAlias);
+#if 0 // Don't do semantic() until instantiation
+    if (defaultAlias)
+        defaultAlias = defaultAlias->semantic(loc, sc);
+#endif
+}
+
+int TemplateAliasParameter::overloadMatch(TemplateParameter *tp)
+{
+    TemplateAliasParameter *tap = tp->isTemplateAliasParameter();
+
+    if (tap)
+    {
+        if (specAlias != tap->specAlias)
+            goto Lnomatch;
+
+        return 1;                       // match
+    }
+
+Lnomatch:
+    return 0;
+}
+
+MATCH TemplateAliasParameter::matchArg(Scope *sc, Objects *tiargs,
+        size_t i, TemplateParameters *parameters, Objects *dedtypes,
+        Declaration **psparam)
+{
+    Object *sa;
+    Object *oarg;
+    Expression *ea;
+    Dsymbol *s;
+
+    //printf("TemplateAliasParameter::matchArg()\n");
+
+    if (i < tiargs->dim)
+        oarg = tiargs->tdata()[i];
+    else
+    {   // Get default argument instead
+        oarg = defaultArg(loc, sc);
+        if (!oarg)
+        {   assert(i < dedtypes->dim);
+            // It might have already been deduced
+            oarg = dedtypes->tdata()[i];
+            if (!oarg)
+                goto Lnomatch;
+        }
+    }
+
+    sa = getDsymbol(oarg);
+    if (sa)
+    {
+        /* specType means the alias must be a declaration with a type
+         * that matches specType.
+         */
+        if (specType)
+        {   Declaration *d = ((Dsymbol *)sa)->isDeclaration();
+            if (!d)
+                goto Lnomatch;
+            if (!d->type->equals(specType))
+                goto Lnomatch;
+        }
+    }
+    else
+    {
+        sa = oarg;
+        ea = isExpression(oarg);
+        if (ea)
+        {   if (specType)
+            {
+                if (!ea->type->equals(specType))
+                    goto Lnomatch;
+            }
+        }
+        else
+            goto Lnomatch;
+    }
+
+    if (specAlias)
+    {
+        if (sa == sdummy)
+            goto Lnomatch;
+        if (sa != specAlias)
+            goto Lnomatch;
+    }
+    else if (dedtypes->tdata()[i])
+    {   // Must match already deduced symbol
+        Object *si = dedtypes->tdata()[i];
+
+        if (!sa || si != sa)
+            goto Lnomatch;
+    }
+    dedtypes->tdata()[i] = sa;
+
+    s = isDsymbol(sa);
+    if (s)
+        *psparam = new AliasDeclaration(loc, ident, s);
+    else
+    {
+        assert(ea);
+
+        // Declare manifest constant
+        Initializer *init = new ExpInitializer(loc, ea);
+        VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
+        v->storage_class = STCmanifest;
+        v->semantic(sc);
+        *psparam = v;
+    }
+    return MATCHexact;
+
+Lnomatch:
+    *psparam = NULL;
+    //printf("\tm = %d\n", MATCHnomatch);
+    return MATCHnomatch;
+}
+
+
+void TemplateAliasParameter::print(Object *oarg, Object *oded)
+{
+    printf(" %s\n", ident->toChars());
+
+    Dsymbol *sa = isDsymbol(oded);
+    assert(sa);
+
+    printf("\tParameter alias: %s\n", sa->toChars());
+}
+
+void TemplateAliasParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("alias ");
+    if (specType)
+    {   HdrGenState hgs1;
+        specType->toCBuffer(buf, ident, &hgs1);
+    }
+    else
+        buf->writestring(ident->toChars());
+    if (specAlias)
+    {
+        buf->writestring(" : ");
+        ObjectToCBuffer(buf, hgs, specAlias);
+    }
+    if (defaultAlias)
+    {
+        buf->writestring(" = ");
+        ObjectToCBuffer(buf, hgs, defaultAlias);
+    }
+}
+
+
+void *TemplateAliasParameter::dummyArg()
+{   Object *s;
+
+    s = specAlias;
+    if (!s)
+    {
+        if (!sdummy)
+            sdummy = new Dsymbol();
+        s = sdummy;
+    }
+    return (void*)s;
+}
+
+
+Object *TemplateAliasParameter::specialization()
+{
+    return specAlias;
+}
+
+
+Object *TemplateAliasParameter::defaultArg(Loc loc, Scope *sc)
+{
+    Object *da = defaultAlias;
+    Type *ta = isType(defaultAlias);
+    if (ta)
+    {
+       if (ta->ty == Tinstance)
+       {
+           // If the default arg is a template, instantiate for each type
+           da = ta->syntaxCopy();
+       }
+    }
+
+    Object *o = aliasParameterSemantic(loc, sc, da);
+    return o;
+}
+
+/* ======================== TemplateValueParameter ========================== */
+
+// value-parameter
+
+AA *TemplateValueParameter::edummies = NULL;
+
+TemplateValueParameter::TemplateValueParameter(Loc loc, Identifier *ident, Type *valType,
+        Expression *specValue, Expression *defaultValue)
+    : TemplateParameter(loc, ident)
+{
+    this->ident = ident;
+    this->valType = valType;
+    this->specValue = specValue;
+    this->defaultValue = defaultValue;
+}
+
+TemplateValueParameter *TemplateValueParameter::isTemplateValueParameter()
+{
+    return this;
+}
+
+TemplateParameter *TemplateValueParameter::syntaxCopy()
+{
+    TemplateValueParameter *tp =
+        new TemplateValueParameter(loc, ident, valType, specValue, defaultValue);
+    tp->valType = valType->syntaxCopy();
+    if (specValue)
+        tp->specValue = specValue->syntaxCopy();
+    if (defaultValue)
+        tp->defaultValue = defaultValue->syntaxCopy();
+    return tp;
+}
+
+void TemplateValueParameter::declareParameter(Scope *sc)
+{
+    VarDeclaration *v = new VarDeclaration(loc, valType, ident, NULL);
+    v->storage_class = STCtemplateparameter;
+    if (!sc->insert(v))
+        error(loc, "parameter '%s' multiply defined", ident->toChars());
+    sparam = v;
+}
+
+void TemplateValueParameter::semantic(Scope *sc)
+{
+    bool wasSame = (sparam->type == valType);
+    sparam->semantic(sc);
+    if (sparam->type == Type::terror && wasSame)
+    {   /* If sparam has a type error, avoid duplicate errors
+         * The simple solution of leaving that function if sparam->type == Type::terror
+         * doesn't quite work because it causes failures in xtest46 for bug 6295
+         */
+        valType = Type::terror;
+        return;
+    }
+    valType = valType->semantic(loc, sc);
+    if (!(valType->isintegral() || valType->isfloating() || valType->isString()) &&
+        valType->ty != Tident)
+    {
+        if (valType != Type::terror)
+            error(loc, "arithmetic/string type expected for value-parameter, not %s", valType->toChars());
+    }
+
+#if 0   // defer semantic analysis to arg match
+    if (specValue)
+    {   Expression *e = specValue;
+
+        e = e->semantic(sc);
+        e = e->implicitCastTo(sc, valType);
+        e = e->optimize(WANTvalue | WANTinterpret);
+        if (e->op == TOKint64 || e->op == TOKfloat64 ||
+            e->op == TOKcomplex80 || e->op == TOKnull || e->op == TOKstring)
+            specValue = e;
+        //e->toInteger();
+    }
+
+    if (defaultValue)
+    {   Expression *e = defaultValue;
+
+        e = e->semantic(sc);
+        e = e->implicitCastTo(sc, valType);
+        e = e->optimize(WANTvalue | WANTinterpret);
+        if (e->op == TOKint64)
+            defaultValue = e;
+        //e->toInteger();
+    }
+#endif
+}
+
+int TemplateValueParameter::overloadMatch(TemplateParameter *tp)
+{
+    TemplateValueParameter *tvp = tp->isTemplateValueParameter();
+
+    if (tvp)
+    {
+        if (valType != tvp->valType)
+            goto Lnomatch;
+
+        if (valType && !valType->equals(tvp->valType))
+            goto Lnomatch;
+
+        if (specValue != tvp->specValue)
+            goto Lnomatch;
+
+        return 1;                       // match
+    }
+
+Lnomatch:
+    return 0;
+}
+
+
+MATCH TemplateValueParameter::matchArg(Scope *sc,
+        Objects *tiargs, size_t i, TemplateParameters *parameters, Objects *dedtypes,
+        Declaration **psparam)
+{
+    //printf("TemplateValueParameter::matchArg()\n");
+
+    Initializer *init;
+    Declaration *sparam;
+    MATCH m = MATCHexact;
+    Expression *ei;
+    Object *oarg;
+
+    if (i < tiargs->dim)
+        oarg = tiargs->tdata()[i];
+    else
+    {   // Get default argument instead
+        oarg = defaultArg(loc, sc);
+        if (!oarg)
+        {   assert(i < dedtypes->dim);
+            // It might have already been deduced
+            oarg = dedtypes->tdata()[i];
+            if (!oarg)
+                goto Lnomatch;
+        }
+    }
+
+    ei = isExpression(oarg);
+    Type *vt;
+
+    if (!ei && oarg)
+        goto Lnomatch;
+
+    if (ei && ei->op == TOKvar)
+    {   // Resolve const variables that we had skipped earlier
+        ei = ei->optimize(WANTvalue | WANTinterpret);
+    }
+
+    //printf("\tvalType: %s, ty = %d\n", valType->toChars(), valType->ty);
+    vt = valType->semantic(0, sc);
+    //printf("ei: %s, ei->type: %s\n", ei->toChars(), ei->type->toChars());
+    //printf("vt = %s\n", vt->toChars());
+
+    if (ei->type)
+    {
+        m = (MATCH)ei->implicitConvTo(vt);
+        //printf("m: %d\n", m);
+        if (!m)
+            goto Lnomatch;
+    }
+
+    if (specValue)
+    {
+        if (!ei || _aaGetRvalue(edummies, ei->type) == ei)
+            goto Lnomatch;
+
+        Expression *e = specValue;
+
+        e = e->semantic(sc);
+        e = e->implicitCastTo(sc, vt);
+        e = e->optimize(WANTvalue | WANTinterpret);
+
+        ei = ei->syntaxCopy();
+        ei = ei->semantic(sc);
+        ei = ei->implicitCastTo(sc, vt);
+        ei = ei->optimize(WANTvalue | WANTinterpret);
+        //printf("\tei: %s, %s\n", ei->toChars(), ei->type->toChars());
+        //printf("\te : %s, %s\n", e->toChars(), e->type->toChars());
+        if (!ei->equals(e))
+            goto Lnomatch;
+    }
+    else
+    {
+        if (dedtypes->tdata()[i])
+        {   // Must match already deduced value
+            Expression *e = (Expression *)dedtypes->tdata()[i];
+
+            if (!ei || !ei->equals(e))
+                goto Lnomatch;
+        }
+        else if (m != MATCHexact)
+        {
+            ei = ei->implicitCastTo(sc, vt);
+            ei = ei->optimize(WANTvalue | WANTinterpret);
+        }
+    }
+    dedtypes->tdata()[i] = ei;
+
+    init = new ExpInitializer(loc, ei);
+    sparam = new VarDeclaration(loc, vt, ident, init);
+    sparam->storage_class = STCmanifest;
+    *psparam = sparam;
+    return m;
+
+Lnomatch:
+    //printf("\tno match\n");
+    *psparam = NULL;
+    return MATCHnomatch;
+}
+
+
+void TemplateValueParameter::print(Object *oarg, Object *oded)
+{
+    printf(" %s\n", ident->toChars());
+
+    Expression *ea = isExpression(oded);
+
+    if (specValue)
+        printf("\tSpecialization: %s\n", specValue->toChars());
+    printf("\tParameter Value: %s\n", ea ? ea->toChars() : "NULL");
+}
+
+
+void TemplateValueParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    valType->toCBuffer(buf, ident, hgs);
+    if (specValue)
+    {
+        buf->writestring(" : ");
+        specValue->toCBuffer(buf, hgs);
+    }
+    if (defaultValue)
+    {
+        buf->writestring(" = ");
+        defaultValue->toCBuffer(buf, hgs);
+    }
+}
+
+
+void *TemplateValueParameter::dummyArg()
+{   Expression *e;
+
+    e = specValue;
+    if (!e)
+    {
+        // Create a dummy value
+        Expression **pe = (Expression **)_aaGet(&edummies, valType);
+        if (!*pe)
+            *pe = valType->defaultInit();
+        e = *pe;
+    }
+    return (void *)e;
+}
+
+
+Object *TemplateValueParameter::specialization()
+{
+    return specValue;
+}
+
+
+Object *TemplateValueParameter::defaultArg(Loc loc, Scope *sc)
+{
+    Expression *e = defaultValue;
+    if (e)
+    {
+        e = e->syntaxCopy();
+        e = e->semantic(sc);
+#if DMDV2
+        e = e->resolveLoc(loc, sc);
+#endif
+    }
+    return e;
+}
+
+/* ======================== TemplateTupleParameter ========================== */
+
+// variadic-parameter
+
+TemplateTupleParameter::TemplateTupleParameter(Loc loc, Identifier *ident)
+    : TemplateParameter(loc, ident)
+{
+    this->ident = ident;
+}
+
+TemplateTupleParameter *TemplateTupleParameter::isTemplateTupleParameter()
+{
+    return this;
+}
+
+TemplateParameter *TemplateTupleParameter::syntaxCopy()
+{
+    TemplateTupleParameter *tp = new TemplateTupleParameter(loc, ident);
+    return tp;
+}
+
+void TemplateTupleParameter::declareParameter(Scope *sc)
+{
+    TypeIdentifier *ti = new TypeIdentifier(loc, ident);
+    sparam = new AliasDeclaration(loc, ident, ti);
+    if (!sc->insert(sparam))
+        error(loc, "parameter '%s' multiply defined", ident->toChars());
+}
+
+void TemplateTupleParameter::semantic(Scope *sc)
+{
+}
+
+int TemplateTupleParameter::overloadMatch(TemplateParameter *tp)
+{
+    TemplateTupleParameter *tvp = tp->isTemplateTupleParameter();
+
+    if (tvp)
+    {
+        return 1;                       // match
+    }
+
+    return 0;
+}
+
+MATCH TemplateTupleParameter::matchArg(Scope *sc, Objects *tiargs,
+        size_t i, TemplateParameters *parameters, Objects *dedtypes,
+        Declaration **psparam)
+{
+    //printf("TemplateTupleParameter::matchArg()\n");
+
+    /* The rest of the actual arguments (tiargs[]) form the match
+     * for the variadic parameter.
+     */
+    assert(i + 1 == dedtypes->dim);     // must be the last one
+    Tuple *ovar;
+
+    if (dedtypes->tdata()[i] && isTuple(dedtypes->tdata()[i]))
+        // It was already been deduced
+        ovar = isTuple(dedtypes->tdata()[i]);
+    else if (i + 1 == tiargs->dim && isTuple(tiargs->tdata()[i]))
+        ovar = isTuple(tiargs->tdata()[i]);
+    else
+    {
+        ovar = new Tuple();
+        //printf("ovar = %p\n", ovar);
+        if (i < tiargs->dim)
+        {
+            //printf("i = %d, tiargs->dim = %d\n", i, tiargs->dim);
+            ovar->objects.setDim(tiargs->dim - i);
+            for (size_t j = 0; j < ovar->objects.dim; j++)
+                ovar->objects.tdata()[j] = tiargs->tdata()[i + j];
+        }
+    }
+    *psparam = new TupleDeclaration(loc, ident, &ovar->objects);
+    dedtypes->tdata()[i] = ovar;
+    return MATCHexact;
+}
+
+
+void TemplateTupleParameter::print(Object *oarg, Object *oded)
+{
+    printf(" %s... [", ident->toChars());
+    Tuple *v = isTuple(oded);
+    assert(v);
+
+    //printf("|%d| ", v->objects.dim);
+    for (size_t i = 0; i < v->objects.dim; i++)
+    {
+        if (i)
+            printf(", ");
+
+        Object *o = v->objects.tdata()[i];
+
+        Dsymbol *sa = isDsymbol(o);
+        if (sa)
+            printf("alias: %s", sa->toChars());
+
+        Type *ta = isType(o);
+        if (ta)
+            printf("type: %s", ta->toChars());
+
+        Expression *ea = isExpression(o);
+        if (ea)
+            printf("exp: %s", ea->toChars());
+
+        assert(!isTuple(o));            // no nested Tuple arguments
+    }
+
+    printf("]\n");
+}
+
+void TemplateTupleParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring(ident->toChars());
+    buf->writestring("...");
+}
+
+
+void *TemplateTupleParameter::dummyArg()
+{
+    return NULL;
+}
+
+
+Object *TemplateTupleParameter::specialization()
+{
+    return NULL;
+}
+
+
+Object *TemplateTupleParameter::defaultArg(Loc loc, Scope *sc)
+{
+    return NULL;
+}
+
+/* ======================== TemplateInstance ================================ */
+
+TemplateInstance::TemplateInstance(Loc loc, Identifier *ident)
+    : ScopeDsymbol(NULL)
+{
+#if LOG
+    printf("TemplateInstance(this = %p, ident = '%s')\n", this, ident ? ident->toChars() : "null");
+#endif
+    this->loc = loc;
+    this->name = ident;
+    this->tiargs = NULL;
+    this->tempdecl = NULL;
+    this->inst = NULL;
+    this->tinst = NULL;
+    this->argsym = NULL;
+    this->aliasdecl = NULL;
+    this->semanticRun = PASSinit;
+    this->semantictiargsdone = 0;
+    this->withsym = NULL;
+    this->nest = 0;
+    this->havetempdecl = 0;
+    this->isnested = NULL;
+    this->speculative = 0;
+    this->ignore = true;
+
+#if IN_LLVM
+    this->emittedInModule = NULL;
+    this->tmodule = NULL;
+#endif
+}
+
+/*****************
+ * This constructor is only called when we figured out which function
+ * template to instantiate.
+ */
+
+TemplateInstance::TemplateInstance(Loc loc, TemplateDeclaration *td, Objects *tiargs)
+    : ScopeDsymbol(NULL)
+{
+#if LOG
+    printf("TemplateInstance(this = %p, tempdecl = '%s')\n", this, td->toChars());
+#endif
+    this->loc = loc;
+    this->name = td->ident;
+    this->tiargs = tiargs;
+    this->tempdecl = td;
+    this->inst = NULL;
+    this->tinst = NULL;
+    this->argsym = NULL;
+    this->aliasdecl = NULL;
+    this->semanticRun = PASSinit;
+    this->semantictiargsdone = 1;
+    this->withsym = NULL;
+    this->nest = 0;
+    this->havetempdecl = 1;
+    this->isnested = NULL;
+    this->speculative = 0;
+    this->ignore = true;
+
+#if IN_LLVM
+    this->tinst = NULL;
+    this->emittedInModule = NULL;
+    this->tmodule = NULL;
+#endif
+
+    assert((size_t)tempdecl->scope > 0x10000);
+}
+
+
+Objects *TemplateInstance::arraySyntaxCopy(Objects *objs)
+{
+    Objects *a = NULL;
+    if (objs)
+    {   a = new Objects();
+        a->setDim(objs->dim);
+        for (size_t i = 0; i < objs->dim; i++)
+        {
+            a->tdata()[i] = objectSyntaxCopy(objs->tdata()[i]);
+        }
+    }
+    return a;
+}
+
+Dsymbol *TemplateInstance::syntaxCopy(Dsymbol *s)
+{
+    TemplateInstance *ti;
+
+    if (s)
+        ti = (TemplateInstance *)s;
+    else
+        ti = new TemplateInstance(loc, name);
+
+    ti->tiargs = arraySyntaxCopy(tiargs);
+
+    ScopeDsymbol::syntaxCopy(ti);
+    return ti;
+}
+
+
+void TemplateInstance::semantic(Scope *sc)
+{
+    semantic(sc, NULL);
+}
+
+void TemplateInstance::expandMembers(Scope *sc2)
+{
+    for (size_t i = 0; i < members->dim; i++)
+    {   Dsymbol *s = (*members)[i];
+        s->setScope(sc2);
+    }
+    for (size_t i = 0; i < members->dim; i++)
+    {
+        Dsymbol *s = members->tdata()[i];
+        //printf("\t[%d] semantic on '%s' %p kind %s in '%s'\n", i, s->toChars(), s, s->kind(), this->toChars());
+        //printf("test: isnested = %d, sc2->parent = %s\n", isnested, sc2->parent->toChars());
+//      if (isnested)
+//          s->parent = sc->parent;
+        //printf("test3: isnested = %d, s->parent = %s\n", isnested, s->parent->toChars());
+        s->semantic(sc2);
+        //printf("test4: isnested = %d, s->parent = %s\n", isnested, s->parent->toChars());
+        sc2->module->runDeferredSemantic();
+    }
+}
+
+void TemplateInstance::tryExpandMembers(Scope *sc2)
+{
+    static int nest;
+    // extracted to a function to allow windows SEH to work without destructors in the same function
+    //printf("%d\n", nest);
+    if (++nest > 500)
+    {
+        global.gag = 0;                 // ensure error message gets printed
+        error("recursive expansion");
+        fatal();
+    }
+
+#if WINDOWS_SEH
+    if(nest == 1)
+    {
+        // do not catch at every nesting level, because generating the output error might cause more stack
+        //  errors in the __except block otherwise
+        __try
+        {
+            expandMembers(sc2);
+        }
+        __except (__ehfilter(GetExceptionInformation()))
+        {
+            global.gag = 0;                     // ensure error message gets printed
+            error("recursive expansion");
+            fatal();
+        }
+    }
+    else
+#endif
+        expandMembers(sc2);
+    nest--;
+}
+
+void TemplateInstance::trySemantic3(Scope *sc2)
+{
+    // extracted to a function to allow windows SEH to work without destructors in the same function
+    static int nest;
+    if (++nest > 300)
+    {
+        global.gag = 0;            // ensure error message gets printed
+        error("recursive expansion");
+        fatal();
+    }
+#if WINDOWS_SEH
+    if(nest == 1)
+    {
+        // do not catch at every nesting level, because generating the output error might cause more stack
+        //  errors in the __except block otherwise
+        __try
+        {
+            semantic3(sc2);
+        }
+        __except (__ehfilter(GetExceptionInformation()))
+        {
+            global.gag = 0;            // ensure error message gets printed
+            error("recursive expansion");
+            fatal();
+        }
+    }
+    else
+#endif
+        semantic3(sc2);
+
+    --nest;
+}
+
+void TemplateInstance::semantic(Scope *sc, Expressions *fargs)
+{
+    //printf("TemplateInstance::semantic('%s', this=%p, gag = %d, sc = %p)\n", toChars(), this, global.gag, sc);
+#if LOG
+    printf("\n+TemplateInstance::semantic('%s', this=%p)\n", toChars(), this);
+#endif
+    if (inst)           // if semantic() was already run
+    {
+#if LOG
+        printf("-TemplateInstance::semantic('%s', this=%p) already run\n", inst->toChars(), inst);
+#endif
+        return;
+    }
+    
+    if (!sc->ignoreTemplates)
+        ignore = false;
+
+
+    // get the enclosing template instance from the scope tinst
+    tinst = sc->tinst;
+
+    if (semanticRun != PASSinit)
+    {
+#if LOG
+        printf("Recursive template expansion\n");
+#endif
+        error(loc, "recursive template expansion");
+//      inst = this;
+        return;
+    }
+    semanticRun = PASSsemantic;
+#if IN_LLVM
+    // get the enclosing template instance from the scope tinst
+    tinst = sc->tinst;
+
+    // get the module of the outermost enclosing instantiation
+    if (tinst)
+	tmodule = tinst->tmodule;
+    else
+	tmodule = sc->module;
+    //printf("%s in %s\n", toChars(), tmodule->toChars());
+#endif
+
+#if LOG
+    printf("\tdo semantic\n");
+#endif
+    if (havetempdecl)
+    {
+        assert((size_t)tempdecl->scope > 0x10000);
+        // Deduce tdtypes
+        tdtypes.setDim(tempdecl->parameters->dim);
+        if (!tempdecl->matchWithInstance(this, &tdtypes, fargs, 2))
+        {
+            error("incompatible arguments for template instantiation");
+            inst = this;
+            return;
+        }
+    }
+    else
+    {
+        /* Run semantic on each argument, place results in tiargs[]
+         * (if we havetempdecl, then tiargs is already evaluated)
+         */
+        semanticTiargs(sc);
+        if (arrayObjectIsError(tiargs))
+        {   inst = this;
+            //printf("error return %p, %d\n", tempdecl, global.errors);
+            return;             // error recovery
+        }
+        unsigned errs = global.errors;
+        tempdecl = findTemplateDeclaration(sc);
+        if (tempdecl)
+            tempdecl = findBestMatch(sc, fargs);
+        if (!tempdecl || (errs != global.errors))
+        {   inst = this;
+            //printf("error return %p, %d\n", tempdecl, global.errors);
+            return;             // error recovery
+        }
+    }
+
+    // If tempdecl is a mixin, disallow it
+    if (tempdecl->ismixin)
+        error("mixin templates are not regular templates");
+
+    hasNestedArgs(tiargs);
+
+    /* See if there is an existing TemplateInstantiation that already
+     * implements the typeargs. If so, just refer to that one instead.
+     */
+
+    for (size_t i = 0; i < tempdecl->instances.dim; i++)
+    {
+        TemplateInstance *ti = tempdecl->instances.tdata()[i];
+#if LOG
+        printf("\t%s: checking for match with instance %d (%p): '%s'\n", toChars(), i, ti, ti->toChars());
+#endif
+        assert(tdtypes.dim == ti->tdtypes.dim);
+
+        // Nesting must match
+        if (isnested != ti->isnested)
+        {
+            //printf("test2 isnested %s ti->isnested %s\n", isnested ? isnested->toChars() : "", ti->isnested ? ti->isnested->toChars() : "");
+            continue;
+        }
+        //printf("parent = %s, ti->parent = %s\n", tempdecl->parent->toPrettyChars(), ti->parent->toPrettyChars());
+
+        if (!arrayObjectMatch(&tdtypes, &ti->tdtypes, tempdecl, sc))
+            goto L1;
+
+        /* Template functions may have different instantiations based on
+         * "auto ref" parameters.
+         */
+        if (fargs)
+        {
+            FuncDeclaration *fd = ti->toAlias()->isFuncDeclaration();
+            if (fd)
+            {
+                Parameters *fparameters = fd->getParameters(NULL);
+                size_t nfparams = Parameter::dim(fparameters); // Num function parameters
+                for (size_t j = 0; j < nfparams && j < fargs->dim; j++)
+                {   Parameter *fparam = Parameter::getNth(fparameters, j);
+                    Expression *farg = fargs->tdata()[j];
+                    if (fparam->storageClass & STCauto)         // if "auto ref"
+                    {
+                        if (farg->isLvalue())
+                        {   if (!(fparam->storageClass & STCref))
+                                goto L1;                        // auto ref's don't match
+                        }
+                        else
+                        {   if (fparam->storageClass & STCref)
+                                goto L1;                        // auto ref's don't match
+                        }
+                    }
+                }
+            }
+        }
+
+        // It's a match
+        inst = ti;
+        parent = ti->parent;
+
+        // If both this and the previous instantiation were speculative,
+        // use the number of errors that happened last time.
+        if (inst->speculative && global.gag)
+        {
+            global.errors += inst->errors;
+            global.gaggedErrors += inst->errors;
+        }
+
+        // If the first instantiation was speculative, but this is not:
+        if (inst->speculative && !global.gag)
+        {
+            // If the first instantiation had failed, re-run semantic,
+            // so that error messages are shown.
+            if (inst->errors)
+                goto L1;
+            // It had succeeded, mark it is a non-speculative instantiation,
+            // and reuse it.
+            inst->speculative = 0;
+        }
+
+#if LOG
+        printf("\tit's a match with instance %p, %d\n", inst, inst->semanticRun);
+#endif
+        return;
+
+     L1:
+        ;
+    }
+
+    /* So, we need to implement 'this' instance.
+     */
+#if LOG
+    printf("\timplement template instance %s '%s'\n", tempdecl->parent->toChars(), toChars());
+    printf("\ttempdecl %s\n", tempdecl->toChars());
+#endif
+    unsigned errorsave = global.errors;
+    inst = this;
+    // Mark as speculative if we are instantiated from inside is(typeof())
+    if (global.gag && sc->speculative)
+        speculative = 1;
+
+    int tempdecl_instance_idx = tempdecl->instances.dim;
+    tempdecl->instances.push(this);
+    parent = tempdecl->parent;
+    //printf("parent = '%s'\n", parent->kind());
+
+    ident = genIdent(tiargs);         // need an identifier for name mangling purposes.
+
+#if 1
+    if (isnested)
+        parent = isnested;
+#endif
+    //printf("parent = '%s'\n", parent->kind());
+
+    // Add 'this' to the enclosing scope's members[] so the semantic routines
+    // will get called on the instance members. Store the place we added it to
+    // in target_symbol_list(_idx) so we can remove it later if we encounter
+    // an error.
+#if 1
+    int dosemantic3 = 0;
+    Dsymbols *target_symbol_list = NULL;
+    int target_symbol_list_idx;
+
+    if (!sc->parameterSpecialization)
+    {   Dsymbols *a;
+
+        Scope *scx = sc;
+#if 0
+        for (scx = sc; scx; scx = scx->enclosing)
+            if (scx->scopesym)
+                break;
+#endif
+
+        //if (scx && scx->scopesym) printf("3: scx is %s %s\n", scx->scopesym->kind(), scx->scopesym->toChars());
+        if (scx && scx->scopesym &&
+            scx->scopesym->members && !scx->scopesym->isTemplateMixin()
+#if 0 // removed because it bloated compile times
+            /* The problem is if A imports B, and B imports A, and both A
+             * and B instantiate the same template, does the compilation of A
+             * or the compilation of B do the actual instantiation?
+             *
+             * see bugzilla 2500.
+             */
+            && !scx->module->selfImports()
+#endif
+           )
+        {
+            //printf("\t1: adding to %s %s\n", scx->scopesym->kind(), scx->scopesym->toChars());
+            a = scx->scopesym->members;
+        }
+        else
+        {   Module *m = sc->module->importedFrom;
+            //printf("\t2: adding to module %s instead of module %s\n", m->toChars(), sc->module->toChars());
+            a = m->members;
+            if (m->semanticRun >= 3)
+            {
+                dosemantic3 = 1;
+            }
+        }
+        for (int i = 0; 1; i++)
+        {
+            if (i == a->dim)
+            {
+                target_symbol_list = a;
+                target_symbol_list_idx = i;
+                a->push(this);
+                break;
+            }
+            if (this == a->tdata()[i])  // if already in Array
+                break;
+        }
+    }
+#endif
+
+    // Copy the syntax trees from the TemplateDeclaration
+    members = Dsymbol::arraySyntaxCopy(tempdecl->members);
+
+    // Create our own scope for the template parameters
+    Scope *scope = tempdecl->scope;
+    if (!tempdecl->semanticRun)
+    {
+        error("template instantiation %s forward references template declaration %s\n", toChars(), tempdecl->toChars());
+        return;
+    }
+
+#if LOG
+    printf("\tcreate scope for template parameters '%s'\n", toChars());
+#endif
+    argsym = new ScopeDsymbol();
+    argsym->parent = scope->parent;
+    scope = scope->push(argsym);
+//    scope->stc = 0;
+
+    // Declare each template parameter as an alias for the argument type
+    Scope *paramscope = scope->push();
+    paramscope->stc = 0;
+    declareParameters(paramscope);
+    paramscope->pop();
+
+    // Add members of template instance to template instance symbol table
+//    parent = scope->scopesym;
+    symtab = new DsymbolTable();
+    int memnum = 0;
+    for (size_t i = 0; i < members->dim; i++)
+    {
+        Dsymbol *s = members->tdata()[i];
+#if LOG
+        printf("\t[%d] adding member '%s' %p kind %s to '%s', memnum = %d\n", i, s->toChars(), s, s->kind(), this->toChars(), memnum);
+#endif
+        memnum |= s->addMember(scope, this, memnum);
+    }
+#if LOG
+    printf("adding members done\n");
+#endif
+
+    /* See if there is only one member of template instance, and that
+     * member has the same name as the template instance.
+     * If so, this template instance becomes an alias for that member.
+     */
+    //printf("members->dim = %d\n", members->dim);
+    if (members->dim)
+    {
+        Dsymbol *s;
+        if (Dsymbol::oneMembers(members, &s, tempdecl->ident) && s)
+        {
+            //printf("s->kind = '%s'\n", s->kind());
+            //s->print();
+            //printf("'%s', '%s'\n", s->ident->toChars(), tempdecl->ident->toChars());
+            //printf("setting aliasdecl\n");
+            aliasdecl = new AliasDeclaration(loc, s->ident, s);
+
+#if IN_LLVM
+                // LDC propagate internal information
+                if (tempdecl->llvmInternal) {
+                    s->llvmInternal = tempdecl->llvmInternal;
+                    if (FuncDeclaration* fd = s->isFuncDeclaration()) {
+                        fd->intrinsicName = tempdecl->intrinsicName;
+                    }
+                }
+#endif
+        }
+    }
+
+    /* If function template declaration
+     */
+    if (fargs && aliasdecl)
+    {
+        FuncDeclaration *fd = aliasdecl->toAlias()->isFuncDeclaration();
+        if (fd)
+        {
+            /* Transmit fargs to type so that TypeFunction::semantic() can
+             * resolve any "auto ref" storage classes.
+             */
+            TypeFunction *tf = (TypeFunction *)fd->type;
+            if (tf && tf->ty == Tfunction)
+                tf->fargs = fargs;
+        }
+    }
+
+    // Do semantic() analysis on template instance members
+#if LOG
+    printf("\tdo semantic() on template instance members '%s'\n", toChars());
+#endif
+    Scope *sc2;
+    sc2 = scope->push(this);
+    //printf("isnested = %d, sc->parent = %s\n", isnested, sc->parent->toChars());
+    sc2->parent = /*isnested ? sc->parent :*/ this;
+    sc2->tinst = this;
+
+    tryExpandMembers(sc2);
+
+    semanticRun = PASSsemanticdone;
+
+    /* If any of the instantiation members didn't get semantic() run
+     * on them due to forward references, we cannot run semantic2()
+     * or semantic3() yet.
+     */
+    for (size_t i = 0; i < Module::deferred.dim; i++)
+    {   Dsymbol *sd = Module::deferred.tdata()[i];
+
+        if (sd->parent == this)
+        {
+        //printf("deferred %s %s\n", sd->parent->toChars(), sd->toChars());
+            AggregateDeclaration *ad = sd->isAggregateDeclaration();
+            if (ad)
+                ad->deferred = this;
+            goto Laftersemantic;
+        }
+    }
+
+    /* ConditionalDeclaration may introduce eponymous declaration,
+     * so we should find it once again after semantic.
+     */
+    if (members->dim)
+    {
+        Dsymbol *s;
+        if (Dsymbol::oneMembers(members, &s, tempdecl->ident) && s)
+        {
+            if (!aliasdecl || aliasdecl->toAlias() != s)
+            {
+                //printf("s->kind = '%s'\n", s->kind());
+                //s->print();
+                //printf("'%s', '%s'\n", s->ident->toChars(), tempdecl->ident->toChars());
+                //printf("setting aliasdecl 2\n");
+                aliasdecl = new AliasDeclaration(loc, s->ident, s);
+            }
+        }
+        else if (aliasdecl)
+            aliasdecl = NULL;
+    }
+
+    /* The problem is when to parse the initializer for a variable.
+     * Perhaps VarDeclaration::semantic() should do it like it does
+     * for initializers inside a function.
+     */
+//    if (sc->parent->isFuncDeclaration())
+
+        /* BUG 782: this has problems if the classes this depends on
+         * are forward referenced. Find a way to defer semantic()
+         * on this template.
+         */
+        semantic2(sc2);
+
+    if (sc->func || dosemantic3)
+    {
+        trySemantic3(sc2);
+    }
+
+  Laftersemantic:
+    sc2->pop();
+
+    scope->pop();
+
+    // Give additional context info if error occurred during instantiation
+    if (global.errors != errorsave)
+    {
+        error(loc, "error instantiating");
+        if (tinst)
+        {   tinst->printInstantiationTrace();
+        }
+        errors = 1;
+        if (global.gag)
+        {
+            // Errors are gagged, so remove the template instance from the
+            // instance/symbol lists we added it to and reset our state to
+            // finish clean and so we can try to instantiate it again later
+            // (see bugzilla 4302 and 6602).
+            tempdecl->instances.remove(tempdecl_instance_idx);
+            if (target_symbol_list)
+            {
+                // Because we added 'this' in the last position above, we
+                // should be able to remove it without messing other indices up.
+                assert(target_symbol_list->tdata()[target_symbol_list_idx] == this);
+                target_symbol_list->remove(target_symbol_list_idx);
+            }
+            semanticRun = PASSinit;
+            inst = NULL;
+        }
+    }
+
+#if LOG
+    printf("-TemplateInstance::semantic('%s', this=%p)\n", toChars(), this);
+#endif
+}
+
+
+void TemplateInstance::semanticTiargs(Scope *sc)
+{
+    //printf("+TemplateInstance::semanticTiargs() %s\n", toChars());
+    if (semantictiargsdone)
+        return;
+    semantictiargsdone = 1;
+    semanticTiargs(loc, sc, tiargs, 0);
+}
+
+/**********************************
+ * Input:
+ *      flags   1: replace const variables with their initializers
+ */
+
+void TemplateInstance::semanticTiargs(Loc loc, Scope *sc, Objects *tiargs, int flags)
+{
+    // Run semantic on each argument, place results in tiargs[]
+    //printf("+TemplateInstance::semanticTiargs()\n");
+    if (!tiargs)
+        return;
+    for (size_t j = 0; j < tiargs->dim; j++)
+    {
+        Object *o = tiargs->tdata()[j];
+        Type *ta = isType(o);
+        Expression *ea = isExpression(o);
+        Dsymbol *sa = isDsymbol(o);
+
+        //printf("1: tiargs->tdata()[%d] = %p, %p, %p, ea=%p, ta=%p\n", j, o, isDsymbol(o), isTuple(o), ea, ta);
+        if (ta)
+        {
+            //printf("type %s\n", ta->toChars());
+            // It might really be an Expression or an Alias
+            ta->resolve(loc, sc, &ea, &ta, &sa);
+            if (ea)
+            {
+                ea = ea->semantic(sc);
+                /* This test is to skip substituting a const var with
+                 * its initializer. The problem is the initializer won't
+                 * match with an 'alias' parameter. Instead, do the
+                 * const substitution in TemplateValueParameter::matchArg().
+                 */
+                if (flags & 1) // only used by __traits, must not interpret the args
+                    ea = ea->optimize(WANTvalue);
+                else if (ea->op != TOKvar)
+                    ea = ea->optimize(WANTvalue | WANTinterpret);
+                tiargs->tdata()[j] = ea;
+            }
+            else if (sa)
+            {
+              Ldsym:
+                tiargs->tdata()[j] = sa;
+                TupleDeclaration *d = sa->toAlias()->isTupleDeclaration();
+                if (d)
+                {
+                    size_t dim = d->objects->dim;
+                    tiargs->remove(j);
+                    tiargs->insert(j, d->objects);
+                    j--;
+                }
+            }
+            else if (ta)
+            {
+              Ltype:
+                if (ta->ty == Ttuple)
+                {   // Expand tuple
+                    TypeTuple *tt = (TypeTuple *)ta;
+                    size_t dim = tt->arguments->dim;
+                    tiargs->remove(j);
+                    if (dim)
+                    {   tiargs->reserve(dim);
+                        for (size_t i = 0; i < dim; i++)
+                        {   Parameter *arg = tt->arguments->tdata()[i];
+                            tiargs->insert(j + i, arg->type);
+                        }
+                    }
+                    j--;
+                }
+                else
+                    tiargs->tdata()[j] = ta;
+            }
+            else
+            {
+                assert(global.errors);
+                tiargs->tdata()[j] = Type::terror;
+            }
+        }
+        else if (ea)
+        {
+            if (!ea)
+            {   assert(global.errors);
+                ea = new ErrorExp();
+            }
+            assert(ea);
+            ea = ea->semantic(sc);
+            if (flags & 1) // only used by __traits, must not interpret the args
+                ea = ea->optimize(WANTvalue);
+            else if (ea->op != TOKvar && ea->op != TOKtuple)
+                ea = ea->optimize(WANTvalue | WANTinterpret);
+            tiargs->tdata()[j] = ea;
+            if (ea->op == TOKtype)
+            {   ta = ea->type;
+                goto Ltype;
+            }
+            if (ea->op == TOKimport)
+            {   sa = ((ScopeExp *)ea)->sds;
+                goto Ldsym;
+            }
+            if (ea->op == TOKtuple)
+            {   // Expand tuple
+                TupleExp *te = (TupleExp *)ea;
+                size_t dim = te->exps->dim;
+                tiargs->remove(j);
+                if (dim)
+                {   tiargs->reserve(dim);
+                    for (size_t i = 0; i < dim; i++)
+                        tiargs->insert(j + i, te->exps->tdata()[i]);
+                }
+                j--;
+            }
+        }
+        else if (sa)
+        {
+            TemplateDeclaration *td = sa->isTemplateDeclaration();
+            if (td && !td->semanticRun && td->literal)
+                td->semantic(sc);
+        }
+        else
+        {
+            assert(0);
+        }
+        //printf("1: tiargs->tdata()[%d] = %p\n", j, tiargs->tdata()[j]);
+    }
+#if 0
+    printf("-TemplateInstance::semanticTiargs()\n");
+    for (size_t j = 0; j < tiargs->dim; j++)
+    {
+        Object *o = tiargs->tdata()[j];
+        Type *ta = isType(o);
+        Expression *ea = isExpression(o);
+        Dsymbol *sa = isDsymbol(o);
+        Tuple *va = isTuple(o);
+
+        printf("\ttiargs[%d] = ta %p, ea %p, sa %p, va %p\n", j, ta, ea, sa, va);
+    }
+#endif
+}
+
+/**********************************************
+ * Find template declaration corresponding to template instance.
+ */
+
+TemplateDeclaration *TemplateInstance::findTemplateDeclaration(Scope *sc)
+{
+    //printf("TemplateInstance::findTemplateDeclaration() %s\n", toChars());
+    if (!tempdecl)
+    {
+        /* Given:
+         *    foo!( ... )
+         * figure out which TemplateDeclaration foo refers to.
+         */
+        Dsymbol *s;
+        Dsymbol *scopesym;
+        Identifier *id;
+
+        id = name;
+        s = sc->search(loc, id, &scopesym);
+        if (!s)
+        {
+            s = sc->search_correct(id);
+            if (s)
+                error("template '%s' is not defined, did you mean %s?", id->toChars(), s->toChars());
+            else
+                error("template '%s' is not defined", id->toChars());
+            return NULL;
+        }
+
+        /* If an OverloadSet, look for a unique member that is a template declaration
+         */
+        OverloadSet *os = s->isOverloadSet();
+        if (os)
+        {   s = NULL;
+            for (size_t i = 0; i < os->a.dim; i++)
+            {   Dsymbol *s2 = os->a.tdata()[i];
+                if (s2->isTemplateDeclaration())
+                {
+                    if (s)
+                        error("ambiguous template declaration %s and %s", s->toPrettyChars(), s2->toPrettyChars());
+                    s = s2;
+                }
+            }
+            if (!s)
+            {   error("template '%s' is not defined", id->toChars());
+                return NULL;
+            }
+        }
+
+#if LOG
+        printf("It's an instance of '%s' kind '%s'\n", s->toChars(), s->kind());
+        if (s->parent)
+            printf("s->parent = '%s'\n", s->parent->toChars());
+#endif
+        withsym = scopesym->isWithScopeSymbol();
+
+        /* We might have found an alias within a template when
+         * we really want the template.
+         */
+        TemplateInstance *ti;
+        if (s->parent &&
+            (ti = s->parent->isTemplateInstance()) != NULL)
+        {
+            if (ti->tempdecl && ti->tempdecl->ident == id)
+            {
+                /* This is so that one can refer to the enclosing
+                 * template, even if it has the same name as a member
+                 * of the template, if it has a !(arguments)
+                 */
+                tempdecl = ti->tempdecl;
+                if (tempdecl->overroot)         // if not start of overloaded list of TemplateDeclaration's
+                    tempdecl = tempdecl->overroot; // then get the start
+                s = tempdecl;
+            }
+        }
+
+        s = s->toAlias();
+
+        /* It should be a TemplateDeclaration, not some other symbol
+         */
+        tempdecl = s->isTemplateDeclaration();
+        if (!tempdecl)
+        {
+            if (!s->parent && global.errors)
+                return NULL;
+            if (!s->parent && s->getType())
+            {   Dsymbol *s2 = s->getType()->toDsymbol(sc);
+                if (!s2)
+                {
+                    error("%s is not a template declaration, it is a %s", id->toChars(), s->kind());
+                    return NULL;
+                }
+                s = s2;
+            }
+#ifdef DEBUG
+            //if (!s->parent) printf("s = %s %s\n", s->kind(), s->toChars());
+#endif
+            //assert(s->parent);
+            TemplateInstance *ti = s->parent ? s->parent->isTemplateInstance() : NULL;
+            if (ti &&
+                (ti->name == id ||
+                 ti->toAlias()->ident == id)
+                &&
+                ti->tempdecl)
+            {
+                /* This is so that one can refer to the enclosing
+                 * template, even if it has the same name as a member
+                 * of the template, if it has a !(arguments)
+                 */
+                tempdecl = ti->tempdecl;
+                if (tempdecl->overroot)         // if not start of overloaded list of TemplateDeclaration's
+                    tempdecl = tempdecl->overroot; // then get the start
+            }
+            else
+            {
+                error("%s is not a template declaration, it is a %s", id->toChars(), s->kind());
+                return NULL;
+            }
+        }
+    }
+    else
+        assert(tempdecl->isTemplateDeclaration());
+    return tempdecl;
+}
+
+TemplateDeclaration *TemplateInstance::findBestMatch(Scope *sc, Expressions *fargs)
+{
+    /* Since there can be multiple TemplateDeclaration's with the same
+     * name, look for the best match.
+     */
+    TemplateDeclaration *td_ambig = NULL;
+    TemplateDeclaration *td_best = NULL;
+    MATCH m_best = MATCHnomatch;
+    Objects dedtypes;
+
+#if LOG
+    printf("TemplateInstance::findBestMatch()\n");
+#endif
+    // First look for forward references
+    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
+    {
+        if (!td->semanticRun)
+        {
+            if (td->scope)
+            {   // Try to fix forward reference
+                td->semantic(td->scope);
+            }
+            if (!td->semanticRun)
+            {
+                error("%s forward references template declaration %s\n", toChars(), td->toChars());
+                return NULL;
+            }
+        }
+    }
+
+    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
+    {
+        MATCH m;
+
+//if (tiargs->dim) printf("2: tiargs->dim = %d, data[0] = %p\n", tiargs->dim, tiargs->tdata()[0]);
+
+        // If more arguments than parameters,
+        // then this is no match.
+        if (td->parameters->dim < tiargs->dim)
+        {
+            if (!td->isVariadic())
+                continue;
+        }
+
+        dedtypes.setDim(td->parameters->dim);
+        dedtypes.zero();
+        assert(td->semanticRun);
+        m = td->matchWithInstance(this, &dedtypes, fargs, 0);
+        //printf("matchWithInstance = %d\n", m);
+        if (!m)                 // no match at all
+            continue;
+
+        if (m < m_best)
+            goto Ltd_best;
+        if (m > m_best)
+            goto Ltd;
+
+        {
+        // Disambiguate by picking the most specialized TemplateDeclaration
+        MATCH c1 = td->leastAsSpecialized(td_best, fargs);
+        MATCH c2 = td_best->leastAsSpecialized(td, fargs);
+        //printf("c1 = %d, c2 = %d\n", c1, c2);
+
+        if (c1 > c2)
+            goto Ltd;
+        else if (c1 < c2)
+            goto Ltd_best;
+        else
+            goto Lambig;
+        }
+
+      Lambig:           // td_best and td are ambiguous
+        td_ambig = td;
+        continue;
+
+      Ltd_best:         // td_best is the best match so far
+        td_ambig = NULL;
+        continue;
+
+      Ltd:              // td is the new best match
+        td_ambig = NULL;
+        td_best = td;
+        m_best = m;
+        tdtypes.setDim(dedtypes.dim);
+        memcpy(tdtypes.tdata(), dedtypes.tdata(), tdtypes.dim * sizeof(void *));
+        continue;
+    }
+
+    if (!td_best)
+    {
+        if (tempdecl && !tempdecl->overnext)
+            // Only one template, so we can give better error message
+            error("%s does not match template declaration %s", toChars(), tempdecl->toChars());
+        else
+            ::error(loc, "%s %s.%s does not match any template declaration",
+                    tempdecl->kind(), tempdecl->parent->toPrettyChars(), tempdecl->ident->toChars());
+        return NULL;
+    }
+    if (td_ambig)
+    {
+        ::error(loc, "%s %s.%s matches more than one template declaration, %s(%d):%s and %s(%d):%s",
+                td_best->kind(), td_best->parent->toPrettyChars(), td_best->ident->toChars(),
+                td_best->loc.filename,  td_best->loc.linnum,  td_best->toChars(),
+                td_ambig->loc.filename, td_ambig->loc.linnum, td_ambig->toChars());
+    }
+
+    /* The best match is td_best
+     */
+    tempdecl = td_best;
+
+#if 0
+    /* Cast any value arguments to be same type as value parameter
+     */
+    for (size_t i = 0; i < tiargs->dim; i++)
+    {   Object *o = tiargs->tdata()[i];
+        Expression *ea = isExpression(o);       // value argument
+        TemplateParameter *tp = tempdecl->parameters->tdata()[i];
+        assert(tp);
+        TemplateValueParameter *tvp = tp->isTemplateValueParameter();
+        if (tvp)
+        {
+            assert(ea);
+            ea = ea->castTo(tvp->valType);
+            ea = ea->optimize(WANTvalue | WANTinterpret);
+            tiargs->tdata()[i] = (Object *)ea;
+        }
+    }
+#endif
+
+#if LOG
+    printf("\tIt's a match with template declaration '%s'\n", tempdecl->toChars());
+#endif
+    return tempdecl;
+}
+
+
+/*****************************************
+ * Determines if a TemplateInstance will need a nested
+ * generation of the TemplateDeclaration.
+ */
+
+int TemplateInstance::hasNestedArgs(Objects *args)
+{   int nested = 0;
+    //printf("TemplateInstance::hasNestedArgs('%s')\n", tempdecl->ident->toChars());
+
+    /* A nested instance happens when an argument references a local
+     * symbol that is on the stack.
+     */
+    for (size_t i = 0; i < args->dim; i++)
+    {   Object *o = args->tdata()[i];
+        Expression *ea = isExpression(o);
+        Dsymbol *sa = isDsymbol(o);
+        Tuple *va = isTuple(o);
+        if (ea)
+        {
+            if (ea->op == TOKvar)
+            {
+                sa = ((VarExp *)ea)->var;
+                goto Lsa;
+            }
+            if (ea->op == TOKthis)
+            {
+                sa = ((ThisExp *)ea)->var;
+                goto Lsa;
+            }
+            if (ea->op == TOKfunction)
+            {
+                sa = ((FuncExp *)ea)->fd;
+                goto Lsa;
+            }
+        }
+        else if (sa)
+        {
+          Lsa:
+            TemplateDeclaration *td = sa->isTemplateDeclaration();
+            Declaration *d = sa->isDeclaration();
+            if ((td && td->literal) ||
+                (d && !d->isDataseg() &&
+#if DMDV2
+                 !(d->storage_class & STCmanifest) &&
+#endif
+                 (!d->isFuncDeclaration() || d->isFuncDeclaration()->isNested()) &&
+                 !isTemplateMixin()
+                ))
+            {
+                // if module level template
+                if (tempdecl->toParent()->isModule())
+                {   Dsymbol *dparent = sa->toParent();
+                    if (!isnested)
+                        isnested = dparent;
+                    else if (isnested != dparent)
+                    {
+                        /* Select the more deeply nested of the two.
+                         * Error if one is not nested inside the other.
+                         */
+                        for (Dsymbol *p = isnested; p; p = p->parent)
+                        {
+                            if (p == dparent)
+                                goto L1;        // isnested is most nested
+                        }
+                        for (Dsymbol *p = dparent; p; p = p->parent)
+                        {
+                            if (p == isnested)
+                            {   isnested = dparent;
+                                goto L1;        // dparent is most nested
+                            }
+                        }
+                        error("%s is nested in both %s and %s",
+                                toChars(), isnested->toChars(), dparent->toChars());
+                    }
+                  L1:
+                    //printf("\tnested inside %s\n", isnested->toChars());
+                    nested |= 1;
+                }
+                else
+                    error("cannot use local '%s' as parameter to non-global template %s", sa->toChars(), tempdecl->toChars());
+            }
+        }
+        else if (va)
+        {
+            nested |= hasNestedArgs(&va->objects);
+        }
+    }
+    return nested;
+}
+
+/****************************************
+ * This instance needs an identifier for name mangling purposes.
+ * Create one by taking the template declaration name and adding
+ * the type signature for it.
+ */
+
+Identifier *TemplateInstance::genIdent(Objects *args)
+{   OutBuffer buf;
+
+    //printf("TemplateInstance::genIdent('%s')\n", tempdecl->ident->toChars());
+    char *id = tempdecl->ident->toChars();
+    buf.printf("__T%llu%s", (ulonglong)strlen(id), id);
+    for (size_t i = 0; i < args->dim; i++)
+    {   Object *o = args->tdata()[i];
+        Type *ta = isType(o);
+        Expression *ea = isExpression(o);
+        Dsymbol *sa = isDsymbol(o);
+        Tuple *va = isTuple(o);
+        //printf("\to [%d] %p ta %p ea %p sa %p va %p\n", i, o, ta, ea, sa, va);
+        if (ta)
+        {
+            buf.writeByte('T');
+            if (ta->deco)
+                buf.writestring(ta->deco);
+            else
+            {
+#ifdef DEBUG
+                if (!global.errors)
+                    printf("ta = %d, %s\n", ta->ty, ta->toChars());
+#endif
+                assert(global.errors);
+            }
+        }
+        else if (ea)
+        {
+            // Don't interpret it yet, it might actually be an alias
+            ea = ea->optimize(WANTvalue);
+            if (ea->op == TOKvar)
+            {
+                sa = ((VarExp *)ea)->var;
+                ea = NULL;
+                goto Lsa;
+            }
+            if (ea->op == TOKthis)
+            {
+                sa = ((ThisExp *)ea)->var;
+                ea = NULL;
+                goto Lsa;
+            }
+            if (ea->op == TOKfunction)
+            {
+                sa = ((FuncExp *)ea)->fd;
+                ea = NULL;
+                goto Lsa;
+            }
+            buf.writeByte('V');
+            if (ea->op == TOKtuple)
+            {   ea->error("tuple is not a valid template value argument");
+                continue;
+            }
+            // Now that we know it is not an alias, we MUST obtain a value
+            unsigned olderr = global.errors;
+            ea = ea->optimize(WANTvalue | WANTinterpret);
+            if (ea->op == TOKerror || olderr != global.errors)
+                continue;
+#if 1
+            /* Use deco that matches what it would be for a function parameter
+             */
+            buf.writestring(ea->type->deco);
+#else
+            // Use type of parameter, not type of argument
+            TemplateParameter *tp = tempdecl->parameters->tdata()[i];
+            assert(tp);
+            TemplateValueParameter *tvp = tp->isTemplateValueParameter();
+            assert(tvp);
+            buf.writestring(tvp->valType->deco);
+#endif
+            ea->toMangleBuffer(&buf);
+        }
+        else if (sa)
+        {
+          Lsa:
+            buf.writeByte('S');
+            Declaration *d = sa->isDeclaration();
+            if (d && (!d->type || !d->type->deco))
+            {   error("forward reference of %s", d->toChars());
+                continue;
+            }
+#if 0
+            VarDeclaration *v = sa->isVarDeclaration();
+            if (v && v->storage_class & STCmanifest)
+            {   ExpInitializer *ei = v->init->isExpInitializer();
+                if (ei)
+                {
+                    ea = ei->exp;
+                    goto Lea;
+                }
+            }
+#endif
+            const char *p = sa->mangle();
+
+            /* Bugzilla 3043: if the first character of p is a digit this
+             * causes ambiguity issues because the digits of the two numbers are adjacent.
+             * Current demanglers resolve this by trying various places to separate the
+             * numbers until one gets a successful demangle.
+             * Unfortunately, fixing this ambiguity will break existing binary
+             * compatibility and the demanglers, so we'll leave it as is.
+             */
+            buf.printf("%llu%s", (ulonglong)strlen(p), p);
+        }
+        else if (va)
+        {
+            assert(i + 1 == args->dim);         // must be last one
+            args = &va->objects;
+            i = -1;
+        }
+        else
+            assert(0);
+    }
+    buf.writeByte('Z');
+    id = buf.toChars();
+    //buf.data = NULL;                          // we can free the string after call to idPool()
+    //printf("\tgenIdent = %s\n", id);
+    return Lexer::idPool(id);
+}
+
+
+/****************************************************
+ * Declare parameters of template instance, initialize them with the
+ * template instance arguments.
+ */
+
+void TemplateInstance::declareParameters(Scope *sc)
+{
+    //printf("TemplateInstance::declareParameters()\n");
+    for (size_t i = 0; i < tdtypes.dim; i++)
+    {
+        TemplateParameter *tp = tempdecl->parameters->tdata()[i];
+        //Object *o = tiargs->tdata()[i];
+        Object *o = tdtypes.tdata()[i];          // initializer for tp
+
+        //printf("\ttdtypes[%d] = %p\n", i, o);
+        tempdecl->declareParameter(sc, tp, o);
+    }
+}
+
+/*****************************************************
+ * Determine if template instance is really a template function,
+ * and that template function needs to infer types from the function
+ * arguments.
+ */
+
+int TemplateInstance::needsTypeInference(Scope *sc)
+{
+    //printf("TemplateInstance::needsTypeInference() %s\n", toChars());
+    if (!tempdecl)
+        tempdecl = findTemplateDeclaration(sc);
+    int multipleMatches = FALSE;
+    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
+    {
+        /* If any of the overloaded template declarations need inference,
+         * then return TRUE
+         */
+        FuncDeclaration *fd;
+        if (!td->onemember ||
+            (fd = td->onemember->toAlias()->isFuncDeclaration()) == NULL ||
+            fd->type->ty != Tfunction)
+        {
+            /* Not a template function, therefore type inference is not possible.
+             */
+            //printf("false\n");
+            return FALSE;
+        }
+
+        for (size_t i = 0; i < td->parameters->dim; i++)
+            if (td->parameters->tdata()[i]->isTemplateThisParameter())
+                return TRUE;
+
+        /* Determine if the instance arguments, tiargs, are all that is necessary
+         * to instantiate the template.
+         */
+        //printf("tp = %p, td->parameters->dim = %d, tiargs->dim = %d\n", tp, td->parameters->dim, tiargs->dim);
+        TypeFunction *fdtype = (TypeFunction *)fd->type;
+        if (Parameter::dim(fdtype->parameters))
+        {
+            TemplateParameter *tp = td->isVariadic();
+            if (tp && td->parameters->dim > 1)
+                return TRUE;
+
+            if (tiargs->dim < td->parameters->dim)
+            {   // Can remain tiargs be filled by default arguments?
+                for (size_t i = tiargs->dim; i < td->parameters->dim; i++)
+                {   tp = (*td->parameters)[i];
+                    if (TemplateTypeParameter *ttp = tp->isTemplateTypeParameter())
+                    {   if (!ttp->defaultType)
+                            return TRUE;
+                    }
+                    else if (TemplateAliasParameter *tap = tp->isTemplateAliasParameter())
+                    {   if (!tap->defaultAlias)
+                            return TRUE;
+                    }
+                    else if (TemplateValueParameter *tvp = tp->isTemplateValueParameter())
+                    {   if (!tvp->defaultValue)
+                            return TRUE;
+                    }
+                }
+            }
+        }
+        /* If there is more than one function template which matches, we may
+         * need type inference (see Bugzilla 4430)
+         */
+        if (td != tempdecl)
+            multipleMatches = TRUE;
+    }
+    //printf("false\n");
+    return multipleMatches;
+}
+
+void TemplateInstance::semantic2(Scope *sc)
+{   int i;
+
+    if (semanticRun >= PASSsemantic2)
+        return;
+    semanticRun = PASSsemantic2;
+#if LOG
+    printf("+TemplateInstance::semantic2('%s')\n", toChars());
+#endif
+    if (!errors && members)
+    {
+        sc = tempdecl->scope;
+        assert(sc);
+        sc = sc->push(argsym);
+        sc = sc->push(this);
+        sc->tinst = this;
+        for (i = 0; i < members->dim; i++)
+        {
+            Dsymbol *s = members->tdata()[i];
+#if LOG
+printf("\tmember '%s', kind = '%s'\n", s->toChars(), s->kind());
+#endif
+            s->semantic2(sc);
+        }
+        sc = sc->pop();
+        sc->pop();
+    }
+#if LOG
+    printf("-TemplateInstance::semantic2('%s')\n", toChars());
+#endif
+}
+
+void TemplateInstance::semantic3(Scope *sc)
+{
+#if LOG
+    printf("TemplateInstance::semantic3('%s'), semanticRun = %d\n", toChars(), semanticRun);
+#endif
+//if (toChars()[0] == 'D') *(char*)0=0;
+    if (semanticRun >= PASSsemantic3)
+        return;
+    semanticRun = PASSsemantic3;
+    if (!errors && members)
+    {
+        sc = tempdecl->scope;
+        sc = sc->push(argsym);
+        sc = sc->push(this);
+        sc->tinst = this;
+        if (ignore)
+            sc->ignoreTemplates++;
+        int oldgag = global.gag;
+        int olderrors = global.errors;
+        /* If this is a speculative instantiation, gag errors.
+         * Future optimisation: If the results are actually needed, errors
+         * would already be gagged, so we don't really need to run semantic
+         * on the members.
+         */
+        if (speculative && !oldgag)
+            olderrors = global.startGagging();
+        for (size_t i = 0; i < members->dim; i++)
+        {
+            Dsymbol *s = members->tdata()[i];
+            s->semantic3(sc);
+            if (speculative && global.errors != olderrors)
+                break;
+        }
+        if (speculative && !oldgag)
+        {   // If errors occurred, this instantiation failed
+            errors += global.errors - olderrors;
+            global.endGagging(olderrors);
+        }
+        sc = sc->pop();
+        sc->pop();
+    }
+}
+
+#if IN_DMD
+
+/**************************************
+ * Given an error instantiating the TemplateInstance,
+ * give the nested TemplateInstance instantiations that got
+ * us here. Those are a list threaded into the nested scopes.
+ */
+void TemplateInstance::printInstantiationTrace()
+{
+    if (global.gag)
+        return;
+
+    const unsigned max_shown = 6;
+    const char format[] = "instantiated from here: %s";
+
+    // determine instantiation depth and number of recursive instantiations
+    int n_instantiations = 1;
+    int n_totalrecursions = 0;
+    for (TemplateInstance *cur = this; cur; cur = cur->tinst)
+    {
+        ++n_instantiations;
+        // If two instantiations use the same declaration, they are recursive.
+        // (this works even if they are instantiated from different places in the
+        // same template).
+        // In principle, we could also check for multiple-template recursion, but it's
+        // probably not worthwhile.
+        if (cur->tinst && cur->tempdecl && cur->tinst->tempdecl
+            && cur->tempdecl->loc.equals(cur->tinst->tempdecl->loc))
+            ++n_totalrecursions;
+    }
+
+    // show full trace only if it's short or verbose is on
+    if (n_instantiations <= max_shown || global.params.verbose)
+    {
+        for (TemplateInstance *cur = this; cur; cur = cur->tinst)
+        {
+            errorSupplemental(cur->loc, format, cur->toChars());
+        }
+    }
+    else if (n_instantiations - n_totalrecursions <= max_shown)
+    {
+        // By collapsing recursive instantiations into a single line,
+        // we can stay under the limit.
+        int recursionDepth=0;
+        for (TemplateInstance *cur = this; cur; cur = cur->tinst)
+        {
+            if (cur->tinst && cur->tempdecl && cur->tinst->tempdecl
+                    && cur->tempdecl->loc.equals(cur->tinst->tempdecl->loc))
+            {
+                ++recursionDepth;
+            }
+            else
+            {
+                if (recursionDepth)
+                    errorSupplemental(cur->loc, "%d recursive instantiations from here: %s", recursionDepth+2, cur->toChars());
+                else
+                    errorSupplemental(cur->loc, format, cur->toChars());
+                recursionDepth = 0;
+            }
+        }
+    }
+    else
+    {
+        // Even after collapsing the recursions, the depth is too deep.
+        // Just display the first few and last few instantiations.
+        unsigned i = 0;
+        for (TemplateInstance *cur = this; cur; cur = cur->tinst)
+        {
+            if (i == max_shown / 2)
+                errorSupplemental(cur->loc, "... (%d instantiations, -v to show) ...", n_instantiations - max_shown);
+
+            if (i < max_shown / 2 ||
+                i >= n_instantiations - max_shown + max_shown / 2)
+                errorSupplemental(cur->loc, format, cur->toChars());
+            ++i;
+        }
+    }
+}
+
+void TemplateInstance::toObjFile(int multiobj)
+{
+#if LOG
+    printf("TemplateInstance::toObjFile('%s', this = %p)\n", toChars(), this);
+#endif
+    if (!errors && members)
+    {
+        if (multiobj)
+            // Append to list of object files to be written later
+            obj_append(this);
+        else
+        {
+            for (size_t i = 0; i < members->dim; i++)
+            {
+                Dsymbol *s = members->tdata()[i];
+                s->toObjFile(multiobj);
+            }
+        }
+    }
+}
+
+#endif
+
+void TemplateInstance::inlineScan()
+{
+#if LOG
+    printf("TemplateInstance::inlineScan('%s')\n", toChars());
+#endif
+    if (!errors && members)
+    {
+        for (size_t i = 0; i < members->dim; i++)
+        {
+            Dsymbol *s = members->tdata()[i];
+            s->inlineScan();
+        }
+    }
+}
+
+void TemplateInstance::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    int i;
+
+    Identifier *id = name;
+    buf->writestring(id->toChars());
+    buf->writestring("!(");
+    if (nest)
+        buf->writestring("...");
+    else
+    {
+        nest++;
+        Objects *args = tiargs;
+        for (i = 0; i < args->dim; i++)
+        {
+            if (i)
+                buf->writeByte(',');
+            Object *oarg = (*args)[i];
+            ObjectToCBuffer(buf, hgs, oarg);
+        }
+        nest--;
+    }
+    buf->writeByte(')');
+}
+
+
+Dsymbol *TemplateInstance::toAlias()
+{
+#if LOG
+    printf("TemplateInstance::toAlias()\n");
+#endif
+    if (!inst)
+    {
+        // Maybe we can resolve it
+        if (scope)
+        {
+            /* Anything that affects scope->offset must be
+             * done in lexical order. Fwd ref error if it is affected, otherwise allow.
+             */
+            unsigned offset = scope->offset;
+            Scope *sc = scope;
+            semantic(scope);
+//            if (offset != sc->offset)
+//                inst = NULL;            // trigger fwd ref error
+        }
+        if (!inst)
+        {   error("cannot resolve forward reference");
+            errors = 1;
+            return this;
+        }
+    }
+
+    if (inst != this)
+        return inst->toAlias();
+
+    if (aliasdecl)
+    {
+        return aliasdecl->toAlias();
+    }
+
+    return inst;
+}
+
+AliasDeclaration *TemplateInstance::isAliasDeclaration()
+{
+    return aliasdecl;
+}
+
+const char *TemplateInstance::kind()
+{
+    return "template instance";
+}
+
+int TemplateInstance::oneMember(Dsymbol **ps, Identifier *ident)
+{
+    *ps = NULL;
+    return TRUE;
+}
+
+char *TemplateInstance::toChars()
+{
+    OutBuffer buf;
+    HdrGenState hgs;
+    char *s;
+
+    toCBuffer(&buf, &hgs);
+    s = buf.toChars();
+    buf.data = NULL;
+    return s;
+}
+
+#if IN_LLVM
+
+void TemplateInstance::printInstantiationTrace()
+{
+    if(global.gag)
+	return;
+
+    const int max_shown = 6;
+
+    // determine instantiation depth
+    int n_instantiations = 1;
+    TemplateInstance* cur = this;
+    while(cur = cur->tinst)
+	++n_instantiations;
+
+    // show full trace only if it's short or verbose is on
+    if(n_instantiations <= max_shown || global.params.verbose)
+    {
+	cur = this;
+	while(cur)
+	{
+	    fprintf(stdmsg,"    instantiatied in %s: %s\n", cur->loc.toChars(), cur->toChars());
+	    cur = cur->tinst;
+	}
+    }
+    else
+    {
+	cur = this;
+	size_t i = 0;
+	for(; i < max_shown/2; ++i, cur = cur->tinst)
+	    fprintf(stdmsg,"    instantiatied in %s: %s\n", cur->loc.toChars(), cur->toChars());
+	fprintf(stdmsg,"    ... (%d instantiations, -v to show) ...\n", n_instantiations - max_shown);
+	for(; i < n_instantiations - max_shown + max_shown/2; ++i, cur = cur->tinst) 
+	{}
+	for(; i < n_instantiations; ++i, cur = cur->tinst) 
+	    fprintf(stdmsg,"    instantiatied in %s: %s\n", cur->loc.toChars(), cur->toChars());
+    }
+}
+
+#endif
+
+/* ======================== TemplateMixin ================================ */
+
+TemplateMixin::TemplateMixin(Loc loc, Identifier *ident, Type *tqual,
+        Identifiers *idents, Objects *tiargs)
+        : TemplateInstance(loc, idents->tdata()[idents->dim - 1])
+{
+    //printf("TemplateMixin(ident = '%s')\n", ident ? ident->toChars() : "");
+    this->ident = ident;
+    this->tqual = tqual;
+    this->idents = idents;
+    this->tiargs = tiargs ? tiargs : new Objects();
+}
+
+Dsymbol *TemplateMixin::syntaxCopy(Dsymbol *s)
+{   TemplateMixin *tm;
+
+    Identifiers *ids = new Identifiers();
+    ids->setDim(idents->dim);
+    for (size_t i = 0; i < idents->dim; i++)
+    {   // Matches TypeQualified::syntaxCopyHelper()
+        Identifier *id = idents->tdata()[i];
+        if (id->dyncast() == DYNCAST_DSYMBOL)
+        {
+            TemplateInstance *ti = (TemplateInstance *)id;
+
+            ti = (TemplateInstance *)ti->syntaxCopy(NULL);
+            id = (Identifier *)ti;
+        }
+        ids->tdata()[i] = id;
+    }
+
+    tm = new TemplateMixin(loc, ident,
+                (Type *)(tqual ? tqual->syntaxCopy() : NULL),
+                ids, tiargs);
+    TemplateInstance::syntaxCopy(tm);
+    return tm;
+}
+
+void TemplateMixin::semantic(Scope *sc)
+{
+#if LOG
+    printf("+TemplateMixin::semantic('%s', this=%p)\n", toChars(), this);
+    fflush(stdout);
+#endif
+    if (semanticRun)
+    {
+        // This for when a class/struct contains mixin members, and
+        // is done over because of forward references
+        if (parent && toParent()->isAggregateDeclaration())
+            semanticRun = PASSsemantic;            // do over
+        else
+        {
+#if LOG
+            printf("\tsemantic done\n");
+#endif
+            return;
+        }
+    }
+    if (!semanticRun)
+        semanticRun = PASSsemantic;
+#if LOG
+    printf("\tdo semantic\n");
+#endif
+
+#if !IN_LLVM && !IN_GCC
+    // dont know what this is
+    util_progress();
+#endif
+
+    Scope *scx = NULL;
+    if (scope)
+    {   sc = scope;
+        scx = scope;            // save so we don't make redundant copies
+        scope = NULL;
+    }
+
+    // Follow qualifications to find the TemplateDeclaration
+    if (!tempdecl)
+    {   Dsymbol *s;
+        size_t i;
+        Identifier *id;
+
+        if (tqual)
+        {   s = tqual->toDsymbol(sc);
+            i = 0;
+        }
+        else
+        {
+            i = 1;
+            id = idents->tdata()[0];
+            switch (id->dyncast())
+            {
+                case DYNCAST_IDENTIFIER:
+                    s = sc->search(loc, id, NULL);
+                    break;
+
+                case DYNCAST_DSYMBOL:
+                {
+                    TemplateInstance *ti = (TemplateInstance *)id;
+                    ti->semantic(sc);
+                    s = ti;
+                    break;
+                }
+                default:
+                    assert(0);
+            }
+        }
+
+        for (; i < idents->dim; i++)
+        {
+            if (!s)
+                break;
+            id = idents->tdata()[i];
+            s = s->searchX(loc, sc, id);
+        }
+        if (!s)
+        {
+            error("is not defined");
+            inst = this;
+            return;
+        }
+        tempdecl = s->toAlias()->isTemplateDeclaration();
+        if (!tempdecl)
+        {
+            error("%s isn't a template", s->toChars());
+            inst = this;
+            return;
+        }
+    }
+
+    // Look for forward reference
+    assert(tempdecl);
+    for (TemplateDeclaration *td = tempdecl; td; td = td->overnext)
+    {
+        if (!td->semanticRun)
+        {
+            /* Cannot handle forward references if mixin is a struct member,
+             * because addField must happen during struct's semantic, not
+             * during the mixin semantic.
+             * runDeferred will re-run mixin's semantic outside of the struct's
+             * semantic.
+             */
+            semanticRun = PASSinit;
+            AggregateDeclaration *ad = toParent()->isAggregateDeclaration();
+            if (ad)
+                ad->sizeok = SIZEOKfwd;
+            else
+            {
+                // Forward reference
+                //printf("forward reference - deferring\n");
+                scope = scx ? scx : new Scope(*sc);
+                scope->setNoFree();
+                scope->module->addDeferredSemantic(this);
+            }
+            return;
+        }
+    }
+
+    // Run semantic on each argument, place results in tiargs[]
+    semanticTiargs(sc);
+    if (errors || arrayObjectIsError(tiargs))
+        return;
+
+    tempdecl = findBestMatch(sc, NULL);
+    if (!tempdecl)
+    {   inst = this;
+        return;         // error recovery
+    }
+
+    if (!ident)
+        ident = genIdent(tiargs);
+
+    inst = this;
+    parent = sc->parent;
+
+    /* Detect recursive mixin instantiations.
+     */
+    for (Dsymbol *s = parent; s; s = s->parent)
+    {
+        //printf("\ts = '%s'\n", s->toChars());
+        TemplateMixin *tm = s->isTemplateMixin();
+        if (!tm || tempdecl != tm->tempdecl)
+            continue;
+
+        /* Different argument list lengths happen with variadic args
+         */
+        if (tiargs->dim != tm->tiargs->dim)
+            continue;
+
+        for (size_t i = 0; i < tiargs->dim; i++)
+        {   Object *o = (*tiargs)[i];
+            Type *ta = isType(o);
+            Expression *ea = isExpression(o);
+            Dsymbol *sa = isDsymbol(o);
+            Object *tmo = (*tm->tiargs)[i];
+            if (ta)
+            {
+                Type *tmta = isType(tmo);
+                if (!tmta)
+                    goto Lcontinue;
+                if (!ta->equals(tmta))
+                    goto Lcontinue;
+            }
+            else if (ea)
+            {   Expression *tme = isExpression(tmo);
+                if (!tme || !ea->equals(tme))
+                    goto Lcontinue;
+            }
+            else if (sa)
+            {
+                Dsymbol *tmsa = isDsymbol(tmo);
+                if (sa != tmsa)
+                    goto Lcontinue;
+            }
+            else
+                assert(0);
+        }
+        error("recursive mixin instantiation");
+        return;
+
+    Lcontinue:
+        continue;
+    }
+
+    // Copy the syntax trees from the TemplateDeclaration
+    members = Dsymbol::arraySyntaxCopy(tempdecl->members);
+    if (!members)
+        return;
+
+    symtab = new DsymbolTable();
+
+    for (Scope *sce = sc; 1; sce = sce->enclosing)
+    {
+        ScopeDsymbol *sds = (ScopeDsymbol *)sce->scopesym;
+        if (sds)
+        {
+            sds->importScope(this, PROTpublic);
+            break;
+        }
+    }
+
+#if LOG
+    printf("\tcreate scope for template parameters '%s'\n", toChars());
+#endif
+    Scope *scy = sc;
+    scy = sc->push(this);
+    scy->parent = this;
+
+    argsym = new ScopeDsymbol();
+    argsym->parent = scy->parent;
+    Scope *argscope = scy->push(argsym);
+
+    unsigned errorsave = global.errors;
+
+    // Declare each template parameter as an alias for the argument type
+    declareParameters(argscope);
+
+    // Add members to enclosing scope, as well as this scope
+    for (size_t i = 0; i < members->dim; i++)
+    {   Dsymbol *s = (*members)[i];
+        s->addMember(argscope, this, i);
+        //sc->insert(s);
+        //printf("sc->parent = %p, sc->scopesym = %p\n", sc->parent, sc->scopesym);
+        //printf("s->parent = %s\n", s->parent->toChars());
+    }
+
+    // Do semantic() analysis on template instance members
+#if LOG
+    printf("\tdo semantic() on template instance members '%s'\n", toChars());
+#endif
+    Scope *sc2;
+    sc2 = argscope->push(this);
+    sc2->offset = sc->offset;
+
+    static int nest;
+    //printf("%d\n", nest);
+    if (++nest > 500)
+    {
+        global.gag = 0;                 // ensure error message gets printed
+        error("recursive expansion");
+        fatal();
+    }
+
+    for (size_t i = 0; i < members->dim; i++)
+    {
+        Dsymbol *s = (*members)[i];
+        s->semantic(sc2);
+    }
+
+    nest--;
+
+    sc->offset = sc2->offset;
+
+    /* The problem is when to parse the initializer for a variable.
+     * Perhaps VarDeclaration::semantic() should do it like it does
+     * for initializers inside a function.
+     */
+//    if (sc->parent->isFuncDeclaration())
+
+        semantic2(sc2);
+
+    if (sc->func)
+    {
+        semantic3(sc2);
+    }
+
+    // Give additional context info if error occurred during instantiation
+    if (global.errors != errorsave)
+    {
+        error("error instantiating");
+    }
+
+    sc2->pop();
+
+    argscope->pop();
+
+//    if (!isAnonymous())
+    {
+        scy->pop();
+    }
+#if LOG
+    printf("-TemplateMixin::semantic('%s', this=%p)\n", toChars(), this);
+#endif
+}
+
+void TemplateMixin::semantic2(Scope *sc)
+{
+    if (semanticRun >= PASSsemantic2)
+        return;
+    semanticRun = PASSsemantic2;
+#if LOG
+    printf("+TemplateMixin::semantic2('%s')\n", toChars());
+#endif
+    if (members)
+    {
+        assert(sc);
+        sc = sc->push(argsym);
+        sc = sc->push(this);
+        for (size_t i = 0; i < members->dim; i++)
+        {
+            Dsymbol *s = (*members)[i];
+#if LOG
+            printf("\tmember '%s', kind = '%s'\n", s->toChars(), s->kind());
+#endif
+            s->semantic2(sc);
+        }
+        sc = sc->pop();
+        sc->pop();
+    }
+#if LOG
+    printf("-TemplateMixin::semantic2('%s')\n", toChars());
+#endif
+}
+
+void TemplateMixin::semantic3(Scope *sc)
+{
+    if (semanticRun >= PASSsemantic3)
+        return;
+    semanticRun = PASSsemantic3;
+#if LOG
+    printf("TemplateMixin::semantic3('%s')\n", toChars());
+#endif
+    if (members)
+    {
+        sc = sc->push(argsym);
+        sc = sc->push(this);
+        for (size_t i = 0; i < members->dim; i++)
+        {
+            Dsymbol *s = members->tdata()[i];
+            s->semantic3(sc);
+        }
+        sc = sc->pop();
+        sc->pop();
+    }
+}
+
+void TemplateMixin::inlineScan()
+{
+    TemplateInstance::inlineScan();
+}
+
+const char *TemplateMixin::kind()
+{
+    return "mixin";
+}
+
+int TemplateMixin::oneMember(Dsymbol **ps, Identifier *ident)
+{
+    return Dsymbol::oneMember(ps, ident);
+}
+
+int TemplateMixin::apply(Dsymbol_apply_ft_t fp, void *param)
+{
+    if (members)
+    {
+        for (size_t i = 0; i < members->dim; i++)
+        {   Dsymbol *s = (*members)[i];
+            if (s)
+            {
+                if (s->apply(fp, param))
+                    return 1;
+            }
+        }
+    }
+    return 0;
+}
+
+int TemplateMixin::hasPointers()
+{
+    //printf("TemplateMixin::hasPointers() %s\n", toChars());
+
+    if (members)
+        for (size_t i = 0; i < members->dim; i++)
+        {
+            Dsymbol *s = (*members)[i];
+            //printf(" s = %s %s\n", s->kind(), s->toChars());
+            if (s->hasPointers())
+            {
+                return 1;
+            }
+        }
+    return 0;
+}
+
+void TemplateMixin::setFieldOffset(AggregateDeclaration *ad, unsigned *poffset, bool isunion)
+{
+    if (members)
+    {
+        for (size_t i = 0; i < members->dim; i++)
+        {   Dsymbol *s = (*members)[i];
+            s->setFieldOffset(ad, poffset, isunion);
+        }
+    }
+}
+
+char *TemplateMixin::toChars()
+{
+    OutBuffer buf;
+    HdrGenState hgs;
+    char *s;
+
+    TemplateInstance::toCBuffer(&buf, &hgs);
+    s = buf.toChars();
+    buf.data = NULL;
+    return s;
+}
+
+void TemplateMixin::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("mixin ");
+
+    for (size_t i = 0; i < idents->dim; i++)
+    {   Identifier *id = idents->tdata()[i];
+
+        if (i)
+            buf->writeByte('.');
+        buf->writestring(id->toChars());
+    }
+    buf->writestring("!(");
+    if (tiargs)
+    {
+        for (size_t i = 0; i < tiargs->dim; i++)
+        {   if (i)
+                buf->writebyte(',');
+            Object *oarg = tiargs->tdata()[i];
+            Type *t = isType(oarg);
+            Expression *e = isExpression(oarg);
+            Dsymbol *s = isDsymbol(oarg);
+            if (t)
+                t->toCBuffer(buf, NULL, hgs);
+            else if (e)
+                e->toCBuffer(buf, hgs);
+            else if (s)
+            {
+                char *p = s->ident ? s->ident->toChars() : s->toChars();
+                buf->writestring(p);
+            }
+            else if (!oarg)
+            {
+                buf->writestring("NULL");
+            }
+            else
+            {
+                assert(0);
+            }
+        }
+    }
+    buf->writebyte(')');
+    if (ident)
+    {
+        buf->writebyte(' ');
+        buf->writestring(ident->toChars());
+    }
+    buf->writebyte(';');
+    buf->writenl();
+}
+
+
+#if IN_DMD
+void TemplateMixin::toObjFile(int multiobj)
+{
+    //printf("TemplateMixin::toObjFile('%s')\n", toChars());
+    TemplateInstance::toObjFile(multiobj);
+}
+#endif
+
diff --git a/dmd2/total.h b/dmd2/total.h
index 1a0c9a89..42f38765 100644
--- a/dmd2/total.h
+++ b/dmd2/total.h
@@ -1,46 +1,46 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2006 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-#ifndef DMD_TOTAL_H
-#define DMD_TOTAL_H
-
-#ifdef __DMC__
-#pragma once
-#endif /* __DMC__ */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <wchar.h>
-
-#include "root.h"
-#include "stringtable.h"
-
-#include "arraytypes.h"
-#include "mars.h"
-#include "lexer.h"
-#include "parse.h"
-#include "identifier.h"
-#include "enum.h"
-#include "aggregate.h"
-#include "mtype.h"
-#include "expression.h"
-#include "declaration.h"
-#include "statement.h"
-#include "scope.h"
-#include "import.h"
-#include "module.h"
-#include "id.h"
-#include "cond.h"
-#include "version.h"
-#include "lib.h"
-
-#endif /* DMD_TOTAL_H */
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2006 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+#ifndef DMD_TOTAL_H
+#define DMD_TOTAL_H
+
+#ifdef __DMC__
+#pragma once
+#endif /* __DMC__ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <wchar.h>
+
+#include "root.h"
+#include "stringtable.h"
+
+#include "arraytypes.h"
+#include "mars.h"
+#include "lexer.h"
+#include "parse.h"
+#include "identifier.h"
+#include "enum.h"
+#include "aggregate.h"
+#include "mtype.h"
+#include "expression.h"
+#include "declaration.h"
+#include "statement.h"
+#include "scope.h"
+#include "import.h"
+#include "module.h"
+#include "id.h"
+#include "cond.h"
+#include "version.h"
+#include "lib.h"
+
+#endif /* DMD_TOTAL_H */