Changeset 89

Show
Ignore:
Timestamp:
06/27/11 10:01:08 (1 year ago)
Author:
aarti_pl
Message:

- refactored strings to string enum
- updated test
- minor changes and corrections to compile with DMD 2.053

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Doost.cbp

    r84 r89  
    2020                <Option type="1" /> 
    2121                <Option compiler="dmd" /> 
     22                <Compiler> 
     23                    <Add option="-debug" /> 
     24                </Compiler> 
    2225            </Target> 
    2326            <Target title="AnyTest"> 
    …… 
    3639                <Compiler> 
    3740                    <Add option="-unittest" /> 
    38                     <Add option="-g" /> 
    3941                    <Add option="-debug" /> 
    4042                </Compiler> 
    …… 
    5860            <Option target="AnyTest" /> 
    5961        </Unit> 
    60         <Unit filename="doost\core\Traits.d"> 
    61             <Option target="Template" /> 
    62             <Option target="ProgramOptionsTest" /> 
    63         </Unit> 
     62        <Unit filename="doost\core\Traits.d" /> 
    6463        <Unit filename="doost\storage\Storage.d"> 
    6564            <Option target="SerializerTest" /> 

  • trunk/doost/util/DUnit.d

    r83 r89  
    6262        string result; 
    6363 
    64         result~=repeat(" ", m_border); 
     64        result~=std.string.repeat(" ", m_border); 
    6565        if (content.length + 2*m_border > m_cwidth) { 
    6666            content = content[0.. m_cwidth-2*m_border -1] ~ "."; 
    …… 
    7171        if (m_aligning == Align.Left) { 
    7272            result~=content; 
    73             result~=repeat(" ", m_cwidth - clen); 
     73            result~=std.string.repeat(" ", m_cwidth - clen); 
    7474        } else 
    7575        if (m_aligning == Align.Right) { 
    76             result~=repeat(" ", m_cwidth - clen); 
     76            result~=std.string.repeat(" ", m_cwidth - clen); 
    7777            result~=content; 
    7878        } else 
    7979        if (m_aligning == Align.Center) { 
    8080            uint empty = m_cwidth - clen; 
    81             result~=repeat(" ", empty / 2); 
     81            result~=std.string.repeat(" ", empty / 2); 
    8282            result~=content; 
    83             result~=repeat(" ", empty - empty / 2); 
    84         } 
    85  
    86         result~=repeat(" ", m_border); 
     83            result~=std.string.repeat(" ", empty - empty / 2); 
     84        } 
     85 
     86        result~=std.string.repeat(" ", m_border); 
    8787        return result; 
    8888    } 
    …… 
    138138    } 
    139139    override string render(string str) { 
    140         return repeat(" ", m_border) ~ repeat(m_form, m_cwidth-2*m_border) ~ repeat(" ", m_border); 
     140        return std.string.repeat(" ", m_border) ~ std.string.repeat(m_form, m_cwidth-2*m_border) ~ std.string.repeat(" ", m_border); 
    141141    } 
    142142} 

  • trunk/doost/util/config/Exception.d

    r82 r89  
    2525    STACK_SHOULD_BE_DISCONNECTED = "Options stack should be disconnected %s.", 
    2626    CONCRETE_STORAGES_NOT_ATTACHED = "There are no concrete storages attached to ProgramOptions.", 
    27     OPTION_NAME_CAN_NOT_BE_EMPTY = "Option name can not be empty." 
     27    OPTION_NAME_CAN_NOT_BE_EMPTY = "Option name can not be empty.", 
     28    COMMA_CAN_NOT_BE_ON_LAST_POSITION = "Comma can not be on last position (definition: '%s').", 
     29    AT_LEAST_NAME_OR_ALIAS_MUST_BE_GIVEN = "At least name or alias must be given" 
    2830} 
    2931 

  • trunk/doost/util/config/Option.d

    r81 r89  
    2727 
    2828//------------------------------------------------------------------------------ 
    29 //Assert string definitions 
    30  
    31 debug { 
    32     const COMMA_CAN_NOT_BE_ON_LAST_POSITION = "Comma can not be on last position (definition: '%s')."; 
    33     const AT_LEAST_NAME_OR_ALIAS_MUST_BE_GIVEN = "At least name or alias must be given"; 
    34 } else { 
    35     const COMMA_CAN_NOT_BE_ON_LAST_POSITION = ""; 
    36     const AT_LEAST_NAME_OR_ALIAS_MUST_BE_GIVEN = ""; 
    37 } 
    38  
    39 //------------------------------------------------------------------------------ 
    4029 
    4130/******************************************************************************* 
    …… 
    5645    static ParsedOption opCall(string name, string stringValue, OptionSemantic osemantic) 
    5746    in { 
    58         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     47        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    5948        assert(osemantic !is null); 
    6049    } 
    …… 
    217206    bool match(string name) 
    218207    in { 
    219         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     208        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    220209    } 
    221210    body { 
    …… 
    261250        int n = indexOf(name, ','); 
    262251 
    263         assert(n != name.length-1, format(COMMA_CAN_NOT_BE_ON_LAST_POSITION, name)); 
     252        assert(n != name.length-1, format(ErrorStrings.COMMA_CAN_NOT_BE_ON_LAST_POSITION, name)); 
    264253 
    265254        if (n != -1) { 
    …… 
    273262        //If option's name is not defined, it is saved as option's alias 
    274263        if (m_oName.length==0) { 
    275             assert(m_oAlias != "", format(AT_LEAST_NAME_OR_ALIAS_MUST_BE_GIVEN)); 
     264            assert(m_oAlias != "", format(ErrorStrings.AT_LEAST_NAME_OR_ALIAS_MUST_BE_GIVEN)); 
    276265            m_oName=m_oAlias; 
    277266        } 
    …… 
    831820                    case OptionCharacteristic.Keyed: 
    832821                            if (opt.optionName in m_index[oc] || (opt.optionAlias != "" && opt.optionAlias in m_index[oc])) 
    833                                 assert(false, format(DUPLICATED_OPTIONS, opt.optionTypeName, opt.optionName)); 
     822                                assert(false, format(ErrorStrings.DUPLICATED_OPTIONS, opt.optionTypeName, opt.optionName)); 
    834823                            break; 
    835824                    case OptionCharacteristic.Single: 
    836825                            if (opt.optionTypeName in m_index[oc]) 
    837                                 assert(false, format(DUPLICATED_OPTIONS, opt.optionTypeName, opt.optionName)); 
     826                                assert(false, format(ErrorStrings.DUPLICATED_OPTIONS, opt.optionTypeName, opt.optionName)); 
    838827                            break; 
    839828                    default: 

  • trunk/doost/util/config/PoTextArchive.d

    r81 r89  
    2525    mixin TextArchiveExt!(ARCHIVE); 
    2626 
    27     ElementSet!(ELEMENTTYPE) arrayTerm; 
    28     ElementSet!(ELEMENTTYPE) asocArrayTerm; 
    29     ElementSet!(ELEMENTTYPE) udtTerm; 
     27    ElementSet!(dchar) arrayTerm; 
     28    ElementSet!(dchar) asocArrayTerm; 
     29    ElementSet!(dchar) udtTerm; 
    3030 
    3131    bool start() { 
    …… 
    5656 
    5757        static if (isSomeString!(typeof(elem))) { 
    58             ElementSet!(ELEMENTTYPE) old = defString.p_allchars; 
     58            ElementSet!(dchar) old = defString.p_allchars; 
    5959            defString.p_allchars.subtract(arrayTerm); 
    6060        } 
    …… 
    7272        } 
    7373 
    74         static if (isString!(typeof(elem))) { 
     74        static if (isSomeString!(typeof(elem))) { 
    7575            defString.p_allchars = old; 
    7676        } 
    …… 
    9292        ValueType val; 
    9393 
    94         static if (isString!(KeyType) || isString!(ValueType)) { 
     94        static if (isSomeString!(KeyType) || isSomeString!(ValueType)) { 
    9595            ElementSet!(ELEMENTTYPE) old = defString.p_allchars; 
    9696            defString.p_allchars.substract(asocArrayTerm); 
    …… 
    119119     **************************************************************************/ 
    120120    bool loadOneField(VALUE)(ref VALUE value, string name) { 
    121         static if (isString!(VALUE)) { 
    122             ElementSet!(ELEMENTTYPE) old = defString.p_allchars; 
     121        static if (isSomeString!(VALUE)) { 
     122            ElementSet!(dchar) old = defString.p_allchars; 
    123123            defString.p_allchars.substract(udtTerm); 
    124124        } 
    …… 
    127127            throw new ParsingException("Wrong data format. "); 
    128128 
    129         static if (isString!(VALUE)) { 
     129        static if (isSomeString!(VALUE)) { 
    130130            defString.p_allchars = old; 
    131131        } 

  • trunk/doost/util/config/ProgramOptions.d

    r81 r89  
    454454    void next_setter(ConcreteStorage storage) 
    455455    in { 
    456         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to add another storage")); 
     456        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to add another storage")); 
    457457        assert(storage !is null); 
    458458    } 
    …… 
    564564    EasyInit!(typeof(this)) options()() 
    565565    in { 
    566         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to set options definition")); 
     566        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set options definition")); 
    567567    } 
    568568    body { 
    …… 
    592592    in { 
    593593        assert( isConnected == false, 
    594                 format(STACK_SHOULD_BE_DISCONNECTED, "to set options definition")); 
     594                format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set options definition")); 
    595595 
    596596        foreach(p; params) { 
    …… 
    615615    typeof(this) formatter(Formatter of) 
    616616    in { 
    617         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to set formatter")); 
     617        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set formatter")); 
    618618    } 
    619619    body { 
    …… 
    668668    override Any* opIn_r(string name) 
    669669    in { 
    670         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    671         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "lookup for options")); 
     670        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     671        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "lookup for options")); 
    672672    } 
    673673    body { 
    …… 
    687687    override Any opIndex(string name) 
    688688    in { 
    689         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    690         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "get value of option")); 
     689        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     690        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "get value of option")); 
    691691    } 
    692692    body { 
    …… 
    701701    override void opIndexAssign(Any val, string name) 
    702702    in { 
    703         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    704         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "set option value")); 
     703        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     704        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "set option value")); 
    705705        assert(val !is null); 
    706706    } 
    …… 
    769769    override void remove(string name) 
    770770    in { 
    771         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    772         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "set option value")); 
     771        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     772        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "set option value")); 
    773773    } 
    774774    body { 
    …… 
    806806    override Value valueInfo(string name) 
    807807    in { 
    808         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    809         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "get option value info")); 
     808        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     809        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "get option value info")); 
    810810    } 
    811811    body { 
    …… 
    858858    override void synchronize(bool nf=true) 
    859859    in { 
    860         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "synchronize options")); 
     860        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "synchronize options")); 
    861861    } 
    862862    body { 
    …… 
    909909    override string[] assignedOptions() 
    910910    in { 
    911         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "get information about assigned options")); 
     911        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "get information about assigned options")); 
    912912    } 
    913913    body { 
    …… 
    10241024    OptionSemantic findOption(string name) 
    10251025    in { 
    1026         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1026        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    10271027        assert(m_desc !is null); 
    10281028    } 
    …… 
    10441044    OptionSemantic findOptionChecked(string name) 
    10451045    in { 
    1046         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1046        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    10471047    } 
    10481048    body { 
    …… 
    10641064    void synchronizeOne(string name, Value nval, bool nf=true) 
    10651065    in { 
    1066         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1066        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    10671067        assert(nval !is null); 
    10681068    } 
    …… 
    11191119    void storeOption_impl(string name, string strVal, OptionSemantic desc, ref Value val) 
    11201120    in { 
    1121         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1121        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    11221122        assert(desc !is null); 
    11231123    } 
    …… 
    12141214    override void checkTypesCoherency(string name) 
    12151215    in { 
    1216         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1216        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    12171217    } 
    12181218    body { 
    …… 
    13041304    override void connect(bool nf=false) 
    13051305    in { 
    1306         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to call function connect")); 
    1307         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1306        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to call function connect")); 
     1307        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    13081308    } 
    13091309    body { 
    …… 
    13241324    override void disconnect() 
    13251325    in { 
    1326         assert(isConnected==true, format(STACK_SHOULD_BE_CONNECTED, "call function disconnect")); 
     1326        assert(isConnected==true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "call function disconnect")); 
    13271327    } 
    13281328    body { 
    …… 
    13601360    override Any opIndex(string name) 
    13611361    in { 
    1362         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    1363         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "get value of option")); 
    1364         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1362        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1363        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "get value of option")); 
     1364        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    13651365    } 
    13661366    body { 
    …… 
    13781378    override void opIndexAssign(Any value, string name) 
    13791379    in { 
    1380         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    1381         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "assign value to option")); 
    1382         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1380        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1381        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "assign value to option")); 
     1382        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    13831383        assert(value !is null); 
    13841384    } 
    …… 
    14031403    override void remove(string name) 
    14041404    in { 
    1405         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    1406         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "assign value to option")); 
    1407         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1405        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1406        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "assign value to option")); 
     1407        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    14081408    } 
    14091409    body { 
    …… 
    14261426    override Any* opIn_r(string name) 
    14271427    in { 
    1428         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    1429         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "lookup for option")); 
    1430         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1428        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1429        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "lookup for option")); 
     1430        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    14311431    } 
    14321432    body { 
    …… 
    14411441    override Value valueInfo(string name) 
    14421442    in { 
    1443         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    1444         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "get value info for option")); 
    1445         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1443        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1444        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "get value info for option")); 
     1445        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    14461446    } 
    14471447    body { 
    …… 
    14751475    override string[] assignedOptions() 
    14761476    in { 
    1477         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "get assigned options")); 
    1478         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1477        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "get assigned options")); 
     1478        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    14791479    } 
    14801480    body { 
    …… 
    14961496    override string[] definedOptions() 
    14971497    in { 
    1498         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1498        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    14991499    } 
    15001500    body { 
    …… 
    15161516    override void synchronize(bool nf=true) 
    15171517    in { 
    1518         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "synchronize options")); 
    1519         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1518        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "synchronize options")); 
     1519        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    15201520    } 
    15211521    body { 
    …… 
    15371537    string[] collectedOptions() 
    15381538    in { 
    1539         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1539        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    15401540    } 
    15411541    body { 
    …… 
    15781578    ProgramOptions callback(string name, OptionCallback[] func=null) 
    15791579    in { 
    1580         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1580        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    15811581    } 
    15821582    body { 
    …… 
    15961596    Any composedOptions(string name) 
    15971597    in { 
    1598         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "get composed options")); 
    1599         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
    1600         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1598        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "get composed options")); 
     1599        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
     1600        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    16011601    } 
    16021602    body { 
    …… 
    16701670    void downStackSync(string name) 
    16711671    in { 
    1672         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    1673         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "make down stack synchronization")); 
    1674         assert(m_next !is null, format(CONCRETE_STORAGES_NOT_ATTACHED)); 
     1672        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     1673        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "make down stack synchronization")); 
     1674        assert(m_next !is null, format(ErrorStrings.CONCRETE_STORAGES_NOT_ATTACHED)); 
    16751675    } 
    16761676    body { 
    …… 
    17691769    void notify(Event e) 
    17701770    in { 
    1771         assert(isConnected == true, format(STACK_SHOULD_BE_CONNECTED, "make notifications")); 
     1771        assert(isConnected == true, format(ErrorStrings.STACK_SHOULD_BE_CONNECTED, "make notifications")); 
    17721772    } 
    17731773    body { 

  • trunk/doost/util/config/Value.d

    r82 r89  
    4040static this() { 
    4141    serializer = new PoSerializer; 
    42     serializer.global.defString.p_midchars = cast(ElementSet!(immutable char))ElementSet!(immutable char).emptyset; 
    43     serializer.global.defString.p_allchars = cast(ElementSet!(immutable char))ElementSet!(immutable char).any_char; 
     42    serializer.global.defString.p_midchars = cast(ElementSet!(dchar))ElementSet!(dchar).emptyset; 
     43    serializer.global.defString.p_allchars = cast(ElementSet!(dchar))ElementSet!(dchar).any_char; 
    4444    serializer.global.defString.p_allchars.subtract(serializer.global.defSkip.p_skip); 
    4545} 
    4646 
    47 const string arg = "arg"; 
     47enum string arg = "arg"; 
    4848 
    4949//------------------------------------------------------------------------------ 

  • trunk/doost/util/config/storages/CommandLineStorage.d

    r81 r89  
    627627    typeof(this) args(string[] args) 
    628628    in { 
    629         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to set command line arguments")); 
     629        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set command line arguments")); 
    630630    } 
    631631    body { 
    …… 
    648648    typeof(this) style(int style) 
    649649    in { 
    650         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to set style of command line")); 
     650        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set style of command line")); 
    651651    } 
    652652    body { 
    …… 
    662662    EasyInit!(typeof(this)) options()() 
    663663    in { 
    664         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to set options definition")); 
     664        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set options definition")); 
    665665    } 
    666666    body { 
    …… 
    684684    in { 
    685685        assert(isConnected == false, 
    686             format(STACK_SHOULD_BE_DISCONNECTED, "to set options definition")); 
     686            format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set options definition")); 
    687687 
    688688        foreach(p; params) { 
    …… 
    715715    in { 
    716716        assert(ext !is null); 
    717         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to set extra parser")); 
     717        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set extra parser")); 
    718718    } 
    719719    body { 

  • trunk/doost/util/config/storages/ConfigFileStorage.d

    r81 r89  
    9292    ConfigFileStorage file(string file) 
    9393    in { 
    94         assert(isConnected == false, format(STACK_SHOULD_BE_DISCONNECTED, "to set config file")); 
     94        assert(isConnected == false, format(ErrorStrings.STACK_SHOULD_BE_DISCONNECTED, "to set config file")); 
    9595        assert(file != ""); 
    9696    } 
    …… 
    375375    override void savePhysicallyOne(string name, Value value) 
    376376    in { 
    377         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     377        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    378378        assert(value !is null); 
    379379    } 

  • trunk/doost/util/config/storages/EnvironmentStorage.d

    r81 r89  
    7676    override Value readPhysicallyOne(string name) 
    7777    in { 
    78         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     78        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    7979    } 
    8080    body { 
    …… 
    112112    override void savePhysicallyOne(string name, Value value) 
    113113    in { 
    114         assert(name != "", format(OPTION_NAME_CAN_NOT_BE_EMPTY)); 
     114        assert(name != "", format(ErrorStrings.OPTION_NAME_CAN_NOT_BE_EMPTY)); 
    115115        assert(value !is null); 
    116116    } 

  • trunk/doost/util/serializer/archive/JsonArchive.d

    r88 r89  
    539539 
    540540        if (Udt.ver in memberStructFields) { 
    541             stored_ver = to!(uint)(memberStructFields[Udt.ver]); 
     541            try { 
     542                stored_ver = to!(uint)(memberStructFields[Udt.ver]); 
     543            } catch(Exception e) { 
     544                throw new ParsingException("Wrong version format: \n" ~ e.toString); 
     545            } 
    542546            return true; 
    543547        } 
    544  
    545548        return false; 
    546549    } 

  • trunk/doost/util/serializer/archive/TextArchive.d

    r88 r89  
    559559 
    560560        if (skip(storage, defUdt.verbegin)) { 
    561             if (!traverse(stored_ver)) throw new ParsingException("Version is not specifed."); 
     561            try { 
     562                if (!traverse(stored_ver)) throw new ParsingException("Version is not specifed."); 
     563            } catch(Exception e) { 
     564                throw new ParsingException("Wrong version format: \n" ~ e.toString); 
     565            } 
     566 
    562567            if (!skip(storage, defUdt.verend)) 
    563568                throw new ParsingException("No version end delimiter."); 

  • trunk/examples/util/serializer/SerializerTest.d

    r87 r89  
    294294    //-------------------------------------------------------------------------- 
    295295 
    296     unittest { testCase.traces().execute("load/dump - opaque classes", { 
     296    unittest { testCase.execute("load/dump - opaque classes", { 
    297297        OpaqueClass input; 
    298298        STORAGETYPE output; 
    …… 
    373373    //-------------------------------------------------------------------------- 
    374374 
    375     unittest { testCase.traces().execute("load/dump - pointers", { 
     375    unittest { testCase.execute("load/dump - pointers", { 
    376376        OpaqueStruct* input_struct; 
    377377        OpaqueClass input_class; 
    …… 
    804804    //-------------------------------------------------------------------------- 
    805805 
    806     unittest { testCase.traces().execute("archive specific - struct/class versioning", { 
     806    unittest { testCase.execute("archive specific - struct/class versioning", { 
    807807        VersionedClass input; 
    808808        STORAGETYPE output; 
    …… 
    857857            } 
    858858        ");})); 
    859         assert(checkException!(Error)({serializer.load!(VersionedClass)(" 
     859 
     860        assert(checkException!(Exception)({serializer.load!(VersionedClass)(" 
    860861        { 
    861862            VersionedClass : {