--- parser3/src/include/pa_string.h 2001/04/23 09:38:50 1.83 +++ parser3/src/include/pa_string.h 2001/05/07 13:30:00 1.86 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_string.h,v 1.83 2001/04/23 09:38:50 paf Exp $ + $Id: pa_string.h,v 1.86 2001/05/07 13:30:00 paf Exp $ */ #ifndef PA_STRING_H @@ -109,7 +109,7 @@ public: UL_SQL, ///< ^table:sql body UL_JS, ///< JavaScript code UL_HTML, ///< HTML code (for editing) - UL_HTML_TYPO ///< HTML code with TYPOgraphic replacements (for showing) + UL_USER_HTML ///< HTML code with USER chars }; public: @@ -193,11 +193,11 @@ public: void split(Array& result, size_t *pos_after_ref, const char *delim, size_t delim_size, - Untaint_lang lang, int limit=-1) const; + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; void split(Array& result, size_t *pos_after_ref, const String& delim, - Untaint_lang lang, int limit=-1) const; + Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const; typedef void (*Row_action)(Table& table, Array *row, int start, int finish, void *info); @@ -215,31 +215,32 @@ public: private: + /// several String fragments struct Chunk { - // the number of rows in chunk - size_t count; + size_t count; ///< the number of rows in chunk + /// string fragment or a link to next chunk union union Row { - // fragment + /// fragment struct { - const char *ptr; // pointer to the start - size_t size; // length - Untaint_lang lang; // untaint flag, later untaint language + const char *ptr; ///< pointer to the start + size_t size; ///< length + Untaint_lang lang; ///< untaint flag, later untaint language #ifndef NO_STRING_ORIGIN - Origin origin; // origin + Origin origin; ///< origin #endif } item; - Chunk *link; // link to the next chunk in chain + Chunk *link; ///< link to the next chunk in chain } rows[CR_PREALLOCATED_COUNT]; - // next rows are here - Chunk *preallocated_link; + Chunk *preallocated_link; ///< next rows are here } - head; // the head chunk of the chunk chain + head; ///< the head chunk of the chunk chain - // next append would write to this record + /// next append would write to this record Chunk::Row *append_here; - // the address of place where lies address - // of the link to the next chunk to allocate + /** the address of place where lies address + of the link to the next chunk to allocate + */ Chunk::Row *link_row; private: