--- parser3/src/include/pa_table.h	2001/05/07 08:29:42	1.30
+++ parser3/src/include/pa_table.h	2001/09/26 10:32:25	1.35
@@ -2,15 +2,15 @@
 	Parser: table class decl.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_table.h,v 1.30 2001/05/07 08:29:42 paf Exp $
+	$Id: pa_table.h,v 1.35 2001/09/26 10:32:25 parser Exp $
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
+#include "pa_config_includes.h"
 #include "pa_types.h"
 #include "pa_array.h"
 #include "pa_hash.h"
@@ -35,7 +35,7 @@ public:
 
 	Table(Pool& apool,
 		const String *aorigin,
-		Array *acolumns,
+		const Array *acolumns,
 		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
 
 	/// where this table came from, may be NULL
@@ -50,15 +50,17 @@ public:
 	int current() { return fcurrent; }
 	void shift(int offset);
 
-	/// @return column index from @a column_name. '<0' if no such column
-	int column_name2index(const String& column) const;
+	/** @return column index from @a column_name. '<0' if no such column
+		if no such colum conditionally 'bark'
+	*/
+	int column_name2index(const String& column, bool bark) const;
 
 	/// @return item from @a column
 	const String *item(int column) const;
 
 	/// @return item from @a column. '0' if no such column
 	const String *item(const String& column) const {
-		int index=column_name2index(column);
+		int index=column_name2index(column, false);
 		return index>=0?item(index):0;
 	}
 
@@ -66,9 +68,7 @@ public:
 	void save(bool nameless_save, const String& file_spec);
 
 	bool locate(int column, const String& value);
-	bool locate(const String& column, const String& value) {
-		return locate(column_name2index(column), value);
-	}
+	bool locate(const String& column, const String& value);
 
 	const Array& at(int index) const {
 		// force @c const result
@@ -87,7 +87,7 @@ private:
 	int fcurrent;
 
 	// columns
-	Array *fcolumns;
+	const Array *fcolumns;
 
 	bool valid(int index) const { return index>=0 && index<size(); }