--- parser3/src/include/pa_string.h 2003/03/25 10:21:08 1.144.2.28.2.34 +++ parser3/src/include/pa_string.h 2003/04/21 06:37:58 1.144.2.28.2.51 @@ -8,7 +8,7 @@ #ifndef PA_STRING_H #define PA_STRING_H -static const char* IDENT_STRING_H="$Date: 2003/03/25 10:21:08 $"; +static const char* IDENT_STRING_H="$Date: 2003/04/21 06:37:58 $"; // includes @@ -16,6 +16,7 @@ static const char* IDENT_STRING_H="$Date #include "pa_array.h" extern "C" { // cord's author forgot to do that +#define CORD_NO_IO #include "cord.h" }; @@ -29,17 +30,6 @@ class Request_charsets; class String; typedef Array ArrayString; -// helpers -/* -/// appends clean piece to String @see String::append -#define APPEND_CLEAN(src, length) append(src, length, String::L_CLEAN) -/// appends piece to String as-is @see String::append -#define APPEND_AS_IS(src, length) append(src, length, String::L_AS_IS) -/// appends tainted piece to String @see String::append -#define APPEND_TAINTED(src, length) append(src, length, String::L_TAINTED) -/// handy: appends const char* piece to String @see String::append -#define APPEND_CONST(src) APPEND_AS_IS(src, 0) -*/ /// this is result of pos functions which mean that substr were not found #define STRING_NOT_FOUND ((size_t)-1) @@ -50,9 +40,17 @@ class StringBody { public: StringBody(): body(CORD_EMPTY) {} - StringBody(CORD abody): body(abody) {} - explicit StringBody(const char* str, size_t length): body(CORD_EMPTY) { - append(str, length); + StringBody(CORD abody): body(abody) { + assert(!body // no body + || *body // ordinary string + || body[1]==1 // CONCAT_HDR + || body[1]==4 // FN_HDR + || body[1]==6 // SUBSTR_HDR + ); + } + /// WARNING: length is only HELPER length, str in ANY case should be zero-terminated + StringBody(const char* str, size_t helper_length): body(CORD_EMPTY) { + append_know_length(str, helper_length?helper_length:strlen(str)); } static StringBody Format(int value); @@ -69,11 +67,17 @@ public: bool is_empty() const { return body==CORD_EMPTY; } - void append(const char *str, size_t length) { - body=CORD_cat_char_star(body, str, length); + void append_know_length(const char *str, size_t known_length) { + if(known_length) + body=CORD_cat_char_star(body, str, known_length); + } + void append_strdup_know_length(const char* str, size_t known_length) { + if(known_length) + append_know_length(pa_strdup(str, known_length), known_length); } void append(char c) { body=CORD_cat_char(body, c); } - void append(StringBody src) { body=CORD_cat(body, src.body); } + StringBody& operator << (const StringBody src) { body=CORD_cat(body, src.body); return *this; } + StringBody& operator << (const char* str) { append_know_length(str, strlen(str)); return *this; } // could not figure out why this operator is needed [should do this chain: string->simple->==] bool operator < (const StringBody src) const { return CORD_cmp(body, src.body)<0; } @@ -106,6 +110,13 @@ public: void set_pos(CORD_pos& pos, size_t index) const { CORD_set_pos(pos, body, index); } + StringBody normalize() const { + return StringBody(CORD_balance(body)); + } + + void dump() const { + CORD_dump(body); + } }; /** @@ -153,12 +164,9 @@ public: Language lang; ///< untaint flag, later untaint language size_t length; ///< length Fragment(Language alang, size_t asize): lang(alang), length(asize) { -#ifdef _DEBUG - if(alang==L_UNSPECIFIED) - _asm int 3; // MUST NOT - if(asize==(size_t)-1) - _asm int 3; // MUST NOT -#endif + assert(alang!=L_UNSPECIFIED); + assert(asize!=0); + assert(asize!=(size_t)-1); } }; @@ -172,9 +180,9 @@ public: } public: ArrayFragment& operator += (element_type src) { - if(count()) { // not empty? + if(size_t lcount=count()) { // not empty? // try to join with last - Fragment& last=get(count()-1); + Fragment& last=get_ref(lcount-1); if(last.lang==src.lang) { last.length+=src.length; return *this; @@ -183,15 +191,31 @@ public: append(src); return *this; } - void append(const ArrayFragment& src) { append(src, 0, 0); } + void append(const ArrayFragment& src) { append(src, 0, ARRAY_OPTION_LIMIT_ALL); } void append_positions(const ArrayFragment& src, size_t substr_begin, size_t substr_end); + + size_t length() { + size_t result=0; + for(Array_iterator i(*this); i.has_next(); ) { + const Fragment fragment=i.next(); + result+=fragment.length; + } + return result; + } }; struct C { + const char *str; + size_t length; + operator const char *() { return str; } + C(const char *astr, size_t asize): str(astr), length(asize) {} + }; + + struct Cm { char *str; size_t length; - operator char *() { return str; } - C(char *astr, size_t asize): str(astr), length(asize) {} + //operator char *() { return str; } + Cm(char *astr, size_t asize): str(astr), length(asize) {} }; private: @@ -201,13 +225,16 @@ private: public: - /// @todo check all places for length to be only HELPER length, and never be !=strlen(cstr) explicit String(const char* cstr=0, size_t helper_length=0, bool tainted=false); + explicit String(const C cstr, bool tainted=false); String(const String& src); String(StringBody abody, Language alang): body(abody) { fragments+=Fragment(alang, abody.length()); } +#define ASSERT_STRING_INVARIANT(string) \ + assert((string).body.length()==(string).fragments.length()) + /// for convinient hash lookup operator const StringBody() const { return body; } @@ -232,14 +259,14 @@ public: return cstr_to_string_body(lang, connection, charsets).cstrm(); } /// puts pieces to buf - C serialize(size_t prolog_size) const; + Cm serialize(size_t prolog_size) const; /// appends pieces from buf to self bool deserialize(size_t prolog_size, void *buf, size_t buf_size); - /** append fragment, - @c length can be zero, it will be autocalced - when length