--- parser3/src/classes/table.C	2011/11/19 04:15:31	1.282
+++ parser3/src/classes/table.C	2012/06/08 11:44:02	1.288
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2011/11/19 04:15:31 $";
-
 #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 #include <sstream>
 #endif
@@ -23,6 +21,8 @@ static const char * const IDENT_TABLE_C=
 #include "pa_vbool.h"
 #include "pa_array.h"
 
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.288 2012/06/08 11:44:02 misha Exp $";
+
 // class
 
 class MTable: public Methoded {
@@ -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);
@@ -209,7 +196,10 @@ 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, *separators.scolumn, String::L_AS_IS);
+			if(head[0]->is_empty())
+				*columns += new String();
+			else
+				head[0]->split(*columns, col_pos_after, *separators.scolumn, String::L_AS_IS);
 		}
 	}
 
@@ -344,7 +334,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);
@@ -472,10 +462,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);
@@ -779,7 +766,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_hash(param_index)){ // options where specified
 					--param_index;
 					int valid_options=0;
 					if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
@@ -814,9 +801,6 @@ 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);
-
 			Array<int> value_fields;
 			if(param_index==0){ // list of columns wasn't specified
 				if(value_type==C_STRING) // $.type[string]
@@ -924,14 +908,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
@@ -1039,16 +1023,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)
@@ -1158,7 +1136,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++;
@@ -1268,14 +1246,15 @@ 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());
 
-	if(size_t size=source_table.count() && limit>0){
+	size_t size=source_table.count();
+	if(offset<0)
+		offset+=size;
+	if(size && limit>0 && offset>=0 && (size_t)offset<size){
 		size_t saved_current=source_table.current();
 		size_t appended=0;