Changeset 901

Timestamp:

06/29/08 18:40:28 (4 months ago)

Author:

Gregor

Message:

MERGE: DMD 2.014

Files:

• branches/dmdfe-2.0/aggregate.h (modified) (2 diffs)
• branches/dmdfe-2.0/cast.c (modified) (1 diff)
• branches/dmdfe-2.0/declaration.c (modified) (4 diffs)
• branches/dmdfe-2.0/declaration.h (modified) (3 diffs)
• branches/dmdfe-2.0/e2ir.c (modified) (3 diffs)
• branches/dmdfe-2.0/expression.c (modified) (5 diffs)
• branches/dmdfe-2.0/init.c (modified) (1 diff)
• branches/dmdfe-2.0/lib.h (added)
• branches/dmdfe-2.0/libelf.c (added)
• branches/dmdfe-2.0/link.c (modified) (1 diff)
• branches/dmdfe-2.0/man.c (added)
• branches/dmdfe-2.0/mars.c (modified) (22 diffs)
• branches/dmdfe-2.0/mars.h (modified) (6 diffs)
• branches/dmdfe-2.0/module.c (modified) (3 diffs)
• branches/dmdfe-2.0/module.h (modified) (4 diffs)
• branches/dmdfe-2.0/mtype.c (modified) (5 diffs)
• branches/dmdfe-2.0/mtype.h (modified) (1 diff)
• branches/dmdfe-2.0/root.c (modified) (3 diffs)
• branches/dmdfe-2.0/root.h (modified) (1 diff)
• branches/dmdfe-2.0/stringtable.c (modified) (1 diff)
• branches/dmdfe-2.0/stringtable.h (modified) (1 diff)
• branches/dmdfe-2.0/template.c (modified) (10 diffs)
• branches/dmdfe-2.0/template.h (modified) (2 diffs)
• branches/dmdfe-2.0/toobj.c (modified) (17 diffs)
• branches/dmdfe-2.0/total.h (modified) (1 diff)
• branches/dmdfe-2.0/typinf.c (modified) (3 diffs)

branches/dmdfe-2.0/aggregate.h

@@ -107 +107 @@
-{
-    int zeroInit;       // !=0 if initialize with 0 fill
+#if V2
-    int hasIdentityAssign;  // !=0 if has identity opAssign
-    FuncDeclaration *cpctor;    // generated copy-constructor, if any
@@ -112 +113 @@
-    FuncDeclarations postblits; // Array of postblit functions
-    FuncDeclaration *postblit;  // aggregate postblit
+#endif
-
-    StructDeclaration(Loc loc, Identifier *id);

branches/dmdfe-2.0/cast.c

@@ -1515 +1515 @@
-    }
-    else if (t1->ty == Tclass || t2->ty == Tclass)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else if (t1->ty == Tstruct && t2->ty == Tstruct)

branches/dmdfe-2.0/declaration.c

@@ -949 +949 @@
-        !init->isVoidInitializer())
-        {
-        Expression *e1;
-        Type *t;
-        int dim;
-
-        //printf("fd = '%s', var = '%s'\n", fd->toChars(), toChars());
-        if (!ei)
@@ -970 +966 @@
-        }
-
-
-
-
+Expression *
+
+Type *
-        if (t->ty == Tsarray)
-        {
@@ -978 +974 @@
-            if (!ei->exp->implicitConvTo(type))
-            {
-
+int 
-            // If multidimensional static array, treat as one large array
-            while (1)
@@ -995 +991 @@
-            ei->exp = ei->exp->semantic(sc);
-            if (!ei->exp->implicitConvTo(type))
-
+
+
+
+
+
-        }
-        ei->exp = new AssignExp(loc, e1, ei->exp);

branches/dmdfe-2.0/declaration.h

@@ -371 +371 @@
-{
-    TypeInfoConstDeclaration(Type *tinfo);
-
-    void toDt(dt_t **pdt);
-};
-
@@ -378 +376 @@
-{
-    TypeInfoInvariantDeclaration(Type *tinfo);
-
-    void toDt(dt_t **pdt);
-};
-#endif
@@ -537 +533 @@
-    FuncAliasDeclaration *isFuncAliasDeclaration() { return this; }
-    char *kind();
-    Symbol *toSymbol();
-};
-

