Changeset 294

Timestamp:

12/15/09 05:53:21 (15 years ago)

Author:

walter

Message:

bugzilla 2816 Sudden-death static assert is not very useful

Files:

• branches/dmd-1.x/src/expression.h (modified) (1 diff)
• branches/dmd-1.x/src/staticassert.c (modified) (1 diff)
• branches/dmd-1.x/src/template.c (modified) (5 diffs)
• branches/dmd-1.x/src/template.h (modified) (1 diff)
• trunk/src/staticassert.c (modified) (1 diff)
• trunk/src/template.c (modified) (2 diffs)

branches/dmd-1.x/src/expression.h

@@ -1223 +1223 @@
-
-    elem *toElem(IRState *irs);
-};
-
-struct ModExp : BinExp
-{
-    ModExp(Loc loc, Expression *e1, Expression *e2);
-    Expression *semantic(Scope *sc);
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
-    void buildArrayIdent(OutBuffer *buf, Expressions *arguments);
-    Expression *buildArrayLoop(Parameters *fparams);
-
-    // For operator overloading
-    Identifier *opId();
-    Identifier *opId_r();
-
-    elem *toElem(IRState *irs);
-};
-
+#if DMDV2
+struct PowExp : BinExp
+{
+    PowExp(Loc loc, Expression *e1, Expression *e2);
+    Expression *semantic(Scope *sc);
+
+    // For operator overloading
+    Identifier *opId();
+    Identifier *opId_r();
+};
+#endif
+
-struct ShlExp : BinExp
-{
-    ShlExp(Loc loc, Expression *e1, Expression *e2);
-    Expression *semantic(Scope *sc);
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
-
-    // For operator overloading
-    Identifier *opId();
-    Identifier *opId_r();
-
-    elem *toElem(IRState *irs);
-};
-
-struct ShrExp : BinExp
-{
-    ShrExp(Loc loc, Expression *e1, Expression *e2);
-    Expression *semantic(Scope *sc);
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);

branches/dmd-1.x/src/staticassert.c

