--- parser3/src/include/pa_table.h 2002/04/22 14:11:28 1.43 +++ parser3/src/include/pa_table.h 2003/01/21 15:51:12 1.48 @@ -1,15 +1,15 @@ /** @file Parser: table class decl. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_table.h,v 1.43 2002/04/22 14:11:28 paf Exp $ */ #ifndef PA_TABLE_H #define PA_TABLE_H +static const char* IDENT_TABLE_H="$Date: 2003/01/21 15:51:12 $"; + #include "pa_types.h" #include "pa_array.h" #include "pa_hash.h" @@ -36,8 +36,7 @@ public: const String *aorigin, const Array *acolumns, int initial_rows=CR_INITIAL_ROWS_DEFAULT); - Table(const Table& source); - Table(Pool& apool, const Table& source, int offset=0); + Table(Pool& apool, const Table& source, int offset=0, int limit=0); /// where this table came from, may be NULL const String *origin_string() { return forigin_string; } @@ -51,7 +50,7 @@ public: /// moves @a current pointer void set_current(int acurrent) { fcurrent=acurrent; } /// @return current pointer - int current() { return fcurrent; } + int current() const { return fcurrent; } void offset(bool absolute, int offset); /** @return column index from @a column_name. '<0' if no such column @@ -85,7 +84,7 @@ private: const String *forigin_string; // column name->number lookup table - Hash name2number; + Hash& name2number; // current row int fcurrent;