--- parser3/src/classes/table.C 2001/03/28 08:01:40 1.36 +++ parser3/src/classes/table.C 2001/03/30 09:58:57 1.41 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: table.C,v 1.36 2001/03/28 08:01:40 paf Exp $ + $Id: table.C,v 1.41 2001/03/30 09:58:57 paf Exp $ */ #include "pa_config_includes.h" @@ -20,7 +20,7 @@ VStateless_class *table_class; // methods - +/// @todo now remove CONFIG untaint, make pos() searches in String static void set_or_load( Request& r, const String& method_name, Array *params, @@ -34,14 +34,14 @@ static void set_or_load( r.fail_if_junction_(is_load, *vdata_or_filename, method_name, is_load?"file name must not be junction":"body must be junction"); - // data or file_name + // data or table_name char *data; if(is_load) { // forcing untaint language - String lfile_name(pool); - lfile_name.append(vdata_or_filename->as_string(), String::UL_FILE_NAME, true); + String ltable_name(pool); + ltable_name.append(vdata_or_filename->as_string(), String::UL_FILE_NAME, true); // loading text - data=file_read_text(pool, r.absolute(lfile_name)); + data=file_read_text(pool, r.absolute(ltable_name)); } else { // suggesting untaint language Temp_lang temp_lang(r, String::UL_TABLE); @@ -63,7 +63,7 @@ static void set_or_load( if(char *row_chars=getrow(&data)) do { String *name=new(pool) String(pool); - name->APPEND(lsplit(&row_chars, '\t'), 0, file, line++); + name->APPEND_CLEAN(lsplit(&row_chars, '\t'), 0, file, line++); *columns+=name; } while(row_chars); } @@ -77,7 +77,7 @@ static void set_or_load( Array *row=new(pool) Array(pool); while(char *cell_chars=lsplit(&row_chars, '\t')) { String *cell=new(pool) String(pool); - cell->APPEND(cell_chars, 0, file, line); + cell->APPEND_CLEAN(cell_chars, 0, file, line); *row+=cell; } line++; @@ -87,27 +87,24 @@ static void set_or_load( // replace any previous table value static_cast(r.self)->set_table(table); } - - static void _set(Request& r, const String& method_name, Array *params) { set_or_load(r, method_name, params, false); } - static void _load(Request& r, const String& method_name, Array *params) { set_or_load(r, method_name, params, true); } static void _save(Request& r, const String& method_name, Array *params) { Pool& pool=r.pool(); - Value *vfile_name=static_cast(params->get(params->size()-1)); + Value *vtable_name=static_cast(params->get(params->size()-1)); // forcing // ^save[this body type] - r.fail_if_junction_(true, *vfile_name, + r.fail_if_junction_(true, *vtable_name, method_name, "file name must not be junction"); // forcing untaint language - String lfile_name(pool); - lfile_name.append(vfile_name->as_string(), + String ltable_name(pool); + ltable_name.append(vtable_name->as_string(), String::UL_FILE_NAME, true); Table& table=static_cast(r.self)->table(); @@ -148,32 +145,28 @@ static void _save(Request& r, const Stri } // write - file_write(pool, r.absolute(lfile_name), sdata.cstr(), sdata.size(), true); + file_write(pool, r.absolute(ltable_name), sdata.cstr(), sdata.size(), true); } -static void _count(Request& r, const String&, Array *) { +static void _count(Request& r, const String&method_name, Array *) { Pool& pool=r.pool(); Value& value=*new(pool) VInt(pool, static_cast(r.self)->table().size()); r.write_no_lang(value); } -static void _line(Request& r, const String&, Array *) { +static void _line(Request& r, const String& method_name, Array *) { Pool& pool=r.pool(); - Value& value=*new(pool) VInt(pool, 1+static_cast(r.self)->table().get_current()); + Value& value=*new(pool) VInt(pool, 1+static_cast(r.self)->table().current()); r.write_no_lang(value); } -static void _offset(Request& r, const String&, Array *params) { +static void _offset(Request& r, const String& method_name, Array *params) { Pool& pool=r.pool(); Table& table=static_cast(r.self)->table(); - if(params->size()) { - if(int size=table.size()) { - int offset= - (int)r.process(*static_cast(params->get(0))).as_double(); - table.set_current((table.get_current()+offset+size)%size); - } - } else { - Value& value=*new(pool) VInt(pool, table.get_current()); + if(params->size()) + table.shift((int)r.process(*static_cast(params->get(0))).as_double()); + else { + Value& value=*new(pool) VInt(pool, table.current()); r.write_no_lang(value); } } @@ -188,6 +181,7 @@ static void _menu(Request& r, const Stri Table& table=static_cast(r.self)->table(); bool need_delim=false; + int saved_current=table.current(); for(int row=0; row(r.self)->table(); if(table.size()==0) { Value& value=r.process(*static_cast(params->get(0))); @@ -229,7 +224,7 @@ static void store_column_item_to_hash(Ar value=new(*ri.pool) VUnknown(*ri.pool); ri.hash->put(column_name, value); } -static void _record(Request& r, const String&, Array *params) { +static void _record(Request& r, const String& method_name, Array *params) { Table& table=static_cast(r.self)->table(); if(const Array *columns=table.columns()) { Pool& pool=r.pool(); @@ -314,7 +309,7 @@ static void _sort(Request& r, const Stri table.set_current(0); } -static void _locate(Request& r, const String&, Array *params) { +static void _locate(Request& r, const String& method_name, Array *params) { VTable& vtable=*static_cast(r.self); Table& table=vtable.table(); vtable.last_locate_was_successful=table.locate( @@ -322,46 +317,116 @@ static void _locate(Request& r, const St static_cast(params->get(1))->as_string()); } +static void _found(Request& r, const String& method_name, Array *params) { + if(static_cast(r.self)->last_locate_was_successful) { + Value& then_code=*static_cast(params->get(0)); + // forcing ^found{this param type} + r.fail_if_junction_(false, then_code, + method_name, "found-parameter must be junction"); + r.write_pass_lang(r.process(then_code)); + } else if(params->size()==2) { + Value& else_code=*static_cast(params->get(1)); + // forcing ^found{this param type} + r.fail_if_junction_(false, else_code, + method_name, "not found-parameter must be junction"); + r.write_pass_lang(r.process(else_code)); + } +} + +static void _flip(Request& r, const String& method_name, Array *params) { + Pool& pool=r.pool(); + VTable& vtable=*static_cast(r.self); + + Table& old_table=*vtable.get_table(); + Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/); + if(old_table.size()) + if(int old_cols=old_table.at(0).size()) + for(int column=0; column(params->get(0)); + // forcing [this body type] + r.fail_if_junction_(true, *value, method_name, "body must not be junction"); + + const String& string=static_cast(value)->as_string(); + + // parse cells + Array& row=*new(pool) Array(pool); + size_t pos_after=0; + int pos_before; + while((pos_before=string.pos("\t", pos_after))>=0) { + row+=&string.piece(pos_after, pos_before); + pos_after=pos_before+1/*\t*/; + } + // last piece + if(pos_after(r.self)->table()+=&row; +} + // initialize void initialize_table_class(Pool& pool, VStateless_class& vclass) { // ^table.set{data} // ^table.set[nameless]{data} - vclass.add_native_method("set", _set, 1, 2); + vclass.add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2); // ^table.load[file] // ^table.load[nameless;file] - vclass.add_native_method("load", _load, 1, 2); + vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); // ^table.save[file] // ^table.save[nameless;file] - vclass.add_native_method("save", _save, 1, 2); + vclass.add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); // ^table.count[] - vclass.add_native_method("count", _count, 0, 0); + vclass.add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0); // ^table.line[] - vclass.add_native_method("line", _line, 0, 0); + vclass.add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0); // ^table.offset[] // ^table.offset[offset] - vclass.add_native_method("offset", _offset, 0, 1); + vclass.add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1); // ^table.menu{code} // ^table.menu{code}[delim] - vclass.add_native_method("menu", _menu, 1, 2); + vclass.add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2); // ^table.empty{code-when-empty} // ^table.empty{code-when-empty}{code-when-not} - vclass.add_native_method("empty", _empty, 1, 2); + vclass.add_native_method("empty", Method::CT_DYNAMIC, _empty, 1, 2); // ^table.record[] - vclass.add_native_method("record", _record, 0, 0); + vclass.add_native_method("record", Method::CT_DYNAMIC, _record, 0, 0); // ^table.sort{string-key-maker} ^table.sort{string-key-maker}[asc|desc] // ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[asc|desc] - vclass.add_native_method("sort", _sort, 1, 2); + vclass.add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2); // ^table.locate[field;value] - vclass.add_native_method("locate", _locate, 2, 2); -} + vclass.add_native_method("locate", Method::CT_DYNAMIC, _locate, 2, 2); + // ^table.found{when-found} + // ^table.found{when-found}{when-not-found} + vclass.add_native_method("found", Method::CT_DYNAMIC, _found, 1, 2); + + // ^table.flip[] + vclass.add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0); + + // ^table.append{r{tab}e{tab}c{tab}o{tab}r{tab}d} + vclass.add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1); +}