--- parser3/src/classes/table.C	2001/03/26 09:53:42	1.29
+++ parser3/src/classes/table.C	2001/03/27 16:35:52	1.34
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.29 2001/03/26 09:53:42 paf Exp $
+	$Id: table.C,v 1.34 2001/03/27 16:35:52 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -115,18 +115,18 @@ static void _save(Request& r, const Stri
 	String sdata(pool);
 	if(params->size()==1) { // not nameless=named output
 		// write out names line
-		if(const Array *columns=table.columns()) { // named table
-			for(int column=0; column<columns->size(); column++) {
+		if(table.columns()) { // named table
+			for(int column=0; column<table.columns()->size(); column++) {
 				if(column)
 					sdata.APPEND_CONST("\t");
-				sdata.append(*static_cast<String *>(columns->quick_get(column)), 
+				sdata.append(*static_cast<String *>(table.columns()->quick_get(column)), 
 					String::UL_TABLE);
 			}
 		} else { // nameless table
-			int size=table.size()?static_cast<Array *>(table.get(0))->size():0;
-			if(size)
-				for(int column=0; column<size; column++) {
-					char *cindex_tab=(char *)pool.malloc(MAX_NUMBER);
+			int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0;
+			if(lsize)
+				for(int column=0; column<lsize; column++) {
+					char *cindex_tab=(char *)malloc(MAX_NUMBER);
 					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
 					sdata.APPEND_CONST(cindex_tab);
 				}
@@ -148,8 +148,7 @@ static void _save(Request& r, const Stri
 	}
 
 	// write
-	char *cdata=sdata.cstr();
-	file_write(pool, r.absolute(lfile_name), cdata, strlen(cdata), true);
+	file_write(pool, r.absolute(lfile_name), sdata.cstr(), sdata.size(), true);
 }
 
 static void _count(Request& r, const String&, Array *) {
@@ -170,7 +169,7 @@ static void _offset(Request& r, const St
 	if(params->size()) {
 		if(int size=table.size()) {
 			int offset=
-				(int)r.process(*static_cast<Value *>(params->get(0))).get_double();
+				(int)r.process(*static_cast<Value *>(params->get(0))).as_double();
 			table.set_current((table.get_current()+offset+size)%size);
 		}
 	} else {
@@ -242,6 +241,79 @@ static void _record(Request& r, const St
 	}
 }
 
+struct Seq_item {
+	Array *row;
+	union {
+		char *c_str;
+		double d;
+	} value;
+};
+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 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;
+	if(va<vb)
+		return -1;
+	else if(va>vb)
+		return +1;
+	else 
+		return 0;
+}
+static void _sort(Request& r, const String& method_name, Array *params) {
+	Value& key_maker=*(Value *)params->get(0);
+	// forcing ^sort{this} ^sort(or this) param type
+	r.fail_if_junction_(false, key_maker, method_name, "key-maker must be junction");
+
+	bool reverse;
+	if(params->size()==2) { // ..[asc|desc]
+		Value& sequence=*(Value *)params->get(1);
+		// forcing ..[this param-type]
+		r.fail_if_junction_(true, sequence, method_name, "sequence must not be junction");
+		reverse=sequence.as_string()=="desc";
+	} else
+		reverse=false;
+
+	Table& table=static_cast<VTable *>(r.self)->table();
+
+	// anything to sort?
+	if(!table.size())
+		return;
+
+	Seq_item *seq=(Seq_item *)malloc(sizeof(Seq_item)*table.size());
+	int i;
+
+	// calculate key values
+	bool key_values_are_strings=true;
+	for(i=0; i<table.size(); i++) {
+		table.set_current(i);
+		// calculate key value
+		seq[i].row=(Array *)table.get(i);
+		Value& value=*r.process(key_maker).as_expr_result(true/*return string as-is*/);
+		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();
+	}
+	// sort keys
+	_qsort(seq, table.size(), sizeof(Seq_item), 
+		key_values_are_strings?sort_cmp_string:sort_cmp_double);
+
+	// reorder table as they require in 'seq'
+	for(i=0; i<table.size(); i++)
+		table.put(i, seq[reverse?table.size()-1-i:i].row);
+
+	// reset 'current'
+	table.set_current(0);
+}
+
 // initialize
 
 void initialize_table_class(Pool& pool, VStateless_class& vclass) {
@@ -278,4 +350,8 @@ void initialize_table_class(Pool& pool,
 	// ^table.record[]
 	vclass.add_native_method("record", _record, 0, 0);
 
+	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[asc|desc]
+	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[asc|desc]
+	vclass.add_native_method("sort", _sort, 1, 2);
+
 }