--- parser3/src/classes/table.C 2012/06/08 11:44:02 1.288 +++ parser3/src/classes/table.C 2013/05/16 02:20:13 1.293 @@ -21,7 +21,7 @@ #include "pa_vbool.h" #include "pa_array.h" -volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.288 2012/06/08 11:44:02 misha Exp $"; +volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.293 2013/05/16 02:20:13 misha Exp $"; // class @@ -268,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; @@ -626,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_hash(param_index)){ // 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 ? @@ -801,6 +805,9 @@ 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"); + Array value_fields; if(param_index==0){ // list of columns wasn't specified if(value_type==C_STRING) // $.type[string] @@ -973,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)); @@ -997,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]); @@ -1082,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"); @@ -1336,6 +1407,10 @@ MTable::MTable(): Methoded("table") { // ^table.flip[] add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0); + // ^table.foreach[row-num;value]{code} + // ^table.foreach[row-num;value]{code}[delim] + add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 3, 4); + // ^table.append{r{tab}e{tab}c{tab}o{tab}r{tab}d} add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);