Changeset 214

Timestamp:

10/14/09 22:36:24 (2 years ago)

Author:

walter

Message:

bugzilla 3401

Files:

• branches/dmd-1.x/src/func.c (modified) (2 diffs)
• branches/dmd-1.x/src/mars.c (modified) (1 diff)
• trunk/src/func.c (modified) (2 diffs)
• trunk/src/json.c (modified) (3 diffs)
• trunk/src/mars.c (modified) (1 diff)

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

@@ -1504 +1504 @@
-    /* Implementing this is done by having the overriding function call
-     * nested functions (the fdrequire functions) nested inside the overridden
-     * function. This requires that the stack layout of the calling function's
-     * parameters and 'this' pointer be in the same place (as the nested
-     * function refers to them).
-     * This is easy for the parameters, as they are all on the stack in the same
-     * place by definition, since it's an overriding function. The problem is
-     * getting the 'this' pointer in the same place, since it is a local variable.
-     * We did some hacks in the code generator to make this happen:
-     *  1. always generate exception handler frame, or at least leave space for it
-     *     in the frame (Windows 32 SEH only)
-     *  2. always generate an EBP style frame
-     *  3. since 'this' is passed in a register that is subsequently copied into
-     *     a stack local, allocate that local immediately following the exception
-     *     handler block, so it is always at the same offset from EBP.
-     */
-    for (int i = 0; i < foverrides.dim; i++)
-    {
-    FuncDeclaration *fdv = (FuncDeclaration *)foverrides.data[i];
-    sf = fdv->mergeFrequire(sf);
-
+d
-    {
-        //printf("fdv->frequire: %s\n", fdv->frequire->toChars());
-        /* Make the call:
-         *   try { __require(); }
-         *   catch { frequire; }
-         */
-        Expression *eresult = NULL;
-        Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdrequire), eresult);
-        Statement *s2 = new ExpStatement(loc, e);
-
-        if (sf)
-        {   Catch *c = new Catch(loc, NULL, NULL, sf);
-        Array *catches = new Array();
-        catches->push(c);
-        sf = new TryCatchStatement(loc, s2, catches);
-        }
-        else
-        sf = s2;
-    }
-    }
@@ -1548 +1548 @@
-/****************************************************
- * Merge into this function the 'out' contracts of all it overrides.
- * 'out's are AND'd together, i.e. all of them need to pass.
- */
-
-Statement *FuncDeclaration::mergeFensure(Statement *sf)
-{
-    /* Same comments as for mergeFrequire(), except that we take care
-     * of generating a consistent reference to the 'result' local by
-     * explicitly passing 'result' to the nested function as a reference
-     * argument.
-     * This won't work for the 'this' parameter as it would require changing
-     * the semantic code for the nested function so that it looks on the parameter
-     * list for the 'this' pointer, something that would need an unknown amount
-     * of tweaking of various parts of the compiler that I'd rather leave alone.
-     */
-    for (int i = 0; i < foverrides.dim; i++)
-    {
-    FuncDeclaration *fdv = (FuncDeclaration *)foverrides.data[i];
-    sf = fdv->mergeFensure(sf);
-
+d
-    {
-        //printf("fdv->fensure: %s\n", fdv->fensure->toChars());
-        // Make the call: __ensure(result)
-        Expression *eresult = NULL;
-        if (outId)
-        eresult = new IdentifierExp(loc, outId);
-        Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdensure), eresult);
-        Statement *s2 = new ExpStatement(loc, e);
-
-        if (sf)
-        {
-        sf = new CompoundStatement(fensure->loc, s2, sf);
-        }
-        else
-        sf = s2;
-    }
-    }
-    return sf;
-}
-

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

@@ -63 +63 @@
-#elif TARGET_NET
-#else
-#error "fix this"
-#endif
-
-#if TARGET_WINDOS
-    lib_ext  = "lib";
-#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-    lib_ext  = "a";
-#elif TARGET_NET
-#else
-#error "fix this"
-#endif
-
-    copyright = "Copyright (c) 1999-2009 by Digital Mars";
-    written = "written by Walter Bright"
-#if TARGET_NET
-    "\nMSIL back-end (alpha release) by Cristian L. Vlasceanu and associates.";
-#endif
-    ;
-0
+1
-    global.structalign = 8;
-
-    memset(&params, 0, sizeof(Param));
-}
-
-char *Loc::toChars()
-{
-    OutBuffer buf;
-    char *p;
-
-    if (filename)
-    {
-    buf.printf("%s", filename);
-    }
-
-    if (linnum)
-    buf.printf("(%d)", linnum);
-    buf.writeByte(0);
-    return (char *)buf.extractData();
-}

trunk/src/func.c

