Merge pull request #398 from ldc-developers/merge-2.063

DMD 2.063.1 merge

Author: dnadlinger

dmd2/aggregate.h

@@ -1,6 +1,6 @@
 
 // Compiler implementation of the D programming language
-// Copyright (c) 1999-2012 by Digital Mars
+// Copyright (c) 1999-2013 by Digital Mars
 // All Rights Reserved
 // written by Walter Bright
 // http://www.digitalmars.com
@@ -18,6 +18,7 @@
 #include "root.h"
 
 #include "dsymbol.h"
+#include "declaration.h"
 
 #if IN_LLVM
 #include <vector>
@@ -74,29 +75,32 @@ struct AggregateDeclaration : ScopeDsymbol
     bool isdeprecated;          // !=0 if deprecated
 
 #if DMDV2
-    bool isnested;              // !=0 if is nested
+    Dsymbol *enclosing;         /* !=NULL if is nested
+                                 * pointing to the dsymbol that directly enclosing it.
+                                 * 1. The function that enclosing it (nested struct and class)
+                                 * 2. The class that enclosing it (nested class only)
+                                 * 3. If enclosing aggregate is template, its enclosing dsymbol.
+                                 * See AggregateDeclaraton::makeNested for the details.
+                                 */
     VarDeclaration *vthis;      // 'this' parameter if this aggregate is nested
 #endif
     // Special member functions
-    InvariantDeclaration *inv;          // invariant
+    FuncDeclarations invs;              // Array of invariants
+    FuncDeclaration *inv;               // invariant
     NewDeclaration *aggNew;             // allocator
     DeleteDeclaration *aggDelete;       // deallocator
 
 #if DMDV2
-    //CtorDeclaration *ctor;
     Dsymbol *ctor;                      // CtorDeclaration or TemplateDeclaration
-    CtorDeclaration *defaultCtor;       // default constructor
+    CtorDeclaration *defaultCtor;       // default constructor - should have no arguments, because
+                                        // it would be stored in TypeInfo_Class.defaultConstructor
     Dsymbol *aliasthis;                 // forward unresolved lookups to aliasthis
     bool noDefaultCtor;         // no default construction
 #endif
 
     FuncDeclarations dtors;     // Array of destructors
     FuncDeclaration *dtor;      // aggregate destructor
 
-#ifdef IN_GCC
-    Expressions *attributes;    // GCC decl/type attributes
-#endif
-
     Expression *getRTInfo;      // pointer to GC info generated by object.RTInfo(this)
 
     AggregateDeclaration(Loc loc, Identifier *id);
@@ -112,18 +116,21 @@ struct AggregateDeclaration : ScopeDsymbol
     Type *getType();
     int firstFieldInUnion(int indx); // first field in union that includes indx
     int numFieldsInUnion(int firstIndex); // #fields in union starting at index
-    int isDeprecated();         // is aggregate deprecated?
+    bool isDeprecated();         // is aggregate deprecated?
     FuncDeclaration *buildDtor(Scope *sc);
-    int isNested();
+    FuncDeclaration *buildInv(Scope *sc);
+    bool isNested();
+    void makeNested();
     int isExport();
 
     void emitComment(Scope *sc);
     void toJson(JsonOut *json);
     void toDocBuffer(OutBuffer *buf, Scope *sc);
 
-    FuncDeclaration *hasIdentityOpAssign(Scope *sc, Dsymbol *assign);
+    FuncDeclaration *hasIdentityOpAssign(Scope *sc);
+    FuncDeclaration *hasIdentityOpEquals(Scope *sc);
 
-    char *mangle(bool isv = false);
+    const char *mangle(bool isv = false);
 
     // For access checking
     virtual PROT getAccess(Dsymbol *smember);   // determine access to smember
@@ -173,7 +180,7 @@ struct StructDeclaration : AggregateDeclaration
     void semantic(Scope *sc);
     Dsymbol *search(Loc, Identifier *ident, int flags);
     void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    char *mangle(bool isv = false);
