--- parser3/src/main/pa_table.C	2001/01/29 15:56:04	1.1
+++ parser3/src/main/pa_table.C	2003/03/18 15:14:19	1.53.2.10.2.1
@@ -1,26 +1,83 @@
-/*
-  $Id: pa_table.C,v 1.1 2001/01/29 15:56:04 paf Exp $
+/** @file
+	Parser: table class.
+
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+static const char* IDENT_TABLE_C="$Date: 2003/03/18 15:14:19 $";
+
 #include "pa_table.h"
-#include "pa_pool.h"
 
-Table::Table(Pool *apool, 
-			 char *afile, uint aline, 
-			 Array *acolumns, 
-			 int initial_rows) :
-	Array(apool, initial_rows),
-	columns_order(acolumns), 
-	name2number(apool, false) {
-#ifndef NO_STRING_ORIGIN
-	origin.file=afile;
-	origin.line=aline;
-#endif
-
-	if(columns_order)
-		for(int i=0; i<columns_order->size(); i++) {
-			String name(pool);
-			name.APPEND(static_cast<char *>((*columns_order)[i]), 0, 0);
-			name2number.put(name, reinterpret_cast<Item>(i));
+#include "pa_exception.h"
+
+Table::Table(
+			 const String* aorigin_string,
+			 columns_type acolumns,
+			 int initial_rows):
+	Array<element_type>(initial_rows),
+
+	forigin_string(aorigin_string),
+	fcurrent(0),
+	fcolumns(acolumns), 
+	name2number(object_ptr<name2number_hash_class>(new name2number_hash_class)) {
+
+	if(fcolumns.get())
+		for(int i=0; i<fcolumns->count(); i++) {
+			const String& name=*fcolumns->get(i).get();
+			name2number->put(name, i+1);
 		}
 }
+
+Table::Table(const Table& src, int offset, int limit) :
+	Array<element_type>(limit/*may be more than needed, no harm done*/),
+
+	forigin_string(src.forigin_string),
+	fcurrent(0),
+	fcolumns(src.fcolumns),
+	name2number(src.name2number) {
+
+	append(src, offset, limit);
+}
+
+int Table::column_name2index(const String& column_name, bool bark) const {
+	if(fcolumns.get()) {// named
+		int result=name2number->get(*column_name.get())-1; // -1 = column not found
+		if(bark && result<0)
+			throw Exception("parser.runtime",
+				column_name,
+				"column not found");
+		return result;
+	} else // nameless
+		return column_name->as_int();
+}
+
+const String& Table::item(int column) {
+	if(valid(fcurrent)) {
+		element_type row=get(fcurrent);
+		if(column>=0 && column<row->count()) // proper index?
+			return row->get(column);
+	}
+	return 0; // it's OK we don't have row|column, just return nothing
+}
+
+bool Table::locate(int column, const String& value) {
+	int scurrent=fcurrent;
+	for(fcurrent=0; fcurrent<count(); fcurrent++) {
+		const String& item_value=item(column);
+		if(*item_value == *value)
+			return true;
+	}
+
+	fcurrent=scurrent;
+	return false;
+}
+
+bool Table::locate(const String& column, const String& value) {
+	return locate(column_name2index(column, true), value);
+}
+
+void Table::offset(bool absolute, int offset) {
+	if(count())
+		fcurrent=((absolute?0:fcurrent)+offset+count())%count();
+}