Changeset 460

Timestamp:

04/12/07 18:54:52 (1 year ago)

Author:

Gregor

Message:

MERGE: DMD 1.012

Files:

• branches/dmdfe/arraytypes.h (modified) (2 diffs)
• branches/dmdfe/declaration.c (modified) (1 diff)
• branches/dmdfe/delegatize.c (modified) (1 diff)
• branches/dmdfe/expression.c (modified) (2 diffs)
• branches/dmdfe/expression.h (modified) (1 diff)
• branches/dmdfe/init.c (modified) (1 diff)
• branches/dmdfe/init.h (modified) (5 diffs)
• branches/dmdfe/inline.c (modified) (3 diffs)
• branches/dmdfe/interpret.c (modified) (1 diff)
• branches/dmdfe/lexer.c (modified) (1 diff)
• branches/dmdfe/lexer.h (modified) (2 diffs)
• branches/dmdfe/mangle.c (modified) (4 diffs)
• branches/dmdfe/mars.c (modified) (3 diffs)
• branches/dmdfe/optimize.c (modified) (1 diff)
• branches/dmdfe/template.c (modified) (7 diffs)
• branches/dmdfe/template.h (modified) (1 diff)

branches/dmdfe/arraytypes.h

@@ -24 +24 @@
-struct TemplateParameter;
-struct FuncDeclaration;
+struct Identifier;
+struct Initializer;
-
-struct TemplateParameters : Array { };
@@ -43 +45 @@
-struct Arguments : Array { };
-
+struct Identifiers : Array { };
+
+struct Initializers : Array { };
+
-#endif

branches/dmdfe/declaration.c

@@ -692 +692 @@
-    storage_class = (storage_class & ~STCconst) | STCctorinit;
-
- || isFinal()
+
-    {
-    }

branches/dmdfe/delegatize.c

@@ -178 +178 @@
-
-
+void AssocArrayLiteralExp::scanForNestedRef(Scope *sc)
+{
+    arrayExpressionScanForNestedRef(sc, keys);
+    arrayExpressionScanForNestedRef(sc, values);
+}
+
+
-void TupleExp::scanForNestedRef(Scope *sc)
-{

branches/dmdfe/expression.c

@@ -2512 +2512 @@
-    {   Expression *e = (Expression *)elements->data[i];
-    e->toMangleBuffer(buf);
+    }
+}
+
+/************************ AssocArrayLiteralExp ************************************/
+
+// [ key0 : value0, key1 : value1, ... ]
+
+AssocArrayLiteralExp::AssocArrayLiteralExp(Loc loc,
+        Expressions *keys, Expressions *values)
+    : Expression(loc, TOKassocarrayliteral, sizeof(AssocArrayLiteralExp))
+{
+    assert(keys->dim == values->dim);
+    this->keys = keys;
+    this->values = values;
+}
+
+Expression *AssocArrayLiteralExp::syntaxCopy()
+{
+    return new AssocArrayLiteralExp(loc,
+    arraySyntaxCopy(keys), arraySyntaxCopy(values));
+}
+
+Expression *AssocArrayLiteralExp::semantic(Scope *sc)
+{   Expression *e;
+    Type *tkey = NULL;
+    Type *tvalue = NULL;
+
+#if LOGSEMANTIC
+    printf("AssocArrayLiteralExp::semantic('%s')\n", toChars());
+#endif
+
+    // Run semantic() on each element
+    for (size_t i = 0; i < keys->dim; i++)
+    {   Expression *key = (Expression *)keys->data[i];
+    Expression *value = (Expression *)values->data[i];
+
+    key = key->semantic(sc);
+    value = value->semantic(sc);
+
+    keys->data[i] = (void *)key;
+    values->data[i] = (void *)value;
+    }
+    expandTuples(keys);
+    expandTuples(values);
+    if (keys->dim != values->dim)
+    {
+    error("number of keys is %u, must match number of values %u", keys->dim, values->dim);
+    keys->setDim(0);
+    values->setDim(0);
+    }
+    for (size_t i = 0; i < keys->dim; i++)
+    {   Expression *key = (Expression *)keys->data[i];
+    Expression *value = (Expression *)values->data[i];
+
+    if (!key->type)
+        error("%s has no value", key->toChars());
+    if (!value->type)
+        error("%s has no value", value->toChars());
+    key = resolveProperties(sc, key);
+    value = resolveProperties(sc, value);
+
+    if (!tkey)
+        tkey = key->type;
+    else
+        key = key->implicitCastTo(sc, tkey);
+    keys->data[i] = (void *)key;
+
+    if (!tvalue)
+        tvalue = value->type;
+    else
+        value = value->implicitCastTo(sc, tvalue);
+    values->data[i] = (void *)value;
+    }
+
+    if (!tkey)
+    tkey = Type::tvoid;
+    if (!tvalue)
+    tvalue = Type::tvoid;
+    type = new TypeAArray(tvalue, tkey);
+    type = type->semantic(loc, sc);
+    return this;
+}
+
+int AssocArrayLiteralExp::checkSideEffect(int flag)
+{   int f = 0;
+
+    for (size_t i = 0; i < keys->dim; i++)
+    {   Expression *key = (Expression *)keys->data[i];
+    Expression *value = (Expression *)values->data[i];
+
+    f |= key->checkSideEffect(2);
+    f |= value->checkSideEffect(2);
+    }
+    if (flag == 0 && f == 0)
+    Expression::checkSideEffect(0);
+    return f;
+}
+
+int AssocArrayLiteralExp::isBool(int result)
+{
+    size_t dim = keys->dim;
+    return result ? (dim != 0) : (dim == 0);
+}
+
+void AssocArrayLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writeByte('[');
+    for (size_t i = 0; i < keys->dim; i++)
+    {   Expression *key = (Expression *)keys->data[i];
+    Expression *value = (Expression *)values->data[i];
+
+    if (i)
+        buf->writeByte(',');
+    expToCBuffer(buf, hgs, key, PREC_assign);
+    buf->writeByte(':');
+    expToCBuffer(buf, hgs, value, PREC_assign);
+    }
+    buf->writeByte(']');
+}
+
+void AssocArrayLiteralExp::toMangleBuffer(OutBuffer *buf)
+{
+    size_t dim = keys->dim;
+    buf->printf("A%u", dim);
+    for (size_t i = 0; i < dim; i++)
+    {   Expression *key = (Expression *)keys->data[i];
+    Expression *value = (Expression *)values->data[i];
+
+    key->toMangleBuffer(buf);
+    value->toMangleBuffer(buf);
-    }
-}
@@ -3208 +3338 @@
-
-    VarDeclaration *v = var->isVarDeclaration();
-
+
+
-    error("cannot modify final variable '%s'", var->toChars());
-

