--- parser3/src/include/pa_string.h 2004/02/27 15:07:46 1.157 +++ parser3/src/include/pa_string.h 2004/05/24 10:45:08 1.161 @@ -8,7 +8,7 @@ #ifndef PA_STRING_H #define PA_STRING_H -static const char * const IDENT_STRING_H="$Date: 2004/02/27 15:07:46 $"; +static const char * const IDENT_STRING_H="$Date: 2004/05/24 10:45:08 $"; // includes @@ -108,8 +108,15 @@ public: union Languages { struct { +#ifdef PA_LITTLE_ENDIAN Language lang:8; int is_not_just_lang:sizeof(CORD)*8-8; +#elif defined(PA_BIG_ENDIAN) + int is_not_just_lang:sizeof(CORD)*8-8; + Language lang:8; +#else +# error word endianness not determined for some obscure reason +#endif } opt; CORD langs; @@ -117,13 +124,13 @@ public: CORD make_langs(C current) const { return opt.is_not_just_lang? langs - :CORD_chars((char)opt.lang, get_length(current)); + :CORD_chars_block((char)opt.lang, get_length(current)); } CORD make_langs(size_t aoffset, size_t alength) const { return opt.is_not_just_lang? CORD_substr(langs, aoffset, alength) - :CORD_chars((char)opt.lang, alength); + :CORD_chars_block((char)opt.lang, alength); } /// appending when 'langs' already contain something [simple cases handled elsewhere] @@ -138,7 +145,7 @@ public: size_t current_size=get_length(current); assert(current_size); langs=CORD_cat( - CORD_chars((char)opt.lang, current_size), // first piece [making from just 'lang'] + CORD_chars_block((char)opt.lang, current_size), // first piece [making from just 'lang'] to_nonempty_target_langs); // new piece } } @@ -168,7 +175,7 @@ public: return; } - append(current, CORD_chars((char)alang, asize)); + append(current, CORD_chars_block((char)alang, asize)); } /// MUST be called exactly prior to modification of current [uses it's length] @@ -321,11 +328,17 @@ public: return CORD_chr(body, offset, c); } - template void for_each( + template int for_each( + int (*f)(char c, I), + I info) const { + return CORD_iter(body, (CORD_iter_fn)f, (void*)info); + } + + template int for_each( int (*f1)(char c, I), int (*f2)(const char* s, I), I info) const { - CORD_iter5(body, 0, (CORD_iter_fn)f1, (CORD_batched_iter_fn)f2, info); + return CORD_iter5(body, 0, (CORD_iter_fn)f1, (CORD_batched_iter_fn)f2, info); } void set_pos(CORD_pos& pos, size_t index) const { CORD_set_pos(pos, body, index); } @@ -343,6 +356,7 @@ public: const char *str; size_t length; operator const char *() { return str; } + C(): str(0), length(0) {} C(const char *astr, size_t asize): str(astr), length(asize) {} }; @@ -350,6 +364,7 @@ public: char *str; size_t length; //operator char *() { return str; } + Cm(): str(0), length(0) {} Cm(char *astr, size_t asize): str(astr), length(asize) {} };