--- parser3/src/classes/table.C	2007/08/20 10:07:36	1.232
+++ parser3/src/classes/table.C	2008/05/27 19:01:46	1.243
@@ -5,10 +5,12 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2007/08/20 10:07:36 $";
+static const char * const IDENT_TABLE_C="$Date: 2008/05/27 19:01:46 $";
 
+#ifndef NO_STRINGSTREAM
 #include <sstream>
 using namespace std;
+#endif
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -41,15 +43,8 @@ DECLARE_CLASS_VAR(table, new MTable, 0);
 
 extern String cycle_data_name;
 
-// defines for globals
-
-#define SQL_BIND_NAME "bind"
-#define SQL_DEFAULT_NAME "default"
-#define SQL_DISTINCT_NAME "distinct"
-#define SQL_VALUE_TYPE_NAME "type"
 #define TABLE_REVERSE_NAME "reverse"
 
-
 // globals
 
 String sql_bind_name(SQL_BIND_NAME);
@@ -130,6 +125,38 @@ static void check_option_param(bool opti
 			"%s", msg);
 }
 
+struct TableSeparators {
+	char column;  const String* scolumn;
+	char encloser; const String* sencloser;
+
+	TableSeparators():
+		column('\t'), scolumn(new String("\t", false)),
+		encloser(0), sencloser(0)
+	{}
+	int load( HashStringValue& options ) {
+		int result=0;
+		if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
+			scolumn=&vseparator->as_string();
+			if(scolumn->length()!=1)
+				throw Exception(PARSER_RUNTIME,
+					scolumn,
+					"separator must be one character long");
+			column=scolumn->first_char();
+			result++;
+		}
+		if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
+			sencloser=&vencloser->as_string();
+			if(sencloser->length()!=1)
+				throw Exception(PARSER_RUNTIME,
+					sencloser,
+					"encloser must be one character long");
+			encloser=sencloser->first_char();
+			result++;
+		}
+		return result;
+	}
+};
+
 static void _create(Request& r, MethodParams& params) {
 	// clone/copy part?
 	if(Table *source=params[0].get_table()) {
@@ -140,20 +167,49 @@ static void _create(Request& r, MethodPa
 		return;
 	}
 
-	// data is last parameter
+	size_t data_param_index=0;
+	bool nameless=false;
+
+	if(params.count()>1) {
+		if(params[0].is_string()){ // can be nameless only
+			const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction");
+			if(snameless!="nameless")
+				throw Exception(PARSER_RUNTIME,
+					&snameless,
+					"table::create called with more then 1 param, first param may be only 'nameless'");
+			nameless=true;
+			data_param_index++;
+		}
+	}
+
+	HashStringValue *options=0;
+	TableSeparators separators;
+
+	size_t options_param_index=data_param_index+1;
+	if(
+		options_param_index<params.count()
+		&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())
+	) {
+		// cloning, so that we could change
+		options=new HashStringValue(*options);
+		separators.load(*options);
+		if(separators.encloser){
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"encloser not supported for table::create yet");
+		}
+	}
+
+	// data
 	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
 	const String&  data=
-		r.process_to_string(params.as_junction(params.count()-1, "body must be code"));
+		r.process_to_string(params.as_junction(data_param_index, "body must be code"));
 
 	// parse columns
 	size_t raw_pos_after=0;
 	Table::columns_type columns;
-	if(params.count()==2) {
-		const String& snameless=params.as_string(0, "called with two params, first param may only be string 'nameless'");
-		if(snameless!="nameless")
-			throw Exception(PARSER_RUNTIME,
-				&snameless,
-				"table::create called with two params, first param may only be 'nameless'");
+
+	if(nameless){
 		columns=Table::columns_type(0); // nameless
 	} else {
 		columns=Table::columns_type(new ArrayString);
@@ -162,7 +218,7 @@ static void _create(Request& r, MethodPa
 		data.split(head, raw_pos_after, "\n", String::L_AS_IS, 1);
 		if(head.count()) {
 			size_t col_pos_after=0;
-			head[0]->split(*columns, col_pos_after, "\t", String::L_AS_IS);
+			head[0]->split(*columns, col_pos_after, *separators.scolumn, String::L_AS_IS);
 		}
 	}
 
@@ -180,7 +236,7 @@ static void _create(Request& r, MethodPa
 			continue;
 
 		size_t col_pos_after=0;
-		string.split(*row, col_pos_after, "\t", String::L_AS_IS);
+		string.split(*row, col_pos_after, *separators.scolumn, String::L_AS_IS);
 		table+=row;
 	}
 
@@ -270,38 +326,6 @@ static void skip_empty_and_comment_lines
 	}
 }
 