+    const char *mangle(bool isv = false);
     const char *kind();
     void finalizeSize(Scope *sc);
     bool isPOD();
@@ -184,12 +191,10 @@ struct StructDeclaration : AggregateDeclaration
     int needOpAssign();
     int needOpEquals();
     FuncDeclaration *buildOpAssign(Scope *sc);
-    FuncDeclaration *buildOpEquals(Scope *sc);
     FuncDeclaration *buildPostBlit(Scope *sc);
     FuncDeclaration *buildCpCtor(Scope *sc);
-
+    FuncDeclaration *buildOpEquals(Scope *sc);
     FuncDeclaration *buildXopEquals(Scope *sc);
-    void makeNested();
 #endif
     void toDocBuffer(OutBuffer *buf, Scope *sc);
 
@@ -273,16 +278,16 @@ struct ClassDeclaration : AggregateDeclaration
 
     BaseClasses *vtblInterfaces;        // array of base interfaces that have
                                         // their own vtbl[]
+
     TypeInfoClassDeclaration *vclassinfo;       // the ClassInfo object for this ClassDeclaration
     int com;                            // !=0 if this is a COM class (meaning
                                         // it derives from IUnknown)
-    int isscope;                         // !=0 if this is an auto class
+    int isscope;                        // !=0 if this is an auto class
     int isabstract;                     // !=0 if abstract class
-#if DMDV1
-    bool isnested;                      // !=0 if is nested
-    VarDeclaration *vthis;              // 'this' parameter if this class is nested
-#endif
     int inuse;                          // to prevent recursive attempts
+    enum Semantic doAncestorsSemantic;  // Before searching symbol, whole ancestors should finish
+                                        // calling semantic() at least once, due to fill symtab
+                                        // and do addMember(). [== Semantic(Start,In,Done)]
 
     ClassDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
     Dsymbol *syntaxCopy(Dsymbol *s);
@@ -295,15 +300,12 @@ struct ClassDeclaration : AggregateDeclaration
 
     virtual int isBaseInfoComplete();
     Dsymbol *search(Loc, Identifier *ident, int flags);
-    Dsymbol *searchBase(Loc, Identifier *ident);
+    ClassDeclaration *searchBase(Loc, Identifier *ident);
 #if DMDV2
     int isFuncHidden(FuncDeclaration *fd);
 #endif
     FuncDeclaration *findFunc(Identifier *ident, TypeFunction *tf);
     void interfaceSemantic(Scope *sc);
-#if DMDV1
-    int isNested();
-#endif
     int isCOMclass();
     virtual int isCOMinterface();
 #if DMDV2
@@ -312,7 +314,7 @@ struct ClassDeclaration : AggregateDeclaration
     int isAbstract();
     virtual int vtblOffset();
     const char *kind();
-    char *mangle(bool isv = false);
+    const char *mangle(bool isv = false);
     void toDocBuffer(OutBuffer *buf, Scope *sc);
 
     PROT getAccess(Dsymbol *smember);   // determine access to smember

dmd2/aliasthis.c

@@ -36,8 +36,22 @@ Expression *resolveAliasThis(Scope *sc, Expression *e)
     L1:
         if (ad && ad->aliasthis)
         {
+            bool isstatic = (e->op == TOKtype);
             e = new DotIdExp(e->loc, e, ad->aliasthis->ident);
             e = e->semantic(sc);
+            if (isstatic && ad->aliasthis->needThis())
+            {
+                /* non-@property function is not called inside typeof(),
+                 * so resolve it ahead.
+                 */
+                int save = sc->intypeof;
+                sc->intypeof = 1;   // bypass "need this" error check
+                e = resolveProperties(sc, e);
+                sc->intypeof = save;
+
+                e = new TypeExp(e->loc, new TypeTypeof(e->loc, e));
+                e = e->semantic(sc);
+            }
             e = resolveProperties(sc, e);
         }
     }
