--- parser3/src/main/pa_string.C 2001/01/29 14:00:39 1.13 +++ parser3/src/main/pa_string.C 2001/02/20 18:45:53 1.26 @@ -1,5 +1,5 @@ /* - $Id: pa_string.C,v 1.13 2001/01/29 14:00:39 paf Exp $ + $Id: pa_string.C,v 1.26 2001/02/20 18:45:53 paf Exp $ */ #include @@ -7,13 +7,12 @@ #include "pa_pool.h" #include "pa_string.h" #include "pa_hash.h" +#include "pa_exception.h" -void *String::operator new(size_t size, Pool *apool) { - return apool->malloc(size); -} +// String -String::String(Pool *apool) : - pool(apool) { +String::String(Pool& apool) : + Pooled(apool) { head.count=curr_chunk_rows=CR_PREALLOCATED_COUNT; append_here=head.rows; head.preallocated_link=0; @@ -24,7 +23,7 @@ String::String(Pool *apool) : void String::expand() { curr_chunk_rows+=curr_chunk_rows*CR_GROW_PERCENT/100; Chunk *chunk=static_cast( - pool->malloc(sizeof(int)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); + pool().malloc(sizeof(int)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); chunk->count=curr_chunk_rows; link_row->link=chunk; append_here=chunk->rows; @@ -32,8 +31,8 @@ void String::expand() { link_row->link=0; } -String::String(String& src) { - pool=src.pool; +String::String(const String& src) : + Pooled(src.pool()) { head.count=CR_PREALLOCATED_COUNT; int src_used_rows=src.used_rows(); @@ -58,7 +57,7 @@ String::String(String& src) { // remaining rows into new_chunk curr_chunk_rows=src_used_rows-head.count; Chunk *new_chunk=static_cast( - pool->malloc(sizeof(int)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); + pool().malloc(sizeof(int)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); new_chunk->count=curr_chunk_rows; head.preallocated_link=new_chunk; append_here=link_row=&new_chunk->rows[curr_chunk_rows]; @@ -89,35 +88,41 @@ String::String(String& src) { fused_rows=src_used_rows; fsize=src.fsize; } +/* +String(const String_iterator& begin, const String_iterator& end) { + ;//TODO +} +*/ String& String::real_append(STRING_APPEND_PARAMS) { if(!src) return *this; - int len=strlen(src); - if(!len) + if(!size) + size=strlen(src); + if(!size) return *this; if(chunk_is_full()) expand(); append_here->item.ptr=src; - fsize+=append_here->item.size=len; + fsize+=append_here->item.size=size; #ifndef NO_STRING_ORIGIN - append_here->item.origin=origin; - append_here->item.line=line; + append_here->item.origin.file=file; + append_here->item.origin.line=line; #endif append_here++; fused_rows++; return *this; } -char *String::c_str() { - char *result=static_cast(pool->malloc(size()+1)); +char *String::cstr() const { + char *result=static_cast(pool().malloc(size()+1)); char *copy_here=result; - Chunk *chunk=&head; + const Chunk *chunk=&head; do { - Chunk::Row *row=chunk->rows; + const Chunk::Row *row=chunk->rows; for(int i=0; icount; i++) { if(row==append_here) goto break2; @@ -133,12 +138,12 @@ break2: return result; } -uint String::hash_code() { +uint String::hash_code() const { uint result=0; - Chunk *chunk=&head; + const Chunk *chunk=&head; do { - Chunk::Row *row=chunk->rows; + const Chunk::Row *row=chunk->rows; for(int i=0; icount; i++) { if(row==append_here) goto break2; @@ -152,14 +157,14 @@ break2: return result; } -bool String::operator == (String& src) { +bool String::operator == (const String& src) const { if(size() != src.size()) return false; - Chunk *a_chunk=&head; - Chunk *b_chunk=&src.head; - Chunk::Row *a_row=a_chunk->rows; - Chunk::Row *b_row=b_chunk->rows; + const Chunk *a_chunk=&head; + const Chunk *b_chunk=&src.head; + const Chunk::Row *a_row=a_chunk->rows; + const Chunk::Row *b_row=b_chunk->rows; int a_offset=0; int b_offset=0; Chunk::Row *a_end=append_here; @@ -208,3 +213,124 @@ bool String::operator == (String& src) { } return a_break==b_break; } +/* +String& String::append(const String_iterator& begin, const String_iterator& end) { + //TODO + return *this; +} + +// Char_types + +Char_types::Char_types() { + memset(types, 0, sizeof(types)); +} + +void Char_types::set(char from, char to, int type) { + memset(&types[static_cast(from)], type, to-from+1); +} + +// String_iterator + +String_iterator::String_iterator(String& astring) : string(astring) { + read_here=string.head.rows; + position=string.size()==0?0:read_here->item.ptr; + link_row=reinterpret_cast(string.head.preallocated_link); +} +/* +String_iterator::String_iterator(String_iterator& asi) { + //TODO +} + +char String_iterator::operator()() const { + return position?*position:0; +} + +void String_iterator::skip() { + if(!position) + return; + + if(++position== + read_here->item.ptr+ + read_here->item.size) { + + // next row + if(++read_here==string.append_here) { + position=0; + return; + } + if(read_here==link_row) { + String::Chunk *chunk=link_row->link; + if(!chunk) + string.pool().exception().raise(0, 0, + &string, + "String_iterator::skip() missed " + "read_here==string.append_here check"); + + read_here=chunk->rows; + link_row=&chunk->rows[chunk->count]; + } + position=read_here->item.ptr; + } +} + +bool String_iterator::skip_to(char c) { + if(!position) + return false; + + while(true) { + if(char *found=static_cast( + memchr(position, c, read_here->item.size-(position-read_here->item.ptr)))) { + position=found; + return true; + } + + // next row + if(++read_here==string.append_here) { + position=0; + return false; + } + if(read_here==link_row) { + String::Chunk *chunk=link_row->link; + if(!chunk) + string.pool().exception().raise(0, 0, + &string, + "String_iterator::skip_to(char) missed " + "read_here==string.append_here check"); + + read_here=chunk->rows; + link_row=&chunk->rows[chunk->count]; + } + position=read_here->item.ptr; + } +} + +int String_iterator::skip_to(Char_types& types) { + if(!position) + return false; + + while(true) { + int countdown=read_here->item.size-(position-read_here->item.ptr); + for(; countdown--; position++) + if(int type=types.get(*position)) + return type; + + // next row + if(++read_here==string.append_here) { + position=0; + return -1; + } + if(read_here==link_row) { + String::Chunk *chunk=link_row->link; + if(!chunk) + string.pool().exception().raise(0, 0, + &string, + "String_iterator::skip_to(Char_type) missed " + "read_here==string.append_here check"); + + read_here=chunk->rows; + link_row=&chunk->rows[chunk->count]; + } + position=read_here->item.ptr; + } +} +*/ \ No newline at end of file