--- parser3/src/classes/op.C	2009/07/14 11:14:34	1.194
+++ parser3/src/classes/op.C	2010/05/20 04:36:36	1.199
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_OP_C="$Date: 2009/07/14 11:14:34 $";
+static const char * const IDENT_OP_C="$Date: 2010/05/20 04:36:36 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -38,15 +38,6 @@ public:
 	VClassMAIN();
 };
 
-// defines for globals
-
-#define CYCLE_DATA_NAME "CYCLE-DATA"
-
-// globals
-
-//^for & co
-String cycle_data_name(CYCLE_DATA_NAME);
-
 // defines for statics
 
 #define SWITCH_DATA_NAME "SWITCH-DATA"
@@ -75,6 +66,7 @@ public:
 	Untaint_lang_name2enum() {
 		#define ULN(name, LANG) \
 			put(String::Body(name), (value_type)(String::L_##LANG));
+		ULN("clean", CLEAN);
 		ULN("as-is", AS_IS);
 		ULN("optimized-as-is", AS_IS|String::L_OPTIMIZE_BIT);
 		ULN("file-spec", FILE_SPEC);
@@ -157,7 +149,7 @@ static void _process(Request& r, MethodP
 	}
 
 	{
-		VStateless_class *target_class=target_self->get_last_derived_class();
+		VStateless_class *target_class=target_self->get_class();
 		if(!target_class)
 			throw Exception(PARSER_RUNTIME,
 				0,
@@ -173,7 +165,7 @@ static void _process(Request& r, MethodP
 		size_t options_index=index+1;
 		HashStringValue* options=0;
 		if(options_index<params.count()) {
-			Value& voptions=params.as_no_junction(options_index, "options must not be code");
+			Value& voptions=params.as_no_junction(options_index, OPTIONS_MUST_NOT_BE_CODE);
 			options=voptions.get_hash();
 			if(!options)
 				throw Exception(PARSER_RUNTIME,
@@ -236,8 +228,7 @@ static void _rem(Request&, MethodParams&
 }
 
 static void _while(Request& r, MethodParams& params) {
-	Temp_hash_value<const String::Body, void*> 
-		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+	InCycle temp(r);
 
 	Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");
 
@@ -293,12 +284,13 @@ static void _while(Request& r, MethodPar
 
 static void _use(Request& r, MethodParams& params) {
 	Value& vfile=params.as_no_junction(0, FILE_NAME_MUST_NOT_BE_CODE);
-	r.use_file(r.main_class, vfile.as_string());
+
+	// _use could be called from the parser3 method only, so caller is always defined
+	r.use_file(r.main_class, vfile.as_string(), r.get_method_filename(r.get_method_frame()->caller()->junction.method));
 }
 
 static void set_skip(Request& r, Request::Skip askip) {
-	void* data=r.classes_conf.get(cycle_data_name);
-	if(!data)
+	if(!r.get_in_cycle())
 		throw Exception(PARSER_RUNTIME,
 			0,
 			"without cycle");
@@ -315,8 +307,7 @@ static void _continue(Request& r, Method
 }
 
 static void _for(Request& r, MethodParams& params) {
-	Temp_hash_value<const String::Body, void*> 
-		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+	InCycle temp(r);
 
 	const String& var_name=params.as_string(0, "var name must be string");
 	int from=params.as_int(1, "from must be int", r);
@@ -332,7 +323,7 @@ static void _for(Request& r, MethodParam
 	VInt* vint=new VInt(0);
 
 	VMethodFrame& caller=*r.get_method_frame()->caller();
-	caller.put_element(caller, var_name, vint, false);
+	caller.put_element(var_name, vint, false);
 	if(delim_maybe_code){ // delimiter set 
 		bool need_delim=false;
 
@@ -391,8 +382,8 @@ struct timeval mt[2];
 	Value& body_code=params.as_junction(1, "body must be code");
 
 	Table* protocol2driver_and_client=0;
-	if(Value* sql=r.main_class.get_element(String(MAIN_SQL_NAME), r.main_class, false)) {
-		if(Value* element=sql->get_element(String(MAIN_SQL_DRIVERS_NAME), *sql, false)) {
+	if(Value* sql=r.main_class.get_element(String(MAIN_SQL_NAME))) {
+		if(Value* element=sql->get_element(String(MAIN_SQL_DRIVERS_NAME))) {
 			protocol2driver_and_client=element->get_table();
 		}
 	}
@@ -540,15 +531,15 @@ static Try_catch_result try_catch(Reques
 
 		Junction* junction=catch_code->get_junction();
 		Value* method_frame=junction->method_frame;
-		Value* saved_exception_var_value=method_frame->get_element(exception_var_name, *method_frame, false);
+		Value* saved_exception_var_value=method_frame->get_element(exception_var_name);
 		VMethodFrame& frame=*junction->method_frame;
-		frame.put_element(frame, exception_var_name, &details.vhash, false);
+		frame.put_element(exception_var_name, &details.vhash, false);
 
 		result.processed_code=r.process(*catch_code);
 		
 		// retriving $exception.handled, restoring $exception var
 		Value* vhandled=details.vhash.hash().get(exception_handled_part_name);
-		frame.put_element(frame, exception_var_name, saved_exception_var_value, false);
+		frame.put_element(exception_var_name, saved_exception_var_value, false);
 
 		bool bhandled=false;
 		if(vhandled) {
@@ -711,7 +702,7 @@ static Cache_get_result cache_get(Reques
 static time_t as_expires(Request& r, MethodParams& params, 
 						int index, time_t now) {
 	time_t result;
-	if(Value* vdate=params[index].as(VDATE_TYPE, false))
+	if(Value* vdate=params[index].as(VDATE_TYPE))
 		result=static_cast<VDate*>(vdate)->get_time();
 	else
 		result=now+(time_t)params.as_double(index, "lifespan must be date or number", r);