--- parser3/src/classes/table.C 2002/10/23 09:32:17 1.166 +++ parser3/src/classes/table.C 2003/02/04 14:04:46 1.172.2.3 @@ -1,11 +1,11 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_TABLE_C="$Date: 2002/10/23 09:32:17 $"; +static const char* IDENT_TABLE_C="$Date: 2003/02/04 14:04:46 $"; #include "classes.h" #include "pa_common.h" @@ -19,7 +19,7 @@ static const char* IDENT_TABLE_C="$Date: class MTable : public Methoded { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VTable(pool); } + ValuePtr create_new_value() { return ValuePtr(new VTable()); } public: MTable(Pool& pool); @@ -30,16 +30,16 @@ public: // Methoded // methods -static void get_copy_options(Request& r, const String& method_name, MethodParams *params, int param_index, +static void get_copy_options(Request& r, StringPtr method_name, MethodParams& params, int param_index, const Table& source, int& offset, int& limit) { offset=0; limit=0; - if(params->size()<=param_index) + if(params.count()<=param_index) return; - Value& voptions=params->as_no_junction(param_index, "options must be hash, not code"); + Value& voptions=params.as_no_junction(param_index, "options must be hash, not code"); if(!voptions.is_string()) { if(Hash *options=voptions.get_hash(&method_name)) { int valid_options=0; @@ -73,10 +73,10 @@ static void get_copy_options(Request& r, limit=-1; // thus fixing } -static void _create(Request& r, const String& method_name, MethodParams *params) { +static void _create(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); // clone/copy part? - if(const Table *source=params->get(0).get_table()) { + if(const Table *source=params.get(0).get_table()) { int offset, limit; get_copy_options(r, method_name, params, 1, *source, offset, limit); @@ -87,12 +87,12 @@ static void _create(Request& r, const St // data is last parameter Temp_lang temp_lang(r, String::UL_PASS_APPENDED); const String& data= - r.process_to_string(params->as_junction(params->size()-1, "body must be code")); + r.process_to_string(params.as_junction(params.count()-1, "body must be code")); size_t pos_after=0; // parse columns Array *columns; - if(params->size()==2) { + if(params.count()==2) { columns=0; } else { columns=new(pool) Array(pool); @@ -123,23 +123,30 @@ static void _create(Request& r, const St static_cast(r.get_self())->set_table(table); } -static void _load(Request& r, const String& method_name, MethodParams *params) { +static void _load(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - // filename is last parameter - Value& vfile_name=params->as_no_junction(params->size()-1, - "file name must not be code"); - + const String& first_param=params.as_string(0, "file name must be string"); + int filename_param_index=0; + bool nameless=first_param=="nameless"; + if(nameless) + filename_param_index++; + int options_param_index=filename_param_index+1; + // loading text - char *data=file_read_text(pool, r.absolute(vfile_name.as_string())); + char *data=file_read_text(pool, + r.absolute(params.as_string(filename_param_index, "file name must be string")), + true, + options_param_indexsize()==2) { + if(nameless) { columns=0; // nameless } else { columns=new(pool) Array(pool); @@ -182,16 +189,16 @@ static void _load(Request& r, const Stri } /// @todo "x\nx" "xxx""xx" -static void _save(Request& r, const String& method_name, MethodParams *params) { +static void _save(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& vfile_name=params->as_no_junction(params->size()-1, + Value& vfile_name=params.as_no_junction(params.count()-1, "file name must not be code"); Table& table=static_cast(r.get_self())->table(&method_name); bool do_append=false; String sdata(pool); - if(params->size()==1) { // named output + if(params.count()==1) { // named output // write out names line if(table.columns()) { // named table Array_iter i(*table.columns()); @@ -213,7 +220,7 @@ static void _save(Request& r, const Stri } sdata.APPEND_CONST("\n"); } else { // mode specified - const String& mode=params->as_string(0, "mode must be string"); + const String& mode=params.as_string(0, "mode must be string"); if(mode=="append") do_append=true; else if(mode=="nameless") @@ -243,25 +250,25 @@ static void _save(Request& r, const Stri sdata.cstr(), sdata.size(), true, do_append); } -static void _count(Request& r, const String& method_name, MethodParams *) { +static void _count(Request& r, StringPtr method_name, MethodParams& ) { Pool& pool=r.pool(); int result=static_cast(r.get_self())->table(&method_name).size(); r.write_no_lang(*new(pool) VInt(pool, result)); } -static void _line(Request& r, const String& method_name, MethodParams *) { +static void _line(Request& r, StringPtr method_name, MethodParams& ) { Pool& pool=r.pool(); int result=1+static_cast(r.get_self())->table(&method_name).current(); r.write_no_lang(*new(pool) VInt(pool, result)); } -static void _offset(Request& r, const String& method_name, MethodParams *params) { +static void _offset(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); Table& table=static_cast(r.get_self())->table(&method_name); - if(params->size()) { + if(params.count()) { bool absolute=false; - if(params->size()>1) { - const String& whence=params->as_string(0, "whence must be string"); + if(params.count()>1) { + const String& whence=params.as_string(0, "whence must be string"); if(whence=="cur") absolute=false; else if(whence=="set") @@ -272,16 +279,16 @@ static void _offset(Request& r, const St "is invalid whence, valid are 'cur' or 'set'"); } - Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression"); + Value& offset_expr=params.as_junction(params.count()-1, "offset must be expression"); table.offset(absolute, r.process_to_value(offset_expr).as_int()); } else r.write_no_lang(*new(pool) VInt(pool, table.current())); } -static void _menu(Request& r, const String& method_name, MethodParams *params) { - Value& body_code=params->as_junction(0, "body must be code"); +static void _menu(Request& r, StringPtr method_name, MethodParams& params) { + Value& body_code=params.as_junction(0, "body must be code"); - Value *delim_maybe_code=params->size()>1?¶ms->get(1):0; + Value *delim_maybe_code=params.count()>1?¶ms.get(1):0; Table& table=static_cast(r.get_self())->table(&method_name); bool need_delim=false; @@ -311,7 +318,7 @@ struct Row_info { Array *value_fields; Hash *hash; bool distinct; - int index; + int row; }; #endif static void table_row_to_hash(Array::Item *value, void *info) { @@ -321,7 +328,7 @@ static void table_row_to_hash(Array::Ite const String *key; if(ri.key_code) { - ri.table->set_current(ri.index++); // change context row + ri.table->set_current(ri.row++); // change context row StringOrValue sv_processed=ri.r->process(*ri.key_code); key=&sv_processed.as_string(); } else @@ -346,17 +353,17 @@ static void table_row_to_hash(Array::Ite key, "duplicate key"); } -static void _hash(Request& r, const String& method_name, MethodParams *params) { +static void _hash(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); Table& self_table=static_cast(r.get_self())->table(&method_name); Value& result=*new(pool) VHash(pool); if(const Array *columns=self_table.columns()) if(columns->size()>0) { bool distinct=false; - int param_index=params->size()-1; + int param_index=params.count()-1; if(param_index>0) { if(Hash *options= - params->as_no_junction(param_index, "param must not be code").get_hash(0)) { + params.as_no_junction(param_index, "param must not be code").get_hash(0)) { --param_index; int valid_options=0; if(Value *vdistinct=(Value *)options->get(*sql_distinct_name)) { @@ -376,7 +383,7 @@ static void _hash(Request& r, const Stri Array value_fields(pool); if(param_index>0) { - Value& value_fields_param=params->as_no_junction(param_index, "value field(s) must not be code"); + Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code"); if(value_fields_param.is_string()) { value_fields+=self_table.column_name2index(value_fields_param.as_string(), true); } else if(Table *value_fields_table=value_fields_param.get_table()) { @@ -395,7 +402,7 @@ static void _hash(Request& r, const Stri value_fields+=i; } - Value& key_param=params->get(0); + Value& key_param=params.get(0); Value *key_code=key_param.get_junction()?&key_param:0; int key_field=key_code?-1 :self_table.column_name2index(key_param.as_string(), true); @@ -434,12 +441,12 @@ static int sort_cmp_double(const void *a else return 0; } -static void _sort(Request& r, const String& method_name, MethodParams *params) { +static void _sort(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& key_maker=params->as_junction(0, "key-maker must be code"); + Value& key_maker=params.as_junction(0, "key-maker must be code"); - bool reverse=params->size()>1/*..[desc|asc|]*/? - reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc": + bool reverse=params.count()>1/*..[desc|asc|]*/? + reverse=params.as_no_junction(1, "order must not be code").as_string()=="desc": false; // default=asc Table& old_table=static_cast(r.get_self())->table(&method_name); @@ -450,8 +457,6 @@ static void _sort(Request& r, const Stri // calculate key values bool key_values_are_strings=true; - // save 'current' - int saved_current=old_table.current(); for(i=0; i(r.get_self())->set_table(new_table); } -static bool _locate_expression(Request& r, const String& method_name, MethodParams *params) { - if(params->size()>1) +static bool _locate_expression(Request& r, StringPtr method_name, MethodParams& params) { + if(params.count()>1) throw Exception("parser.runtime", &method_name, "locate by expression has only one parameter - expression"); - Value& expression_code=params->as_junction(0, "must be expression"); + Value& expression_code=params.as_junction(0, "must be expression"); Table& table=static_cast(r.get_self())->table(&method_name); int saved_current=table.current(); @@ -499,27 +502,27 @@ static bool _locate_expression(Request& table.set_current(saved_current); return false; } -static bool _locate_name_value(Request& r, const String& method_name, MethodParams *params) { - if(params->size()>2) +static bool _locate_name_value(Request& r, StringPtr method_name, MethodParams& params) { + if(params.count()>2) throw Exception("parser.runtime", &method_name, "locate by name and value has only two parameters - name and value"); Table& table=static_cast(r.get_self())->table(&method_name); return table.locate( - params->as_string(0, "column name must be string"), - params->as_string(1, "value must be string") + params.as_string(0, "column name must be string"), + params.as_string(1, "value must be string") ); } -static void _locate(Request& r, const String& method_name, MethodParams *params) { +static void _locate(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - bool result=params->get(0).get_junction()? + bool result=params.get(0).get_junction()? _locate_expression(r, method_name, params) : _locate_name_value(r, method_name, params); r.write_no_lang(*new(pool) VBool(pool, result)); } -static void _flip(Request& r, const String& method_name, MethodParams *params) { +static void _flip(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); Table& old_table=static_cast(r.get_self())->table(&method_name); Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/); @@ -537,12 +540,12 @@ static void _flip(Request& r, const Stri r.write_no_lang(*new(pool) VTable(pool, &new_table)); } -static void _append(Request& r, const String& method_name, MethodParams *params) { +static void _append(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); // data Temp_lang temp_lang(r, String::UL_PASS_APPENDED); const String& string= - r.process_to_string(params->as_junction(0, "body must be code")); + r.process_to_string(params.as_junction(0, "body must be code")); // parse cells Array& row=*new(pool) Array(pool); @@ -551,10 +554,10 @@ static void _append(Request& r, const St static_cast(r.get_self())->table(&method_name)+=&row; } -static void _join(Request& r, const String& method_name, MethodParams *params) { +static void _join(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Table *maybe_src=params->as_no_junction(0, "table ref must not be code").get_table(); + Table *maybe_src=params.as_no_junction(0, "table ref must not be code").get_table(); if(!maybe_src) throw Exception("parser.runtime", &method_name, @@ -594,10 +597,10 @@ static void _join(Request& r, const Stri } #ifndef DOXYGEN -class Table_sql_event_handlers : public SQL_Driver_query_event_handlers { +class Table_sql_event_handlers: public SQL_Driver_query_event_handlers { public: Table_sql_event_handlers(Pool& apool, const String& amethod_name, - const String& astatement_string, const char *astatement_cstr) : + const String& astatement_string, const char* astatement_cstr) : pool(apool), method_name(amethod_name), statement_string(astatement_string), @@ -608,47 +611,71 @@ public: { } - void add_column(void *ptr, size_t size) { - String *column=new(pool) String(pool); - column->APPEND_TAINTED( - (const char *)ptr, size, - statement_cstr, 0); - columns+=column; - } - void before_rows() { - table=new(pool) Table(pool, &method_name, &columns); - } - void add_row() { - (*table)+=(row=new(pool) Array(pool)); - } - void add_row_cell(void *ptr, size_t size) { - String *cell=new(pool) String(pool); - if(size) - cell->APPEND_TAINTED( - (const char *)ptr, size, - statement_cstr, table->size()-1); - (*row)+=cell; + bool add_column(SQL_Error& error, void *ptr, size_t size) { + try { + String *column=new(pool) String(pool); + column->APPEND_TAINTED( + (const char* )ptr, size, + statement_cstr, 0); + columns+=column; + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_column"); + return true; + } + } + bool before_rows(SQL_Error& error) { + try { + table=new(pool) Table(pool, &method_name, &columns); + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows"); + return true; + } + } + bool add_row(SQL_Error& error) { + try { + (*table)+=(row=new(pool) Array(pool)); + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_row"); + return true; + } + } + bool add_row_cell(SQL_Error& error, void *ptr, size_t size) { + try { + String *cell=new(pool) String(pool); + if(size) + cell->APPEND_TAINTED( + (const char* )ptr, size, + statement_cstr, table->size()-1); + (*row)+=cell; + return false; + } catch(...) { + error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell"); + return true; + } } private: Pool& pool; const String& method_name; - const String& statement_string; const char *statement_cstr; + const String& statement_string; const char* statement_cstr; Array& columns; Array *row; public: Table *table; }; #endif -static void _sql(Request& r, const String& method_name, MethodParams *params) { +static void _sql(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& statement=params->as_junction(0, "statement must be code"); + Value& statement=params.as_junction(0, "statement must be code"); ulong limit=0; ulong offset=0; - if(params->size()>1) { - Value& voptions=params->as_no_junction(1, "options must be hash, not code"); + if(params.count()>1) { + Value& voptions=params.as_no_junction(1, "options must be hash, not code"); if(!voptions.is_string()) if(Hash *options=voptions.get_hash(&method_name)) { int valid_options=0; @@ -672,7 +699,7 @@ static void _sql(Request& r, const Strin Temp_lang temp_lang(r, String::UL_SQL); const String& statement_string=r.process_to_string(statement); - const char *statement_cstr= + const char* statement_cstr= statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name)); Table_sql_event_handlers handlers(pool, method_name, statement_string, statement_cstr); @@ -705,7 +732,7 @@ static void _sql(Request& r, const Strin static_cast(r.get_self())->set_table(*result); } -static void _columns(Request& r, const String& method_name, MethodParams *) { +static void _columns(Request& r, StringPtr method_name, MethodParams& ) { Pool& pool=r.pool(); Array& result_columns=*new(pool) Array(pool); @@ -725,10 +752,10 @@ static void _columns(Request& r, const S r.write_no_lang(*new(pool) VTable(pool, &result_table)); } -static void _select(Request& r, const String& method_name, MethodParams *params) { +static void _select(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& vcondition=params->as_junction(0, "condition must be expression"); + Value& vcondition=params.as_junction(0, "condition must be expression"); Table& source_table=static_cast(r.get_self())->table(&method_name); Table& result_table=*new(pool) Table(pool, @@ -765,7 +792,7 @@ MTable::MTable(Pool& apool) : Methoded(a // ^table::load[file] // ^table::load[nameless;file] - add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); + add_native_method("load", Method::CT_DYNAMIC, _load, 1, 3); // ^table.save[file] // ^table.save[nameless;file]