branches/dmdfe-2.0/e2ir.c

@@ -1055 +1055 @@
-        return Dsymbol_toElem(s, irs);
-    if (vd->isStatic() || vd->storage_class & STCextern)
-
+0
-    else
-    {
@@ -1074 +1074 @@
-    {
-    irs->deferToObj->push(s);
-    //sd->toObjFile();
-    }
-    else if ((sd = s->isStructDeclaration()) != NULL)
-    {
-    irs->deferToObj->push(sd);
-    //sd->toObjFile();
-    }
-    else if ((fd = s->isFuncDeclaration()) != NULL)
@@ -1085 +1083 @@
-    //printf("function %s\n", fd->toChars());
-    irs->deferToObj->push(fd);
-    //fd->toObjFile();
-    }
-    else if ((tm = s->isTemplateMixin()) != NULL)

branches/dmdfe-2.0/expression.c

@@ -195 +195 @@
-
-    precedence[TOKcomma] = PREC_expr;
+}
+
+/*************************************************************
+ * Given var, we need to get the
+ * right 'this' pointer if var is in an outer class, but our
+ * existing 'this' pointer is in an inner class.
+ * Input:
+ *  e1  existing 'this'
+ *  ad  struct or class we need the correct 'this' for
+ *  var the specific member of ad we're accessing
+ */
+
+Expression *getRightThis(Loc loc, Scope *sc, AggregateDeclaration *ad,
+    Expression *e1, Declaration *var)
+{
+ L1:
+    Type *t = e1->type->toBasetype();
+
+    /* If e1 is not the 'this' pointer for ad
+     */
+    if (ad &&
+    !(t->ty == Tpointer && t->nextOf()->ty == Tstruct &&
+      ((TypeStruct *)t->nextOf())->sym == ad)
+    &&
+    !(t->ty == Tstruct &&
+      ((TypeStruct *)t)->sym == ad)
+       )
+    {
+    ClassDeclaration *cd = ad->isClassDeclaration();
+    ClassDeclaration *tcd = t->isClassHandle();
+
+    /* e1 is the right this if ad is a base class of e1
+     */
+    if (!cd || !tcd ||
+        !(tcd == cd || cd->isBaseOf(tcd, NULL))
+       )
+    {
+        /* Only classes can be inner classes with an 'outer'
+         * member pointing to the enclosing class instance
+         */
+        if (tcd && tcd->isNested())
+        {   /* e1 is the 'this' pointer for an inner class.
+         * Rewrite it as the 'this' pointer for the outer class.
+         */
+
+        e1 = new DotVarExp(loc, e1, tcd->vthis);
+        e1 = e1->semantic(sc);
+
+        // Skip up over nested functions, and get the enclosing
+        // class type.
+        Dsymbol *s;
+        for (s = tcd->toParent();
+             s && s->isFuncDeclaration();
+             s = s->toParent())
+        {   FuncDeclaration *f = s->isFuncDeclaration();
+            if (f->vthis)
+            {
+            e1 = new VarExp(loc, f->vthis);
+            }
+        }
+        if (s && s->isClassDeclaration())
+            e1->type = s->isClassDeclaration()->type;
+        e1 = e1->semantic(sc);
+        goto L1;
+        }
+
+        /* Can't find a path from e1 to ad
+         */
+        error("this for %s needs to be type %s not type %s",
+        var->toChars(), ad->toChars(), t->toChars());
+    }
+    }
+    return e1;
-}
-
@@ -5052 +5125 @@
-        }
-
+        TupleDeclaration *tup = s->isTupleDeclaration();
+        if (tup)
+        {
+        if (eleft)
+            error("cannot have e.tuple");
+        e = new TupleExp(loc, tup);
+        e = e->semantic(sc);
+        return e;
+        }
+
-        ScopeDsymbol *sds = s->isScopeDsymbol();
-        if (sds)
@@ -5205 +5288 @@
-
-        AggregateDeclaration *ad = var->toParent()->isAggregateDeclaration();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        if (!sc->noaccesscheck)
-        accessCheck(loc, sc, e1, var);
@@ -5495 +5531 @@
-    type = new TypeDelegate(func->type);
-    type = type->semantic(loc, sc);
-//-----------------
-    /* For func, we need to get the
-     * right 'this' pointer if func is in an outer class, but our
-     * existing 'this' pointer is in an inner class.
-     * This code is analogous to that used for variables
-     * in DotVarExp::semantic().
-     */
-    AggregateDeclaration *ad = func->toParent()->isAggregateDeclaration();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-    return this;
@@ -5869 +5870 @@
-        ad = td->toParent()->isAggregateDeclaration();
-    }   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    checkDeprecated(sc, f);

