--- parser3/src/classes/table.C	2001/05/08 08:14:48	1.74
+++ parser3/src/classes/table.C	2001/05/08 10:23:50	1.78
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.74 2001/05/08 08:14:48 paf Exp $
+	$Id: table.C,v 1.78 2001/05/08 10:23:50 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -226,13 +226,11 @@ static void _menu(Request& r, const Stri
 	table.set_current(saved_current); vtable.unlock();
 }
 
-/// @test make bool returning func
 static void _empty(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 	Table& table=static_cast<VTable *>(r.self)->table();
-	if(table.size()==0)
-		r.write_pass_lang(r.process(params->get(0)));
-	else if(params->size()>1)
-		r.write_pass_lang(r.process(params->get(1)));
+	
+	r.write_no_lang(*new(pool) VBool(pool, table.size()==0));
 }
 
 /// used by table: _record / store_column_item_to_hash
@@ -275,16 +273,9 @@ static void table_row_to_hash(Array::Ite
 	Row_info& ri=*static_cast<Row_info *>(info);
 	Pool& pool=ri.table->pool();
 
-	Value *result;
-	if(ri.value_fields->size()==1) { // key=value [not valueS]
-		int value_field=ri.value_fields->get_int(0);
-		if(value_field<row.size())
-			result=new(pool) VString(*row.get_string(value_field));
-		else
-			result=0;
-	} else {
-		VHash& vhash=*new(pool) VHash(pool);
-		Hash& hash=*vhash.get_hash();
+	if(ri.key_field<row.size()) {
+		VHash& result=*new(pool) VHash(pool);
+		Hash& hash=*result.get_hash();
 		for(int i=0; i<ri.value_fields->size(); i++) {
 			int value_field=ri.value_fields->get_int(i);
 			if(value_field<row.size())
@@ -293,11 +284,8 @@ static void table_row_to_hash(Array::Ite
 					new(pool) VString(*row.get_string(value_field)));
 		}
 		
-		result=&vhash;
+		ri.hash->put(*row.get_string(ri.key_field), &result);
 	}
-	
-	if(ri.key_field<row.size())
-		ri.hash->put(*row.get_string(ri.key_field), result);
 }
 static void _hash(Request& r, const String& method_name, MethodParams *params) {
 	Table& table=static_cast<VTable *>(r.self)->table();
@@ -335,7 +323,7 @@ static void _hash(Request& r, const Stri
 }
 
 /// used by table: _sort / sort_cmp_string|sort_cmp_double
-struct Seq_item {
+struct Table_seq_item {
 	Array *row;
 	union {
 		char *c_str;
@@ -344,13 +332,13 @@ struct Seq_item {
 };
 static int sort_cmp_string(const void *a, const void *b) {
 	return strcmp(
-		static_cast<const Seq_item *>(a)->value.c_str, 
-		static_cast<const Seq_item *>(b)->value.c_str
+		static_cast<const Table_seq_item *>(a)->value.c_str, 
+		static_cast<const Table_seq_item *>(b)->value.c_str
 	);
 }
 static int sort_cmp_double(const void *a, const void *b) {
-	double va=static_cast<const Seq_item *>(a)->value.d;
-	double vb=static_cast<const Seq_item *>(b)->value.d;
+	double va=static_cast<const Table_seq_item *>(a)->value.d;
+	double vb=static_cast<const Table_seq_item *>(b)->value.d;
 	if(va<vb)
 		return -1;
 	else if(va>vb)
@@ -371,7 +359,7 @@ static void _sort(Request& r, const Stri
 	if(!table.size())
 		return;
 
-	Seq_item *seq=(Seq_item *)malloc(sizeof(Seq_item)*table.size());
+	Table_seq_item *seq=(Table_seq_item *)malloc(sizeof(Table_seq_item)*table.size());
 	int i;
 
 	// calculate key values
@@ -390,7 +378,7 @@ static void _sort(Request& r, const Stri
 			seq[i].value.d=value.as_double();
 	}
 	// sort keys
-	_qsort(seq, table.size(), sizeof(Seq_item), 
+	_qsort(seq, table.size(), sizeof(Table_seq_item), 
 		key_values_are_strings?sort_cmp_string:sort_cmp_double);
 
 	// reorder table as they require in 'seq'
@@ -663,9 +651,8 @@ MTable::MTable(Pool& apool) : Methoded(a
 	// ^table.menu{code}[delim]
 	add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);
 
-	// ^table.empty{code-when-empty}  
-	// ^table.empty{code-when-empty}{code-when-not}
-	add_native_method("empty", Method::CT_DYNAMIC, _empty, 1, 2);
+	// ^table.empty[]
+	add_native_method("empty", Method::CT_DYNAMIC, _empty, 0, 0);
 
 	// ^table.record[]
 	add_native_method("record", Method::CT_DYNAMIC, _record, 0, 0);