--- parser3/src/classes/string.C	2001/10/16 14:49:16	1.82
+++ parser3/src/classes/string.C	2002/01/16 10:28:33	1.93
@@ -2,9 +2,9 @@
 	Parser: @b string parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: string.C,v 1.82 2001/10/16 14:49:16 parser Exp $
+	$Id: string.C,v 1.93 2002/01/16 10:28:33 paf Exp $
 */
 
 #include "classes.h"
@@ -41,25 +41,17 @@ static void _length(Request& r, const St
 
 static void _int(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	bool convert_problem=false; Exception rethrow_me;
 	int converted;
 	Value *default_code=params->size()>0?
 		default_code=&params->as_junction(0, "default must be int"):0; // (default)
-	PTRY {
+	try {
 		converted=r.self->as_int();
-	}
-	PCATCH(e) { // convert problem
-		if(convert_problem=!default_code) { // we have a problem when no default
-			rethrow_me=e;  
-			converted=0;
-		} else
+	} catch(...) { // convert problem
+		if(!default_code) // we have a problem when no default
+			/*re*/throw;
+		else
 			converted=r.process(*default_code).as_int();
 	}
-	PEND_CATCH
-	if(convert_problem)
-		PTHROW(rethrow_me.type(), rethrow_me.code(), 
-			rethrow_me.problem_source(),
-			rethrow_me.comment());
 
 	Value& result=*new(pool) VInt(pool, converted);
 	result.set_name(method_name);
@@ -68,25 +60,17 @@ static void _int(Request& r, const Strin
 
 static void _double(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	bool convert_problem=false; Exception rethrow_me;
 	double converted;
 	Value *default_code=params->size()>0?
 		default_code=&params->as_junction(0, "default must be double"):0; // (default)
-	PTRY {
+	try {
 		converted=r.self->as_double();
-	}
-	PCATCH(e) { // convert problem
-		if(convert_problem=!default_code) { // we have a problem when no default
-			rethrow_me=e;  
-			converted=0;
-		} else
+	} catch(...) { // convert problem
+		if(!default_code) // we have a problem when no default
+			/*re*/throw;  
+		else
 			converted=r.process(*default_code).as_double();
 	}
-	PEND_CATCH
-	if(convert_problem)
-		PTHROW(rethrow_me.type(), rethrow_me.code(), 
-			rethrow_me.problem_source(),
-			rethrow_me.comment());
 
 	Value& result=*new(pool) VDouble(pool, converted);
 	result.set_name(method_name);
@@ -99,7 +83,8 @@ static void _double(Request& r, const St
 	Value& fmt=params->as_junction(0, "fmt must be code");
 
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	char *buf=format(pool, r.self->as_double(), r.process(fmt).as_string().cstr());
+	char *buf=format(pool, r.self->as_double(), 
+		r.process(fmt).as_string().cstr(String::UL_UNSPECIFIED, r.connection(0)));
 
 	String result(pool);
 	result.APPEND_CLEAN(buf, 0, 
@@ -129,10 +114,12 @@ static void _right(Request& r, const Str
 static void _mid(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
 
+	const String& string=*static_cast<VString *>(r.self)->get_string();
+
 	size_t p=(size_t)params->as_int(0, "p must be int", r);
-	size_t n=params->size()>1?(size_t)params->as_int(1, "n must be int", r):0;
+	size_t n=params->size()>1?
+		(size_t)params->as_int(1, "n must be int", r):string.size();
 	
-	const String& string=*static_cast<VString *>(r.self)->get_string();
 	r.write_assign_lang(*new(pool) VString(string.mid(p, p+n)));
 }
 
@@ -258,7 +245,7 @@ static void _match(Request& r, const Str
 	Table *table;
 	if(params->size()<3) { // search
 		bool was_global;
-		bool matched=src.match(r.pcre_tables(),
+		bool matched=src.match(
 			&method_name, 
 			regexp.as_string(), options,
 			&table,
@@ -271,7 +258,7 @@ static void _match(Request& r, const Str
 		else 
 			result=new(pool) VBool(pool, matched);			
 	} else { // replace
-		Value& replacement_code=params->as_junction(2, "replacement code must be code");
+		Value& replacement_code=params->as_junction(2, "replacement param must be code");
 
 		String& dest=*new(pool) String(pool);
 		Replace_action_info replace_action_info={
@@ -280,7 +267,7 @@ static void _match(Request& r, const Str
 			&replacement_code,
 			&src
 		};
-		src.match(r.pcre_tables(),
+		src.match(
 			&method_name, 
 			r.process(regexp).as_string(), options,
 			&table,
@@ -296,7 +283,7 @@ static void change_case(Request& r, cons
 	Pool& pool=r.pool();
 	const String& src=*static_cast<VString *>(r.self)->get_string();
 
-	r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables(),
+	r.write_assign_lang(*new(pool) VString(src.change_case(pool, 
 		kind)));
 }
 static void _upper(Request& r, const String& method_name, MethodParams *params) {
@@ -320,7 +307,7 @@ public:
 
 	void add_column(void *ptr, size_t size) {
 		if(got_column)
-			PTHROW(0, 0,
+			throw Exception(0, 0,
 				&statement_string,
 				"result must contain exactly one column");
 		got_column=true;
@@ -329,7 +316,7 @@ public:
 	void add_row() { /* ignore */ }
 	void add_row_cell(void *ptr, size_t size) {
 		if(got_cell)
-			PTHROW(0, 0,
+			throw Exception(0, 0,
 				&statement_string,
 				"result must not contain more then one row");
 		got_cell=true;
@@ -350,11 +337,6 @@ const String* sql_result_string(Request&
 								Hash *& options, Value *& default_code) {
 	Pool& pool=r.pool();
 
-	if(!r.connection)
-		PTHROW(0, 0,
-			&method_name,
-			"without connect");
-
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
@@ -363,19 +345,19 @@ const String* sql_result_string(Request&
 	if(params->size()>1) {
 		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
 		if(voptions.is_defined())
-			if(options=voptions.get_hash()) {
+			if(options=voptions.get_hash(&method_name)) {
 				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();
 				if(default_code=(Value *)options->get(*sql_default_name)) {
 					if(!default_code->get_junction())
-						PTHROW(0, 0,
+						throw Exception(0, 0,
 							&method_name,
 							"default option must be code");
 				}
 			} else
-				PTHROW(0, 0,
+				throw Exception(0, 0,
 					&method_name,
 					"options must be hash");
 	} else
@@ -384,22 +366,18 @@ const String* sql_result_string(Request&
 	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);
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	String_sql_event_handlers handlers(pool, statement_string, statement_cstr);
-	bool need_rethrow=false; Exception rethrow_me;
-	PTRY {
-		r.connection->query(
+	try {
+		r.connection(&method_name)->query(
 			statement_cstr, offset, limit, 
 			handlers);
+	} catch(const Exception& e) { // query problem
+		// give more specific source [were url]
+		throw Exception(e.type(), e.code(),
+			&statement_string, 
+			"%s", e.comment());
 	}
-	PCATCH(e) { // query problem
-		rethrow_me=e;  need_rethrow=true;
-	}
-	PEND_CATCH
-	if(need_rethrow)
-		PTHROW(rethrow_me.type(), rethrow_me.code(),
-			&statement_string, // setting more specific source [were url]
-			rethrow_me.comment());
 	
 	if(!handlers.got_cell)
 		return 0; // no lines, caller should return second param[default value]
@@ -419,7 +397,7 @@ static void _sql(Request& r, const Strin
 			if(!string)
 				string=new(pool) String(pool);
 		} else
-			PTHROW(0, 0,
+			throw Exception(0, 0,
 				&method_name,
 				"produced no result, but no default option specified");
 	}
@@ -434,7 +412,7 @@ static void _replace(Request& r, const S
 
 	Table *table=params->as_no_junction(0, "parameter must not be code").get_table();
 	if(!table)
-		PTHROW(0, 0,
+		throw Exception(0, 0,
 			&method_name,
 			"parameter must be table");
 
@@ -444,14 +422,26 @@ static void _replace(Request& r, const S
 
 static void _save(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Value& vfile_name=params->as_no_junction(0, 
-		"file name must not be code");
+	const String& file_name=params->as_string(params->size()-1, 
+		"file name must be string");
 
 	const String& src=*static_cast<VString *>(r.self)->get_string();
 
+	bool do_append=false;
+	if(params->size()>1) {
+		const String& mode=params->as_string(0, "mode must be string");
+		if(mode=="append")
+			do_append=true;
+		else
+			throw Exception(0, 0,
+				&mode,
+				"unknown mode, must be 'append'");
+	}		
+
 	// write
-	file_write(pool, r.absolute(vfile_name.as_string()), 
-		src.cstr(String::UL_AS_IS), src.size(), true);
+	const char *buf=src.cstr(String::UL_UNSPECIFIED);
+	file_write(pool, r.absolute(file_name), 
+		buf, strlen(buf), true, do_append);
 }
 
 // constructor
@@ -505,7 +495,7 @@ MString::MString(Pool& apool) : Methoded
 	add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1);
 
 	// ^string.save[file]  
-	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1);
+	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);
 }	
 
 // global variable