--- parser3/src/classes/op.C	2003/03/24 11:05:27	1.127.2.22.2.14
+++ parser3/src/classes/op.C	2003/04/02 14:16:17	1.127.2.22.2.22
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_OP_C="$Date: 2003/03/24 11:05:27 $";
+static const char* IDENT_OP_C="$Date: 2003/04/02 14:16:17 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -31,7 +31,6 @@ static const char* IDENT_OP_C="$Date: 20
 class VClassMAIN: public VClass {
 public:
 	VClassMAIN();
-	override ~VClassMAIN() {}
 };
 
 // defines for statics
@@ -59,7 +58,7 @@ static const String exception_handled_pa
 
 // helpers
 
-class Untaint_lang_name2enum: public Hash<const StringBody&, String::Language> {
+class Untaint_lang_name2enum: public Hash<const StringBody, String::Language> {
 public:
 	Untaint_lang_name2enum() {
 		#define ULN(name, LANG) \
@@ -188,9 +187,8 @@ static void _process(Request& r, MethodP
 		// process source code, append processed methods to 'self' class
 		// maybe-define new @main
 		r.use_buf(*target_class,
-			source.cstr(String::L_UNSPECIFIED, r.connection()), 
-			*new String("later"), //new String(heap_place, place_size, true /*tainted*/),
-			"later"); //heap_place);
+			source.cstr(String::L_UNSPECIFIED, r.connection(false)),
+			0); // later! *new String("later"), //new String(heap_place, place_size, true /*tainted*/),
 		
 		// main_method
 		main_method=target_class->get_method(main_method_name);
@@ -269,7 +267,7 @@ static void _for(Request& r, MethodParam
 static void _eval(Request& r, MethodParams* params) {
 	Value& expr=params->as_junction(0, "need expression");
 	// evaluate expresion
-	Value& 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->count()>1) {
@@ -335,7 +333,7 @@ public:
 #endif
 static void _switch(Request& r, MethodParams* params) {
 	Switch_data* data=new Switch_data(r, r.process_to_value(*(*params)[0]));
-	Temp_hash_value<const StringBody& , PA_Object*> 
+	Temp_hash_value<const StringBody, PA_Object*> 
 		switch_data_setter(r.classes_conf, switch_data_name, data);
 
 	Value& cases_code=params->as_junction(1, "switch cases must be code");
@@ -413,7 +411,6 @@ class Cache_data: public PA_Object {
 public:
 	time_t expires;
 };
-DECLARE_OBJECT_PTR(Cache_data);
 struct Locked_process_and_cache_put_action_info {
 	Request *r;
 	Cache_data *data;
@@ -530,7 +527,7 @@ static void _cache(Request& r, MethodPar
 	const String& file_spec=r.absolute(params->as_string(0, "filespec must be string"));
 
 	Cache_data* data=new Cache_data;
-	Temp_hash_value<const StringBody& , PA_Object*> 
+	Temp_hash_value<const StringBody, PA_Object*> 
 		cache_data_setter(r.classes_conf, cache_data_name, data);
 	data->expires=as_expires(r, params, 1, now);
 	Value& body_code=params->as_junction(2, "body must be code");
@@ -748,6 +745,5 @@ VClassMAIN::VClassMAIN(): VClass() {
 // constructor & configurator
 
 VStateless_class& VClassMAIN_create() {
-	
 	return *new VClassMAIN;
 }