--- parser3/src/classes/table.C	2001/03/27 15:37:50	1.33
+++ parser3/src/classes/table.C	2001/03/30 09:58:57	1.41
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.33 2001/03/27 15:37:50 paf Exp $
+	$Id: table.C,v 1.41 2001/03/30 09:58:57 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -20,7 +20,7 @@
 VStateless_class *table_class;
 
 // methods
-
+/// @todo now remove CONFIG untaint, make pos() searches in String
 static void set_or_load(
 						Request& r, 
 						const String& method_name, Array *params, 
@@ -34,14 +34,14 @@ static void set_or_load(
 	r.fail_if_junction_(is_load, *vdata_or_filename, 
 		method_name, is_load?"file name must not be junction":"body must be junction");
 
-	// data or file_name
+	// data or table_name
 	char *data;
 	if(is_load) {
 		// forcing untaint language
-		String lfile_name(pool);
-		lfile_name.append(vdata_or_filename->as_string(), String::UL_FILE_NAME, true);
+		String ltable_name(pool);
+		ltable_name.append(vdata_or_filename->as_string(), String::UL_FILE_NAME, true);
 		// loading text
-		data=file_read_text(pool, r.absolute(lfile_name));
+		data=file_read_text(pool, r.absolute(ltable_name));
 	} else {
 		// suggesting untaint language
 		Temp_lang temp_lang(r, String::UL_TABLE);
@@ -63,7 +63,7 @@ static void set_or_load(
 		if(char *row_chars=getrow(&data)) 
 			do {
 				String *name=new(pool) String(pool);
-				name->APPEND(lsplit(&row_chars, '\t'), 0, file, line++);
+				name->APPEND_CLEAN(lsplit(&row_chars, '\t'), 0, file, line++);
 				*columns+=name;
 			} while(row_chars);
 	}
@@ -77,7 +77,7 @@ static void set_or_load(
 		Array *row=new(pool) Array(pool);
 		while(char *cell_chars=lsplit(&row_chars, '\t')) {
 			String *cell=new(pool) String(pool);
-			cell->APPEND(cell_chars, 0, file, line);
+			cell->APPEND_CLEAN(cell_chars, 0, file, line);
 			*row+=cell;
 		}
 		line++;
@@ -87,27 +87,24 @@ static void set_or_load(
 	// replace any previous table value
 	static_cast<VTable *>(r.self)->set_table(table);
 }
-
-
 static void _set(Request& r, const String& method_name, Array *params) {
 	set_or_load(r, method_name, params, false);
 }
-
 static void _load(Request& r, const String& method_name, Array *params) {
 	set_or_load(r, method_name, params, true);
 }
 
 static void _save(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
-	Value *vfile_name=static_cast<Value *>(params->get(params->size()-1));
+	Value *vtable_name=static_cast<Value *>(params->get(params->size()-1));
 	// forcing
 	// ^save[this body type]
-	r.fail_if_junction_(true, *vfile_name, 
+	r.fail_if_junction_(true, *vtable_name, 
 		method_name, "file name must not be junction");
 
 	// forcing untaint language
-	String lfile_name(pool);
-	lfile_name.append(vfile_name->as_string(),
+	String ltable_name(pool);
+	ltable_name.append(vtable_name->as_string(),
 		String::UL_FILE_NAME, true);
 
 	Table& table=static_cast<VTable *>(r.self)->table();
@@ -148,32 +145,28 @@ static void _save(Request& r, const Stri
 	}
 
 	// write
-	file_write(pool, r.absolute(lfile_name), sdata.cstr(), sdata.size(), true);
+	file_write(pool, r.absolute(ltable_name), sdata.cstr(), sdata.size(), true);
 }
 
-static void _count(Request& r, const String&, Array *) {
+static void _count(Request& r, const String&method_name, Array *) {
 	Pool& pool=r.pool();
 	Value& value=*new(pool) VInt(pool, static_cast<VTable *>(r.self)->table().size());
 	r.write_no_lang(value);
 }
 
-static void _line(Request& r, const String&, Array *) {
+static void _line(Request& r, const String& method_name, Array *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, 1+static_cast<VTable *>(r.self)->table().get_current());
+	Value& value=*new(pool) VInt(pool, 1+static_cast<VTable *>(r.self)->table().current());
 	r.write_no_lang(value);
 }
 
-static void _offset(Request& r, const String&, Array *params) {
+static void _offset(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
 	Table& table=static_cast<VTable *>(r.self)->table();
-	if(params->size()) {
-		if(int size=table.size()) {
-			int offset=
-				(int)r.process(*static_cast<Value *>(params->get(0))).get_double();
-			table.set_current((table.get_current()+offset+size)%size);
-		}
-	} else {
-		Value& value=*new(pool) VInt(pool, table.get_current());
+	if(params->size())
+		table.shift((int)r.process(*static_cast<Value *>(params->get(0))).as_double());
+	else {
+		Value& value=*new(pool) VInt(pool, table.current());
 		r.write_no_lang(value);
 	}
 }
@@ -188,6 +181,7 @@ static void _menu(Request& r, const Stri
 
 	Table& table=static_cast<VTable *>(r.self)->table();
 	bool need_delim=false;
+	int saved_current=table.current();
 	for(int row=0; row<table.size(); row++) {
 		table.set_current(row);
 
@@ -200,9 +194,10 @@ static void _menu(Request& r, const Stri
 		}
 		r.write_pass_lang(processed_body);
 	}
+	table.set_current(saved_current);
 }
 
-static void _empty(Request& r, const String&, Array *params) {
+static void _empty(Request& r, const String& method_name, Array *params) {
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(table.size()==0) {
 		Value& value=r.process(*static_cast<Value *>(params->get(0)));
@@ -229,7 +224,7 @@ static void store_column_item_to_hash(Ar
 		value=new(*ri.pool) VUnknown(*ri.pool);
 	ri.hash->put(column_name, value);
 }
-static void _record(Request& r, const String&, Array *params) {
+static void _record(Request& r, const String& method_name, Array *params) {
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(const Array *columns=table.columns()) {
 		Pool& pool=r.pool();
@@ -241,10 +236,29 @@ static void _record(Request& r, const St
 	}
 }
 
-struct Order_item {
-	int index;
-	Value *value;
+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
@@ -254,69 +268,165 @@ static void _sort(Request& r, const Stri
 	if(params->size()==2) { // ..[asc|desc]
 		Value& order=*(Value *)params->get(1);
 		// forcing ..[this param-type]
-		r.fail_if_junction_(false, order, method_name, "order must not be junction");
-		reverse=order.as_string()=="asc";
+		r.fail_if_junction_(true, order, method_name, "order must not be junction");
+		reverse=order.as_string()=="desc";
 	} else
 		reverse=false;
 
-	// calculating key values
 	Table& table=static_cast<VTable *>(r.self)->table();
-	Order_item *order=(Order_item *)malloc(sizeof(Order_item)*table.size());
-	Order_item *current=order;
-	for(int i=0; i<table.size(); i++) {
+
+	// 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
-		current->index=i;
-		current->value=r.process(key_maker).get_expr_result(true/*return string as-is*/);
-		current++;
+		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
-	//\ todo
+	_qsort(seq, table.size(), sizeof(Seq_item), 
+		key_values_are_strings?sort_cmp_string:sort_cmp_double);
 
-	// reorder table as they require in 'order'
-	//\ todo
+	// 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);
 }
 
+static void _locate(Request& r, const String& method_name, Array *params) {
+	VTable& vtable=*static_cast<VTable *>(r.self);
+	Table& table=vtable.table();
+	vtable.last_locate_was_successful=table.locate(
+		static_cast<Value *>(params->get(0))->as_string(),
+		static_cast<Value *>(params->get(1))->as_string());
+}
+
+static void _found(Request& r, const String& method_name, Array *params) {
+	if(static_cast<VTable *>(r.self)->last_locate_was_successful) {
+		Value& then_code=*static_cast<Value *>(params->get(0));
+		// forcing ^found{this param type}
+		r.fail_if_junction_(false, then_code, 
+			method_name, "found-parameter must be junction");
+		r.write_pass_lang(r.process(then_code));
+	} else if(params->size()==2) {
+		Value& else_code=*static_cast<Value *>(params->get(1));
+		// forcing ^found{this param type}
+		r.fail_if_junction_(false, else_code, 
+			method_name, "not found-parameter must be junction");
+		r.write_pass_lang(r.process(else_code));
+	}
+}
+
+static void _flip(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+	VTable& vtable=*static_cast<VTable *>(r.self);
+
+	Table& old_table=*vtable.get_table();
+	Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/);
+	if(old_table.size())
+		if(int old_cols=old_table.at(0).size()) 
+			for(int column=0; column<old_cols; column++) {
+				Array& new_row=*new(pool) Array(pool, old_table.size());
+				for(int i=0; i<old_table.size(); i++) {
+					const Array& old_row=old_table.at(i);
+					new_row+=column<old_row.size()?old_row.get(column):empty_string;
+				}
+				new_table+=&new_row;
+			}
+
+	vtable.set_table(new_table);
+}
+
+/// @todo now require \t to be clean [UL_NO]
+static void _append(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+	// data is last parameter
+	Value *value=static_cast<Value *>(params->get(0));
+	// forcing [this body type]
+	r.fail_if_junction_(true, *value, method_name, "body must not be junction");
+
+	const String& string=static_cast<VString *>(value)->as_string();
+
+	// parse cells
+	Array& row=*new(pool) Array(pool);
+	size_t pos_after=0;
+	int pos_before;
+	while((pos_before=string.pos("\t", pos_after))>=0) {
+		row+=&string.piece(pos_after, pos_before);
+		pos_after=pos_before+1/*\t*/;
+	}
+	// last piece
+	if(pos_after<string.size()) 
+		row+=&string.piece(pos_after, string.size());
+
+	static_cast<VTable *>(r.self)->table()+=&row;
+}
+
 // initialize
 
 void initialize_table_class(Pool& pool, VStateless_class& vclass) {
 	// ^table.set{data}
 	// ^table.set[nameless]{data}
-	vclass.add_native_method("set", _set, 1, 2);
+	vclass.add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2);
 
 	// ^table.load[file]  
 	// ^table.load[nameless;file]
-	vclass.add_native_method("load", _load, 1, 2);
+	vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
 
 	// ^table.save[file]  
 	// ^table.save[nameless;file]
-	vclass.add_native_method("save", _save, 1, 2);
+	vclass.add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);
 
 	// ^table.count[]
-	vclass.add_native_method("count", _count, 0, 0);
+	vclass.add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);
 
 	// ^table.line[]
-	vclass.add_native_method("line", _line, 0, 0);
+	vclass.add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);
 
 	// ^table.offset[]  
 	// ^table.offset[offset]
-	vclass.add_native_method("offset", _offset, 0, 1);
+	vclass.add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1);
 
 	// ^table.menu{code}  
 	// ^table.menu{code}[delim]
-	vclass.add_native_method("menu", _menu, 1, 2);
+	vclass.add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);
 
 	// ^table.empty{code-when-empty}  
 	// ^table.empty{code-when-empty}{code-when-not}
-	vclass.add_native_method("empty", _empty, 1, 2);
+	vclass.add_native_method("empty", Method::CT_DYNAMIC, _empty, 1, 2);
 
 	// ^table.record[]
-	vclass.add_native_method("record", _record, 0, 0);
+	vclass.add_native_method("record", Method::CT_DYNAMIC, _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);
+	vclass.add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
+
+	// ^table.locate[field;value]
+	vclass.add_native_method("locate", Method::CT_DYNAMIC, _locate, 2, 2);
+	// ^table.found{when-found}
+	// ^table.found{when-found}{when-not-found}
+	vclass.add_native_method("found", Method::CT_DYNAMIC, _found, 1, 2);
 
-}	
+	// ^table.flip[]
+	vclass.add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);
+
+	// ^table.append{r{tab}e{tab}c{tab}o{tab}r{tab}d}
+	vclass.add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);
+}