Changeset 931 for trunk/rebuild

Timestamp:

09/13/08 11:19:13 (4 months ago)

Author:

Gregor

Message:

rebuild/parse.c: Removed unnecessary errors.

rebuild/mars.c, rebuild/link.c: Fixed linking libraries.

Files:

• trunk/rebuild/link.c (modified) (1 diff)
• trunk/rebuild/mars.c (modified) (2 diffs)
• trunk/rebuild/parse.c (modified) (63 diffs)

trunk/rebuild/link.c

@@ -227 +227 @@
-    global.params.exefile = strdup(out.c_str());
-    }
-
+
-    // do we even need to do the build?
-    if (global.params.fullbuild ||

trunk/rebuild/mars.c

@@ -1007 +1007 @@
-    global.params.useAssert = 1;
-
- || global.params.lib
+
-    global.params.link = 0;
-
@@ -1723 +1723 @@
-    
-    mem.fullcollect();
-
+
-    // Now do the actual compilation, across any number of processors
-#ifndef _WIN32

trunk/rebuild/parse.c

@@ -74 +74 @@
-    nextToken();
-    if (token.value != TOKidentifier)
-error("Identifier expected following module");
+/* error("Identifier expected following module"); */
-        goto Lerr;
-    }
@@ -90 +90 @@
-        nextToken();
-        if (token.value != TOKidentifier)
-error("Identifier expected following package");
+/* error("Identifier expected following package"); */
-            goto Lerr;
-        }
@@ -98 +98 @@
-        md = new ModuleDeclaration(a, id);
-
-
-
+/* 
+ */
-        nextToken();
-        addComment(mod, comment);
@@ -107 +107 @@
-    decldefs = parseDeclDefs(0);
-    if (token.value != TOKeof)
-error("unrecognized declaration");
+/* error("unrecognized declaration"); */
-    goto Lerr;
-    }
@@ -390 +390 @@
-            case TOKpublic:
-            case TOKexport:
-error("redundant protection attribute");
+/* error("redundant protection attribute"); */
-            break;
-        }
@@ -408 +408 @@
-            n = (unsigned)token.uns64value;
-            else
-error("integer expected, not %s", token.toChars());
+/* error("integer expected, not %s", token.toChars()); */
-            n = 1;
-            }
@@ -429 +429 @@
-        check(TOKlparen);
-        if (token.value != TOKidentifier)
-error("pragma(identifier expected");
+/* error("pragma(identifier expected"); */
-            goto Lerror;
-        }
@@ -457 +457 @@
-            s = new DebugSymbol(loc, (unsigned)token.uns64value);
-            else
-error("identifier or integer expected, not %s", token.toChars());
+/* error("identifier or integer expected, not %s", token.toChars()); */
-            s = NULL;
-            }
-            nextToken();
-
-
+/* 
+ */
-            nextToken();
-            break;
@@ -480 +480 @@
-            s = new VersionSymbol(loc, (unsigned)token.uns64value);
-            else
-error("identifier or integer expected, not %s", token.toChars());
+/* error("identifier or integer expected, not %s", token.toChars()); */
-            s = NULL;
-            }
-            nextToken();
-
-
+/* 
+ */
-            nextToken();
-            break;
@@ -537 +537 @@
-    {
-    case TOKsemicolon:
-error("declaration expected following attribute, not ';'");
+/* error("declaration expected following attribute, not ';'"); */
-        nextToken();
-        break;
@@ -546 +546 @@
-        if (token.value != TOKrcurly)
-        {   /* { */
-error("matching '}' expected, not %s", token.toChars());
+/* error("matching '}' expected, not %s", token.toChars()); */
-        }
-        else
@@ -656 +656 @@
-    else
-    {
-error("valid linkage identifiers are D, C, C++, Pascal, Windows, System");
+/* error("valid linkage identifiers are D, C, C++, Pascal, Windows, System"); */
-        link = LINKd;
-    }
@@ -686 +686 @@
-    else if (token.value == TOKint32v)
-        level = (unsigned)token.uns64value;
-
-
+/* 
+ */
-    nextToken();
-    check(TOKrparen);
@@ -723 +723 @@
-        id = Lexer::idPool(Token::toChars(TOKunittest));
-#endif
-
-
+/* 
+ */
-    nextToken();
-    check(TOKrparen);
-
-    }
-
-
+/* 
+ */
-    c = new VersionCondition(mod, level, id);
-    return c;
@@ -758 +758 @@
-    }
-    else
-error("(expression) expected following static if");
+/* error("(expression) expected following static if"); */
-    exp = NULL;
-    }
@@ -956 +956 @@
-    nextToken();
-    arguments = parseParameters(&varargs);
-
-
+/* 
+ */
-    f = new DeleteDeclaration(loc, 0, arguments);
-    parseContracts(f);
@@ -1172 +1172 @@
-        {
-        type = parseType(&ident, NULL);
-
-
+/* 
+ */
-        }
-
@@ -1184 +1184 @@
-        else
-        {   value = NULL;
-
-
+/* 
+ */
-        }
-
@@ -1203 +1203 @@
-    nextToken();
-    }
-
-
+/* 
+ */
-
-    //printf("-parseEnum() %s\n", e->toChars());
@@ -1252 +1252 @@
-        baseclasses = parseBaseClasses();
-
-
-
+/* 
+ */
-        }
-
@@ -1289 +1289 @@
-    nextToken();
-    Array *decl = parseDeclDefs(0);
-
-
+/* 
+ */
-    nextToken();
-    if (anon)
@@ -1303 +1303 @@
-    else
-    {
-error("{ } expected following aggregate declaration");
+/* error("{ } expected following aggregate declaration"); */
-    a = new StructDeclaration(loc, NULL);
-    }
@@ -1358 +1358 @@
-    else
-    {
-error("base classes expected instead of %s", token.toChars());
+/* error("base classes expected instead of %s", token.toChars()); */
-        return NULL;
-    }
@@ -1401 +1401 @@
-    nextToken();
-    if (token.value != TOKidentifier)
-error("TemplateIdentifier expected following template");
+/* error("TemplateIdentifier expected following template"); */
-    goto Lerr;
-    }
@@ -1413 +1413 @@
-
-    if (token.value != TOKlcurly)
-error("members of template declaration expected");
+/* error("members of template declaration expected"); */
-    goto Lerr;
-    }
@@ -1421 +1421 @@
-    decldefs = parseDeclDefs(0);
-    if (token.value != TOKrcurly)
-error("template member expected");
+/* error("template member expected"); */
-        goto Lerr;
-    }
@@ -1446 +1446 @@
-
-    if (!flag && token.value != TOKlparen)
-error("parenthesized TemplateParameterList expected following TemplateIdentifier");
+/* error("parenthesized TemplateParameterList expected following TemplateIdentifier"); */
-    goto Lerr;
-    }
@@ -1480 +1480 @@
-        {
-            if (token.value != TOKidentifier)
-error("identifier expected for template alias parameter");
+/* error("identifier expected for template alias parameter"); */
-            goto Lerr;
-            }
@@ -1510 +1510 @@
-        {   // TypeParameter
-        if (token.value != TOKidentifier)
-error("identifier expected for template type parameter");
+/* error("identifier expected for template type parameter"); */
-            goto Lerr;
-        }
@@ -1529 +1529 @@
-        else if (token.value == TOKidentifier && t->value == TOKdotdotdot)
-        {   // ident...
-
-
+/* 
+ */
-        isvariadic = 1;
-        tp_ident = token.ident;
@@ -1565 +1565 @@
-        if (!tp_ident)
-        {
-error("identifier expected for template value parameter");
+/* error("identifier expected for template value parameter"); */
-            tp_ident = new Identifier("error", TOKidentifier);
-        }
@@ -1624 +1624 @@
-    if (token.value != TOKidentifier)
-    {
-error("identifier expected, not %s", token.toChars());
+/* error("identifier expected, not %s", token.toChars()); */
-        id = Id::empty;
-    }
@@ -1655 +1655 @@
-    nextToken();
-    if (token.value != TOKidentifier)
-error("identifier expected following '.' instead of '%s'", token.toChars());
+/* error("identifier expected following '.' instead of '%s'", token.toChars()); */
-        break;
-    }
@@ -1672 +1672 @@
-
-    tm = new TemplateMixin(loc, id, tqual, idents, tiargs);
-
-
+/* 
+ */
-    nextToken();
-
@@ -1691 +1691 @@
-    //printf("Parser::parseTemplateArgumentList()\n");
-    if (token.value != TOKlparen)
-error("!(TemplateArgumentList) expected following TemplateIdentifier");
+/* error("!(TemplateArgumentList) expected following TemplateIdentifier"); */
-    return new Objects();
-    }
@@ -1740 +1740 @@
-    nextToken();
-    if (token.value != TOKidentifier)
-error("Identifier expected following import");
+/* error("Identifier expected following import"); */
-        break;
-    }
@@ -1760 +1760 @@
-        nextToken();
-        if (token.value != TOKidentifier)
-error("Identifier expected following package");
+/* error("Identifier expected following package"); */
-        break;
-        }
@@ -1782 +1782 @@
-        nextToken();
-        if (token.value != TOKidentifier)
-error("Identifier expected following :");
+/* error("Identifier expected following :"); */
-            break;
-        }
@@ -1791 +1791 @@
-            nextToken();
-            if (token.value != TOKidentifier)
-error("Identifier expected following %s=", alias->toChars());
+/* error("Identifier expected following %s=", alias->toChars()); */
-            break;
-            }
@@ -1813 +1813 @@
-    else
-    {
-error("';' expected");
+/* error("';' expected"); */
-    nextToken();
-    }
@@ -1876 +1876 @@
-        {   nextToken();
-        if (token.value != TOKidentifier)
-error("identifier expected following '.' instead of '%s'", token.toChars());
+/* error("identifier expected following '.' instead of '%s'", token.toChars()); */
-            break;
-        }
@@ -1923 +1923 @@
-
-    default:
-error("basic type expected, not %s", token.toChars());
+/* error("basic type expected, not %s", token.toChars()); */
-        t = Type::tint32;
-        break;
@@ -2250 +2250 @@
-        unsigned u = storage_class;
-        u &= STCconst | STCinvariant | STCmanifest;
-
-
+/* 
+ */
-        }
-        nextToken();
@@ -2327 +2327 @@
-        error("multiple declarations must have the same type, not %s and %s",
-        tfirst->toChars(), t->toChars()); */
-
-
+/* 
+ */
-
-    if (tok == TOKtypedef || tok == TOKalias)
@@ -2368 +2368 @@
-
-        default:
-error("semicolon expected to close %s declaration", Token::toChars(tok));
+/* error("semicolon expected to close %s declaration", Token::toChars(tok)); */
-            break;
-        }
@@ -2447 +2447 @@
-
-        default:
-error("semicolon expected, not '%s'", token.toChars());
+/* error("semicolon expected, not '%s'", token.toChars()); */
-            break;
-        }
@@ -2493 +2493 @@
-        continue;
-        }
-
-
-
-
-
+/* 
+ */
+
+/* 
+ */
-    break;
-    }
@@ -2520 +2520 @@
-    {
-    case TOKlcurly:
-
-
+/* 
+ */
-        f->fbody = parseStatement(PSsemi);
-        f->endloc = endloc;
@@ -2533 +2533 @@
-
-    case TOKsemicolon:
-
-
+/* 
+ */
-        nextToken();
-        break;
@@ -2578 +2578 @@
-        {
-        check(TOKlparen);
-
-
+/* 
+ */
-        f->outId = token.ident;
-        nextToken();
@@ -2590 +2590 @@
-
-    default:
-error("semicolon expected following function declaration");
+/* error("semicolon expected following function declaration"); */
-        break;
-    }
@@ -2683 +2683 @@
-
-            case TOKeof:
-error("found EOF instead of initializer");
+/* error("found EOF instead of initializer"); */
-            break;
-
@@ -2848 +2848 @@
-    //printf("parseStatement()\n");
-
-
-
+/* 
+ */
-
-    switch (token.value)
@@ -3163 +3163 @@
-        }
-        at = parseType(&ai);
-
-
+/* 
+ */
-          Larg:
-        a = new Argument(storageClass, at, ai, NULL);
@@ -3651 +3651 @@
-            case TOKeof:
-            /* { */
-error("matching '}' expected, not end of file");
+/* error("matching '}' expected, not end of file"); */
-            break;
-
@@ -3672 +3672 @@
-
-    default:
-error("found '%s' instead of statement", token.toChars());
+/* error("found '%s' instead of statement", token.toChars()); */
-        goto Lerror;
-
@@ -3696 +3696 @@
-void Parser::check(Loc loc, enum TOK value)
-{
-
-
+/* 
+ */
-    nextToken();
-}
@@ -3703 +3703 @@
-void Parser::check(enum TOK value, const char *string)
-{
-
+/* 
-    error("found '%s' when expecting '%s' following '%s'",
-
+ */
-    nextToken();
-}
@@ -4430 +4430 @@
-        check(TOKdot, t->toChars());
-        if (token.value != TOKidentifier)
-error("found '%s' when expecting identifier following '%s.'", token.toChars(), t->toChars());
+/* error("found '%s' when expecting identifier following '%s.'", token.toChars(), t->toChars()); */
-        goto Lerr;
-        }
@@ -4733 +4733 @@
-            continue;
-        }
-
-
+/* 
+ */
-        break;
-
@@ -4962 +4962 @@
-                nextToken();
-                if (token.value != TOKidentifier)
-error("Identifier expected following (type).");
+/* error("Identifier expected following (type)."); */
-                return NULL;
-                }
@@ -5450 +5450 @@
-
-    if (token.value != TOKlcurly)
-error("{ members } expected for anonymous class");
+/* error("{ members } expected for anonymous class"); */
-        cd->members = NULL;
-    }
@@ -5457 +5457 @@
-        nextToken();
-        Array *decl = parseDeclDefs(0);
-
-
+/* 
+ */
-        nextToken();
-        cd->members = decl;