--- parser3/src/classes/op.C	2021/11/09 14:45:06	1.261
+++ parser3/src/classes/op.C	2024/12/23 16:59:17	1.271
@@ -1,8 +1,8 @@
 /** @file
 	Parser: parser @b operators.
 
-	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2024 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.261 2021/11/09 14:45:06 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.271 2024/12/23 16:59:17 moko Exp $";
 
 // defines
 
@@ -76,7 +76,15 @@ public:
 		ULN("json", JSON);
 		#undef ULN
 	}
-} untaint_lang_name2enum;
+
+	static Untaint_lang_name2enum &instance(){
+		static Untaint_lang_name2enum *singleton=NULL;
+		if(!singleton)
+			singleton=new Untaint_lang_name2enum;
+		return *singleton;
+	}
+
+};
 
 // methods
 
@@ -97,7 +105,7 @@ static void _if(Request& r, MethodParams
 }
 
 String::Language get_untaint_lang(const String& lang_name){
-	String::Language lang=untaint_lang_name2enum.get(lang_name);
+	String::Language lang=Untaint_lang_name2enum::instance().get(lang_name);
 	if(!lang)
 		throw Exception(PARSER_RUNTIME,	&lang_name, "invalid taint language");
 	return lang;
@@ -279,7 +287,7 @@ 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);
+	const String& file_name=params.as_file_name(0);
 
 	const String* use_origin=0;
 	bool allow_class_replace=false;
@@ -319,7 +327,7 @@ static void _use(Request& r, MethodParam
 
 	Temp_class_replace class_replace(r, allow_class_replace);
 
-	r.use_file(vfile.as_string(), use_origin, load_auto_p);
+	r.use_file(file_name, use_origin, load_auto_p);
 }
 
 static void set_skip(Request& r, Request::Skip askip) {
@@ -401,7 +409,7 @@ static void _eval(Request& r, MethodPara
 		if(fmt.is_empty()){
 			r.write(value_result);
 		} else {
-			r.write(String(format(value_result.as_double(), fmt.cstrm())));
+			r.write(String(format_double(value_result.as_double(), fmt.cstrm())));
 		}
 	} else
 		r.write(value_result);
@@ -707,7 +715,7 @@ struct Cache_get_result {
 };
 #endif
 
-static Cache_get_result cache_get(Request_charsets& charsets, const String& file_spec, time_t now) {
+static Cache_get_result cache_get(const String& file_spec, time_t now) {
 	Cache_get_result result={0, false};
 
 	File_read_result file=file_read_binary(file_spec, false /*fail_on_read_problem*/);
@@ -729,8 +737,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);
 	
@@ -789,7 +797,7 @@ static void _cache(Request& r, MethodPar
 		catch_code=&params.as_junction(3, "catch_code must be code");
 
 	if(scope.expires>now) {
-		Cache_get_result cached=cache_get(r.charsets, file_spec, now);
+		Cache_get_result cached=cache_get(file_spec, now);
 
 		if(cached.body) { // have cached copy
 			if(cached.expired) {