--- parser3/src/include/pa_table.h 2003/03/19 16:28:08 1.48.2.11.2.3 +++ parser3/src/include/pa_table.h 2003/03/26 18:52:49 1.48.2.11.2.6 @@ -8,7 +8,7 @@ #ifndef PA_TABLE_H #define PA_TABLE_H -static const char* IDENT_TABLE_H="$Date: 2003/03/19 16:28:08 $"; +static const char* IDENT_TABLE_H="$Date: 2003/03/26 18:52:49 $"; #include "pa_types.h" #include "pa_hash.h" @@ -28,7 +28,7 @@ static const char* IDENT_TABLE_H="$Date: rows and strings stored are read-only. once stored they can be removed, but not altered. that's handy for quick copying & co. see table:join */ -class Table: public Array { +class Table: public Array { public: typedef ArrayString* columns_type; @@ -52,7 +52,7 @@ public: int column_name2index(const String& column, bool bark) const; /// @return item from @a column - const String* item(int column); + const String* item(size_t column); /// @return item from @a column. '0' if no such column const String* item(const String& column) { @@ -63,25 +63,25 @@ public: /// saves to text file void save(bool nameless_save, const String& file_spec); - bool locate(int column, const String& value); + bool locate(size_t column, const String& value); bool locate(const String& column, const String& value); private: // current row - int fcurrent; + size_t fcurrent; // columns columns_type fcolumns; // column names are already referenced in fcolumns, no need to doublecheck references here // column name->number lookup table - typedef Hash name2number_hash_class; + typedef Hash name2number_hash_class; name2number_hash_class* name2number; // we own columns? - bool valid(int index) const { return index>=0 && index=0 && index