Changeset 27

Show
Ignore:
Timestamp:
06/30/06 05:39:23 (2 years ago)
Author:
yossarian
Message:

upgraded, now compiles without errors :)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lex_token.d

    r20 r27  
    2222distribution. 
    2323*/ 
    24 private import lex_util; 
     24module xpath.lex_token; 
     25private import xpath.lex_util; 
    2526private import std.stdio; 
    2627 

  • trunk/lex_util.d

    r18 r27  
    2828    Miscellaneous utilities for the TinyXPath project 
    2929*/ 
     30module xpath.lex_util; 
    3031private import std.string; 
    3132 

  • trunk/test/test.d

    r24 r27  
    1111//#include "htmlutil.h" 
    1212 
    13 import xpath_static; 
    14 import xpath_processor; 
    15 import htmlutil; 
     13import xpath.xpath_static; 
     14import xpath.xpath_processor; 
     15import xpath.htmlutil; 
    1616import std.stream; 
    1717import std.stdio; 

  • trunk/tokenlist.d

    r26 r27  
    2828    XPath Syntax analyzer for TinyXPath project : token list handling 
    2929*/ 
     30module xpath.tokenlist; 
    3031private import xpath.lex_util; 
    3132private import xpath.lex_token; 

  • trunk/xpath_processor.d

    r26 r27  
    2727    \author Yves Berquin 
    2828*/ 
    29  
     29module xpath.xpath_processor; 
    3030private 
    3131{ 
    …… 
    228228        return cast(TiXmlAttribute)XBp_res; 
    229229    } 
    230     Errors e_error; 
     230    public Errors e_error; 
    231231} 
    232232protected { 

  • trunk/xpath_stack.d

    r26 r27  
    2727    \author Yves Berquin 
    2828*/ 
    29  
     29module xpath.xpath_stack; 
    3030private { 
    3131import xpath.xpath_stream; 

  • trunk/xpath_static.d

    r26 r27  
    2828*/ 
    2929 
    30 export { 
    31  
    32     import xpath.tinyxml; 
    33     import xpath.xpath_processor; 
     30    module xpath.xpath_static; 
     31    public import xpath.tinyxml; 
     32    private import xpath.xpath_processor; 
    3433 
    3534    // no check static functions 
    …… 
    8483        auto xpath_processor xp_proc = new xpath_processor(XNp_source_tree, cp_xpath_expr); 
    8584        i_res = xp_proc . i_compute_xpath (); 
    86         if (xp_proc.e_error != xpath_processor.Errors.e_no_error) 
     85        if (xp_proc.e_error != Errors.e_no_error) 
    8786            myerr = FormatError(xp_proc.e_error);        
    88         return (xp_proc.e_error == xpath_processor.Errors.e_no_error); 
     87        return (xp_proc.e_error == Errors.e_no_error); 
     88    } 
     89    bool o_xpath_double (TiXmlNode XNp_source_tree, char[] cp_xpath_expr, out double d_res) 
     90    { 
     91        char[] tmp; 
     92        return o_xpath_double(XNp_source_tree, cp_xpath_expr, d_res, tmp); 
    8993    } 
    9094 
    …… 
    9397        auto xpath_processor xp_proc = new xpath_processor(XNp_source_tree, cp_xpath_expr); 
    9498        d_res = xp_proc . d_compute_xpath (); 
    95         if (xp_proc.e_error != xpath_processor.Errors.e_no_error) 
     99        if (xp_proc.e_error != Errors.e_no_error) 
    96100            myerr = FormatError(xp_proc.e_error);        
    97         return (xp_proc.e_error == xpath_processor.Errors.e_no_error); 
     101        return (xp_proc.e_error == Errors.e_no_error); 
    98102    } 
    99103    bool o_xpath_bool (TiXmlNode XNp_source_tree, char[] cp_xpath_expr, out bool b_res, out char[] myerr) 
    …… 
    101105        auto xpath_processor xp_proc = new xpath_processor(XNp_source_tree, cp_xpath_expr); 
    102106        b_res = xp_proc . o_compute_xpath (); 
    103         if (xp_proc.e_error != xpath_processor.Errors.e_no_error) 
     107        if (xp_proc.e_error != Errors.e_no_error) 
    104108            myerr = FormatError(xp_proc.e_error);        
    105         return (xp_proc.e_error == xpath_processor.Errors.e_no_error); 
     109        return (xp_proc.e_error == Errors.e_no_error); 
    106110    } 
    107111    bool o_xpath_string (TiXmlNode XNp_source_tree, char[] cp_xpath_expr, out char[] S_res, out char[] myerr) 
    …… 
    109113        auto xpath_processor xp_proc = new xpath_processor(XNp_source_tree, cp_xpath_expr); 
    110114        S_res = xp_proc . S_compute_xpath (); 
    111         if (xp_proc.e_error != xpath_processor.Errors.e_no_error) 
     115        if (xp_proc.e_error != Errors.e_no_error) 
    112116            myerr = FormatError(xp_proc.e_error); 
    113         return (xp_proc.e_error == xpath_processor.Errors.e_no_error); 
     117        return (xp_proc.e_error == Errors.e_no_error); 
    114118    } 
    115119    bool o_xpath_node (TiXmlNode XNp_source_tree, char[] cp_xpath_expr, out TiXmlNode XNp_node) 
    …… 
    122126            return false; 
    123127        XNp_node = xp_proc . XNp_get_xpath_node (0); 
    124         return (xp_proc.e_error == xpath_processor.Errors.e_no_error); 
     128        return (xp_proc.e_error == Errors.e_no_error); 
    125129    } 
    126130 
    …… 
    139143 
    140144 
    141 } 
     145 

  • trunk/xpath_syntax.d

    r26 r27  
    3030private import xpath.lex_util; 
    3131private import xpath.tokenlist; 
     32private import xpath.lex_token; 
    3233private import std.stdio; 
    3334public {