--- parser3/src/main/pa_table.C	2003/01/23 15:38:06	1.53.2.1
+++ parser3/src/main/pa_table.C	2003/02/04 08:29:27	1.53.2.9
@@ -1,21 +1,19 @@
 /** @file
 	Parser: table class.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	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/01/23 15:38:06 $";
-
-//#include <stdlib.h>
+static const char* IDENT_TABLE_C="$Date: 2003/02/04 08:29:27 $";
 
 #include "pa_table.h"
 #include "pa_pool.h"
 #include "pa_exception.h"
 
 Table::Table(
-			 object_ptr<const String> aorigin_string,
-			 object_ptr<const Array<const String> > acolumns,
+			 StringPtr aorigin_string,
+			 columns_type acolumns,
 			 int initial_rows):
 	Array<element_type>(initial_rows),
 
@@ -26,7 +24,7 @@ Table::Table(
 
 	if(fcolumns.get())
 		for(int i=0; i<fcolumns->count(); i++) {
-			const String& name=fcolumns->get(i);
+			const String& name=*fcolumns->get(i).get();
 			name2number->put(name, i+1);
 		}
 }
@@ -42,7 +40,7 @@ Table::Table(const Table& src, int offse
 	append(src, offset, limit);
 }
 
-int Table::column_name2index(object_ptr<const String> column_name, bool bark) const {
+int Table::column_name2index(StringPtr 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)
@@ -50,35 +48,24 @@ int Table::column_name2index(object_ptr<
 				column_name,
 				"column not found");
 		return result;
-	} else { // nameless
-		char *error_pos;
-		const char *cstr=column_name.cstr();
-		int result=(int)strtol(cstr, &error_pos, 0);
-		if(*error_pos/*not EOS*/) {
-			result=-1;
-			if(bark)
-				throw Exception("parser.runtime",
-					&column_name,
-					"invalid column number");
-		}
-		return result;
-	}
+	} else // nameless
+		return column_name->as_int();
 }
 
-const String *Table::item(int column) const {
+StringPtr Table::item(int column) {
 	if(valid(fcurrent)) {
-		const Array& row=at(fcurrent);
-		if(column>=0 && column<row.size()) // proper index?
-			return row.get_string(column);
+		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
+	return StringPtr(0); // it's OK we don't have row|column, just return nothing
 }
 
-bool Table::locate(int column, const String& value) {
+bool Table::locate(int column, StringPtr value) {
 	int scurrent=fcurrent;
-	for(fcurrent=0; fcurrent<size(); fcurrent++) {
-		const String *item_value=item(column);
-		if(item_value && *item_value==value)
+	for(fcurrent=0; fcurrent<count(); fcurrent++) {
+		StringPtr item_value=item(column);
+		if(item_value.get() == value.get())
 			return true;
 	}
 
@@ -86,11 +73,11 @@ bool Table::locate(int column, const Str
 	return false;
 }
 
-bool Table::locate(const String& column, const String& value) {
+bool Table::locate(StringPtr column, StringPtr value) {
 	return locate(column_name2index(column, true), value);
 }
 
 void Table::offset(bool absolute, int offset) {
-	if(size())
-		fcurrent=((absolute?0:fcurrent)+offset+size())%size();
+	if(count())
+		fcurrent=((absolute?0:fcurrent)+offset+count())%count();
 }