branches/dmdfe-2.0/init.c

@@ -167 +167 @@
-        if (fieldi >= ad->fields.dim)
-        {   error(loc, "too many initializers for %s", ad->toChars());
+            field.remove(i);
+            i--;
-            continue;
-        }

branches/dmdfe-2.0/link.c

@@ -72 +72 @@
-    {   // Generate exe file name from first obj name
-    char *n = (char *)global.params.objfiles->data[0];
-    char *ex;
-
-    n = FileName::name(n);
-    FileName *fn = FileName::forceExt(n, "exe");

branches/dmdfe-2.0/mars.c

@@ -39 +39 @@
-#include "expression.h"
-#include "lexer.h"
-
+
+
+
-void getenv_setargv(const char *envvar, int *pargc, char** *pargv);
+
+void obj_start(char *srcfile);
+void obj_end(Library *library, File *objfile);
-
-Global global;
@@ -54 +59 @@
-    obj_ext  = "o";
-
+#if _WIN32
+    lib_ext  = "lib";
+#elif linux
+    lib_ext  = "a";
+#else
+#error "fix this"
+#endif
+
-    copyright = "Copyright (c) 1999-2008 by Digital Mars";
-    written = "written by Walter Bright";
-3
+4
-    global.structalign = 8;
-
@@ -147 +160 @@
-    global.version, global.copyright, global.written);
-    printf("\
-
+2.0/
-Usage:\n\
-  dmd files.d ... { -switch }\n\
@@ -174 +187 @@
-  -Jpath         where to look for string imports\n\
-  -Llinkerflag   pass linkerflag to link\n\
+  -lib           generate library rather than object files\n\
+  -man           open web browser on manual page\n\
-  -nofloat       do not emit reference to floating point\n\
-  -O             optimize\n\
-  -o-            do not write object file\n\
-
+& library 
-  -offilename    name output file to filename\n\
-  -op            do not strip paths from source file\n\
@@ -202 +217 @@
-    int i;
-    Array files;
+    Array libmodules;
-    char *p;
-    Module *m;
@@ -269 +285 @@
-    VersionCondition::addPredefinedGlobalIdent("D_InlineAsm");
-    VersionCondition::addPredefinedGlobalIdent("D_InlineAsm_X86");
+#if V2
-    VersionCondition::addPredefinedGlobalIdent("D_Version2");
+#endif
-    VersionCondition::addPredefinedGlobalIdent("all");
-
@@ -299 +317 @@
-        else if (strcmp(p + 1, "fPIC") == 0)
-        global.params.pic = 1;
+        else if (strcmp(p + 1, "multiobj") == 0)
+        global.params.multiobj = 1;
-        else if (strcmp(p + 1, "g") == 0)
-        global.params.symdebug = 1;
@@ -313 +333 @@
-        else if (strcmp(p + 1, "v1") == 0)
-        {
+#if V1
+        global.params.Dversion = 1;
+#else
-        error("use DMD 1.0 series compilers for -v1 switch");
-        break;
-
+
+
-        else if (strcmp(p + 1, "w") == 0)
-        global.params.warnings = 1;
@@ -405 +429 @@
-        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;
@@ -531 +557 @@
-    }
-    else
+    {
-        files.push(p);
+    }
-    }
-    if (global.errors)
@@ -557 +585 @@
-    global.params.useAssert = 1;
-
-
+ || global.params.lib
-    global.params.link = 0;
-
@@ -563 +591 @@
-    {
-    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)
+        global.params.multiobj = 1;
-    }
-    else if (global.params.run)
@@ -574 +626 @@
-    if (global.params.objname && files.dim > 1)
-    {
-
-
+
+
+
-    }
-    }
-    if (global.params.cov)
-    VersionCondition::addPredefinedGlobalIdent("D_Coverage");
+#if V2
-    if (global.params.useUnitTests)
-    VersionCondition::addPredefinedGlobalIdent("unittest");
+#endif
-
-    // Initialization
@@ -630 +685 @@
-    Array modules;
-    modules.reserve(files.dim);
+    int firstmodule = 1;
-    for (i = 0; i < files.dim; i++)
-  Identifier *id;
+
-    char *ext;
-    char *name;
@@ -649 +705 @@
-    ext = FileName::ext(p);
-    if (ext)
-
+
+
-        if (strcmp(ext, global.obj_ext) == 0)
-        {
-        global.params.objfiles->push(files.data[i]);
+        libmodules.push(files.data[i]);
-        continue;
-        }
-
-"a"
+global.lib_ext
-        {
-        global.params.libfiles->push(files.data[i]);
+        libmodules.push(files.data[i]);
-        continue;
-        }
@@ -668 +727 @@
-        }
-
+        /* Examine extension to see if it is a valid
+         * D source file extension
+         */
-        if (stricmp(ext, global.mars_ext) == 0 ||
-        stricmp(ext, "dd") == 0 ||
@@ -700 +762 @@
-    }
-
-
+
+
+
+
+
-    m = new Module((char *) files.data[i], id, global.params.doDocComments, global.params.doHdrGeneration);
-    modules.push(m);
-
-
+
+
+
+
-    }
-
@@ -712 +781 @@
-#endif
-    // Read files, parse them
+    int anydocfiles = 0;
-    for (i = 0; i < modules.dim; i++)
-    {
@@ -720 +790 @@
-        Module::rootModule = m;
-    m->importedFrom = m;
-
+
+
-    m->read(0);
-    m->parse();
-    if (m->isDocFile)
-    {
+        anydocfiles = 1;
-        m->gendocfile();
-
@@ -744 +816 @@
-        global.params.link = 0;
-    }
+    }
+    if (anydocfiles && modules.dim &&
+    (global.params.oneobj || global.params.objname))
+    {
+    error("conflicting Ddoc and obj generation options");
+    fatal();
-    }
-    if (global.errors)
@@ -834 +912 @@
-    fatal();
-
+    /*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 (int i = 0; i < libmodules.dim; i++)
+    {
+        char *p = (char *)libmodules.data[i];
+        library->addObject(p, NULL, 0);
+    }
+    }*/
+
-    // Generate output files
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        m->gendocfile();
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#if _WIN32 && __DMC__
-  }
@@ -882 +1006 @@
-        for (i = 0; i < modules.dim; i++)
-        {
-
+Module *
-            m->deleteObjFile();
+            if (global.params.oneobj)
+            break;
-        }
-        deleteExeFile();

