--- parser3/src/classes/table.C 2011/11/22 22:23:19 1.283 +++ parser3/src/classes/table.C 2013/05/16 02:20:13 1.293 @@ -1,12 +1,10 @@ /** @file Parser: @b table parser class. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_TABLE_C="$Date: 2011/11/22 22:23:19 $"; - #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4)) #include #endif @@ -23,6 +21,8 @@ static const char * const IDENT_TABLE_C= #include "pa_vbool.h" #include "pa_array.h" +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.293 2013/05/16 02:20:13 misha Exp $"; + // class class MTable: public Methoded { @@ -56,20 +56,7 @@ static Table::Action_options get_action_ if(params.count() <= options_index) return result; - Value& maybe_options=params[options_index]; -/* can not do it: - want to enable ^table::create[$source; -# $.option[] - ] - but there is ^table.locate[name;value] - - ...if(voptions.is_defined() && !voptions.is_string())) - if(maybe_options.is_string()) { // allow empty options - result.defined=true; - return result; - } -*/ - HashStringValue* options=maybe_options.get_hash(); + HashStringValue* options=params.as_hash(options_index); if(!options) return result; @@ -179,7 +166,7 @@ static void _create(Request& r, MethodPa size_t options_param_index=data_param_index+1; if( options_param_indexsplit(*columns, col_pos_after, *separators.scolumn, String::L_AS_IS); + if(head[0]->is_empty()) + *columns += new String(); + else + head[0]->split(*columns, col_pos_after, *separators.scolumn, String::L_AS_IS); } } @@ -278,20 +268,24 @@ static lsplit_result lsplit(char** strin char *write; write=read=string; char c; - while((c=*read++)) { + // we are enclosed, searching for second encloser + while(c=*read++) { if(c==encloser) { - char n=*read; - if(n==encloser) // double-encloser stands for encloser + if(*read==encloser) // double-encloser stands for encloser read++; - else if(n==delim1 || n==delim2) { - result.delim=n; - read++; - break; - } + else + break; // note: skipping encloser } - *write++=c; } + // we are no longer enclosed, searching for delimiter, skipping extra enclosers + while(c=*read++) { + if(c==delim1 || c==delim2) { + result.delim=c; + break; + } else if(c!=encloser) + *write++=c; + } *write=0; // terminate *string_ref=c? read: 0; result.piece=string; @@ -344,7 +338,7 @@ static void _load(Request& r, MethodPara HashStringValue *options=0; TableSeparators separators; if(options_param_indexcount()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); @@ -639,12 +630,12 @@ static void _menu(Request& r, MethodPara Value* delim_maybe_code=params.count()>1?¶ms[1]:0; Table& table=GET_SELF(r, VTable).table(); - int saved_current=table.current(); - int size=table.count(); + size_t saved_current=table.current(); + size_t size=table.count(); if(delim_maybe_code) { // delimiter set bool need_delim=false; - for(int row=0; row0) { - if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // options where specified + if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // can't use .as_has because the 2nd param could be table so .as_hash throws an error --param_index; int valid_options=0; if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ? @@ -815,7 +806,7 @@ static void _hash(Request& r, MethodPara } if(param_index==2) // options was specified but not as hash - throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH); + throw Exception(PARSER_RUNTIME, 0, "options must be hash"); Array value_fields; if(param_index==0){ // list of columns wasn't specified @@ -924,14 +915,14 @@ static void _sort(Request& r, MethodPara old_table.set_current(i); // calculate key value seq[i].row=old_table[i]; - Value& value=r.process_to_value(key_maker).as_expr_result(true/*return string as-is*/); + Value& value=r.process_to_value(key_maker); if(i==0) // determining key values type by first one key_values_are_strings=value.is_string(); if(key_values_are_strings) seq[i].value.c_str=value.as_string().cstr(); else - seq[i].value.d=value.as_double(); + seq[i].value.d=value.as_expr_result().as_double(); } // @todo: handle this elsewhere @@ -989,7 +980,7 @@ static bool _locate_name_value(Table& ta static void _locate(Request& r, MethodParams& params) { Table& table=GET_SELF(r, VTable).table(); - bool result=params[0].get_junction()? + bool result=params[0].get_junction() || (params.count() == 1) ? _locate_expression(table, r, params) : _locate_name_value(table, r, params); r.write_no_lang(VBool::get(result)); @@ -1013,6 +1004,70 @@ static void _flip(Request& r, MethodPara r.write_no_lang(*new VTable(&new_table)); } +static void _foreach(Request& r, MethodParams& params) { + InCycle temp(r); + + const String& rownum_name=params.as_string(0, "rownum-var name must be string"); + const String& value_name=params.as_string(1, "value-var name must be string"); + + Value& body_code=params.as_junction(2, "body must be code"); + + Value* delim_maybe_code=params.count()>3?¶ms[3]:0; + + Table& table=GET_SELF(r, VTable).table(); + size_t saved_current=table.current(); + size_t size=table.count(); + + const String* rownum_var_name=rownum_name.is_empty()? 0 : &rownum_name; + const String* value_var_name=value_name.is_empty()? 0 : &value_name; + + Value* var_context=r.get_method_frame()->caller(); + + if(delim_maybe_code) { // delimiter set + bool need_delim=false; + for(size_t row=0; rowput_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)), false); + if(value_var_name) + var_context->put_element(*value_var_name, new VTable(&table), false); + + StringOrValue sv_processed=r.process(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + + const String* s_processed=sv_processed.get_string(); + if(s_processed && !s_processed->is_empty()) { // we have body + if(need_delim) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); + else + need_delim=true; + } + + r.write_pass_lang(sv_processed); + + if(lskip==Request::SKIP_BREAK) + break; + } + } else { + for(size_t row=0; rowput_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)), false); + if(value_var_name) + var_context->put_element(*value_var_name, new VTable(&table), false); + + r.process_write(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + + if(lskip==Request::SKIP_BREAK) + break; + } + } + table.set_current(saved_current); +} + static void _append(Request& r, MethodParams& params) { Temp_lang temp_lang(r, String::L_PASS_APPENDED); const String& string=r.process_to_string(params[0]); @@ -1039,16 +1094,10 @@ static void join_nameless_row(Table& src *dest+=src[src.current()]; } static void _join(Request& r, MethodParams& params) { - Table* maybe_src=params.as_no_junction(0, "table ref must not be code").get_table(); - if(!maybe_src) - throw Exception(PARSER_RUNTIME, - 0, - "source is not a table"); - Table& src=*maybe_src; + Table& src=*params.as_table(0, "source"); Table::Action_options o=get_action_options(r, params, 1, src); - check_option_param(o.defined, params, 1, - "invalid extra parameter"); + check_option_param(o.defined, params, 1, "invalid extra parameter"); Table& dest=GET_SELF(r, VTable).table(); if(&src == &dest) @@ -1104,7 +1153,7 @@ public: } bool add_row_cell(SQL_Error& error, const char* str, size_t ) { try { - *row+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */); + *row+=str?new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):&String::Empty; return false; } catch(...) { error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell"); @@ -1158,7 +1207,7 @@ static void _sql(Request& r, MethodParam ulong limit=SQL_NO_LIMIT; ulong offset=0; if(params.count()>1) - if(HashStringValue* options=params.as_hash(1)) { + if(HashStringValue* options=params.as_hash(1, "sql options")) { int valid_options=0; if(Value* vbind=options->get(sql_bind_name)) { valid_options++; @@ -1268,9 +1317,7 @@ static void _select(Request& r, MethodPa reverse=r.process_to_value(*vreverse).as_bool(); } if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } Table& result_table=*new Table(source_table.columns()); @@ -1278,7 +1325,7 @@ static void _select(Request& r, MethodPa size_t size=source_table.count(); if(offset<0) offset+=size; - if(size && limit>0 && offset>=0 && offset0 && offset>=0 && (size_t)offset