branches/dmdfe/expression.h

@@ -351 +351 @@
-};
-
+struct AssocArrayLiteralExp : Expression
+{
+    Expressions *keys;
+    Expressions *values;
+
+    AssocArrayLiteralExp(Loc loc, Expressions *keys, Expressions *values);
+
+    Expression *syntaxCopy();
+    Expression *semantic(Scope *sc);
+    int isBool(int result);
+    elem *toElem(IRState *irs);
+    int checkSideEffect(int flag);
+    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+    void toMangleBuffer(OutBuffer *buf);
+    void scanForNestedRef(Scope *sc);
+    Expression *optimize(int result);
+    Expression *interpret(InterState *istate);
+
+    int inlineCost(InlineCostState *ics);
+    Expression *doInline(InlineDoState *ids);
+    Expression *inlineScan(InlineScanState *iss);
+};
+
-struct TypeDotIdExp : Expression
-{

branches/dmdfe/init.c

@@ -46 +46 @@
-}
-
-Array *Initializer::arraySyntaxCopy(Array
-Array
+Initializers *Initializer::arraySyntaxCopy(Initializers
+Initializers
-
-    if (ai)
-    {
-Array
+Initializers
-    a->setDim(ai->dim);
-    for (int i = 0; i < a->dim; i++)

branches/dmdfe/init.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -15 +15 @@
-
-#include "mars.h"
+#include "arraytypes.h"
-
-struct Identifier;
@@ -40 +41 @@
-    char *toChars();
-
-Array *arraySyntaxCopy(Array
+Initializers *arraySyntaxCopy(Initializers
-
-    virtual VoidInitializer *isVoidInitializer() { return NULL; }
@@ -61 +62 @@
-struct StructInitializer : Initializer
-{
-Array
-Array
+Identifiers
+Initializers
-
-    Array vars;     // parallel array of VarDeclaration *'s
@@ -77 +78 @@
-struct ArrayInitializer : Initializer
-{
-Array index;   // of Expression *'
-Array
+Expressions index; // indice
+Initializers
-    unsigned dim;   // length of array being initialized
-    Type *type;     // type that array will be used to initialize

branches/dmdfe/inline.c

@@ -182 +182 @@
-{
-    return 1 + arrayInlineCost(ics, elements);
+}
+
+int AssocArrayLiteralExp::inlineCost(InlineCostState *ics)
+{
+    return 1 + arrayInlineCost(ics, keys) + arrayInlineCost(ics, values);
-}
-
@@ -700 +705 @@
-
-
+Expression *AssocArrayLiteralExp::doInline(InlineDoState *ids)
+{
+    AssocArrayLiteralExp *ce;
+
+    ce = (AssocArrayLiteralExp *)copy();
+    ce->keys = arrayExpressiondoInline(keys, ids);
+    ce->values = arrayExpressiondoInline(values, ids);
+    return ce;
+}
+
+
-Expression *ArrayExp::doInline(InlineDoState *ids)
-{
@@ -1089 +1105 @@
-    //printf("ArrayLiteralExp::inlineScan()\n");
-    arrayInlineScan(iss, elements);
+
+    return e;
+}
+
+
+Expression *AssocArrayLiteralExp::inlineScan(InlineScanState *iss)
+{   Expression *e = this;
+
+    //printf("AssocArrayLiteralExp::inlineScan()\n");
+    arrayInlineScan(iss, keys);
+    arrayInlineScan(iss, values);
-
-    return e;

branches/dmdfe/interpret.c

@@ -985 +985 @@
-    }
-    ArrayLiteralExp *ae = new ArrayLiteralExp(loc, expsx);
+    ae->type = type;
+    return ae;
+    }
+    return this;
+}
+
+Expression *AssocArrayLiteralExp::interpret(InterState *istate)
+{   Expressions *keysx = NULL;
+    Expressions *valuesx = NULL;
+
+#if LOG
+    printf("AssocArrayLiteralExp::interpret() %s\n", toChars());
+#endif
+    for (size_t i = 0; i < keys->dim; i++)
+    {   Expression *ekey = (Expression *)keys->data[i];
+    Expression *evalue = (Expression *)values->data[i];
+    Expression *ex;
+
+    ex = ekey->interpret(istate);
+    if (ex == EXP_CANT_INTERPRET)
+    {   delete keysx;
+        delete valuesx;
+        return EXP_CANT_INTERPRET;
+    }
+
+    /* If any changes, do Copy On Write
+     */
+    if (ex != ekey)
+    {
+        if (!keysx)
+        {   keysx = new Expressions();
+        keysx->setDim(keys->dim);
+        for (size_t j = 0; j < i; j++)
+        {
+            keysx->data[j] = keys->data[j];
+        }
+        }
+        keysx->data[i] = (void *)ex;
+    }
+
+    ex = evalue->interpret(istate);
+    if (ex == EXP_CANT_INTERPRET)
+    {   delete keysx;
+        delete valuesx;
+        return EXP_CANT_INTERPRET;
+    }
+
+    /* If any changes, do Copy On Write
+     */
+    if (ex != evalue)
+    {
+        if (!valuesx)
+        {   valuesx = new Expressions();
+        valuesx->setDim(values->dim);
+        for (size_t j = 0; j < i; j++)
+        {
+            valuesx->data[j] = values->data[j];
+        }
+        }
+        valuesx->data[i] = (void *)ex;
+    }
+    }
+    if (keysx || valuesx)
+    {
+    if (keysx)
+        expandTuples(keysx);
+    if (valuesx)
+        expandTuples(valuesx);
+    if ((keysx && keysx->dim != keys->dim) ||
+        (valuesx && valuesx->dim != values->dim))
+    {   delete keysx;
+        delete valuesx;
+        return EXP_CANT_INTERPRET;
+    }
+    AssocArrayLiteralExp *ae = new AssocArrayLiteralExp(loc,
+        keysx ? keysx : keys, valuesx ? valuesx : values);
-    ae->type = type;
-    return ae;

branches/dmdfe/lexer.c

@@ -2730 +2730 @@
-    Token::tochars[TOKarraylength]  = "arraylength";
-    Token::tochars[TOKarrayliteral] = "arrayliteral";
+    Token::tochars[TOKassocarrayliteral] = "assocarrayliteral";
-    Token::tochars[TOKstring]       = "string";
-    Token::tochars[TOKdsymbol]      = "symbol";

branches/dmdfe/lexer.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -67 +67 @@
-    TOKremove,
-    TOKnewanonclass, TOKcomment,
-
+ TOKassocarrayliteral,
-
-    // Operators

branches/dmdfe/mangle.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -126 +126 @@
-    p = buf.toChars();
-    buf.data = NULL;
+    //printf("Declaration::mangle(this = %p, '%s', parent = '%s', linkage = %d) = %s\n", this, toChars(), parent ? parent->toChars() : "null", linkage, p);
-    return p;
-    }
@@ -193 +194 @@
-char *TemplateInstance::mangle()
-{
-    //printf("TemplateInstance::mangle() '%s'\n", toChars());
-    return Dsymbol::mangle();
-}
-
-
-
-char *Dsymbol::mangle()
-{
-    OutBuffer buf;
-    char *id;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    id = ident ? ident->toChars() : toChars();
-    if (parent)
-    {
-    //printf("  parent = '%s', kind = '%s'\n", parent->mangle(), parent->kind());
-    char *p = parent->mangle();
-    if (p[0] == '_' && p[1] == 'D')
@@ -214 +239 @@
-    buf.writestring(p);
-    }
-ZU "
+"%zu
-    id = buf.toChars();
-    buf.data = NULL;
-
-
-
-
+
+
+
+
+

branches/dmdfe/mars.c

@@ -56 +56 @@
-    copyright = "Copyright (c) 1999-2007 by Digital Mars";
-    written = "written by Walter Bright";
-1
+2
-    global.structalign = 8;
-
@@ -217 +217 @@
-    }
-
-    // Initialization
-    Type::init();
-    Id::initialize();
-    Module::init();
-    initPrecedence();
-
-    //backend_init();
-
-#if __DMC__ // DMC unique support for response files
-    if (response_expand(&argc,&argv))   // expand response files
@@ -564 +556 @@
-    VersionCondition::addPredefinedGlobalIdent("D_Coverage");
-
+    // Initialization
+    Type::init();
+    Id::initialize();
+    Module::init();
+    initPrecedence();
+
+    //backend_init();
-
-    //printf("%d source files\n",files.dim);

branches/dmdfe/optimize.c

@@ -84 +84 @@
-        elements->data[i] = (void *)e;
-    }
+    }
+    return this;
+}
+
+Expression *AssocArrayLiteralExp::optimize(int result)
+{
+    assert(keys->dim == values->dim);
+    for (size_t i = 0; i < keys->dim; i++)
+    {   Expression *e = (Expression *)keys->data[i];
+
+    e = e->optimize(WANTvalue | (result & WANTinterpret));
+    keys->data[i] = (void *)e;
+
+    e = (Expression *)values->data[i];
+    e = e->optimize(WANTvalue | (result & WANTinterpret));
+    values->data[i] = (void *)e;
-    }
-    return this;

branches/dmdfe/template.c

@@ -2407 +2407 @@
-    this->nest = 0;
-    this->havetempdecl = 0;
-0
+NULL
-    this->errors = 0;
-}
@@ -2429 +2429 @@
-    this->nest = 0;
-    this->havetempdecl = 1;
-0
+NULL
-    this->errors = 0;
-
@@ -2540 +2540 @@
-    if (isnested != ti->isnested)
-        continue;
+#if 0
-    if (isnested && sc->parent != ti->parent)
-        continue;
-
+
-    for (size_t j = 0; j < tdtypes.dim; j++)
-    {   Object *o1 = (Object *)tdtypes.data[j];
@@ -2576 +2577 @@
-    ident = genIdent();     // need an identifier for name mangling purposes.
-
+#if 1
-    if (isnested)
-
+
+
-    //printf("parent = '%s'\n", parent->kind());
-
@@ -3071 +3074 @@
-
-int TemplateInstance::isNested(Objects *args)
-
+   int nested = 0;
-    //printf("TemplateInstance::isNested('%s')\n", tempdecl->ident->toChars());
-
@@ -3105 +3108 @@
-        // if module level template
-        if (tempdecl->toParent()->isModule())
-
-
+
+
+
+
+
-        }
-        else
@@ -3114 +3120 @@
-    else if (va)
-    {
-
-
-
-
-
+
+
+
+
-}
-

branches/dmdfe/template.h

@@ -250 +250 @@
-    int nest;       // for recursion detection
-    int havetempdecl;   // 1 if used second constructor
-int isnested;  // if referencing local symbols
+Dsymbol *isnested; // if referencing local symbols, this is the context
-    int errors;     // 1 if compiled with errors
-#ifdef IN_GCC