--- parser3/src/main/pa_string.C 2001/05/14 13:18:07 1.82 +++ parser3/src/main/pa_string.C 2001/08/06 16:18:26 1.98 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_string.C,v 1.82 2001/05/14 13:18:07 parser Exp $ */ +static const char *RCSId="$Id: pa_string.C,v 1.98 2001/08/06 16:18:26 parser Exp $"; #include "pa_config_includes.h" @@ -21,14 +20,10 @@ #include "pa_array.h" #include "pa_globals.h" #include "pa_table.h" -#include "pa_threads.h" - -//#include "pa_sapi.h" - -// String String::String(Pool& apool, const char *src, size_t src_size, bool tainted) : - Pooled(apool) { + Pooled(apool), + forigins_mode(false) { last_chunk=&head; head.count=CR_PREALLOCATED_COUNT; append_here=head.rows; @@ -43,23 +38,15 @@ String::String(Pool& apool, const char * APPEND_CLEAN(src, src_size, 0, 0); } -void String::expand() { - size_t new_chunk_count=last_chunk->count+last_chunk->count*CR_GROW_PERCENT/100; - last_chunk=static_cast( - malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *))); - last_chunk->count=new_chunk_count; - link_row->link=last_chunk; - append_here=last_chunk->rows; - link_row=&last_chunk->rows[last_chunk->count]; - link_row->link=0; -} - -String::String(const String& src) : Pooled(src.pool()) { +String::String(const String& src) : + Pooled(src.pool()), + forigins_mode(false) { head.count=CR_PREALLOCATED_COUNT; size_t src_used_rows=src.fused_rows; if(src_used_rows<=head.count) { // all new rows fit size_to preallocated area + last_chunk=&head; size_t curr_chunk_rows=head.count; memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*src_used_rows); append_here=&head.rows[src_used_rows]; @@ -78,15 +65,15 @@ String::String(const String& src) : Pool memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*head.count); // remaining rows size_to new_chunk size_t curr_chunk_rows=src_used_rows-head.count; - Chunk *new_chunk=static_cast( + last_chunk=static_cast( malloc(sizeof(size_t)+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[new_chunk->count]; + last_chunk->count=curr_chunk_rows; + head.preallocated_link=last_chunk; + append_here=link_row=&last_chunk->rows[last_chunk->count]; Chunk *old_chunk=src.head.preallocated_link; - Chunk::Row *new_rows=new_chunk->rows; - size_t rows_left_to_copy=new_chunk->count; + Chunk::Row *new_rows=last_chunk->rows; + size_t rows_left_to_copy=last_chunk->count; while(true) { size_t old_count=old_chunk->count; Chunk *next_chunk=old_chunk->rows[old_count].link; @@ -111,6 +98,17 @@ String::String(const String& src) : Pool fsize=src.fsize; } +void String::expand() { + size_t new_chunk_count=last_chunk->count+CR_GROW_COUNT; + last_chunk=static_cast( + malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *))); + last_chunk->count=new_chunk_count; + link_row->link=last_chunk; + append_here=last_chunk->rows; + link_row=&last_chunk->rows[last_chunk->count]; + link_row->link=0; +} + String& String::append(const String& src, Untaint_lang lang, bool forced) { const Chunk *chunk=&src.head; do { @@ -152,6 +150,15 @@ String& String::real_append(STRING_APPEN return *this; } +char String::first_char() const { + if(!fused_rows) + THROW(0, 0, + this, + "getting first char of empty string"); + + return *head.rows[0].item.ptr; +} + uint String::hash_code() const { uint result=0; @@ -187,16 +194,12 @@ int String::cmp(int& partial, const Stri Chunk::Row *b_end=src.append_here; size_t a_countdown=a_chunk->count; size_t b_countdown=b_chunk->count; - bool a_break=false; - bool b_break=false; size_t result; size_t pos=0; - while(true) { - a_break=a_row==a_end; - b_break=b_row==b_end; - if(a_break || b_break) - break; + bool a_break=size()==0; + bool b_break=src.size()==0; + if(!(a_break || b_break)) while(true) { if(pos+a_row->item.size > this_offset) { if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) return -1; // wrong lang -- bail out @@ -229,7 +232,10 @@ int String::cmp(int& partial, const Stri pos+=a_row->item.size; a_row++; a_countdown--; a_offset=0; } - + if(b_break=b_row==b_end) { + a_break=a_row==a_end; + break; + } if(!b_countdown) { b_chunk=b_row->link; b_row=b_chunk->rows; @@ -241,6 +247,10 @@ int String::cmp(int& partial, const Stri a_row++; a_countdown--; } + if(a_break=a_row==a_end) { + b_break=b_row==b_end; + break; + } if(!a_countdown) { a_chunk=a_row->link; a_row=a_chunk->rows; @@ -269,14 +279,11 @@ int String::cmp(int& partial, const char size_t b_offset=0; Chunk::Row *a_end=append_here; size_t a_countdown=a_chunk->count; - bool a_break=false; - bool b_break=false; size_t pos=0; - while(true) { - a_break=a_row==a_end; - if(a_break || b_break) - break; + bool a_break=size()==0; + bool b_break=b_size==0; + if(!(a_break || b_break)) while(true) { if(pos+a_row->item.size > this_offset) { if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) return -1; // wrong lang -- bail out @@ -312,6 +319,9 @@ int String::cmp(int& partial, const char a_row++; a_countdown--; } + a_break=a_row==a_end; + if(a_break || b_break) + break; if(!a_countdown) { a_chunk=a_row->link; a_row=a_chunk->rows; @@ -329,10 +339,10 @@ int String::cmp(int& partial, const char #ifndef NO_STRING_ORIGIN const Origin& String::origin() const { - if(!fused_rows) - THROW(0, 0, - 0, - "String::origin() of empty string called"); + if(!fused_rows) { + static const Origin empty_origin={"empty string"}; + return empty_origin; + } // determining origin by last appended piece // because first one frequently constant. @@ -487,12 +497,14 @@ static void regex_options(char *options, } } +/// @todo maybe need speedup: some option to remove pre/match/post string generation bool String::match(const unsigned char *pcre_tables, const String *aorigin, const String& regexp, const String *options, Table **table, - Row_action row_action, void *info) const { + Row_action row_action, void *info, + bool *was_global) const { if(!regexp.size()) THROW(0, 0, @@ -502,6 +514,8 @@ bool String::match(const unsigned char * const char *errptr; int erroffset; int option_bits[2]; regex_options(options?options->cstr():0, option_bits); + if(was_global) + *was_global=option_bits[1]!=0; pcre *code=pcre_compile(pattern, option_bits[0], &errptr, &erroffset, pcre_tables); @@ -637,3 +651,38 @@ break2: return result; } + +double String::as_double() const { + double result; + const char *cstr=this->cstr(); + char *error_pos=0; + // 0xABC + if(cstr[0]=='0' && (cstr[1]=='x' || cstr[1]=='X')) + result=(double)(unsigned long)strtol(cstr, &error_pos, 0); + else + result=strtod(cstr, &error_pos); + + if(error_pos && *error_pos) + THROW(0, 0, + this, + "invalid number (double)"); + + return result; +} +int String::as_int() const { + int result; + const char *cstr=this->cstr(); + char *error_pos=0; + // 0xABC + if(cstr[0]=='0' && (cstr[1]=='x' || cstr[1]=='X')) + result=(int)(unsigned long)strtol(cstr, &error_pos, 0); + else + result=(int)strtol(cstr, &error_pos, 0); + + if(error_pos && *error_pos) + THROW(0, 0, + this, + "invalid number (int)"); + + return result; +}