--- parser3/src/classes/op.C	2002/04/16 08:05:09	1.87
+++ parser3/src/classes/op.C	2002/06/20 14:50:22	1.97
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: op.C,v 1.87 2002/04/16 08:05:09 paf Exp $
+	$Id: op.C,v 1.97 2002/06/20 14:50:22 paf Exp $
 */
 
 #include "classes.h"
@@ -20,7 +20,6 @@
 
 // defines
 
-#define OP_CLASS_NAME "OP"
 #define CASE_DEFAULT_VALUE "DEFAULT"
 
 // class
@@ -92,7 +91,7 @@ static void _taint(Request& r, const Str
 	{
 		Value& vbody=params->as_no_junction(params->size()-1, "body must not be code");
 		
-		String result(r.pool());
+		String& result=*new(pool) String(pool);
 		result.append(
 			vbody.as_string(),  // process marking tainted with that lang
 			lang, true);  // force result language to specified
@@ -101,17 +100,22 @@ static void _taint(Request& r, const Str
 }
 
 static void _process(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 	// calculate pseudo file name of processed chars
 	// would be something like "/some/file(4) process"
-	char place[MAX_STRING];
+	char local_place[MAX_STRING];
 #ifndef NO_STRING_ORIGIN
 	const Origin& origin=method_name.origin();
-	snprintf(place, MAX_STRING, "%s(%d) %s", 
+	size_t place_size=snprintf(local_place, MAX_STRING, "%s(%d) %s", 
 		origin.file?origin.file:"unknown_file", 1+origin.line,
-		method_name.cstr());
+		method_name.cstr())+1;
 #else
-	strncpy(place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0;
-#endif	
+	strncpy(local_place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0;
+	size_t place_size=strlen(local_place)+1;
+#endif
+	char *heap_place=(char *)r.malloc(place_size);
+	memcpy(heap_place, local_place, place_size);
+
 
 	VStateless_class& self_class=*r.self->get_class();
 	const Method *main_method;
@@ -119,7 +123,7 @@ static void _process(Request& r, const S
 		// temporary remove language change
 		Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 		// temporary zero @main so to maybe-replace it in processed code
-		Temp_method temp_method_main(self_class, *main_method_name, 0);
+		Temp_method temp_method_main(self_class, r.main_method_name, 0);
 		// temporary zero @auto so it wouldn't be auto-called in Request::use_buf
 		Temp_method temp_method_auto(self_class, *auto_method_name, 0);
 		
@@ -130,11 +134,12 @@ static void _process(Request& r, const S
 		// maybe-define new @main
 		r.use_buf(
 			source.cstr(String::UL_UNSPECIFIED, r.connection(0)), 
-			place, 
+			*new(pool) String(pool, heap_place, place_size, true /*tainted*/),
+			heap_place, 
 			&self_class);
 		
 		// main_method
-		main_method=self_class.get_method(*main_method_name);
+		main_method=self_class.get_method(r.main_method_name);
 	}
 	// after restoring current-request-lang
 	// maybe-execute @main[]
@@ -193,9 +198,9 @@ static void _for(Request& r, const Strin
 
 	bool need_delim=false;
 	VInt *vint=new(pool) VInt(pool, 0);
+	r.root->put_element(var_name, vint);
 	for(int i=from; i<=to; i++) {
 		vint->set_int(i);
-		r.root->put_element(var_name, vint);
 
 		StringOrValue processed_body=r.process(body_code);
 		if(delim_maybe_code) { // delimiter set?
@@ -211,7 +216,7 @@ static void _for(Request& r, const Strin
 static void _eval(Request& r, const String& method_name, MethodParams *params) {
 	Value& expr=params->as_junction(0, "need expression");
 	// evaluate expresion
-	Value *result=r.process_to_value(expr, 
+	Value *value_result=r.process_to_value(expr, 
 		/*0/*no name YET* /,*/
 		true/*don't intercept string*/).as_expr_result();
 	if(params->size()>1) {
@@ -219,11 +224,10 @@ static void _eval(Request& r, const Stri
 
 		Pool& pool=r.pool();
 		String& string=*new(pool) String(pool);
-		string.APPEND_CONST(format(pool, result->as_double(), fmt.as_string().cstr()));
-		result=new(pool) VString(string);
-	}
-	result->set_name(method_name);
-	r.write_no_lang(*result);
+		string.APPEND_CONST(format(pool, value_result->as_double(), fmt.as_string().cstr()));
+		r.write_no_lang(string);
+	} else
+		r.write_no_lang(*value_result);
 }
 
 static void _connect(Request& r, const String& method_name, MethodParams *params) {
@@ -398,7 +402,8 @@ const String *locked_process_and_cache_p
 		"cache_put", locked_process_and_cache_put_action, &info,
 		false/*as_text*/,
 		false/*do_append*/,
-		false/*block*/) ? info.evaluated_body: 0;
+		false/*block*/,
+		false/*fail on lock problem*/) ? info.evaluated_body: 0;
 	if(data.expires==0)
 		cache_delete(file_spec);
 	return result;
@@ -531,23 +536,22 @@ static void _cache(Request& r, const Str
 VHash& exception2vhash(Pool& pool, const Exception& e) {
 	VHash& result=*new(pool) VHash(pool);
 	Hash& hash=result.hash(0);
-	if(const char *type=e.type())
+	if(const char *type=e.type(true))
 		hash.put(*exception_type_part_name, new(pool) VString(*new(pool) String(pool, type)));
 	if(const String *asource=e.problem_source()) {
 		String& source=*new(pool) String(pool); 
 		source.append(*asource, String::UL_TAINTED, true/*forced*/);
-		result.set_name(source);
 
 		hash.put(*exception_source_part_name, new(pool) VString(source));
 #ifndef NO_STRING_ORIGIN
 		const Origin& origin=source.origin();
-		hash.put(*new(pool) String(pool, "file"), 				
+		hash.put(*new(pool) String(pool, "file", 0, true),
 			new(pool) VString(*new(pool) String(pool, origin.file)));
 		hash.put(*new(pool) String(pool, "lineno"),
 			new(pool) VInt(pool, 1+origin.line));
 #endif
 	}
-	if(const char *ecomment=e.comment()) {
+	if(const char *ecomment=e.comment(true)) {
 		int comment_size=strlen(ecomment);
 		char *pcomment=(char *)pool.malloc(comment_size);
 		memcpy(pcomment, ecomment, comment_size);
@@ -627,19 +631,17 @@ static void _throw_operator(Request& r,
 	} else {
 		const char *type=params->as_string(0, "type must be string").cstr();
 		const String& source=params->as_string(1, "source must be string");
-		const char *comment=params->as_string(2, "comment must be string").cstr();
-		throw Exception(type, &source, comment);
+		const char *comment=params->size()>2?params->as_string(2, "comment must be string").cstr():0;
+		throw Exception(type, &source, "%s", comment?comment:"");
 	}
 }
 	
 // constructor
 
-MOP::MOP(Pool& apool) : Methoded(apool),
+MOP::MOP(Pool& apool) : Methoded(apool, "OP"),
 	main_sql_name(apool, MAIN_SQL_NAME),
 	main_sql_drivers_name(apool, MAIN_SQL_DRIVERS_NAME)
 {
-	set_name(*NEW String(pool(), OP_CLASS_NAME));
-
 	// ^if(condition){code-when-true}
 	// ^if(condition){code-when-true}{code-when-false}
 	add_native_method("if", Method::CT_ANY, _if, 2, 3);