--- parser3/src/classes/table.C	2012/03/16 09:24:08	1.286
+++ parser3/src/classes/table.C	2013/02/21 04:27:12	1.291
@@ -21,7 +21,7 @@
 #include "pa_vbool.h"
 #include "pa_array.h"
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.286 2012/03/16 09:24:08 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.291 2013/02/21 04:27:12 moko Exp $";
 
 // class
 
@@ -56,20 +56,7 @@ static Table::Action_options get_action_
 	if(params.count() <= options_index)
 		return result;
 
-	Value& maybe_options=params[options_index];
-/* can not do it: 
-	want to enable ^table::create[$source;
-#		$.option[]
-	]
-	but there is ^table.locate[name;value]
-
-	...if(voptions.is_defined() && !voptions.is_string()))
-	if(maybe_options.is_string()) { // allow empty options
-		result.defined=true;
-		return result;
-	}
-*/
-	HashStringValue* options=maybe_options.get_hash();
+	HashStringValue* options=params.as_hash(options_index);
 	if(!options)
 		return result;
 
@@ -179,7 +166,7 @@ static void _create(Request& r, MethodPa
 	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())
+		&& (options=params.as_hash(options_param_index))
 	) {
 		// cloning, so that we could change
 		options=new HashStringValue(*options);
@@ -281,20 +268,24 @@ static lsplit_result lsplit(char** strin
 			char *write;
 			write=read=string;
 			char c;
-			while((c=*read++)) {
+			// we are enclosed, searching for second encloser
+			while(c=*read++) {
 				if(c==encloser) {
-					char n=*read;
-					if(n==encloser) // double-encloser stands for encloser
+					if(*read==encloser) // double-encloser stands for encloser
 						read++;
-					else if(n==delim1 || n==delim2) {
-						result.delim=n;
-						read++;
-						break;
-					}
+					else
+						break; // note: skipping encloser
 				}
-
 				*write++=c;
 			}
+			// we are no longer enclosed, searching for delimiter, skipping extra enclosers
+			while(c=*read++) {
+				if(c==delim1 || c==delim2) {
+					result.delim=c;
+					break;
+				} else 	if(c!=encloser)
+					*write++=c;
+			}
 			*write=0; // terminate
 			*string_ref=c? read: 0;
 			result.piece=string;
@@ -347,7 +338,7 @@ static void _load(Request& r, MethodPara
 	HashStringValue *options=0;
 	TableSeparators separators;
 	if(options_param_index<params.count()
-		&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())) {
+		&& (options=params.as_hash(options_param_index))) {
 		// cloning, so that we could change [to simplify checks on params inside file_read_text
 		options=new HashStringValue(*options);
 		separators.load(*options);
@@ -475,10 +466,7 @@ static void _save(Request& r, MethodPara
 
 	TableSeparators separators;
 	if(param_index<params.count())
-		if(HashStringValue* options=params.as_hash(param_index++, 
-				"additional params must be hash",
-				"additional params must be hash (did you spell mode parameter correctly?)"
-		)) {
+		if(HashStringValue* options=params.as_hash(param_index++)) {
 			int valid_options=separators.load(*options);
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
@@ -782,7 +770,7 @@ static void _hash(Request& r, MethodPara
 			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()){ // options where specified
+				if(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // can't use .as_has because the 2nd param could be table so .as_hash throws an error
 					--param_index;
 					int valid_options=0;
 					if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
@@ -818,7 +806,7 @@ static void _hash(Request& r, MethodPara
 			}
 
 			if(param_index==2) // options was specified but not as hash
-				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
+				throw Exception(PARSER_RUNTIME, 0, "options must be hash");
 
 			Array<int> value_fields;
 			if(param_index==0){ // list of columns wasn't specified
@@ -927,14 +915,14 @@ static void _sort(Request& r, MethodPara
 		old_table.set_current(i);
 		// calculate key value
 		seq[i].row=old_table[i];
-		Value& value=r.process_to_value(key_maker).as_expr_result(true/*return string as-is*/);
+		Value& value=r.process_to_value(key_maker);
 		if(i==0) // determining key values type by first one
 			key_values_are_strings=value.is_string();
 
 		if(key_values_are_strings)
 			seq[i].value.c_str=value.as_string().cstr();
 		else
-			seq[i].value.d=value.as_double();
+			seq[i].value.d=value.as_expr_result().as_double();
 	}
 
 	// @todo: handle this elsewhere
@@ -992,7 +980,7 @@ static bool _locate_name_value(Table& ta
 static void _locate(Request& r, MethodParams& params) {
 	Table& table=GET_SELF(r, VTable).table();
 
-	bool result=params[0].get_junction()?
+	bool result=params[0].get_junction() || (params.count() == 1) ?
 		_locate_expression(table, r, params) :
 		_locate_name_value(table, r, params);
 	r.write_no_lang(VBool::get(result));
@@ -1042,16 +1030,10 @@ static void join_nameless_row(Table& src
 	*dest+=src[src.current()];
 }
 static void _join(Request& r, MethodParams& params) {
-	Table* maybe_src=params.as_no_junction(0, "table ref must not be code").get_table();
-	if(!maybe_src)
-		throw Exception(PARSER_RUNTIME, 
-			0, 
-			"source is not a table");
-	Table& src=*maybe_src;
+	Table& src=*params.as_table(0, "source");
 
 	Table::Action_options o=get_action_options(r, params, 1, src);
-	check_option_param(o.defined, params, 1,
-		"invalid extra parameter");
+	check_option_param(o.defined, params, 1, "invalid extra parameter");
 
 	Table& dest=GET_SELF(r, VTable).table();
 	if(&src == &dest)
@@ -1161,7 +1143,7 @@ static void _sql(Request& r, MethodParam
 	ulong limit=SQL_NO_LIMIT;
 	ulong offset=0;
 	if(params.count()>1)
-		if(HashStringValue* options=params.as_hash(1)) {
+		if(HashStringValue* options=params.as_hash(1, "sql options")) {
 			int valid_options=0;
 			if(Value* vbind=options->get(sql_bind_name)) {
 				valid_options++;
@@ -1271,9 +1253,7 @@ static void _select(Request& r, MethodPa
 				reverse=r.process_to_value(*vreverse).as_bool();
 			}
 			if(valid_options!=options->count())
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"called with invalid option");
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		}
 
 	Table& result_table=*new Table(source_table.columns());