Changeset 240

Show
Ignore:
Timestamp:
03/11/07 07:45:50 (2 years ago)
Author:
aldacron
Message:

[General]
* touched up buildme.d a bit so that it at least parses when run with a Tango DMD. It still won't execute, though.
[DerelictUtil?]
* modified the splitStr function in wrapper.d to make use of split() in the newer Tango revisions. The demarcate() method, depecrated in the Tango trunk, is still used when compiling with the beta release of Tango. This matches the implementation in buildme.d. At some point, likely with the next official Tango release, demarcate will be removed as it requires passing the -d flag to DMD when compiling with the latest Tango revisions.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictUtil/derelict/util/wrapper.d

    r237 r240  
    9191    version(Tango) 
    9292    { 
    93         return demarcate(str, delim); 
     93        if(0.95f == Tango) 
     94        { 
     95            return demarcate(str, delim); 
     96        } 
     97        else 
     98        { 
     99            return split(str, delim); 
     100        } 
    94101    } 
    95102    else 

  • trunk/buildme.d

    r237 r240  
    99        import tango.text.Ascii; 
    1010        import tango.text.String; 
     11        import tango.text.Util; 
    1112        import tango.io.File; 
    1213        import tango.sys.Process; 
    …… 
    423424    { 
    424425        auto f = new File(name); 
    425         if(f.isExisting()) 
    426             return cast(char[])f.read(); 
    427         else 
    428             return null; 
     426        return cast(char[])f.read(); 
    429427    } 
    430428    else