--- parser3/src/classes/table.C	2001/03/12 13:40:01	1.1
+++ parser3/src/classes/table.C	2001/03/12 20:36:52	1.6
@@ -3,12 +3,14 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.1 2001/03/12 13:40:01 paf Exp $
+	$Id: table.C,v 1.6 2001/03/12 20:36:52 paf Exp $
 */
 
 #include "pa_request.h"
 #include "_table.h"
 #include "pa_vtable.h"
+#include "pa_common.h"
+#include "pa_vint.h"
 
 // global var
 
@@ -19,23 +21,29 @@ VClass *table_class;
 
 // TODO: проверить ^set в ^menu & co
 
-static void _set(Request& r, const String& method_name, Array *params) {
+static void set_or_load(
+						Request& r, 
+						const String& method_name, Array *params, 
+						bool is_load) {
 	Pool& pool=r.pool();
 	// data is last parameter
 	Value *vdata=static_cast<Value *>(params->get(params->size()-1));
-	if(vdata->get_junction())
-		R_THROW(0, 0,
-			&method_name,
-			"body must not be a junction");
-
-	// data string
-	char *data=vdata->as_string().cstr();
+	// forcing
+	//	[this param type] 
+	//	[this param type] 
+	r.fail_if_junction_(true, *vdata, 
+		method_name, "body must not be a junction");
+
+	// data or file_name
+	char *data_or_filename=vdata->as_string().cstr();
+	// data
+	char *data=is_load?file_read(pool, r.absolute(data_or_filename)):data_or_filename;
 
 	// parse columns
 	Array *columns;
 #ifndef NO_STRING_ORIGIN
 	const Origin& origin=method_name.origin();
-	const char *file=0;//origin.file;
+	const char *file=origin.file;
 	uint line=origin.line;
 #endif
 	if(params->size()==2) {
@@ -69,7 +77,55 @@ static void _set(Request& r, const Strin
 	r.self->as_vtable().set_table(table);
 }
 
+
+static void _set(Request& r, const String& method_name, Array *params) {
+	set_or_load(r, method_name, params, false);
+}
+
+static void _load(Request& r, const String& method_name, Array *params) {
+	set_or_load(r, method_name, params, true);
+}
+
+static void _count(Request& r, const String&, Array *) {
+	Pool& pool=r.pool();
+	Value& value=*new(pool) VInt(pool, r.self->as_vtable().table().size());
+	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+}
+
+static void _line(Request& r, const String&, Array *) {
+	Pool& pool=r.pool();
+	Value& value=*new(pool) VInt(pool, 1+r.self->as_vtable().table().get_current());
+	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+}
+
+static void _offset(Request& r, const String&, Array *params) {
+	Pool& pool=r.pool();
+	Table& table=r.self->as_vtable().table();
+	if(params->size()) {
+		if(int size=table.size()) {
+			int offset=static_cast<int>(
+				r.process(*static_cast<Value *>(params->get(0))).get_double());
+			table.set_current((table.get_current()+offset+size)%size);
+		}
+	} else {
+		Value& value=*new(pool) VInt(pool, table.get_current());
+		r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+	}
+}
+
 void initialize_table_class(Pool& pool, VClass& vclass) {
-	// ^table.create[data]  ^table.create[nameless;data]
+	// ^table.set[data]  ^table.set[nameless;data]
 	vclass.add_native_method("set", _set, 1, 2);
+
+	// ^table.load[file]  ^table.load[nameless;file]
+	vclass.add_native_method("load", _load, 1, 2);
+
+	// ^table.count[]
+	vclass.add_native_method("count", _count, 0, 0);
+
+	// ^table.line[]
+	vclass.add_native_method("line", _line, 0, 0);
+
+	// ^table.offset[]  ^table.offset[offset]
+	vclass.add_native_method("offset", _offset, 0, 1);
 }