--- parser3/src/classes/op.C	2020/10/29 16:02:21	1.256
+++ parser3/src/classes/op.C	2024/09/13 04:01:22	1.263
@@ -1,8 +1,8 @@
 /** @file
 	Parser: parser @b operators.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "classes.h"
@@ -18,7 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.256 2020/10/29 16:02:21 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.263 2024/09/13 04:01:22 moko Exp $";
 
 // defines
 
@@ -200,7 +200,7 @@ static void _process(Request& r, MethodP
 					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			}
 
-		uint processe_file_no=file_alias ? r.register_file(r.absolute(*file_alias)) : pseudo_file_no__process;
+		uint processe_file_no=file_alias ? r.register_file(r.full_disk_path(*file_alias)) : pseudo_file_no__process;
 		// process...{string}
 		Value& vjunction=params.as_junction(index, "body must be code");
 		// evaluate source to process
@@ -319,7 +319,7 @@ static void _use(Request& r, MethodParam
 
 	Temp_class_replace class_replace(r, allow_class_replace);
 
-	r.use_file(r.main_class, vfile.as_string(), use_origin, load_auto_p);
+	r.use_file(vfile.as_string(), use_origin, load_auto_p);
 }
 
 static void set_skip(Request& r, Request::Skip askip) {
@@ -729,8 +729,8 @@ 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))
-		result=(time_t)(static_cast<VDate*>(vdate)->get_time());
+	if(VDate* vdate=dynamic_cast<VDate*>(&params[index]))
+		result=vdate->get_time();
 	else
 		result=now+(time_t)params.as_double(index, "lifespan must be date or number", r);
 	
@@ -738,7 +738,7 @@ static time_t as_expires(Request& r, Met
 }
 
 static const String& as_file_spec(Request& r, MethodParams& params, int index) {
-	return r.absolute(params.as_string(index, "filespec must be string"));
+	return r.full_disk_path(params.as_string(index, "filespec must be string"));
 }
 
 static void _cache(Request& r, MethodParams& params) {
@@ -861,7 +861,6 @@ static void _try_operator(Request& r, Me
 		// no exception in try/catch, writing processed body_code or catch_code
 		r.write(result.processed_code);
 	}
-
 }
 
 static void _throw_operator(Request&, MethodParams& params) {
@@ -877,26 +876,22 @@ static void _throw_operator(Request&, Me
 			if(Value* value=hash->get(exception_comment_part_name))
 				comment=value->as_string().cstr();
 
-			throw Exception(type,
-				source?source:0,
-				"%s", comment?comment:"");
+			throw Exception(type, source, "%s", comment); // to avoid MAX_STRING limit
 		} else
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"one-param version has hash or string param");
+			throw Exception(PARSER_RUNTIME, 0, "one-param version has hash or string param");
 	} else {
 		const char* type=params.as_string(0, "type must be string").cstr();
-		const String* source=params.count()>1? &params.as_string(1, "source must be string"):0;
-		const char* comment=params.count()>2? params.as_string(2, "comment must be string").cstr():0;
-		throw Exception(type, source, "%s", comment?comment:"");
+		const String* source=params.count()>1 ? &params.as_string(1, "source must be string") : 0;
+		const char* comment=params.count()>2 ? params.as_string(2, "comment must be string").cstr() : 0;
+		throw Exception(type, source, "%s", comment); // to avoid MAX_STRING limit
 	}
- }
+}
 
 static void _sleep_operator(Request& r, MethodParams& params) {
 	double seconds=params.as_double(0, "seconds must be double", r);
 	if(seconds>0)
 		pa_sleep((int)trunc(seconds), (int)trunc((seconds-trunc(seconds))*1000000));
- }
+}
 
 #if defined(WIN32) && defined(_DEBUG) && !defined(_WIN64)
 #	define PA_BPT