--- parser3/src/classes/table.C	2001/07/28 12:07:26	1.97
+++ parser3/src/classes/table.C	2001/09/06 06:11:13	1.110
@@ -5,19 +5,15 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: table.C,v 1.97 2001/07/28 12:07:26 parser Exp $"; 
-
-#include "pa_config_includes.h"
-
-#include "pcre.h"
+static const char *RCSId="$Id: table.C,v 1.110 2001/09/06 06:11:13 parser Exp $"; 
 
 #include "classes.h"
+#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vtable.h"
 #include "pa_vint.h"
 #include "pa_sql_connection.h"
-#include "pa_dir.h"
 #include "pa_vbool.h"
 
 // defines
@@ -65,10 +61,10 @@ static void _set(Request& r, const Strin
 	// 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_iter i(rows);
+	while(i.has_next()) {
 		Array& row=*new(pool) Array(pool);
-		const String& string=*rows.quick_get_string(i);
+		const String& string=*i.next_string();
 		// remove empty lines
 		if(!string.size())
 			continue;
@@ -122,7 +118,9 @@ static void _load(Request& r, const Stri
 			cell->APPEND_TAINTED(cell_chars, 0, file, line);
 			*row+=cell;
 		}
+#ifndef NO_STRING_ORIGIN
 		line++;
+#endif
 		table+=row;
 	};
 
@@ -156,7 +154,7 @@ static Table *fill_month_days(Request& r
     	for(int wday=0; wday<7; wday++, _day++) {
         	String *cell=new(pool) String(pool);
 			if(_day>=1 && _day<=monthDays) {
-				char *buf=(char *)malloc(2+1); 
+				char *buf=(char *)pool.malloc(2+1); 
 				cell->APPEND_CLEAN(buf, sprintf(buf, "%02d", _day), 
 					method_name.origin().file, method_name.origin().line);
             }
@@ -200,7 +198,7 @@ static Table *fill_week_days(Request& r,
         tm *tmOut=localtime(&t);
 		Array& row=*new(pool) Array(pool, 4);
 #define WDFILL(size, value) { \
-		char *buf=(char *)malloc(size+1); \
+		char *buf=(char *)pool.malloc(size+1); \
 		String *cell=new(pool) String(pool); \
 		cell->APPEND_CLEAN(buf, sprintf(buf, "%0"#size"d", value), \
 			method_name.origin().file, \
@@ -255,17 +253,17 @@ static void _save(Request& r, const Stri
 	if(params->size()==1) { // not nameless=named output
 		// write out names line
 		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 *>(table.columns()->quick_get(column)), 
+			Array_iter i(*table.columns());
+			while(i.has_next()) {
+				sdata.append(*i.next_string(), //*static_cast<String *>(table.columns()->quick_get(column)), 
 					String::UL_TABLE);
+				if(i.has_next())
+					sdata.APPEND_CONST("\t");
 			}
 		} else { // nameless table
-			int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0;
-			if(lsize)
+			if(int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0)
 				for(int column=0; column<lsize; column++) {
-					char *cindex_tab=(char *)malloc(MAX_NUMBER);
+					char *cindex_tab=(char *)pool.malloc(MAX_NUMBER);
 					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
 					sdata.APPEND_CONST(cindex_tab);
 				}
@@ -275,13 +273,14 @@ static void _save(Request& r, const Stri
 		sdata.APPEND_CONST("\n");
 	}
 	// data lines
-	for(int index=0; index<table.size(); index++) {
-		Array *row=static_cast<Array *>(table.quick_get(index));
-		for(int column=0; column<row->size(); column++) {
-			if(column)
-				sdata.APPEND_CONST("\t");
-			sdata.append(*static_cast<String *>(row->quick_get(column)), 
+	Array_iter i(table);
+	while(i.has_next()) {
+		Array_iter c(*static_cast<Array *>(i.next()));
+		while(c.has_next()) {
+			sdata.append(*c.next_string(), //*static_cast<String *>(row->quick_get(column)), 
 				String::UL_TABLE);
+			if(c.has_next())
+				sdata.APPEND_CONST("\t");
 		}
 		sdata.APPEND_CONST("\n");
 	}
@@ -326,8 +325,9 @@ static void _menu(Request& r, const Stri
 	VTable& vtable=*static_cast<VTable *>(r.self);
 	Table& table=vtable.table();
 	bool need_delim=false;
-	vtable.lock(); int saved_current=table.current();
-	for(int row=0; row<table.size(); row++) {
+	int saved_current=table.current();
+	int size=table.size();
+	for(int row=0; row<size; row++) {
 		table.set_current(row);
 
 		Value& processed_body=r.process(body_code);
@@ -339,7 +339,7 @@ static void _menu(Request& r, const Stri
 		}
 		r.write_pass_lang(processed_body);
 	}
-	table.set_current(saved_current); vtable.unlock();
+	table.set_current(saved_current);
 }
 
 static void _empty(Request& r, const String& method_name, MethodParams *params) {
@@ -349,13 +349,14 @@ static void _empty(Request& r, const Str
 	r.write_no_lang(*new(pool) VBool(pool, table.size()==0));
 }
 
-/// used by table: _hash / table_row_to_hash
+#ifndef DOXYGEN
 struct Row_info {
 	Table *table;
 	int key_field;
 	Array *value_fields;
 	Hash *hash;
 };
+#endif
 static void table_row_to_hash(Array::Item *value, void *info) {
 	Array& row=*static_cast<Array *>(value);
 	Row_info& ri=*static_cast<Row_info *>(info);
@@ -410,7 +411,7 @@ static void _hash(Request& r, const Stri
 	r.write_no_lang(result);
 }
 
-/// used by table: _sort / sort_cmp_string|sort_cmp_double
+#ifndef DOXYGEN
 struct Table_seq_item {
 	Array *row;
 	union {
@@ -418,6 +419,7 @@ struct Table_seq_item {
 		double d;
 	} value;
 };
+#endif
 static int sort_cmp_string(const void *a, const void *b) {
 	return strcmp(
 		static_cast<const Table_seq_item *>(a)->value.c_str, 
@@ -435,27 +437,27 @@ static int sort_cmp_double(const void *a
 		return 0;
 }
 static void _sort(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 	Value& key_maker=params->as_junction(0, "key-maker must be code");
 
-	bool reverse=params->size()==2/*..[asc|desc]*/?
+	bool reverse=params->size()==2/*..[desc|asc|]*/?
 		reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":
-		false;
+		false; // default=asc
 
-	Table& table=static_cast<VTable *>(r.self)->table();
-
-	// anything to sort?
-	if(!table.size())
-		return;
+	Table& old_table=static_cast<VTable *>(r.self)->table();
+	Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns());
 
-	Table_seq_item *seq=(Table_seq_item *)malloc(sizeof(Table_seq_item)*table.size());
+	Table_seq_item *seq=(Table_seq_item *)pool.malloc(sizeof(Table_seq_item)*old_table.size());
 	int i;
 
 	// calculate key values
 	bool key_values_are_strings=true;
-	for(i=0; i<table.size(); i++) {
-		table.set_current(i);
+	// save 'current'
+	int saved_current=old_table.current();
+	for(i=0; i<old_table.size(); i++) {
+		old_table.set_current(i);
 		// calculate key value
-		seq[i].row=(MethodParams *)table.get(i);
+		seq[i].row=(MethodParams *)old_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();
@@ -465,16 +467,17 @@ static void _sort(Request& r, const Stri
 		else
 			seq[i].value.d=value.as_double();
 	}
+	// restore 'current'
+	old_table.set_current(saved_current);
 	// sort keys
-	_qsort(seq, table.size(), sizeof(Table_seq_item), 
+	_qsort(seq, old_table.size(), sizeof(Table_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);
+	for(i=0; i<old_table.size(); i++)
+		new_table+=seq[reverse?old_table.size()-1-i:i].row;
 
-	// reset 'current'
-	table.set_current(0);
+	r.write_no_lang(*new(pool) VTable(pool, &new_table));
 }
 
 static void _locate(Request& r, const String& method_name, MethodParams *params) {
@@ -506,7 +509,7 @@ static void _flip(Request& r, const Stri
 				new_table+=&new_row;
 			}
 
-	vtable.set_table(new_table);
+	r.write_no_lang(*new(pool) VTable(pool, &new_table));
 }
 
 static void _append(Request& r, const String& method_name, MethodParams *params) {
@@ -520,10 +523,7 @@ static void _append(Request& r, const St
 	string.split(row, 0, "\t", 1, String::UL_CLEAN);
 
 	VTable& vtable=*static_cast<VTable *>(r.self);
-	// disable ^a.menu{^a.append[]}
-	vtable.lock();
 	vtable.table()+=&row;
-	vtable.unlock();
 }
 
 static void _join(Request& r, const String& method_name, MethodParams *params) {
@@ -617,15 +617,19 @@ static void _sql(Request& r, const Strin
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
-	if(params->size()>1) {
-		Value& limit_code=params->as_junction(1, "limit must be expression");
-		limit=(uint)r.process(limit_code).as_double();
-	}
-
 	ulong offset=0;
-	if(params->size()>2) {
-		Value& offset_code=params->as_junction(2, "offset must be expression");
-		offset=(ulong)r.process(offset_code).as_double();
+	if(params->size()>1) {
+		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
+		if(voptions.is_defined())
+			if(Hash *options=voptions.get_hash()) {
+				if(Value *vlimit=(Value *)options->get(*sql_limit_name))
+					limit=(ulong)r.process(*vlimit).as_double();
+				if(Value *voffset=(Value *)options->get(*sql_offset_name))
+					offset=(ulong)r.process(*voffset).as_double();
+			} else
+				PTHROW(0, 0,
+					&method_name,
+					"options must be hash");
 	}
 
 	Temp_lang temp_lang(r, String::UL_SQL);
@@ -635,7 +639,7 @@ static void _sql(Request& r, const Strin
 	Table_sql_event_handlers handlers(pool, method_name,
 		statement_string, statement_cstr);
 	bool need_rethrow=false; Exception rethrow_me;
-	PTRY {
+		PTRY {
 		r.connection->query(
 			statement_cstr, offset, limit, 
 			handlers);
@@ -657,81 +661,6 @@ static void _sql(Request& r, const Strin
 	static_cast<VTable *>(r.self)->set_table(*result);
 }
 
-static void _dir(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-
-	Value& relative_path=params->as_no_junction(0, "path must not be code");
-
-	const String *regexp;
-	pcre *regexp_code;
-	int ovecsize;
-	int *ovector;
-	if(params->size()>1) {
-		regexp=&params->as_no_junction(1, "regexp must not be code").as_string();
-
-		const char *pattern=regexp->cstr(String::UL_AS_IS);
-		const char *errptr;
-		int erroffset;
-		regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, 
-			&errptr, &erroffset, 
-			r.pcre_tables);
-
-		if(!regexp_code)
-			PTHROW(0, 0, 
-				&regexp->mid(erroffset, regexp->size()), 
-				"regular expression syntax error - %s", errptr);
-
-		ovector=(int *)malloc(sizeof(int)*(ovecsize=(1/*match*/)*3));
-	} else 
-		regexp_code=0;
-
-
-	const char* absolute_path_cstr=r.absolute(relative_path.as_string())
-		.cstr(String::UL_FILE_NAME);
-
-	Array& columns=*new(pool) Array(pool);
-	columns+=new(pool) String(pool, "name");	
-	Table& table=*new(pool) Table(pool, &method_name, &columns);
-
-	LOAD_DIR(absolute_path_cstr, 
-		size_t file_name_size=strlen(ffblk.ff_name);
-		bool suits=true;
-		if(regexp_code) {
-			int exec_result=pcre_exec(regexp_code, 0, 
-				ffblk.ff_name, file_name_size, 0, 
-				0, ovector, ovecsize);
-			
-			if(exec_result==PCRE_ERROR_NOMATCH)
-				suits=false;
-			else if(exec_result<0) {
-				(*pcre_free)(regexp_code);
-				PTHROW(0, 0, 
-					regexp, 
-					"regular expression execute (%d)", 
-						exec_result);
-			}
-		}
-
-		if(suits) {
-			char *file_name_cstr=(char *)r.malloc(file_name_size);
-			memcpy(file_name_cstr, ffblk.ff_name, file_name_size);
-			String &file_name=*new(pool) String(pool);
-			file_name.APPEND(file_name_cstr, file_name_size, String::UL_FILE_NAME, 
-				method_name.origin().file, method_name.origin().line);
-		
-			Array& row=*new(pool) Array(pool);
-			row+=&file_name;
-			table+=&row;
-		}
-	);
-
-	if(regexp_code)
-		(*pcre_free)(regexp_code);
-
-	// replace any previous table value
-	static_cast<VTable *>(r.self)->set_table(table);
-}
-
 static void _columns(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
 
@@ -741,10 +670,10 @@ static void _columns(Request& r, const S
 
 	Table& source_table=static_cast<VTable *>(r.self)->table();
 	if(const Array *source_columns=source_table.columns()) {
-		int size=source_columns->quick_size();
-		for(int i=0; i<size; i++) {
+		Array_iter i(*source_columns);
+		while(i.has_next()) {
 			Array& result_row=*new(pool) Array(pool);
-			result_row+=source_columns->quick_get(i);
+			result_row+=i.next();
 			result_table+=&result_row;
 		}
 	}
@@ -796,8 +725,8 @@ MTable::MTable(Pool& apool) : Methoded(a
 	// ^table:hash[key field name][value field name;...]
 	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 1000);
 
-	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[asc|desc]
-	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[asc|desc]
+	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc]
+	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc]
 	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
 
 	// ^table.locate[field;value]
@@ -813,12 +742,9 @@ MTable::MTable(Pool& apool) : Methoded(a
 	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1);
 
 
-	// ^table:sql[query][(count[;offset])]
-	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);
-
-	// ^table:dir[path]
-	// ^table:dir[path][regexp]
-	add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2);
+	// ^table:sql[query]
+	// ^table:sql[query][$.limit(1) $.offset(2)]
+	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
 	// ^table:columns[]
 	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);