--- parser3/src/classes/table.C	2001/03/29 20:53:02	1.39
+++ parser3/src/classes/table.C	2001/04/03 05:32:02	1.46
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.39 2001/03/29 20:53:02 paf Exp $
+	$Id: table.C,v 1.46 2001/04/03 05:32:02 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -20,39 +20,64 @@
 VStateless_class *table_class;
 
 // methods
-
-static void set_or_load(
-						Request& r, 
-						const String& method_name, Array *params, 
-						bool is_load) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
+static void _set(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
 	// data is last parameter
-	Value *vdata_or_filename=static_cast<Value *>(params->get(params->size()-1));
-	// forcing
-	// ^load[this file name type]
-	// ^set{this body type}
-	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 table_name
-	char *data;
-	if(is_load) {
-		// forcing untaint language
-		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(ltable_name));
+	Value *vdata=static_cast<Value *>(params->get(params->size()-1));
+	// forcing {this body type}
+	r.fail_if_junction_(false, *vdata, method_name, "body must be junction");
+
+	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
+	const String& data=r.process(*vdata).as_string();
+
+	size_t pos_after=0;
+	// parse columns
+	Array *columns;
+	if(params->size()==2) {
+		columns=0;
 	} else {
-		// suggesting untaint language
-		Temp_lang temp_lang(r, String::UL_TABLE);
-		data=r.process(*vdata_or_filename).as_string().cstr();
+		columns=new(pool) Array(pool);
+
+		Array head(pool);
+		data.split(head, &pos_after, "\n", 1, String::UL_CLEAN, 1);
+		if(head.size())
+			head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_CLEAN);
+	}
+
+	Table& table=*new(pool) Table(pool, &method_name, columns);
+	// parse cells
+	Array rows(pool);
+	data.split(rows, &pos_after, "\n", 1, String::UL_CLEAN);
+	int size=rows.quick_size();
+	for(int i=0; i<size; i++) {
+		Array& row=*new(pool) Array(pool);
+		const String& string=*rows.quick_get_string(i);
+		// remove empty lines
+		if(!string.size())
+			continue;
+
+		string.split(row, 0, "\t", 1, String::UL_CLEAN);
+		table+=&row;
 	}
 
+	// replace any previous table value
+	static_cast<VTable *>(r.self)->set_table(table);
+}
+
+static void _load(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+	// filename is last parameter
+	Value *vfilename=static_cast<Value *>(params->get(params->size()-1));
+	// forcing [this file name type]
+	r.fail_if_junction_(true, *vfilename, 
+		method_name, "file name must not be junction");
+
+	// forcing untaint language
+	String lfilename(pool);
+	lfilename.append(vfilename->as_string(), String::UL_FILE_NAME, true);
+	// loading text
+	char *data=file_read_text(pool, r.absolute(lfilename));
+
 	// parse columns
 	Array *columns;
 #ifndef NO_STRING_ORIGIN
@@ -68,7 +93,7 @@ static void set_or_load(
 		if(char *row_chars=getrow(&data)) 
 			do {
 				String *name=new(pool) String(pool);
-				name->APPEND_CLEAN(lsplit(&row_chars, '\t'), 0, file, line++);
+				name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++);
 				*columns+=name;
 			} while(row_chars);
 	}
@@ -82,7 +107,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_CLEAN(cell_chars, 0, file, line);
+			cell->APPEND_TAINTED(cell_chars, 0, file, line);
 			*row+=cell;
 		}
 		line++;
@@ -93,25 +118,10 @@ static void set_or_load(
 	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) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	Pool& pool=r.pool();
 	Value *vtable_name=static_cast<Value *>(params->get(params->size()-1));
-	// forcing
-	// ^save[this body type]
+	// forcing this body type]
 	r.fail_if_junction_(true, *vtable_name, 
 		method_name, "file name must not be junction");
 
