--- parser3/src/include/pa_dictionary.h	2001/08/28 09:27:42	1.2
+++ parser3/src/include/pa_dictionary.h	2003/01/31 12:34:30	1.13.2.4
@@ -1,45 +1,42 @@
 /** @file
 	Parser: dictionary class decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_dictionary.h,v 1.2 2001/08/28 09:27:42 parser Exp $
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_DICTIONARY_H
 #define PA_DICTIONARY_H
 
-#include "pa_config_includes.h"
+static const char* IDENT_DICTIONARY_H="$Date: 2003/01/31 12:34:30 $";
+
 #include "pa_table.h"
 
 /// simple dictionary, speding up lookups on contained two columned table
-class Dictionary : public Pooled {
-	friend static void add_first(Array::Item *value, void *info);
+class Dictionary : public PA_Object {
 public:
 
 	/// construct wrapper, grabbing first letters of first column into @b first
-	Dictionary(Table& atable, double amin_ratio=1);
+	Dictionary(TablePtr atable, double amin_ratio=1);
 
 	/// get max ratio
 	double max_ratio() { return fmax_ratio; }
 
 	/// find first row that contains string in first column which starts @b src
-	void* first_that_starts(const char *src) const;
+	Table::element_type first_that_starts(const char* src, size_t src_size=0) const;
 
 	/// where this table came from, may be NULL. proxy to Table
-	const String *origin_string() { return table.origin_string(); }
+	StringPtr origin_string() { return table->origin_string(); }
 
 private:
 
-	Table& table;
+	TablePtr table;
 	double fmax_ratio;
 
 private:
+	friend void add_first(Table::element_type row, Dictionary* self);
 
 	int starting_line_of[0x100]; int constructor_line;
-
 };
 
 #endif