Changeset 213

Timestamp:

10/14/09 17:09:50 (11 months ago)

Author:

walter

Message:

1.050 and 2.035

Files:

• trunk/src/mtype.c (modified) (1 diff)
• trunk/src/mtype.h (modified) (1 diff)
• trunk/src/parse.c (modified) (3 diffs)

trunk/src/mtype.c

@@ -6863 +6863 @@
-
-    buf->printf("[%s .. ", lwr->toChars());
-    buf->printf("%s]", upr->toChars());
-}
-
+/***************************** TypeNewArray *****************************/
+
+/* T[new]
+ */
+
+TypeNewArray::TypeNewArray(Type *next)
+    : TypeNext(Tnarray, next)
+{
+    //printf("TypeNewArray\n");
+}
+
+void TypeNewArray::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
+{
+    if (mod != this->mod)
+    {   toCBuffer3(buf, hgs, mod);
+    return;
+    }
+    next->toCBuffer2(buf, hgs, this->mod);
+    buf->writestring("[new]");
+}
+
-/***************************** Argument *****************************/
-
-Argument::Argument(unsigned storageClass, Type *type, Identifier *ident, Expression *defaultArg)
-{
-    this->type = type;

trunk/src/mtype.h

@@ -796 +796 @@
-    Type *semantic(Loc loc, Scope *sc);
-    void resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps);
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-};
-
+struct TypeNewArray : TypeNext
+{
+    TypeNewArray(Type *next);
+    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
+};
+
-/**************************************************************/
-
-//enum InOut { None, In, Out, InOut, Lazy };
-
-struct Argument : Object

trunk/src/parse.c

@@ -2221 +2221 @@
-        if (token.value == TOKrbracket)
-        {
-            t = new TypeDArray(t);          // []
-            nextToken();
-        }
+        else if (token.value == TOKnew && peekNext() == TOKrbracket)
+        {
+            t = new TypeNewArray(t);            // [new]
+            nextToken();
+            nextToken();
+        }
-        else if (isDeclaration(&token, 0, TOKrbracket, NULL))
-        {   // It's an associative array declaration
-
-            //printf("it's an associative array\n");
-            Type *index = parseType();      // [ type ]
@@ -2341 +2347 @@
-        TypeNext *ta;
-        nextToken();
-        if (token.value == TOKrbracket)
-        {   // It's a dynamic array
-            ta = new TypeDArray(t);     // []
+            nextToken();
+        }
+        else if (token.value == TOKnew && peekNext() == TOKrbracket)
+        {
+            t = new TypeNewArray(t);        // [new]
+            nextToken();
-            nextToken();
-        }
-        else if (isDeclaration(&token, 0, TOKrbracket, NULL))
-        {   // It's an associative array
-
@@ -4263 +4275 @@
-
-        case TOKlbracket:
-        t = peek(t);
-        if (t->value == TOKrbracket)
-        {
+            t = peek(t);
+        }
+        else if (t->value == TOKnew && peek(t)->value == TOKrbracket)
+        {
+            t = peek(t);
-            t = peek(t);
-        }
-        else if (isDeclaration(t, 0, TOKrbracket, &t))
-        {   // It's an associative array declaration
-            t = peek(t);