--- parser3/src/include/pa_table.h 2001/05/07 08:29:42 1.30 +++ parser3/src/include/pa_table.h 2002/02/08 07:27:45 1.40 @@ -1,11 +1,10 @@ /** @file Parser: table class decl. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_table.h,v 1.30 2001/05/07 08:29:42 paf Exp $ + $Id: pa_table.h,v 1.40 2002/02/08 07:27:45 paf Exp $ */ #ifndef PA_TABLE_H @@ -35,8 +34,9 @@ public: Table(Pool& apool, const String *aorigin, - Array *acolumns, + const Array *acolumns, int initial_rows=CR_INITIAL_ROWS_DEFAULT); + Table(const Table& source); /// where this table came from, may be NULL const String *origin_string() { return forigin_string; } @@ -48,17 +48,19 @@ public: void set_current(int acurrent) { fcurrent=acurrent; } /// @return current pointer int current() { return fcurrent; } - void shift(int offset); + void offset(bool absolute, int offset); - /// @return column index from @a column_name. '<0' if no such column - int column_name2index(const String& column) const; + /** @return column index from @a column_name. '<0' if no such column + if no such colum conditionally 'bark' + */ + int column_name2index(const String& column, bool bark) const; /// @return item from @a column const String *item(int column) const; /// @return item from @a column. '0' if no such column const String *item(const String& column) const { - int index=column_name2index(column); + int index=column_name2index(column, false); return index>=0?item(index):0; } @@ -66,9 +68,7 @@ public: void save(bool nameless_save, const String& file_spec); bool locate(int column, const String& value); - bool locate(const String& column, const String& value) { - return locate(column_name2index(column), value); - } + bool locate(const String& column, const String& value); const Array& at(int index) const { // force @c const result @@ -87,7 +87,7 @@ private: int fcurrent; // columns - Array *fcolumns; + const Array *fcolumns; bool valid(int index) const { return index>=0 && index