--- parser3/src/include/pa_table.h 2003/01/21 15:51:12 1.48 +++ parser3/src/include/pa_table.h 2003/04/14 11:22:53 1.50 @@ -8,7 +8,7 @@ #ifndef PA_TABLE_H #define PA_TABLE_H -static const char* IDENT_TABLE_H="$Date: 2003/01/21 15:51:12 $"; +static const char* IDENT_TABLE_H="$Date: 2003/04/14 11:22:53 $"; #include "pa_types.h" #include "pa_array.h" @@ -31,12 +31,20 @@ static const char* IDENT_TABLE_H="$Date: */ class Table : public Array { public: + struct Action_options { + int offset; + int limit; //< negative limit means 'all'. zero limit means 'nothing' + bool reverse; + bool defined; + + Action_options(): offset(0), limit(-1), reverse(false), defined(false) {} + }; Table(Pool& apool, const String *aorigin, const Array *acolumns, int initial_rows=CR_INITIAL_ROWS_DEFAULT); - Table(Pool& apool, const Table& source, int offset=0, int limit=0); + Table(Pool& apool, const Table& source, Action_options& options); /// where this table came from, may be NULL const String *origin_string() { return forigin_string; } @@ -48,7 +56,8 @@ public: void set_columns(const Array *acolumns) { fcolumns=acolumns; } /// moves @a current pointer - void set_current(int acurrent) { fcurrent=acurrent; } + void set_current(int acurrent) { fcurrent=acurrent; } + /// @return current pointer int current() const { return fcurrent; } void offset(bool absolute, int offset); @@ -70,8 +79,10 @@ public: /// saves to text file void save(bool nameless_save, const String& file_spec); - bool locate(int column, const String& value); - bool locate(const String& column, const String& value); + typedef bool (*locate_func)(Table& self, void* info); + bool locate(locate_func func, void* info, Action_options& options); + bool locate(int column, const String& value, Action_options& options); + bool locate(const String& column, const String& value, Action_options& options); const Array& at(int index) const { // force @c const result