--- parser3/src/classes/table.C	2015/07/28 21:23:38	1.307
+++ parser3/src/classes/table.C	2016/03/31 21:46:20	1.313
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 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.307 2015/07/28 21:23:38 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.313 2016/03/31 21:46:20 moko Exp $";
 
 // class
 
@@ -35,7 +35,7 @@ public:
 
 // global variable
 
-DECLARE_CLASS_VAR(table, new MTable, 0);
+DECLARE_CLASS_VAR(table, new MTable);
 
 #define TABLE_REVERSE_NAME "reverse"
 
@@ -656,7 +656,7 @@ static void _count(Request& r, MethodPar
 	if(params.count()) {
 		const String& param=params.as_string(0, PARAMETER_MUST_BE_STRING);
 		if(param == "columns")
-			result = table.columns() ? table.columns()->count() : 0;
+			result = table.columns() ? table.columns()->count() : table.max_cells();
 		else if(param == "cells")
 			result = table.count() ? table[table.current()]->count() : 0;
 		else if(param == "rows") // synonim for ^table.count[]
@@ -804,7 +804,9 @@ static void table_row_to_hash(Table::ele
 				table=new Table(*info->table, table_options/*no rows, just structure*/);
 				info->hash->put(*key, new VTable(table));
 			}
-			*table+=row;
+			Table::element_type row_copy(new ArrayString(row->count()));
+			row_copy->append(*row);
+			*table+=row_copy;
 			break;
 		}
 	}
@@ -1060,7 +1062,7 @@ static void _flip(Request& r, MethodPara
 	Table& old_table=GET_SELF(r, VTable).table();
 	Table& new_table=*new Table(0);
 	if(size_t old_count=old_table.count())
-		if(size_t old_cols=old_table.columns()?old_table.columns()->count():old_table[0]->count()) 
+		if(size_t old_cols=old_table.columns()?old_table.columns()->count():old_table.max_cells())
 			for(size_t column=0; column<old_cols; column++) {
 				Table::element_type new_row(new ArrayString(old_count));
 				for(size_t i=0; i<old_count; i++) {
@@ -1137,32 +1139,54 @@ static void _foreach(Request& r, MethodP
 	table.set_current(saved_current);
 }
 
-static void _append(Request& r, MethodParams& params) {
+static void update_cell(HashStringValue::key_type aname, HashStringValue::value_type avalue, VTable *dest) {
+	dest->put_element(String(aname, String::L_CLEAN), avalue); // new not required
+}
+
+inline Table::element_type row_from_string(Request& r, Value &param){
+	if(!param.is_string() && !param.get_junction())
+		throw Exception(PARSER_RUNTIME, 0, "row must be string, code or hash");
+
 	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
-	const String& string=r.process_to_string(params[0]);
+	const String& string=r.process_to_string(param);
 
 	// parse cells
 	Table::element_type row=new ArrayString;
 	size_t pos_after=0;
 	string.split(*row, pos_after, "\t", String::L_AS_IS);
 
-	GET_SELF(r, VTable).table()+=row;
+	return row;
 }
 
-static void _insert(Request& r, MethodParams& params) {
-	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
-	const String& string=r.process_to_string(params[0]);
+static void _append(Request& r, MethodParams& params) {
+	VTable vtable=GET_SELF(r, VTable);
+	Table& table=vtable.table();
 
-	// parse cells
-	Table::element_type row=new ArrayString;
-	size_t pos_after=0;
-	string.split(*row, pos_after, "\t", String::L_AS_IS);
+	HashStringValue* hash=params[0].get_hash();
+	if(hash){
+		table+=new ArrayString();
+		size_t saved_current=table.current();
+		table.set_current(table.count()-1);
+		hash->for_each<VTable*>(update_cell, &vtable);
+		table.set_current(saved_current);
+	} else {
+		table+=row_from_string(r, params[0]);
+	}
+}
 
-	Table& table=GET_SELF(r, VTable).table();
-	table.insert(table.current(), row);
+static void _insert(Request& r, MethodParams& params) {
+	VTable vtable=GET_SELF(r, VTable);
+	Table& table=vtable.table();
+	HashStringValue* hash=params[0].get_hash();
+	if(hash){
+		table.insert(table.current(), new ArrayString());
+		hash->for_each<VTable*>(update_cell, &vtable);
+	} else {
+		table.insert(table.current(), row_from_string(r, params[0]));
+	}
 }
 
-static void _delete(Request& r, MethodParams& params) {
+static void _delete(Request& r, MethodParams&) {
 	Table& table=GET_SELF(r, VTable).table();
 	table.remove_current();
 }