--- parser3/src/main/pa_dictionary.C	2003/04/02 12:02:33	1.17.2.6.2.6
+++ parser3/src/main/pa_dictionary.C	2017/02/07 22:00:42	1.28
@@ -1,36 +1,55 @@
 /**	@file
 	Parser: dictionary class  impl.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_DICTIONARY_C="$Date: 2003/04/02 12:02:33 $";
-
 #include "pa_dictionary.h"
 #include "pa_exception.h"
 
-// could not make this static: gcc complains "prev decl was extern"
-void pa_dictionary_add_first(Table::element_type row, Dictionary* self) {
-	// get a=>b values
-	const String* a=row->get(0);
-	// empty 'a' check
-	if(a->is_empty()) {
-		throw Exception("parser.runtime",
-			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;
+volatile const char * IDENT_PA_DICTIONARY_C="$Id: pa_dictionary.C,v 1.28 2017/02/07 22:00:42 moko Exp $" IDENT_PA_DICTIONARY_H;
 
-	self->constructor_line++;
-}
-Dictionary::Dictionary(Table& atable): table(atable) {
+Dictionary::Dictionary(Table& atable): substs(atable.count()) {
 	// clear starting_lines
 	memset(starting_line_of, 0, sizeof(starting_line_of));
 	// grab first letters of first column of a table
-	constructor_line=1;  table.for_each(pa_dictionary_add_first, this);
+	constructor_line=1;
+
+	for(Array_iterator<ArrayString*> i(atable); i.has_next(); ) {
+		ArrayString* row=i.next();
+
+		append_subst(
+			row->get(0),
+			(row->count()>1) ? row->get(1) : 0,
+			"dictionary table 'from' column elements must not be empty"
+		);
+	}
+}
+
+Dictionary::Dictionary(const String& from, const String& to): substs(1) {
+	// clear starting_lines
+	memset(starting_line_of, 0, sizeof(starting_line_of));
+	constructor_line=1;
+
+	append_subst(&from, &to);
+}
+
+
+void Dictionary::append_subst(const String* from, const String* to, const char* exception_cstr) {
+	if(from->is_empty())
+		throw Exception(PARSER_RUNTIME,
+			0,
+			exception_cstr ? exception_cstr : "'from' must not be empty");
+
+	// record simplier 'from' for quick comparisons in 'starts' extremely-tight-callback
+	substs+=Dictionary::Subst(from->cstr(), (to && !to->is_empty()) ? to : 0);
+
+	unsigned char c=(unsigned char)from->first_char();
+	if(!starting_line_of[c])
+		starting_line_of[c]=constructor_line;
+
+	constructor_line++;
 }
 
 #ifndef DOXYGEN
@@ -39,20 +58,20 @@ struct First_that_begins_info {
 	const char* str;
 };
 #endif
-static bool starts(Table::element_type row, First_that_begins_info* info) {
+static bool starts(Dictionary::Subst subst, First_that_begins_info* info) {
 	// skip irrelevant lines
 	if(info->line>1) {
 		--info->line;
 		return 0;
 	}
 
-	return row->get(0)->this_starts(info->str);
+	return strncmp(subst.from, info->str, subst.from_length)==0;
 }
-Table::element_type Dictionary::first_that_begins(const char* str) const {
+Dictionary::Subst Dictionary::first_that_begins(const char* str) const {
 	First_that_begins_info info;
-	if(info.line=starting_line_of[(unsigned char)*str]) {
+	if((info.line=starting_line_of[(unsigned char)*str])) {
 		info.str=str;
-		return table.first_that(starts, &info);
+		return substs.first_that(starts, &info);
 	} else
-		return Table::element_type(0);
+		return 0;
 }