--- parser3/src/classes/table.C	2001/04/05 11:50:06	1.53
+++ parser3/src/classes/table.C	2001/04/06 12:34:50	1.58
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.53 2001/04/05 11:50:06 paf Exp $
+	$Id: table.C,v 1.58 2001/04/06 12:34:50 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -15,6 +15,7 @@
 #include "pa_vtable.h"
 #include "pa_vint.h"
 #include "pa_sql_connection.h"
+#include "pa_dir.h"
 
 // global var
 
@@ -26,7 +27,7 @@ static void _set(Request& r, const Strin
 	// data is last parameter
 	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");
+	r.fail_if_junction_(false, *vdata, method_name, "body must be code");
 
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 	const String& data=r.process(*vdata).as_string();
@@ -71,7 +72,7 @@ static void _load(Request& r, const Stri
 	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");
+		method_name, "file name must not be code");
 
 	// loading text
 	char *data=file_read_text(pool, r.absolute(vfilename->as_string()));
@@ -121,7 +122,7 @@ static void _save(Request& r, const Stri
 	Value *vtable_name=static_cast<Value *>(params->get(params->size()-1));
 	// forcing this body type]
 	r.fail_if_junction_(true, *vtable_name, 
-		method_name, "file name must not be junction");
+		method_name, "file name must not be code");
 
 	Table& table=static_cast<VTable *>(r.self)->table();
 
@@ -188,11 +189,12 @@ static void _offset(Request& r, const St
 	}
 }
 
+/// @test $a.menu{ $a[123] }
 static void _menu(Request& r, const String& method_name, Array *params) {
 	Value& body_code=*static_cast<Value *>(params->get(0));
 	// forcing ^menu{this param type}
 	r.fail_if_junction_(false, body_code, 
-		method_name, "body must be junction");
+		method_name, "body must be code");
 	
 	Value *delim_code=params->size()==2?static_cast<Value *>(params->get(1)):0;
 
@@ -279,13 +281,13 @@ static int sort_cmp_double(const void *a
 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");
+	r.fail_if_junction_(false, key_maker, method_name, "key-maker must be code");
 
 	bool reverse;
 	if(params->size()==2) { // ..[asc|desc]
 		Value& order=*(Value *)params->get(1);
 		// forcing ..[this param-type]
-		r.fail_if_junction_(true, order, method_name, "order must not be junction");
+		r.fail_if_junction_(true, order, method_name, "order must not be code");
 		reverse=order.as_string()=="desc";
 	} else
 		reverse=false;
@@ -339,13 +341,13 @@ static void _found(Request& r, const Str
 		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");
+			method_name, "found-parameter must be code");
 		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");
+			method_name, "not found-parameter must be code");
 		r.write_pass_lang(r.process(else_code));
 	}
 }
@@ -375,7 +377,7 @@ static void _append(Request& r, const St
 	// 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");
+	r.fail_if_junction_(false, *value, method_name, "body must be code");
 
 	const String& string=r.process(*value).as_string();
 
@@ -391,7 +393,7 @@ static void _join(Request& r, const Stri
 
 	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");
+	r.fail_if_junction_(true, *value, method_name, "table ref must not be code");
 
 	Table *maybe_src=value->get_table();
 	if(!maybe_src)
@@ -422,7 +424,7 @@ static void _join(Request& r, const Stri
 	}
 }
 
-/// ^table:sql{query}[(count[;offset])] @test limit/offset
+/// ^table:sql{query}[(count[;offset])]
 static void _sql(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
 
@@ -433,7 +435,7 @@ static void _sql(Request& r, const Strin
 
 	Value& statement=*static_cast<Value *>(params->get(0));
 	// forcing {this query param type}
-	r.fail_if_junction_(true, statement, method_name, "statement must not be junction");
+	r.fail_if_junction_(false, statement, method_name, "statement must be code");
 
 	ulong limit=0;
 	if(params->size()>1) {
@@ -451,8 +453,10 @@ static void _sql(Request& r, const Strin
 		offset=(ulong)r.process(offset_code).as_double();
 	}
 
-	const String& statement_string=statement.as_string();
-	const char *statement_cstr=statement_string.cstr(String::UL_SQL);
+	Temp_lang temp_lang(r, String::UL_SQL);
+	const String& statement_string=r.process(statement).as_string();
+	const char *statement_cstr=
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
 	unsigned int sql_column_count; SQL_Driver::Cell *sql_columns;
 	unsigned long sql_row_count; SQL_Driver::Cell **sql_rows;
 	bool need_rethrow=false; Exception rethrow_me;
@@ -502,8 +506,39 @@ static void _sql(Request& r, const Strin
 	static_cast<VTable *>(r.self)->set_table(table);
 }
 
-// initialize
+/// ^table:dir[path]
+/// ^table:dir[path][regexp]
+static void _dir(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+
+	Value& relative_path=*static_cast<Value *>(params->get(0));
+	// forcing [path]
+	r.fail_if_junction_(true, relative_path, method_name, "path must not be code");
+
+	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, 
+		Array& row=*new(pool) Array(pool);
+		size_t file_name_size=strlen(ffblk.ff_name);
+		char *file_name=(char *)r.malloc(file_name_size);
+		memcpy(file_name, ffblk.ff_name, file_name_size);
+		String &string=*new(pool) String(pool);
+		string.APPEND_TAINTED(file_name, file_name_size, 
+			method_name.origin().file, method_name.origin().line);
+		row+=&string;
+		table+=&row;
+	);
 
+	// replace any previous table value
+	static_cast<VTable *>(r.self)->set_table(table);
+}
+
+// initialize
 void initialize_table_class(Pool& pool, VStateless_class& vclass) {
 	// ^table:set{data}
 	// ^table:set[nameless]{data}
@@ -560,4 +595,8 @@ void initialize_table_class(Pool& pool,
 
 	// ^table:sql[query][(count[;offset])]
 	vclass.add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);
+
+	// ^table:dir[path]
+	// ^table:dir[path][regexp]
+	vclass.add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2);
 }