--- parser3/src/classes/table.C	2001/03/12 20:55:14	1.7
+++ parser3/src/classes/table.C	2001/03/13 11:15:03	1.11
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.7 2001/03/12 20:55:14 paf Exp $
+	$Id: table.C,v 1.11 2001/03/13 11:15:03 paf Exp $
 */
 
 #include "pa_request.h"
@@ -103,8 +103,8 @@ 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 {
@@ -126,7 +126,13 @@ static void _menu(Request& r, const Stri
 	for(int i=0; i<table.size(); i++) {
 		table.set_current(i);
 
-		Value& processed_body=r.process(body_code);
+		RTRY 
+			Value& processed_body=r.process(body_code);
+		RCATCH(e)
+			if(e.type()==ET_SILENT && e.code()==EC_BREAK)
+				e.set_handled();
+		RFINALLY
+		REND_TRY
 		if(delim_code) { // delimiter set?
 			const String *string=processed_body.get_string();
 			if(need_delim && string && string->size()) // need delim & iteration produced string?
@@ -137,11 +143,24 @@ static void _menu(Request& r, const Stri
 	}
 }
 
+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);
+	}
+}
+
 void initialize_table_class(Pool& pool, VClass& vclass) {
-	// ^table.set[data]  ^table.set[nameless;data]
+	// ^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[]
@@ -150,9 +169,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]
+	// ^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);
+
 }