--- parser3/src/classes/table.C	2006/04/09 12:25:03	1.220.4.1
+++ parser3/src/classes/table.C	2006/04/09 13:38:47	1.221
@@ -4,7 +4,8 @@
 	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char * const IDENT_TABLE_C="$Date: 2006/04/09 12:25:03 $";
+
+static const char * const IDENT_TABLE_C="$Date: 2006/04/09 13:38:47 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -33,6 +34,10 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(table, new MTable, 0);
 
+// externs
+
+extern String cycle_data_name;
+
 // defines for globals
 
 #define SQL_BIND_NAME "bind"
@@ -490,6 +495,9 @@ static void _offset(Request& r, MethodPa
 }
 
 static void _menu(Request& r, MethodParams& params) {
+	Temp_hash_value<const String::Body, void*> 
+		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+
 	Value& body_code=params.as_junction(0, "body must be code");
 	
 	Value* delim_maybe_code=params.count()>1?&params[1]:0;
@@ -502,6 +510,7 @@ static void _menu(Request& r, MethodPara
 		table.set_current(row);
 
 		StringOrValue sv_processed=r.process(body_code);
+		Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
 		const String* s_processed=sv_processed.get_string();
 		if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
 			if(need_delim) // need delim & iteration produced string?
@@ -509,6 +518,9 @@ static void _menu(Request& r, MethodPara
 			need_delim=true;
 		}
 		r.write_pass_lang(sv_processed);
+
+		if(lskip==Request::SKIP_BREAK)
+			break;
 	}
 	table.set_current(saved_current);
 }