@@ -162,33 +172,18 @@ static void _save(Request& r, const Stri
 }
 
 static void _count(Request& r, const String&method_name, Array *) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	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& method_name, Array *) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	Pool& pool=r.pool();
 	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& method_name, Array *params) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	Pool& pool=r.pool();
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(params->size())
@@ -200,11 +195,6 @@ static void _offset(Request& r, const St
 }
 
 static void _menu(Request& r, const String& method_name, Array *params) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	Value& body_code=*static_cast<Value *>(params->get(0));
 	// forcing ^menu{this param type}
 	r.fail_if_junction_(false, body_code, 
@@ -231,11 +221,6 @@ static void _menu(Request& r, const Stri
 }
 
 static void _empty(Request& r, const String& method_name, Array *params) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(table.size()==0) {
 		Value& value=r.process(*static_cast<Value *>(params->get(0)));
@@ -263,11 +248,6 @@ static void store_column_item_to_hash(Ar
 	ri.hash->put(column_name, value);
 }
 static void _record(Request& r, const String& method_name, Array *params) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	Table& table=static_cast<VTable *>(r.self)->table();
 	if(const Array *columns=table.columns()) {
 		Pool& pool=r.pool();
@@ -303,11 +283,6 @@ static int sort_cmp_double(const void *a
 		return 0;
 }
 static void _sort(Request& r, const String& method_name, Array *params) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	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");
@@ -358,11 +333,6 @@ static void _sort(Request& r, const Stri
 }
 
 static void _locate(Request& r, const String& method_name, Array *params) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	VTable& vtable=*static_cast<VTable *>(r.self);
 	Table& table=vtable.table();
 	vtable.last_locate_was_successful=table.locate(
@@ -371,11 +341,6 @@ static void _locate(Request& r, const St
 }
 
 static void _found(Request& r, const String& method_name, Array *params) {
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	if(static_cast<VTable *>(r.self)->last_locate_was_successful) {
 		Value& then_code=*static_cast<Value *>(params->get(0));
 		// forcing ^found{this param type}
@@ -393,12 +358,6 @@ static void _found(Request& r, const Str
 
 static void _flip(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
-
-	if(r.self==table_class)
-		RTHROW(0, 0,
-			&method_name,
-			"method of 'table' is not static");
-
 	VTable& vtable=*static_cast<VTable *>(r.self);
 
 	Table& old_table=*vtable.get_table();
@@ -417,52 +376,110 @@ static void _flip(Request& r, const Stri
 	vtable.set_table(new_table);
 }
 
+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_(false, *value, method_name, "body must be junction");
+
+	const String& string=r.process(*value).as_string();
+
+	// parse cells
+	Array& row=*new(pool) Array(pool);
+	string.split(row, 0, "\t", 1, String::UL_CLEAN);
+
+	static_cast<VTable *>(r.self)->table()+=&row;
+}
+
+static void _join(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+
+	Value *value=static_cast<Value *>(params->get(0));
+	// forcing [this table ref type]
+	r.fail_if_junction_(true, *value, method_name, "table ref must not be junction");
+
+	Table *maybe_src=value->get_table();
+	if(!maybe_src)
+		RTHROW(0, 0,
+			&method_name,
+			"source is not a table");
+
+	Table& src=*maybe_src;
+	Table& dest=static_cast<VTable *>(r.self)->table();
+	if(&src == &dest)
+		RTHROW(0, 0,
+			&method_name,
+			"source and destination are same table");
+
+	if(const Array *dest_columns=dest.columns()) { // dest is named
+		int saved_src_current=src.current();
+		for(int src_row=0; src_row<src.size(); src_row++) {
+			src.set_current(src_row);
+			Array& dest_row=*new(pool) Array(pool);
+			for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) 
+				dest_row+=src.item(*dest_columns->get_string(dest_column));
+			dest+=&dest_row;
+		}
+		src.set_current(saved_src_current);
+	} else { // dest is nameless
+		for(int src_row=0; src_row<src.size(); src_row++)
+			dest+=&src.at(src_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", _locate, 2, 2);
+	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", _found, 1, 2);
+	vclass.add_native_method("found", Method::CT_DYNAMIC, _found, 1, 2);
 
 	// ^table.flip[]
-	vclass.add_native_method("flip", _flip, 0, 0);
-}	
+	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);
+
+	// ^table.join[table]
+	vclass.add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1);
+}