@@ -1533 +1533 @@
-    /* Implementing this is done by having the overriding function call
-     * nested functions (the fdrequire functions) nested inside the overridden
-     * function. This requires that the stack layout of the calling function's
-     * parameters and 'this' pointer be in the same place (as the nested
-     * function refers to them).
-     * This is easy for the parameters, as they are all on the stack in the same
-     * place by definition, since it's an overriding function. The problem is
-     * getting the 'this' pointer in the same place, since it is a local variable.
-     * We did some hacks in the code generator to make this happen:
-     *  1. always generate exception handler frame, or at least leave space for it
-     *     in the frame (Windows 32 SEH only)
-     *  2. always generate an EBP style frame
-     *  3. since 'this' is passed in a register that is subsequently copied into
-     *     a stack local, allocate that local immediately following the exception
-     *     handler block, so it is always at the same offset from EBP.
-     */
-    for (int i = 0; i < foverrides.dim; i++)
-    {
-    FuncDeclaration *fdv = (FuncDeclaration *)foverrides.data[i];
-    sf = fdv->mergeFrequire(sf);
-
+d
-    {
-        //printf("fdv->frequire: %s\n", fdv->frequire->toChars());
-        /* Make the call:
-         *   try { __require(); }
-         *   catch { frequire; }
-         */
-        Expression *eresult = NULL;
-        Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdrequire, 0), eresult);
-        Statement *s2 = new ExpStatement(loc, e);
-
-        if (sf)
-        {   Catch *c = new Catch(loc, NULL, NULL, sf);
-        Array *catches = new Array();
-        catches->push(c);
-        sf = new TryCatchStatement(loc, s2, catches);
-        }
-        else
-        sf = s2;
-    }
-    }
@@ -1577 +1577 @@
-/****************************************************
- * Merge into this function the 'out' contracts of all it overrides.
- * 'out's are AND'd together, i.e. all of them need to pass.
- */
-
-Statement *FuncDeclaration::mergeFensure(Statement *sf)
-{
-    /* Same comments as for mergeFrequire(), except that we take care
-     * of generating a consistent reference to the 'result' local by
-     * explicitly passing 'result' to the nested function as a reference
-     * argument.
-     * This won't work for the 'this' parameter as it would require changing
-     * the semantic code for the nested function so that it looks on the parameter
-     * list for the 'this' pointer, something that would need an unknown amount
-     * of tweaking of various parts of the compiler that I'd rather leave alone.
-     */
-    for (int i = 0; i < foverrides.dim; i++)
-    {
-    FuncDeclaration *fdv = (FuncDeclaration *)foverrides.data[i];
-    sf = fdv->mergeFensure(sf);
-
+d
-    {
-        //printf("fdv->fensure: %s\n", fdv->fensure->toChars());
-        // Make the call: __ensure(result)
-        Expression *eresult = NULL;
-        if (outId)
-        eresult = new IdentifierExp(loc, outId);
-        Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdensure, 0), eresult);
-        Statement *s2 = new ExpStatement(loc, e);
-
-        if (sf)
-        {
-        sf = new CompoundStatement(fensure->loc, s2, sf);
-        }
-        else
-        sf = s2;
-    }
-    }
-    return sf;
-}
-

trunk/src/json.c

