Diff for /parser3/src/include/pa_table.h between versions 1.48.2.5 and 1.48.2.11.2.5

version 1.48.2.5, 2003/01/27 16:00:42 version 1.48.2.11.2.5, 2003/03/24 13:43:41
Line 1 Line 1
 /** @file  /** @file
         Parser: table class decl.          Parser: table class decl.
   
         Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)          Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
         Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)          Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */  */
   
Line 11 Line 11
 static const char* IDENT_TABLE_H="$Date$";  static const char* IDENT_TABLE_H="$Date$";
   
 #include "pa_types.h"  #include "pa_types.h"
 #include "pa_array.h"  
 #include "pa_hash.h"  #include "pa_hash.h"
 #include "pa_string.h"  #include "pa_string.h"
   
Line 29  static const char* IDENT_TABLE_H="$Date$ Line 28  static const char* IDENT_TABLE_H="$Date$
         rows and strings stored are read-only. once stored they can be removed,          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          but not altered. that's handy for quick copying & co. see table:join
 */  */
 class Table: public Array<object_ptr<const Array<ConstStringPtr > > > {  class Table: public Array<ArrayString*> {
 public:  public:
         typedef object_ptr<const Array<ConstStringPtr> > columns_type;          typedef ArrayString* columns_type;
   
         Table(          Table(
                 ConstStringPtr aorigin_string,  
                 columns_type acolumns,                  columns_type acolumns,
                 int initial_rows=3);                  int initial_rows=3);
         Table(const Table& src, int offset=0, int limit=0);          Table(const Table& src, int offset=0, int limit=0);
   
         /// where this table came from, may be NULL  
         ConstStringPtr origin_string() { return forigin_string; }  
   
         /// gets column names          /// gets column names
         columns_type columns() { return fcolumns; }          columns_type columns() { return fcolumns; }
   
Line 54  public: Line 49  public:
         /** @return column index from @a column_name. '<0' if no such column          /** @return column index from @a column_name. '<0' if no such column
                 if no such - 'bark'                  if no such - 'bark'
         */          */
         int column_name2index(ConstStringPtr column, bool bark) const;          int column_name2index(const String& column, bool bark) const;
   
         /// @return item from @a column          /// @return item from @a column
         ConstStringPtr item(int column) const;          const String* item(int column);
   
         /// @return item from @a column. '0' if no such column          /// @return item from @a column. '0' if no such column
         ConstStringPtr item(ConstStringPtr column) const {          const String* item(const String& column) {
                 int index=column_name2index(column, false);                  int index=column_name2index(column, false);
                 return index>=0?item(index):ConstStringPtr(0);                  return index>=0?item(index):0;
         }          }
   
         /// saves to text file          /// saves to text file
         void save(bool nameless_save, object_ptr<const String> file_spec);          void save(bool nameless_save, const String& file_spec);
   
         bool locate(int column, ConstStringPtr value);  
         bool locate(object_ptr<const String> column, ConstStringPtr value);  
   
         element_type at(int index) const {          bool locate(int column, const String& value);
                 return get(index);          bool locate(const String& column, const String& value);
         }  
   
 private:  private:
                   
         // where this table came from, may be NULL  
         ConstStringPtr forigin_string;  
   
         // current row          // current row
         int fcurrent;          int fcurrent;
   
Line 88  private: Line 76  private:
   
         // column names are already referenced in fcolumns, no need to doublecheck references here          // column names are already referenced in fcolumns, no need to doublecheck references here
         // column name->number lookup table          // column name->number lookup table
         typedef Hash<const String&, int> name2number_hash_class;          typedef Hash<const StringBody, int> name2number_hash_class;
         object_ptr<name2number_hash_class> name2number;          name2number_hash_class* name2number;
   
         // we own columns?          // we own columns?
   
Line 97  private: Line 85  private:
   
 };  };
   
 typedef object_ptr<Table> TablePtr;  
   
 #endif  #endif

Removed from v.1.48.2.5  
changed lines
  Added in v.1.48.2.11.2.5


E-mail: