--- parser3/src/classes/table.C 2001/04/20 14:18:30 1.63 +++ parser3/src/classes/table.C 2001/04/27 17:17:58 1.65.2.2 @@ -5,27 +5,41 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: table.C,v 1.63 2001/04/20 14:18:30 paf Exp $ + $Id: table.C,v 1.65.2.2 2001/04/27 17:17:58 paf Exp $ */ #include "pa_config_includes.h" #include "pcre.h" +#include "classes.h" #include "pa_common.h" #include "pa_request.h" -#include "_table.h" #include "pa_vtable.h" #include "pa_vint.h" #include "pa_sql_connection.h" #include "pa_dir.h" -// global var +// defines -VStateless_class *table_class; +#define TABLE_CLASS_NAME "table" + +// class + +class MTable : public Methoded { +public: // VStateless_class + + Value *create_new_value(Pool& pool) { return new(pool) VTable(pool); } + +public: + MTable(Pool& pool); + bool used_directly() { return true; } + +}; // methods -static void _set(Request& r, const String& method_name, MethodParams *params) { + +void _set(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); // data is last parameter Value& vdata=params->get_junction(params->size()-1, "body must be code"); @@ -67,7 +81,7 @@ static void _set(Request& r, const Strin static_cast(r.self)->set_table(table); } -static void _load(Request& r, const String& method_name, MethodParams *params) { +void _load(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); // filename is last parameter Value& vfilename=params->get_no_junction(params->size()-1, @@ -116,7 +130,7 @@ static void _load(Request& r, const Stri static_cast(r.self)->set_table(table); } -static void _save(Request& r, const String& method_name, MethodParams *params) { +void _save(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Value& vtable_name=params->get_no_junction(params->size()-1, "file name must not be code"); @@ -163,19 +177,19 @@ static void _save(Request& r, const Stri sdata.cstr(), sdata.size(), true); } -static void _count(Request& r, const String&, MethodParams *) { +void _count(Methoded& m, Request& r, const String&, MethodParams *) { 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& method_name, MethodParams *) { +void _line(Methoded& m, Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); 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& method_name, MethodParams *params) { +void _offset(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Table& table=static_cast(r.self)->table(); if(params->size()) @@ -186,15 +200,15 @@ static void _offset(Request& r, const St } } -/// @test $a.menu{ $a[123] } -static void _menu(Request& r, const String& method_name, MethodParams *params) { +void _menu(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Value& body_code=params->get_junction(0, "body must be code"); Value *delim_code=params->size()==2?¶ms->get(1):0; - Table& table=static_cast(r.self)->table(); + VTable& vtable=*static_cast(r.self); + Table& table=vtable.table(); bool need_delim=false; - int saved_current=table.current(); + vtable.lock(); int saved_current=table.current(); for(int row=0; row(r.self)->table(); if(table.size()==0) r.write_pass_lang(r.process(params->get(0))); @@ -218,6 +232,7 @@ static void _empty(Request& r, const Str r.write_pass_lang(r.process(params->get(1))); } +/// used by table: _record / store_column_item_to_hash struct Record_info { Pool *pool; Table *table; @@ -234,7 +249,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& method_name, MethodParams *params) { +void _record(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Table& table=static_cast(r.self)->table(); if(const Array *columns=table.columns()) { Pool& pool=r.pool(); @@ -269,7 +284,7 @@ static int sort_cmp_double(const void *a else return 0; } -static void _sort(Request& r, const String& method_name, MethodParams *params) { +void _sort(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Value& key_maker=params->get_junction(0, "key-maker must be code"); bool reverse=params->size()==2/*..[asc|desc]*/? @@ -312,7 +327,7 @@ static void _sort(Request& r, const Stri table.set_current(0); } -static void _locate(Request& r, const String& method_name, MethodParams *params) { +void _locate(Methoded& m, Request& r, const String& method_name, MethodParams *params) { VTable& vtable=*static_cast(r.self); Table& table=vtable.table(); vtable.last_locate_was_successful=table.locate( @@ -320,14 +335,14 @@ static void _locate(Request& r, const St params->get(1).as_string()); } -static void _found(Request& r, const String& method_name, MethodParams *params) { +void _found(Methoded& m, Request& r, const String& method_name, MethodParams *params) { if(static_cast(r.self)->last_locate_was_successful) r.write_pass_lang(r.process(params->get_junction(0, "found-parameter must be code"))); else if(params->size()==2) r.write_pass_lang(r.process(params->get_junction(0, "else-parameter must be code"))); } -static void _flip(Request& r, const String& method_name, MethodParams *params) { +void _flip(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VTable& vtable=*static_cast(r.self); @@ -347,7 +362,7 @@ static void _flip(Request& r, const Stri vtable.set_table(new_table); } -static void _append(Request& r, const String& method_name, MethodParams *params) { +void _append(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); // data is last parameter const String& string= @@ -360,7 +375,7 @@ static void _append(Request& r, const St static_cast(r.self)->table()+=&row; } -static void _join(Request& r, const String& method_name, MethodParams *params) { +void _join(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Table *maybe_src=params->get_no_junction(0, "table ref must not be code").get_table(); @@ -393,7 +408,7 @@ static void _join(Request& r, const Stri } /// ^table:sql{query}[(count[;offset])] -static void _sql(Request& r, const String& method_name, MethodParams *params) { +void _sql(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); if(!r.connection) @@ -470,7 +485,7 @@ static void _sql(Request& r, const Strin /// ^table:dir[path] /// ^table:dir[path][regexp] -static void _dir(Request& r, const String& method_name, MethodParams *params) { +void _dir(Methoded& m, Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); Value& relative_path=params->get_no_junction(0, "path must not be code"); @@ -545,65 +560,78 @@ static void _dir(Request& r, const Strin static_cast(r.self)->set_table(table); } -// initialize -void initialize_table_class(Pool& pool, VStateless_class& vclass) { +// constructor + +MTable::MTable(Pool& pool) : Methoded(pool) { + set_name(NEW String(pool, TABLE_CLASS_NAME)); + // ^table:set{data} // ^table:set[nameless]{data} - vclass.add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2); + add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2); // ^table:load[file] // ^table:load[nameless;file] - vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); + add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); // ^table.save[file] // ^table.save[nameless;file] - vclass.add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); + add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); // ^table.count[] - vclass.add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0); + add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0); // ^table.line[] - vclass.add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0); + add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0); // ^table.offset[] // ^table.offset[offset] - vclass.add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1); + add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1); // ^table.menu{code} // ^table.menu{code}[delim] - vclass.add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2); + 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", Method::CT_DYNAMIC, _empty, 1, 2); + add_native_method("empty", Method::CT_DYNAMIC, _empty, 1, 2); // ^table.record[] - vclass.add_native_method("record", Method::CT_DYNAMIC, _record, 0, 0); + 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", Method::CT_DYNAMIC, _sort, 1, 2); + add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2); // ^table.locate[field;value] - vclass.add_native_method("locate", Method::CT_DYNAMIC, _locate, 2, 2); + 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); + add_native_method("found", Method::CT_DYNAMIC, _found, 1, 2); // ^table.flip[] - vclass.add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0); + 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); + add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1); // ^table.join[table] - vclass.add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1); + add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1); // ^table:sql[query][(count[;offset])] - vclass.add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3); + add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3); // ^table:dir[path] // ^table:dir[path][regexp] - vclass.add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2); + add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2); +} + +// global variable + +Methoded *table_class; + +// creator + +Methoded *MTable_create(Pool& pool) { + return table_class=new(pool) MTable(pool); }