--- parser3/src/include/pa_table.h 2001/03/24 19:12:18 1.19 +++ parser3/src/include/pa_table.h 2001/03/26 09:53:42 1.22 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_table.h,v 1.19 2001/03/24 19:12:18 paf Exp $ + $Id: pa_table.h,v 1.22 2001/03/26 09:53:42 paf Exp $ */ #ifndef PA_TABLE_H @@ -33,12 +33,12 @@ class Table : public Array { public: Table(Pool& apool, - const String& asource, + const String *aorigin, Array *acolumns, int initial_rows=CR_INITIAL_ROWS_DEFAULT); - /// the string source of table's data - //const String& source() { return fsource; } + /// where this table came from, may be NULL + const String *origin_string() { return forigin_string; } /// column names const Array *columns() { return fcolumns; } @@ -52,9 +52,9 @@ public: const String *item(const String& column_name); private: - - // the base origin of table's data - const String& fsource; + + // where this table came from, may be NULL + const String *forigin_string; // column name->number lookup table Hash name2number; @@ -65,7 +65,7 @@ private: // columns Array *fcolumns; - bool valid(int index) { return index>=0 && index=0 && index