@@ -1 +1 @@
-
-// Copyright (c) 1999-2007 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 "dsymbol.h"
-#include "staticassert.h"
-#include "expression.h"
-#include "id.h"
-#include "hdrgen.h"
-#include "scope.h"
-#include "template.h"
+#include "declaration.h"
-
-
-/********************************* AttribDeclaration ****************************/
-
-StaticAssert::StaticAssert(Loc loc, Expression *exp, Expression *msg)
-    : Dsymbol(Id::empty)
-{
-    this->loc = loc;
-    this->exp = exp;
-    this->msg = msg;
-}
-
-Dsymbol *StaticAssert::syntaxCopy(Dsymbol *s)
-{
-    StaticAssert *sa;
-
-    assert(!s);
-    sa = new StaticAssert(loc, exp->syntaxCopy(), msg ? msg->syntaxCopy() : NULL);
-    return sa;
-}
-
-int StaticAssert::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
-{
-    return 0;       // we didn't add anything
-}
-
-void StaticAssert::semantic(Scope *sc)
-{
-}
-
-#include "scope.h"
-#include "template.h"
-#include "declaration.h"
-
-void StaticAssert::semantic2(Scope *sc)
-{
-    Expression *e;
-
-    //printf("StaticAssert::semantic2() %s\n", toChars());
-    e = exp->semantic(sc);
-    e = e->optimize(WANTvalue | WANTinterpret);
-    if (e->isBool(FALSE))
-    {
-    if (msg)
-    {   HdrGenState hgs;
-        OutBuffer buf;
-
-        msg = msg->semantic(sc);
-        msg = msg->optimize(WANTvalue | WANTinterpret);
-        hgs.console = 1;
-        msg->toCBuffer(&buf, &hgs);
-        error("%s", buf.toChars());
-    }
-    else
-        error("(%s) is false", exp->toChars());
-   if
+if 
-        sc->tinst->printInstantiationTrace();
-  if (!global.gag) {
+if (!global.gag)
-          fatal();
-      }
-    }
-    else if (!e->isBool(TRUE))
-    {
-    error("(%s) is not evaluatable at compile time", exp->toChars());
-    }
-}
-
-int StaticAssert::oneMember(Dsymbol **ps)
-{
-    //printf("StaticAssert::oneMember())\n");
-    *ps = NULL;
-    return TRUE;
-}
-
-void StaticAssert::inlineScan()
-{
-}
-
-void StaticAssert::toObjFile(int multiobj)
-{

branches/dmd-1.x/src/template.c

@@ -3438 +3438 @@
-    {   Dsymbol *sd = (Dsymbol *)Module::deferred.data[i];
-
-    if (sd->parent == this)
-        goto Laftersemantic;
-    }
-
-    /* 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)
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-  Laftersemantic:
-    sc2->pop();
-
-    scope->pop();
-
-    // Give additional context info if error occurred during instantiation
-    if (global.errors != errorsave)
-    {
-    error("error instantiating");
- && !global.gag
+
-    {   tinst->printInstantiationTrace();
-        fatal();
-    }
-    errors = 1;
-    if (global.gag)
-        tempdecl->instances.remove(tempdecl_instance_idx);
-    }
-
-#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;
@@ -3613 +3634 @@
- * 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;
-    int i;
-
-    id = name;
-    s = sc->search(loc, id, &scopesym);
-    if (!s)
-identifier
+template
-        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->name == id ||
-         ti->toAlias()->ident == id)
-        &&
@@ -3919 +3940 @@
-        else
-            error("cannot use local '%s' as parameter to non-global template %s", d->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()
-{   OutBuffer buf;
-    char *id;
-    Objects *args;
-
-    //printf("TemplateInstance::genIdent('%s')\n", tempdecl->ident->toChars());
-
+char *
-    buf.printf("__T%zu%s", strlen(id), id);
-
+Objects *
-    for (int i = 0; i < args->dim; i++)
-    {   Object *o = (Object *)args->data[i];
-    Type *ta = isType(o);
-    Expression *ea = isExpression(o);
-    Dsymbol *sa = isDsymbol(o);
-    Tuple *va = isTuple(o);
-%p ta %p ea %p sa %p va %p\n"
+[%d] %p ta %p ea %p sa %p va %p\n", i
-    if (ta)
-    {
-        buf.writeByte('T');
-        if (ta->deco)
-        buf.writestring(ta->deco);
-        else
-        {
-#ifdef DEBUG
-        printf("ta = %d, %s\n", ta->ty, ta->toChars());
-#endif
-        assert(global.errors);
-        }
-    }
-    else if (ea)
-    {   sinteger_t v;
-        real_t r;
-
-        ea = ea->optimize(WANTvalue | WANTinterpret);
-        if (ea->op == TOKvar)
-        {
@@ -4130 +4149 @@
-//if (toChars()[0] == 'D') *(char*)0=0;
-    if (semanticRun >= 3)
-    return;
-    semanticRun = 3;
-    if (!errors && members)
-    {
-    sc = tempdecl->scope;
-    sc = sc->push(argsym);
-    sc = sc->push(this);
-    sc->tinst = this;
-    for (int i = 0; i < members->dim; i++)
-    {
-        Dsymbol *s = (Dsymbol *)members->data[i];
-        s->semantic3(sc);
-    }
-    sc = sc->pop();
-    sc->pop();
-    }
-}
-
+/**************************************
+ * 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 int max_shown = 6;
+    const char format[] = "%s:        instantiated from here: %s\n";
+
+    // 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)
+    {
+        fprintf(stdmsg, format, cur->loc.toChars(), 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)
+            fprintf(stdmsg, "%s:        %d recursive instantiations from here: %s\n", cur->loc.toChars(), recursionDepth+2, cur->toChars());
+        else 
+            fprintf(stdmsg,format, cur->loc.toChars(), cur->toChars());
+        recursionDepth = 0;
+        }
+    }
+    }
+    else
+    {
+    // Even after collapsing the recursions, the depth is too deep.
+    // Just display the first few and last few instantiations.
+    size_t i = 0;
+    for (TemplateInstance *cur = this; cur; cur = cur->tinst)
+    {
+        if (i == max_shown / 2)
+        fprintf(stdmsg,"    ... (%d instantiations, -v to show) ...\n", n_instantiations - max_shown);
+
+        if (i < max_shown / 2 ||
+        i >= n_instantiations - max_shown + max_shown / 2)
+        fprintf(stdmsg, format, cur->loc.toChars(), 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 (int i = 0; i < members->dim; i++)
-        {
-        Dsymbol *s = (Dsymbol *)members->data[i];
-        s->toObjFile(multiobj);
-        }
-    }
@@ -4213 +4303 @@
-    }
-    buf->writeByte(')');
-}
-
-
-Dsymbol *TemplateInstance::toAlias()
-{
-#if LOG
-    printf("TemplateInstance::toAlias()\n");
-#endif
-    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)
-{
-    *ps = NULL;
-    return TRUE;
-}
-

branches/dmd-1.x/src/template.h

@@ -68 +68 @@
-    int overloadInsert(Dsymbol *s);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    const char *kind();
-    char *toChars();
-
-    void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
-//    void toDocBuffer(OutBuffer *buf);
-
-    MATCH matchWithInstance(TemplateInstance *ti, Objects *atypes, int flag);
-    MATCH leastAsSpecialized(TemplateDeclaration *td2);
-
-    MATCH deduceFunctionTemplateMatch(Loc loc, Objects *targsi, Expression *ethis, Expressions *fargs, Objects *dedargs);
-    FuncDeclaration *deduceFunctionTemplate(Scope *sc, Loc loc, Objects *targsi, Expression *ethis, Expressions *fargs, int flags = 0);
-    void declareParameter(Scope *sc, TemplateParameter *tp, Object *o);
-
-    TemplateDeclaration *isTemplateDeclaration() { return this; }
-
-    TemplateTupleParameter *isVariadic();
-    int isOverloadable();
+
+    void makeParamNamesVisibleInConstraint(Scope *paramscope);
-};
-
-struct TemplateParameter
-{
-    /* For type-parameter:
-     *  template Foo(ident)     // specType is set to NULL
-     *  template Foo(ident : specType)
-     * For value-parameter:
-     *  template Foo(valType ident) // specValue is set to NULL
-     *  template Foo(valType ident : specValue)
-     * For alias-parameter:
-     *  template Foo(alias ident)
-     * For this-parameter:
-     *  template Foo(this ident)
-     */
-
-    Loc loc;
-    Identifier *ident;
-
-    Declaration *sparam;

trunk/src/staticassert.c

@@ -1 +1 @@
-
-// Copyright (c) 1999-2007 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 "dsymbol.h"
-#include "staticassert.h"
-#include "expression.h"
-#include "id.h"
-#include "hdrgen.h"
-#include "scope.h"
-#include "template.h"
+#include "declaration.h"
-
-
-/********************************* AttribDeclaration ****************************/
-
-StaticAssert::StaticAssert(Loc loc, Expression *exp, Expression *msg)
-    : Dsymbol(Id::empty)
-{
-    this->loc = loc;
-    this->exp = exp;
-    this->msg = msg;
-}
-
-Dsymbol *StaticAssert::syntaxCopy(Dsymbol *s)
-{
-    StaticAssert *sa;
-
-    assert(!s);
-    sa = new StaticAssert(loc, exp->syntaxCopy(), msg ? msg->syntaxCopy() : NULL);
-    return sa;
-}
-
-int StaticAssert::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
-{
-    return 0;       // we didn't add anything
-}
-
-void StaticAssert::semantic(Scope *sc)
-{
-}
-
-#include "scope.h"
-#include "template.h"
-#include "declaration.h"
-
-void StaticAssert::semantic2(Scope *sc)
-{
-    Expression *e;
-
-    //printf("StaticAssert::semantic2() %s\n", toChars());
-    e = exp->semantic(sc);
-    e = e->optimize(WANTvalue | WANTinterpret);
-    if (e->isBool(FALSE))
-    {
-    if (msg)
-    {   HdrGenState hgs;
-        OutBuffer buf;
-
-        msg = msg->semantic(sc);
-        msg = msg->optimize(WANTvalue | WANTinterpret);
-        hgs.console = 1;
-        msg->toCBuffer(&buf, &hgs);
-        error("%s", buf.toChars());
-    }
-    else
-        error("(%s) is false", exp->toChars());
-   if
+if 
-        sc->tinst->printInstantiationTrace();
-  if (!global.gag) {
+if (!global.gag)
-          fatal();
-      }
-    }
-    else if (!e->isBool(TRUE))
-    {
-    error("(%s) is not evaluatable at compile time", exp->toChars());
-    }
-}
-
-int StaticAssert::oneMember(Dsymbol **ps)
-{
-    //printf("StaticAssert::oneMember())\n");
-    *ps = NULL;
-    return TRUE;
-}
-
-void StaticAssert::inlineScan()
-{
-}
-
-void StaticAssert::toObjFile(int multiobj)
-{

trunk/src/template.c

@@ -3734 +3734 @@
-#if WINDOWS_SEH
-    }
-    __except (__ehfilter(GetExceptionInformation()))
-    {
-        global.gag = 0;            // ensure error message gets printed
-        error("recursive expansion");
-        fatal();
-    }
-#endif
-    }
-
-  Laftersemantic:
-    sc2->pop();
-
-    scope->pop();
-
-    // Give additional context info if error occurred during instantiation
-    if (global.errors != errorsave)
-    {
-    error("error instantiating");
- && !global.gag
+
-    {   tinst->printInstantiationTrace();
-        fatal();
-    }
-    errors = 1;
-    if (global.gag)
-        tempdecl->instances.remove(tempdecl_instance_idx);
-    }
-
-#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;
@@ -4457 +4457 @@
-//if (toChars()[0] == 'D') *(char*)0=0;
-    if (semanticRun >= 3)
-    return;
-    semanticRun = 3;
-    if (!errors && members)
-    {
-    sc = tempdecl->scope;
-    sc = sc->push(argsym);
-    sc = sc->push(this);
-    sc->tinst = this;
-    for (int i = 0; i < members->dim; i++)
-    {
-        Dsymbol *s = (Dsymbol *)members->data[i];
-        s->semantic3(sc);
-    }
-    sc = sc->pop();
-    sc->pop();
-    }
-}
-
+/**************************************
+ * 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 int max_shown = 6;
+    const char format[] = "%s:        instantiated from here: %s\n";
+
+    // 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)
+    {
+        fprintf(stdmsg, format, cur->loc.toChars(), 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)
+            fprintf(stdmsg, "%s:        %d recursive instantiations from here: %s\n", cur->loc.toChars(), recursionDepth+2, cur->toChars());
+        else 
+            fprintf(stdmsg,format, cur->loc.toChars(), cur->toChars());
+        recursionDepth = 0;
+        }
+    }
+    }
+    else
+    {
+    // Even after collapsing the recursions, the depth is too deep.
+    // Just display the first few and last few instantiations.
+    size_t i = 0;
+    for (TemplateInstance *cur = this; cur; cur = cur->tinst)
+    {
+        if (i == max_shown / 2)
+        fprintf(stdmsg,"    ... (%d instantiations, -v to show) ...\n", n_instantiations - max_shown);
+
+        if (i < max_shown / 2 ||
+        i >= n_instantiations - max_shown + max_shown / 2)
+        fprintf(stdmsg, format, cur->loc.toChars(), 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 (int i = 0; i < members->dim; i++)
-        {
-        Dsymbol *s = (Dsymbol *)members->data[i];
-        s->toObjFile(multiobj);
-        }
-    }