branches/dmdfe-2.0/mars.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -30 +30 @@
-#endif
-
+#define V1  0
-#define V2  1   // Version 2.0 features
-#define BREAKABI 1  // 0 if not ready to break the ABI just yet
@@ -40 +41 @@
-    char obj;       // write object file
-    char link;      // perform link
+    char lib;       // write library file instead of object file(s)
+    char multiobj;  // break one object file into multiple ones
+    char oneobj;    // write one object file instead of multiple ones
-    char trace;     // insert profiling hooks
-    char quiet;     // suppress non-error messages
@@ -71 +75 @@
-    Array *imppath; // array of char*'s of where to look for import modules
-    Array *fileImppath; // array of char*'s of where to look for file import modules
-
+/.lib
-    char *objname;  // .obj file output name
+    char *libname;  // .lib file output name
-
-    char doDocComments; // process embedded documentation comments
@@ -124 +129 @@
-    char *sym_ext;
-    char *obj_ext;
+    char *lib_ext;
-    char *doc_ext;  // for Ddoc generated files
-    char *ddoc_ext; // for Ddoc macro include files
@@ -285 +291 @@
-#endif
-
+struct Dsymbol;
+struct Library;
+struct File;
+void obj_start(char *srcfile);
+void obj_end(Library *library, File *objfile);
+void obj_append(Dsymbol *s);
+void obj_write_deferred(Library *library);
+
-#endif /* DMD_MARS_H */

