--- parser3/src/include/pa_table.h	2001/01/29 15:56:03	1.1
+++ parser3/src/include/pa_table.h	2001/01/30 13:43:43	1.7
@@ -1,31 +1,63 @@
 /*
-  $Id: pa_table.h,v 1.1 2001/01/29 15:56:03 paf Exp $
+  $Id: pa_table.h,v 1.7 2001/01/30 13:43:43 paf Exp $
 */
 
+/*
+	hence most of tables are "named", no need to uptimize unnamed onces
+*/
+
+
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
 #include "pa_types.h"
 #include "pa_array.h"
 #include "pa_hash.h"
+#include "pa_string.h"
+#include "pa_request.h"
 
 class Table : public Array {
 public:
 
-	// the base origin of table data
-	Origin origin;
+	Table(Request& arequest,
+		char *afile, uint aline,
+		Array *acolumns,
+		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
+
+	// the base origin of table's data
+	//const Origin& origin() { return forigin; }
+
+	const Array *columns() { return fcolumns; }
+
+	void set_current(int acurrent) { fcurrent=acurrent; }
+	int get_current() { return fcurrent; }
+	void inc_current() { fcurrent++; }
 
-	// columns order
-	Array *columns_order;
+	void read_item(String& result, const String& column_name) {
+		result.APPEND(item(column_name), forigin.file, forigin.line+fcurrent);
+	}
+
+protected:
+
+	// the request I'm processed on. for error reporting
+	Request& request;
+
+	// the base origin of table's data
+	Origin forigin;
 
 	// column name->number lookup table
-	// hence most of tables are "named", no need to uptimize unnamed onces
 	Hash name2number;
 
-	Table(Pool *apool, 
-		char *afile, uint aline, 
-		Array *acolumns, 
-		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
+	// current row
+	int fcurrent;
+
+	// columns
+	Array *fcolumns;
+
+	const Array& at(int index);
+
+	const char *item(int column_index);
+	const char *item(const String& column_name);
 };
 
 #endif