--- parser3/src/classes/table.C	2016/11/01 23:10:41	1.338
+++ parser3/src/classes/table.C	2017/02/07 22:00:30	1.342
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -22,7 +22,7 @@
 #define USE_STRINGSTREAM
 #endif
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.338 2016/11/01 23:10:41 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.342 2017/02/07 22:00:30 moko Exp $";
 
 // class
 
@@ -781,7 +781,7 @@ static void _menu(Request& r, MethodPara
 			table.set_current(row);
 
 			Value& sv_processed=r.process(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+			TempSkip4Delimiter skip(r);
 
 			const String* s_processed=sv_processed.get_string();
 			if(s_processed && !s_processed->is_empty()) { // we have body
@@ -793,7 +793,7 @@ static void _menu(Request& r, MethodPara
 
 			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -801,9 +801,8 @@ static void _menu(Request& r, MethodPara
 			table.set_current(row);
  
 			r.process_write(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
  
-			if(lskip==Request::SKIP_BREAK)
+			if(r.check_skip_break())
 				break;
 		}
 	}
@@ -986,8 +985,8 @@ static void _hash(Request& r, MethodPara
 					throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code");
 			}
 
-			if(value_type==C_STRING && value_fields.count()!=1)
-				throw Exception(PARSER_RUNTIME, 0, "you can specify only one value field with option $.type[string]");
+			if(value_type==C_STRING && value_fields.count()>1)
+				throw Exception(PARSER_RUNTIME, 0, "you can't specify more then one value field with option $.type[string]");
 
 			{
 				Value* key_param=&params[0];
@@ -1044,9 +1043,7 @@ static int sort_cmp_double(const void *a
 static void _sort(Request& r, MethodParams& params) {
 	Value& key_maker=params.as_junction(0, "key-maker must be code");
 
-	bool reverse=params.count()>1/*..[desc|asc|]*/?
-		reverse=params.as_no_junction(1, "order must not be code").as_string()=="desc":
-		false; // default=asc
+	bool reverse=params.count()>1 /*..[desc|asc|]*/ && params.as_no_junction(1, "order must not be code").as_string()=="desc"; // default=asc
 
 	Table& old_table=GET_SELF(r, VTable).table();
 	Table& new_table=*new Table(old_table.columns());
@@ -1174,7 +1171,7 @@ static void _foreach(Request& r, MethodP
 				r.put_element(*var_context, *value_var_name, new VTable(&table));
 
 			Value& sv_processed=r.process(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+			TempSkip4Delimiter skip(r);
 
 			const String* s_processed=sv_processed.get_string();
 			if(s_processed && !s_processed->is_empty()) { // we have body
@@ -1186,7 +1183,7 @@ static void _foreach(Request& r, MethodP
 
 			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -1199,9 +1196,8 @@ static void _foreach(Request& r, MethodP
 				r.put_element(*var_context, *value_var_name, new VTable(&table));
 
 			r.process_write(body_code);
-			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
  
-			if(lskip==Request::SKIP_BREAK)
+			if(r.check_skip_break())
 				break;
 		}
 	}