Changeset 517

Show
Ignore:
Timestamp:
11/27/07 16:10:16 (1 year ago)
Author:
braddr
Message:

Manually cleanup remaining differences between candidate and trunk. std/variant.d is the only file with differences remaining.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • candidate/phobos/std/traits.d

    r516 r517  
    471471static assert (!isStaticArray!(int[char])); 
    472472static assert (!isStaticArray!(int[1][])); 
    473 static assert(isStaticArray!(invariant char[13u])); 
    474 static assert(isStaticArray!(const(real)[1])); 
    475 static assert(isStaticArray!(const(real)[1][1])); 
    476 static assert(isStaticArray!(typeof("string literal"))); 
    477 static assert(isStaticArray!(void[0])); 
    478 static assert(!isStaticArray!(int[int])); 
    479 static assert(!isStaticArray!(int)); 
     473static assert (isStaticArray!(invariant char[13u])); 
     474static assert (isStaticArray!(const(real)[1])); 
     475static assert (isStaticArray!(const(real)[1][1])); 
     476static assert (isStaticArray!(typeof("string literal"))); 
     477static assert (isStaticArray!(void[0])); 
     478static assert (!isStaticArray!(int[int])); 
     479static assert (!isStaticArray!(int)); 
    480480 
    481481/** 

  • trunk/phobos/std/getopt.d

    r514 r517  
    248248--------- 
    249249 
    250 In the example above, "--foo", "--bar", "--FOo", "--bAr" etc. are recognized. The directive is active til the end of $(D_PARAM getopt), or until the converse directive $(D_PARAM caseSensitive) is encountered: 
     250In the example above, "--foo", "--bar", "--FOo", "--bAr" etc. are recognized. The directive is active til the end of $(D_PARAM getopt), or until the converse directive $(D_PARAM caseInsensitive) is encountered: 
    251251 
    252252--------- 

  • trunk/phobos/std/metastrings.d

    r515 r517  
    150150{ 
    151151    auto s = Format!("hel%slo", "world", -138, 'c', true); 
    152     // BUG 1616 filed: assert(s == "helworldlo-138ctrue"); 
     152    // BUG 1616 filed: assert(s == "helworldlo-138ctrue", "[" ~ s ~ "]"); 
    153153} 
    154154 

  • trunk/phobos/std/stdio.d

    r515 r517  
    244244    FILE* f = fopen(file, "w"); 
    245245    assert(f, getcwd()); 
     246    scope(exit) { std.file.remove(file); } 
    246247    write(f, "Hello, ",  "world number ", 42, "!"); 
    247248    fclose(f) == 0 || assert(false); 
    …… 
    275276    FILE* f = fopen(file, "w"); 
    276277    assert(f); 
     278    scope(exit) { std.file.remove(file); } 
    277279    writeln(f, "Hello, ",  "world number ", 42, "!"); 
    278280    fclose(f) == 0 || assert(false); 
    …… 
    367369    auto f = fopen(file, "w"); 
    368370    assert(f); 
     371    scope(exit) { std.file.remove(file); } 
    369372    writef(f, "Hello, %s world number %s!", "nice", 42); 
    370373    fclose(f) == 0 || assert(false); 
    …… 
    394397    FILE* f = fopen(file, "w"); 
    395398    assert(f); 
     399    scope(exit) { std.file.remove(file); } 
    396400    writefln(f, "Hello, %s world number %s!", "nice", 42); 
    397401    fclose(f) == 0 || assert(false); 
    …… 
    10591063{ 
    10601064    string file = "dmd-build-test.deleteme.txt"; 
     1065    scope(exit) { std.file.remove(file); } 
    10611066    alias TypeTuple!(string, wstring, dstring, 
    10621067                     char[], wchar[], dchar[]) 
    …… 
    12451250{ 
    12461251    string file = "dmd-build-test.deleteme.txt"; 
     1252    scope(exit) { std.file.remove(file); } 
    12471253    // test looping with an empty file 
    12481254    std.file.write(file, ""); 

  • trunk/phobos/std/traits.d

    r515 r517  
    471471static assert (!isStaticArray!(int[char])); 
    472472static assert (!isStaticArray!(int[1][])); 
    473 static assert(isStaticArray!(invariant char[13u])); 
    474 static assert(isStaticArray!(void[0])); 
    475 static assert(!isStaticArray!(int[int])); 
    476 static assert(!isStaticArray!(int)); 
    477 static assert(isStaticArray!(const(real)[1])); 
    478 static assert(isStaticArray!(const(real)[1][1])); 
    479 static assert(isStaticArray!(typeof("string literal"))); 
     473static assert (isStaticArray!(invariant char[13u])); 
     474static assert (isStaticArray!(const(real)[1])); 
     475static assert (isStaticArray!(const(real)[1][1])); 
     476static assert (isStaticArray!(typeof("string literal"))); 
     477static assert (isStaticArray!(void[0])); 
     478static assert (!isStaticArray!(int[int])); 
     479static assert (!isStaticArray!(int)); 
    480480 
    481481/** 

  • trunk/phobos/unittest.d

    r465 r517  
    1  
    21/* 
    32 *  Copyright (C) 1999-2006 by Digital Mars, www.digitalmars.com 
    …… 
    2726// Then, it prints out the arguments passed to main(). 
    2827 
    29 import std.c.stdio; 
    30 import std.string; 
    31 import std.path; 
    32 import std.math; 
    33 import std.math2; 
    34 import std.outbuffer; 
    35 import std.ctype; 
    36 import std.regexp; 
    37 import std.random; 
    38 import std.date; 
    39 import std.dateparse; 
    40 import std.demangle; 
    41 import std.cstream; 
    42 import std.stream; 
    43 import std.utf; 
    44 import std.uri; 
    45 import std.zlib; 
    46 import std.md5; 
    47 import std.stdio; 
    48 import std.conv; 
    49 import std.boxer; 
    50 import std.bitarray; 
    51 import std.uni; 
    52 import std.file; 
    53 import std.signals; 
    54 import std.cpuid; 
    55 import std.socket; 
     28import all_std_modules_generated; 
    5629 
    5730int main(char[][] args)