branches/dmdfe-2.0/module.c

@@ -105 +105 @@
-    macrotable = NULL;
-    escapetable = NULL;
+    doppelganger = 0;
-    cov = NULL;
-    covb = NULL;
@@ -766 +767 @@
-    OutBuffer buf;
-    HdrGenState hgs;
-    int i;
-
-    //printf("Module::gensymfile()\n");
@@ -773 +773 @@
-    buf.writenl();
-
-
-
-
-
-
+
+
+
-    s->toCBuffer(&buf, &hgs);
-    }

branches/dmdfe-2.0/module.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-5
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -25 +25 @@
-struct Escape;
-struct VarDeclaration;
+struct Library;
-
-// Back end
@@ -126 +127 @@
-    void genhdrfile();  // generate D import file
-#endif
-
+int multiobj
-    void gensymfile();
-    void gendocfile();
@@ -137 +138 @@
-    // Back end
-
+    int doppelganger;       // sub-module
-    Symbol *cov;        // private uint[] __coverage;
-    unsigned *covb;     // bit array of valid code line numbers

branches/dmdfe-2.0/mtype.c

@@ -898 +898 @@
-void Type::resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps)
-{
-
-
-
+
+
-    *pt = t;
-    *pe = NULL;
@@ -1911 +1910 @@
-    if (*pe)
-    {   // It's really an index expression
-
-
+
-    *pe = e;
-    }
@@ -2371 +2369 @@
-        return MATCHnomatch;    // not const-compatible
-
-c
+w
-     */
-    if (next->ty != Tvoid && ta->next->ty == Tvoid)
@@ -2384 +2382 @@
-        m = MATCHconst;
-        return m;
+    }
+
+    /* Allow conversions of T[][] to const(T)[][]
+     */
+    if (mod == ta->mod && next->ty == Tarray && ta->next->ty == Tarray)
+    {
+        m = next->implicitConvTo(ta->next);
+        if (m == MATCHconst)
+        return m;
-    }
-
@@ -2508 +2515 @@
-    return merge();
-}
+
+void TypeAArray::resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps)
+{
+    //printf("TypeAArray::resolve() %s\n", toChars());
+
+    // Deal with the case where we thought the index was a type, but
+    // in reality it was an expression.
+    if (index->ty == Tident || index->ty == Tinstance || index->ty == Tsarray)
+    {
+    Expression *e;
+    Type *t;
+    Dsymbol *s;
+
+    index->resolve(loc, sc, &e, &t, &s);
+    if (e)
+    {   // It was an expression -
+        // Rewrite as a static array
+
+        TypeSArray *tsa = new TypeSArray(next, e);
+        return tsa->resolve(loc, sc, pe, pt, ps);
+    }
+    else if (t)
+        index = t;
+    else
+        index->error(loc, "index is not a type or an expression");
+    }
+    Type::resolve(loc, sc, pe, pt, ps);
+}
+
-
-Expression *TypeAArray::dotExp(Scope *sc, Expression *e, Identifier *ident)

branches/dmdfe-2.0/mtype.h

@@ -374 +374 @@
-    d_uns64 size(Loc loc);
-    Type *semantic(Loc loc, Scope *sc);