@@ -154 +154 @@
-    buf->printf("%d", value);
-    buf->writestring(",\n");
-}
-
-void JsonRemoveComma(OutBuffer *buf)
-{
-    if (buf->offset >= 2 &&
-    buf->data[buf->offset - 2] == ',' &&
-    buf->data[buf->offset - 1] == '\n')
-    buf->offset -= 2;
-}
-
-void Dsymbol::toJsonBuffer(OutBuffer *buf)
-{
-}
-
-void Module::toJsonBuffer(OutBuffer *buf)
-{
-    buf->writestring("{\n");
-
-
+
+
-
-    JsonProperty(buf, Pkind, kind());
-
-    JsonProperty(buf, Pfile, srcfile->toChars());
-
-    if (comment)
-    JsonProperty(buf, Pcomment, (const char *)comment);
-
-    JsonString(buf, Pmembers);
-    buf->writestring(" : [\n");
-
-    size_t offset = buf->offset;
-    for (int i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (Dsymbol *)members->data[i];
-    if (offset != buf->offset)
-
+\n
-        offset = buf->offset;
-    }
-    s->toJsonBuffer(buf);
-    }
-
+    JsonRemoveComma(buf);
-    buf->writestring("]\n");
-
-    buf->writestring("}\n");
-}
-
-void AttribDeclaration::toJsonBuffer(OutBuffer *buf)
-{
-    //printf("AttribDeclaration::toJsonBuffer()\n");
-
-    Array *d = include(NULL, NULL);
-
-    if (d)
-    {
-    for (unsigned i = 0; i < d->dim; i++)
-    {   Dsymbol *s = (Dsymbol *)d->data[i];
-        //printf("AttribDeclaration::toJsonBuffer %s\n", s->toChars());
-        s->toJsonBuffer(buf);
-    }
-    }
-}
@@ -272 +274 @@
-    if (comment)
-    JsonProperty(buf, Pcomment, (const char *)comment);
-    if (loc.linnum)
-    JsonProperty(buf, Pline, loc.linnum);
-
-    ClassDeclaration *cd = isClassDeclaration();
-    if (cd)
-    {
-    if (cd->baseClass)
-    {
-        JsonProperty(buf, "base", cd->baseClass->toChars());
-    }
-    if (cd->interfaces_dim)
-    {
-        JsonString(buf, "interfaces");
-        buf->writestring(" : [\n");
-        size_t offset = buf->offset;
-        for (int i = 0; i < cd->interfaces_dim; i++)
-        {   BaseClass *b = cd->interfaces[i];
-        if (offset != buf->offset)
-
+\n
-            offset = buf->offset;
-        }
-        JsonString(buf, b->base->toChars());
-        }
+        JsonRemoveComma(buf);
-        buf->writestring("],\n");
-    }
-    }
-
-    JsonString(buf, Pmembers);
-    buf->writestring(" : [\n");
-    size_t offset = buf->offset;
-    for (int i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (Dsymbol *)members->data[i];
-    if (offset != buf->offset)
-
+\n
-        offset = buf->offset;
-    }
-    s->toJsonBuffer(buf);
-    }
+    JsonRemoveComma(buf);
-    buf->writestring("]\n");
-
-    buf->writestring("}\n");
-}
-
-void TemplateDeclaration::toJsonBuffer(OutBuffer *buf)
-{
-    //printf("TemplateDeclaration::toJsonBuffer()\n");
-
-    buf->writestring("{\n");
-
-    JsonProperty(buf, Pname, toChars());
-    JsonProperty(buf, Pkind, kind());
-    if (comment)
-    JsonProperty(buf, Pcomment, (const char *)comment);
-
-    if (loc.linnum)
-    JsonProperty(buf, Pline, loc.linnum);
-
-    JsonString(buf, Pmembers);
-    buf->writestring(" : [\n");
-    size_t offset = buf->offset;
-    for (int i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (Dsymbol *)members->data[i];
-    if (offset != buf->offset)
-
+\n
-        offset = buf->offset;
-    }
-    s->toJsonBuffer(buf);
-    }
+    JsonRemoveComma(buf);
-    buf->writestring("]\n");
-
-    buf->writestring("}\n");
-}
-
-void EnumDeclaration::toJsonBuffer(OutBuffer *buf)
-{
-    //printf("EnumDeclaration::toJsonBuffer()\n");
-    if (isAnonymous())
-    {
-    if (members)
-    {
-        for (int i = 0; i < members->dim; i++)
-        {
-        Dsymbol *s = (Dsymbol *)members->data[i];
-        s->toJsonBuffer(buf);
-        buf->writestring(",\n");
-        }
-        JsonRemoveComma(buf);
-    }
@@ -364 +369 @@
-
-    buf->writestring("{\n");
-
-    JsonProperty(buf, Pname, toChars());
-    JsonProperty(buf, Pkind, kind());
-    if (comment)
-    JsonProperty(buf, Pcomment, (const char *)comment);
-
-    if (loc.linnum)
-    JsonProperty(buf, Pline, loc.linnum);
-
-    if (memtype)
-    JsonProperty(buf, "base", memtype->toChars());
-
-    JsonString(buf, Pmembers);
-    buf->writestring(" : [\n");
-    size_t offset = buf->offset;
-    for (int i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (Dsymbol *)members->data[i];
-    if (offset != buf->offset)
-
+\n
-        offset = buf->offset;
-    }
-    s->toJsonBuffer(buf);
-    }
+    JsonRemoveComma(buf);
-    buf->writestring("]\n");
-
-    buf->writestring("}\n");
-}
-
-void EnumMember::toJsonBuffer(OutBuffer *buf)
-{
-    //printf("EnumMember::toJsonBuffer()\n");
-    buf->writestring("{\n");
-
-    JsonProperty(buf, Pname, toChars());
-    JsonProperty(buf, Pkind, kind());
-
-    if (comment)
-    JsonProperty(buf, Pcomment, (const char *)comment);
-
-    if (loc.linnum)
-    JsonProperty(buf, Pline, loc.linnum);
-
-    JsonRemoveComma(buf);

trunk/src/mars.c

@@ -63 +63 @@
-#elif TARGET_NET
-#else
-#error "fix this"
-#endif
-
-#if TARGET_WINDOS
-    lib_ext  = "lib";
-#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-    lib_ext  = "a";
-#elif TARGET_NET
-#else
-#error "fix this"
-#endif
-
-    copyright = "Copyright (c) 1999-2009 by Digital Mars";
-    written = "written by Walter Bright"
-#if TARGET_NET
-    "\nMSIL back-end (alpha release) by Cristian L. Vlasceanu and associates.";
-#endif
-    ;
-5
+6
-    global.structalign = 8;
-
-    memset(&params, 0, sizeof(Param));
-}
-
-char *Loc::toChars()
-{
-    OutBuffer buf;
-    char *p;
-
-    if (filename)
-    {
-    buf.printf("%s", filename);
-    }
-
-    if (linnum)
-    buf.printf("(%d)", linnum);
-    buf.writeByte(0);
-    return (char *)buf.extractData();
-}