--- parser3/src/include/pa_dictionary.h	2001/08/28 09:27:42	1.2
+++ parser3/src/include/pa_dictionary.h	2005/08/09 08:14:49	1.18
@@ -1,45 +1,47 @@
 /** @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-2005 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 * const IDENT_DICTIONARY_H="$Date: 2005/08/09 08:14:49 $";
+
 #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);
+	struct Subst {
+		const char *from; size_t from_length;
+		const String* to;
+
+		Subst(int): from(0) {}
+		Subst(const char* afrom, const String* ato): from(afrom), to(ato) {
+			from_length=strlen(afrom);
+		}
+		operator bool() { return from!=0; }
+	};
 
-	/// get max ratio
-	double max_ratio() { return fmax_ratio; }
+	/// construct wrapper, grabbing first letters of first column into @b first
+	Dictionary(Table& atable);
 
 	/// find first row that contains string in first column which starts @b src
-	void* first_that_starts(const char *src) const;
-
-	/// where this table came from, may be NULL. proxy to Table
-	const String *origin_string() { return table.origin_string(); }
+	Subst first_that_begins(const char* str) const;
 
 private:
 
-	Table& table;
-	double fmax_ratio;
+	Array<Subst> substs;
 
 private:
+	friend void pa_dictionary_add_first(Table::element_type row, Dictionary* self);
+	//friend bool starts(FromTo row, First_that_begins_info* info);
 
 	int starting_line_of[0x100]; int constructor_line;
-
 };
 
 #endif