--- parser3/src/main/pa_dictionary.C	2001/08/06 16:18:26	1.3
+++ parser3/src/main/pa_dictionary.C	2001/09/26 10:32:26	1.6
@@ -2,32 +2,65 @@
 	Parser: dictionary class  impl.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: pa_dictionary.C,v 1.6 2001/09/26 10:32:26 parser Exp $
 */
-static const char *RCSId="$Id: pa_dictionary.C,v 1.3 2001/08/06 16:18:26 parser Exp $"; 
 
 #include "pa_dictionary.h"
+#include "pa_exception.h"
 
-
-static void add_first(Array::Item *value, void *info) {
+void Dictionary::add_first(Array::Item *value, void *info) {
 	Dictionary& self=*static_cast<Dictionary *>(info);
-	self.first[(unsigned char)static_cast<Array *>(value)->get_string(0)->first_char()]=true;
+	Array *row=static_cast<Array *>(value);
+	// get a=>b values
+	const String& a=*row->get_string(0);
+	const String& b=*row->get_string(1);
+	// empty 'a' check
+	if(a.size()==0) {
+		Pool& pool=self.pool();
+		PTHROW(0, 0, 
+			&a, 
+			"dictionary table 'from' column elements must not be empty");
+	}
+	unsigned char c=(unsigned char)a.first_char();
+	if(!self.starting_line_of[c])
+		self.starting_line_of[c]=self.constructor_line;
+
+	double ratio=b.size()/a.size();
+	if(ratio>self.fmax_ratio)
+		self.fmax_ratio=ratio;
+
+	self.constructor_line++;
 }
 
-Dictionary::Dictionary(Table& atable) : Pooled(atable.pool()), table(atable) {
-	// clear firsts
-	memset(first, 0, sizeof(first));
+Dictionary::Dictionary(Table& atable, double amin_ratio) : Pooled(atable.pool()), 
+	table(atable), 
+	fmax_ratio(amin_ratio)  {
+
+	// clear starting_lines
+	memset(starting_line_of, 0, sizeof(starting_line_of));
 	// grab first letters of first column of a table
-	table.for_each(add_first, this);
+	constructor_line=1;  table.for_each(add_first, this);
 }
 
-static void *starts(Array::Item *value, const void *info) {
+#ifndef DOXYGEN
+struct First_that_starts_info {
+	int line;
+	const char *src;
+};
+#endif
+static void *starts(Array::Item *value, void *info) {
+	First_that_starts_info& i=*static_cast<First_that_starts_info *>(info);
+	// skip irrelevant lines
+	if(i.line>1) {
+		--i.line;
+		return 0;
+	}
 	Array *row=static_cast<Array *>(value);
-	const char *src=static_cast<const char *>(info);
 
 	int partial;
-	row->get_string(0)->cmp(partial, src);
+	row->get_string(0)->cmp(partial, i.src);
 	return (
 		partial==0 || // full match
 		partial==1) // typo left column starts 'src'
@@ -35,8 +68,10 @@ static void *starts(Array::Item *value,
 }
 
 void* Dictionary::first_that_starts(const char *src) const {
-	if(first[(unsigned char)*src])
-		return table.first_that(starts, src);
-	else
+	First_that_starts_info info;
+	if(info.line=starting_line_of[(unsigned char)*src]) {
+		info.src=src;
+		return table.first_that(starts, &info);
+	} else
 		return 0;
 }