@@ -74,7 +88,7 @@ void AliasThis::semantic(Scope *sc)
         assert(ad->members);
         Dsymbol *s = ad->search(loc, ident, 0);
         if (!s)
-        {   s = sc->search(loc, ident, 0);
+        {   s = sc->search(loc, ident, NULL);
             if (s)
                 ::error(loc, "%s is not a member of %s", s->toChars(), ad->toChars());
             else

dmd2/apply.c

@@ -36,12 +36,7 @@ int Expression::apply(fp_t fp, void *param)
 /******************************
  * Perform apply() on an t if not null
  */
-template<typename T>
-int condApply(T* t, fp_t fp, void* param)
-{
-    return t ? t->apply(fp, param) : 0;
-}
-
+#define condApply(t, fp, param) (t ? t->apply(fp, param) : 0)
 
 int NewExp::apply(int (*fp)(Expression *, void *), void *param)
 {
@@ -129,14 +124,20 @@ int AssocArrayLiteralExp::apply(fp_t fp, void *param)
 
 int StructLiteralExp::apply(fp_t fp, void *param)
 {
-    return condApply(elements, fp, param) ||
+    if(stageflags & stageApply) return 0;
+    int old = stageflags;
+    stageflags |= stageApply;
+    int ret = condApply(elements, fp, param) ||
            (*fp)(this, param);
+    stageflags = old;      
+    return ret;
 }
 
 
 int TupleExp::apply(fp_t fp, void *param)
 {
-    return condApply(exps, fp, param) ||
+    return (e0 ? (*fp)(e0, param) : 0) ||
+           condApply(exps, fp, param) ||
            (*fp)(this, param);
 }
 

dmd2/argtypes.c

@@ -26,9 +26,6 @@
 #include "aggregate.h"
 #include "hdrgen.h"
 
-#define tfloat2 tfloat64
-//#define tfloat2 tcomplex32
-
 /****************************************************
  * This breaks a type down into 'simpler' types that can be passed to a function
  * in registers, and returned in registers.
@@ -84,7 +81,7 @@ TypeTuple *TypeBasic::toArgTypes()
 
         case Tcomplex32:
             if (global.params.is64bit)
-                t1 = Type::tfloat2;
+                t1 = Type::tfloat64;
             else
             {
                 t1 = Type::tfloat64;
@@ -223,16 +220,16 @@ Type *argtypemerge(Type *t1, Type *t2, unsigned offset2)
     if (!t2)
         return t1;
 
-    unsigned sz1 = t1->size(0);
-    unsigned sz2 = t2->size(0);
+    unsigned sz1 = t1->size(Loc());
+    unsigned sz2 = t2->size(Loc());
 
     if (t1->ty != t2->ty &&
         (t1->ty == Tfloat80 || t2->ty == Tfloat80))
         return NULL;
 
     // [float,float] => [cfloat]
     if (t1->ty == Tfloat32 && t2->ty == Tfloat32 && offset2 == 4)
-        return Type::tfloat2;
+        return Type::tfloat64;
 
     // Merging floating and non-floating types produces the non-floating type
     if (t1->isfloating())
@@ -287,7 +284,7 @@ TypeTuple *TypeStruct::toArgTypes()
     }
     Type *t1 = NULL;
     Type *t2 = NULL;
-    d_uns64 sz = size(0);
+    d_uns64 sz = size(Loc());
     assert(sz < 0xFFFFFFFF);
     switch ((unsigned)sz)
     {
@@ -349,7 +346,7 @@ TypeTuple *TypeStruct::toArgTypes()
                     goto Lmemory;
 
                 // Fields that overlap the 8byte boundary goto Lmemory
-                unsigned fieldsz = f->type->size(0);
+                unsigned fieldsz = f->type->size(Loc());
                 if (f->offset < 8 && (f->offset + fieldsz) > 8)
                     goto Lmemory;
             }