--- parser3/src/classes/table.C	2016/12/26 20:04:05	1.339
+++ parser3/src/classes/table.C	2017/11/15 22:48:57	1.344
@@ -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.339 2016/12/26 20:04:05 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.344 2017/11/15 22:48:57 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];
@@ -1017,7 +1016,7 @@ static void _hash(Request& r, MethodPara
 }
 
 #ifndef DOXYGEN
-struct Table_seq_item {
+struct Table_seq_item : public PA_Allocated {
 	ArrayString* row;
 	union {
 		const char *c_str;
@@ -1049,7 +1048,7 @@ static void _sort(Request& r, MethodPara
 	Table& old_table=GET_SELF(r, VTable).table();
 	Table& new_table=*new Table(old_table.columns());
 
-	Table_seq_item* seq=new(PointerFreeGC) Table_seq_item[old_table.count()];
+	Table_seq_item* seq=new Table_seq_item[old_table.count()];
 	int i;
 
 	// calculate key values
@@ -1172,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
@@ -1184,7 +1183,7 @@ static void _foreach(Request& r, MethodP
 
 			r.write(sv_processed);
 
-			if(lskip==Request::SKIP_BREAK)
+			if(skip.check_break())
 				break;
 		}
 	} else {
@@ -1197,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;
 		}
 	}
@@ -1301,7 +1299,7 @@ public:
 			columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
+			error=SQL_Error("exception occurred in Table_sql_event_handlers::add_column");
 			return true;
 		}
 	}
@@ -1311,7 +1309,7 @@ public:
 			columns_count=columns.count();
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
+			error=SQL_Error("exception occurred in Table_sql_event_handlers::before_rows");
 			return true;
 		}
 	}
@@ -1320,7 +1318,7 @@ public:
 			*table+=row=new ArrayString(columns_count);
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");
+			error=SQL_Error("exception occurred in Table_sql_event_handlers::add_row");
 			return true;
 		}
 	}
@@ -1329,7 +1327,7 @@ public:
 			*row+=str?new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):&String::Empty;
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
+			error=SQL_Error("exception occurred in Table_sql_event_handlers::add_row_cell");
 			return true;
 		}
 	}
@@ -1353,7 +1351,7 @@ static void marshal_bind(
 // not static, used elsewhere
 int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders) {
 	int hash_count=hash.count();
-	placeholders=new SQL_Driver::Placeholder[hash_count];
+	placeholders=new(PointerGC) SQL_Driver::Placeholder[hash_count];
 	SQL_Driver::Placeholder* ptr=placeholders;
 	hash.for_each<SQL_Driver::Placeholder**>(marshal_bind, &ptr);
 	return hash_count;