--- parser3/src/classes/table.C	2001/03/12 20:36:52	1.6
+++ parser3/src/classes/table.C	2001/03/19 16:06:13	1.16
@@ -3,24 +3,21 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.6 2001/03/12 20:36:52 paf Exp $
+	$Id: table.C,v 1.16 2001/03/19 16:06:13 paf Exp $
 */
 
+#include "pa_common.h"
 #include "pa_request.h"
 #include "_table.h"
 #include "pa_vtable.h"
-#include "pa_common.h"
 #include "pa_vint.h"
 
 // global var
 
-VClass *table_class;
+VStateless_class *table_class;
 
 // methods
 
-
-// TODO: проверить ^set в ^menu & co
-
 static void set_or_load(
 						Request& r, 
 						const String& method_name, Array *params, 
@@ -89,13 +86,13 @@ static void _load(Request& r, const Stri
 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*/);
+	r.write_no_lang(value);
 }
 
 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*/);
+	r.write_no_lang(value);
 }
 
 static void _offset(Request& r, const String&, Array *params) {
@@ -103,21 +100,60 @@ static void _offset(Request& r, const St
 	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());
+			int offset=
+				(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*/);
+		r.write_no_lang(value);
 	}
 }
 
-void initialize_table_class(Pool& pool, VClass& vclass) {
-	// ^table.set[data]  ^table.set[nameless;data]
+static void _menu(Request& r, const String& method_name, Array *params) {
+	Value& body_code=*static_cast<Value *>(params->get(0));
+	// forcing ^menu{this param type}
+	r.fail_if_junction_(false, body_code, 
+		method_name, "body must be junction");
+	
+	Value *delim_code=params->size()==2?static_cast<Value *>(params->get(1)):0;
+
+	Table& table=r.self->as_vtable().table();
+	bool need_delim=false;
+	for(int i=0; i<table.size(); i++) {
+		table.set_current(i);
+
+		Value& processed_body=r.process(body_code);
+		if(delim_code) { // delimiter set?
+			const String *string=processed_body.get_string();
+			if(need_delim && string && string->size()) // need delim & iteration produced string?
+				r.write_pass_lang(r.process(*delim_code));
+			need_delim=true;
+		}
+		r.write_pass_lang(processed_body);
+	}
+}
+
+static void _empty(Request& r, const String&, Array *params) {
+	Table& table=r.self->as_vtable().table();
+	if(table.size()==0) {
+		Value& value=r.process(*static_cast<Value *>(params->get(0)));
+		r.write_pass_lang(value);
+	} else if(params->size()==2) {
+		Value& value=r.process(*static_cast<Value *>(params->get(1)));
+		r.write_pass_lang(value);
+	}
+}
+
+// initialize
+
+void initialize_table_class(Pool& pool, VStateless_class& vclass) {
+	// ^table.set[data]  
+	// ^table.set[nameless;data]
 	vclass.add_native_method("set", _set, 1, 2);
 
-	// ^table.load[file]  ^table.load[nameless;file]
+	// ^table.load[file]  
+	// ^table.load[nameless;file]
 	vclass.add_native_method("load", _load, 1, 2);
 
 	// ^table.count[]
@@ -126,6 +162,16 @@ void initialize_table_class(Pool& pool,
 	// ^table.line[]
 	vclass.add_native_method("line", _line, 0, 0);
 
-	// ^table.offset[]  ^table.offset[offset]
+	// ^table.offset[]  
+	// ^table.offset[offset]
 	vclass.add_native_method("offset", _offset, 0, 1);
+
+	// ^table.menu{code}  
+	// ^table.menu{code}[delim]
+	vclass.add_native_method("menu", _menu, 1, 2);
+
+	// ^table.empty{code-when-empty}  
+	// ^table.empty{code-when-empty}{code-when-not}
+	vclass.add_native_method("empty", _empty, 1, 2);
+
 }