-struct TableSeparators {
-	char column;  const String* scolumn;
-	char encloser; const String* sencloser;
-
-	TableSeparators():
-		column('\t'), scolumn(new String("\t", false)),
-		encloser(0), sencloser(0)
-	{}
-	int load( HashStringValue& options ) {
-		int result=0;
-		if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
-			scolumn=&vseparator->as_string();
-			if(scolumn->length()!=1)
-				throw Exception(PARSER_RUNTIME,
-					scolumn,
-					"separator must be one character long");
-			column=scolumn->first_char();
-			result++;
-		}
-		if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
-			sencloser=&vencloser->as_string();
-			if(sencloser->length()!=1)
-				throw Exception(PARSER_RUNTIME,
-					sencloser,
-					"encloser must be one character long");
-			encloser=sencloser->first_char();
-			result++;
-		}
-		return result;
-	}
-};
-
 static void _load(Request& r, MethodParams& params) {
 	const String&  first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING);
 	int filename_param_index=0;
@@ -365,6 +389,8 @@ static void _load(Request& r, MethodPara
 	GET_SELF(r, VTable).set_table(table);
 }
 
+#ifdef NO_STRINGSTREAM
+
 void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
 	if(encloser) {
 		to<<*sencloser;
@@ -385,6 +411,8 @@ void maybe_enclose( String& to, const St
 		to<<from;
 }
 
+#else
+
 void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
 	if(encloser) {
 		to<<encloser;
@@ -405,9 +433,10 @@ void maybe_enclose( ostringstream& to, c
 		to<<from.cstr();
 }
 
+#endif
 
-static void _save_old(Request& r, MethodParams& params) {
-	const String& first_arg=params.as_string(0, "first argument must not be code");
+static void _save(Request& r, MethodParams& params) {
+	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
 	size_t param_index=1;
 
 	bool do_append=false;
@@ -447,6 +476,8 @@ static void _save_old(Request& r, Method
 
 	Table& table=GET_SELF(r, VTable).table();
 
+#ifdef NO_STRINGSTREAM
+
 	String sdata;
 	if(output_column_names) {
 		if(table.columns()) { // named table
@@ -489,48 +520,8 @@ static void _save_old(Request& r, Method
 		if(*data_cstr) // not empty (when empty it's not heap memory)
 			pa_free((void*)data_cstr); // not needed anymore
 	}
-}
-
-static void _save(Request& r, MethodParams& params) {
-	const String& first_arg=params.as_string(0, "first argument must not be code");
-	size_t param_index=1;
-
-	bool do_append=false;
-	bool output_column_names=true;
-
-	// mode?
-	if(first_arg=="append")
-		do_append=true;
-	else if(first_arg=="nameless")
-		output_column_names=false;
-	else
-		--param_index;
-
-	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
-
-	TableSeparators separators;
-	if(param_index<params.count()) {
-		Value& voptions=params.as_no_junction(param_index++, "additional params must be hash");
-		if( voptions.is_defined() && !voptions.is_string() ) {
-			if(HashStringValue* options=voptions.get_hash()) {
-				int valid_options=separators.load(*options);
-				if(valid_options!=options->count())
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"invalid option passed");
-			} else {
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"additional params must be hash (did you spell mode parameter correctly?)");
-			}
-		}
-	}
-	if(param_index<params.count())
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"bad mode (must be nameless or append)");
 
-	Table& table=GET_SELF(r, VTable).table();
+#else
 
 	ostringstream ost(stringstream::out);
 
@@ -549,7 +540,7 @@ static void _save(Request& r, MethodPara
 					if(separators.encloser) {
 						ost<<separators.encloser<<column<<separators.encloser;
 					} else {
-					ost<<column;
+						ost<<column;
 					}
 					if(column<lsize-1){
 						ost<<separators.column;
@@ -579,6 +570,8 @@ static void _save(Request& r, MethodPara
 
 		file_write(r.absolute(file_name), data_cstr, data.length(), true /* as text */, do_append);
 	}
+
+#endif
 }
 
 static void _count(Request& r, MethodParams&) {
@@ -630,12 +623,15 @@ static void _menu(Request& r, MethodPara
 
 		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?
 				r.write_pass_lang(r.process(*delim_maybe_code));
-			need_delim=true;
+			else
+				need_delim=true;
 		}
+
 		r.write_pass_lang(sv_processed);
 
 		if(lskip==Request::SKIP_BREAK)
@@ -645,8 +641,6 @@ static void _menu(Request& r, MethodPara
 }
 
 #ifndef DOXYGEN
-enum Table2hash_distint { D_ILLEGAL, D_FIRST };
-enum Table2hash_value_type { C_HASH, C_STRING, C_TABLE };
 struct Row_info {
 	Request *r;
 	Table *table;
@@ -672,15 +666,13 @@ static void table_row_to_hash(Table::ele
 	if(!key)
 		return; // ignore rows without key [too-short-record_array if-indexed]
 		
-	bool exist = false;
-	switch (info->value_type) {
-	case C_STRING:
-		{
+	bool exist=false;
+	switch(info->value_type) {
+		case C_STRING: {
 			exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0))));
+			break;
 		}
-		break;
-	case C_HASH:
-		{
+		case C_HASH: {
 			VHash* vhash=new VHash;
 			HashStringValue& hash=vhash->hash();
 			for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {
@@ -692,18 +684,16 @@ static void table_row_to_hash(Table::ele
 			}
 
 			exist=info->hash->put_dont_replace(*key, vhash);
+			break;
 		}
-		break;
-	case C_TABLE:
-		{
-			VTable* vtable=(VTable*)info->hash->get(*key); // put. table existed?
-			if( info->distinct==D_ILLEGAL ){
-				exist=true;
-				break;
-			}
-
+		case C_TABLE: {
+			VTable* vtable=(VTable*)info->hash->get(*key); // table exist?
 			Table* table;
 			if(vtable) {
+				if(info->distinct==D_ILLEGAL) {
+					exist=true;
+					break;
+				}
 				table=vtable->get_table();
 			} else {
 				// no? creating table of same structure as source
@@ -712,29 +702,49 @@ static void table_row_to_hash(Table::ele
 				info->hash->put(*key, new VTable(table));
 			}
 			*table+=row;
+			break;
 		}
-		break;
 	}
 	if(exist && info->distinct==D_ILLEGAL)
 		throw Exception(PARSER_RUNTIME,
 			key,
 			"duplicate key");
 }
+
+Table2hash_value_type get_value_type(Value& vvalue_type){
+	if(vvalue_type.is_string()) {
+		const String& svalue_type=*vvalue_type.get_string();
+		if(svalue_type == "table"){
+			return C_TABLE;
+		} else if (svalue_type == "string") {
+			return C_STRING;
+		} else if (svalue_type == "hash") {
+			return C_HASH;
+		} else {
+			throw Exception(PARSER_RUNTIME,
+				&svalue_type,
+				"must be 'hash', 'table' or 'string'");
+		}
+	} else {
+		throw Exception(PARSER_RUNTIME,
+			0,
+			"'type' must be hash");
+	}
+}
+
 static void _hash(Request& r, MethodParams& params) {
 	Table& self_table=GET_SELF(r, VTable).table();
 	VHash& result=*new VHash;
-	if(Table::columns_type columns=self_table.columns())
+	if(Table::columns_type columns=self_table.columns()){
 		if(columns->count()>0) {
 			Table2hash_distint distinct=D_ILLEGAL;
 			Table2hash_value_type value_type=C_HASH;
 			int param_index=params.count()-1;
 			if(param_index>0) {
-				if(HashStringValue* options=
-					params.as_no_junction(param_index, "param must not be code").get_hash()
-				){
+				if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // options where specified
 					--param_index;
 					int valid_options=0;
-					if(Value* vdistinct_code=options->get(sql_distinct_name)) {
+					if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
 						valid_options++;
 						Value& vdistinct_value=r.process_to_value(*vdistinct_code);
 						if(vdistinct_value.is_string()) {
@@ -742,37 +752,24 @@ static void _hash(Request& r, MethodPara
 							if(sdistinct=="tables") {
 								value_type=C_TABLE;
 								distinct=D_FIRST;
-							} else
+							} else {
 								throw Exception(PARSER_RUNTIME,
 									&sdistinct,
 									"must be 'tables' or true/false");
-						} else
+							}
+						} else {
 							distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;
+						}
 					}
-					if(Value* vvalue_type_code=options->get(sql_value_type_name)) {
-						if(value_type==C_TABLE){ // $.distinct[tables] was specified
+					if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ?
+						if(value_type==C_TABLE) // $.distinct[tables] already was specified
 							throw Exception(PARSER_RUNTIME,
 								0,
-								"you can't specify $.distinct[tables] and $.values[] together.");
-						} else {
-							valid_options++;
-							Value& vvalue_type_value=r.process_to_value(*vvalue_type_code);
-							if(vvalue_type_value.is_string()) {
-								const String& svalue_type=*vvalue_type_value.get_string();
-								if(svalue_type == "table"){
-									value_type=C_TABLE;
-								} else if (svalue_type == "string") {
-									value_type=C_STRING;
-								} else if (svalue_type == "hash") {
-									value_type=C_HASH;
-								} else {
-									throw Exception(PARSER_RUNTIME,
-										&svalue_type,
-										"must be 'hash', 'table' or 'string'");
-								}
-							}
-						}
-					} 
+								"you can't specify $.distinct[tables] and $.type[] together");
+
+						valid_options++;
+						value_type=get_value_type(r.process_to_value(*vvalue_type_code));
+					}
 
 					if(valid_options!=options->count())
 						throw Exception(PARSER_RUNTIME,
@@ -780,48 +777,46 @@ static void _hash(Request& r, MethodPara
 							"called with invalid option");
 				}
 			}
-			if(param_index==2) // bad options param type
+
+			if(param_index==2) // options was specified but not as hash
 				throw Exception(PARSER_RUNTIME,
 					0,
 					"options must be hash");
 
 			Array<int> value_fields;
-			if(param_index>0) {
+			if(param_index==0){ // list of columns wasn't specified
+				if(value_type==C_STRING) // $.type[string]
+					throw Exception(PARSER_RUNTIME,
+						0,
+						"you must specify one value field with option $.type[string]");
+				
+				for(size_t i=0; i<columns->count(); i++) // by all columns, including key
+					value_fields+=i;
+
+			} else { // list of columns was specified
 				if(value_type==C_TABLE)
 					throw Exception(PARSER_RUNTIME,
 						0,
-						"in distinct[tables] mode you may not specify value field(s)");
+						"you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");
+
 				Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code");
-				if(value_fields_param.is_string()) {
-					value_fields+=self_table.column_name2index(
-						*value_fields_param.get_string(), true);
-				} else if(Table* value_fields_table=value_fields_param.get_table()) {
-					for(Array_iterator<Table::element_type> i(*value_fields_table); 
-						i.has_next(); ) {
-						const String& value_field_name
-							=*i.next()->get(0);
-						value_fields
-							+=self_table.column_name2index(value_field_name, true);
+				if(value_fields_param.is_string()) { // one column as string was specified
+					value_fields+=self_table.column_name2index(*value_fields_param.get_string(), true);
+				} else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table
+					for(Array_iterator<Table::element_type> i(*value_fields_table); i.has_next(); ) {
+						const String& value_field_name =*i.next()->get(0);
+						value_fields +=self_table.column_name2index(value_field_name, true);
 					}
 				} else
 					throw Exception(PARSER_RUNTIME,
 						0,
 						"value field(s) must be string or table");
-
-			} else { // by all columns, including key
-				if(value_type==C_STRING)
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"with $.values[string] you must specify one value field(s)");
-				// if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
-					for(size_t i=0; i<columns->count(); i++)
-						value_fields+=i;
 			}
 
 			if(value_type==C_STRING && value_fields.count()!=1)
 				throw Exception(PARSER_RUNTIME,
 					0,
-					"you can specify one value field with this $.type[].");
+					"you can specify only one value field with option $.type[string]");
 
 			{
 				Value* key_param=&params[0];
@@ -846,6 +841,7 @@ static void _hash(Request& r, MethodPara
 				result.extract_default();
 			}
 		}
+	}
 	r.write_no_lang(result);
 }
 
@@ -1194,10 +1190,15 @@ static void _sql(Request& r, MethodParam
 	GET_SELF(r, VTable).set_table(result);
 }
 
-static void _columns(Request& r, MethodParams&) {
+static void _columns(Request& r, MethodParams& params) {
+	const String* column_column_name;
+	if(params.count()>0)
+		column_column_name=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
+	else 
+		column_column_name=new String("column");
 
 	Table::columns_type result_columns(new ArrayString);
-	*result_columns+=new String("column");
+	*result_columns+=column_column_name;
 	Table& result_table=*new Table(result_columns);
 
 	Table& source_table=GET_SELF(r, VTable).table();
@@ -1240,9 +1241,9 @@ MTable::MTable(): Methoded("table") {
 	// ^table::create{data}
 	// ^table::create[nameless]{data}
 	// ^table::create[table]
-	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2);
+	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 3);
 	// old name for compatibility with <= v 1.141 2002/01/25 11:33:45 paf
-	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 2); 
+	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 3); 
 
 	// ^table::load[file]  
 	// ^table::load[nameless;file]
@@ -1269,8 +1270,8 @@ MTable::MTable(): Methoded("table") {
 	// ^table.menu{code}[delim]
 	add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);
 
-	// ^table:hash[key field name]
-	// ^table:hash[key field name][value field name(s) string/table]
+	// ^table.hash[key field name]
+	// ^table.hash[key field name][value field name(s) string/table]
 	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);
 
 	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc]
@@ -1290,12 +1291,12 @@ MTable::MTable(): Methoded("table") {
 	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);
 
 
-	// ^table:sql[query]
-	// ^table:sql[query][$.limit(1) $.offset(2)]
+	// ^table::sql[query]
+	// ^table::sql[query][$.limit(1) $.offset(2)]
 	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
-	// ^table:columns[]
-	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);
+	// ^table.columns[[column name]]
+	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 1);
 
 	// ^table.select(expression) = table
 	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);