--- parser3/src/include/pa_dictionary.h	2004/02/11 15:33:13	1.17
+++ parser3/src/include/pa_dictionary.h	2017/02/07 22:00:33	1.22
@@ -1,14 +1,14 @@
 /** @file
 	Parser: dictionary class decl.
 
-	Copyright (c) 2001-2004 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)
 */
 
 #ifndef PA_DICTIONARY_H
 #define PA_DICTIONARY_H
 
-static const char * const IDENT_DICTIONARY_H="$Date: 2004/02/11 15:33:13 $";
+#define IDENT_PA_DICTIONARY_H "$Id: pa_dictionary.h,v 1.22 2017/02/07 22:00:33 moko Exp $"
 
 #include "pa_table.h"
 
@@ -30,18 +30,25 @@ public:
 	/// construct wrapper, grabbing first letters of first column into @b first
 	Dictionary(Table& atable);
 
+	/// construct simple dictionary within a single pair only
+	Dictionary(const String& from, const String& to);
+
 	/// find first row that contains string in first column which starts @b src
 	Subst first_that_begins(const char* str) const;
 
 private:
-
 	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);
+	void append_subst(const String* from, const String* to, const char* exception=0);
 
 	int starting_line_of[0x100]; int constructor_line;
+
+public:
+	size_t count() const { return substs.count(); }
+
+	Subst get(size_t index) const { return substs.get(index); }
+
 };
 
 #endif