--- parser3/src/classes/file.C	2024/11/10 20:33:21	1.288
+++ parser3/src/classes/file.C	2024/12/06 23:20:04	1.291
@@ -27,7 +27,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.288 2024/11/10 20:33:21 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.291 2024/12/06 23:20:04 moko Exp $";
 
 // defines
 
@@ -59,7 +59,7 @@ public:
 
 static Table &file_list_table_template(){
 	static Table *singleton=NULL;
-	if(singleton==NULL)
+	if(!singleton)
 		singleton=new Table(new File_list_table_template_columns);
 	return *singleton;
 }
@@ -134,7 +134,7 @@ static const String::Body cdate_name("cd
 
 static void _save(Request& r, MethodParams& params) {
 	bool is_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_NOT_BE_CODE));
-	Value& vfile_name=params.as_no_junction(1, FILE_NAME_MUST_NOT_BE_CODE);
+	const String& file_name=params.as_file_name(1);
 
 	Charset* asked_charset=0;
 	if(params.count()>2)
@@ -149,11 +149,11 @@ static void _save(Request& r, MethodPara
 		}
 
 	// save
-	GET_SELF(r, VFile).save(r.charsets, r.full_disk_path(vfile_name.as_string()), is_text, asked_charset);
+	GET_SELF(r, VFile).save(r.charsets, r.full_disk_path(file_name), is_text, asked_charset);
 }
 
 static void _delete(Request& r, MethodParams& params) {
-	const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
+	const String& file_name=params.as_file_name(0);
 	bool keep_empty_dirs=false;
 	bool fail_on_problem=true;
 
@@ -257,7 +257,7 @@ static void _load_pass_param(
 
 static void _load(Request& r, MethodParams& params) {
 	bool as_text=VFile::is_text_mode(params.as_string(0, MODE_MUST_NOT_BE_CODE));
-	const String& lfile_name=r.full_disk_path(params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE));
+	const String& lfile_name=r.full_disk_path(params.as_file_name(1));
 
 	size_t param_index=params.count()-1;
 	Value* param_value=param_index>1?&params.as_no_junction(param_index, "file name or options must not be code"):0;
@@ -318,7 +318,7 @@ static void _create(Request& r, MethodPa
 		// old format: ^file::create[text|binary;file-name;string-or-file-content[;options]] 
 		mode=&params.as_string(0, MODE_MUST_NOT_BE_CODE);
 		is_text=VFile::is_text_mode(*mode);
-		file_name=&params.as_string(1, FILE_NAME_MUST_NOT_BE_CODE);
+		file_name=&params.as_string(1, FILE_NAME_MUST_BE_STRING);
 		content_index=2;
 		options_index=3;
 		extended_options=false;
@@ -390,7 +390,7 @@ static void _create(Request& r, MethodPa
 }
 
 static void _stat(Request& r, MethodParams& params) {
-	const String& lfile_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
+	const String& lfile_name=params.as_file_name(0);
 
 	uint64_t size;
 	time_t atime, mtime, ctime;
@@ -487,7 +487,7 @@ static void _exec_cgi(Request& r, Method
 	if(param_index>=params.count())
 		throw Exception(PARSER_RUNTIME, 0, FILE_NAME_MUST_BE_SPECIFIED);
 
-	const String& script_name=r.full_disk_path(params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE));
+	const String& script_name=r.full_disk_path(params.as_file_name(param_index++));
 
 	HashStringString env;
 	#define ECSTR(name, value_cstr) if(value_cstr) env.put(#name, value_cstr);
@@ -783,7 +783,7 @@ static void lock_execute_body(int , void
 }
 
 static void _lock(Request& r, MethodParams& params) {
-	const String& file_spec=r.full_disk_path(params.as_string(0, FILE_NAME_MUST_BE_STRING));
+	const String& file_spec=r.full_disk_path(params.as_file_name(0));
 	Lock_execute_body_info info={
 		&r, 
 		&params.as_junction(1, "body must be code")
@@ -807,7 +807,7 @@ static size_t afterlastslash(const Strin
 }
 
 static void _find(Request& r, MethodParams& params) {
-	const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
+	const String& file_name=params.as_string(0, FILE_NAME_MUST_BE_STRING);
 
 	Value* not_found_code=(params.count()==2)?&params.as_junction(1, "not-found param must be code"):0;
 
@@ -1137,7 +1137,7 @@ static void _base64(Request& r, MethodPa
 		if(params.count() > 2)
 			throw Exception(PARSER_RUNTIME, 0, "accepts maximum 2 parameter(s) (has %d parameters)", params.count());
 
-		const String& file_spec = params.as_string(0, FILE_NAME_MUST_BE_STRING);
+		const String& file_spec = params.as_file_name(0);
 		File_read_result data = file_read_binary(r.full_disk_path(file_spec), true /*fail on problem*/);
 
 		Base64Options options = base64_encode_options(r, params.count() > 1 ? params.as_hash(1) : NULL);
@@ -1151,7 +1151,7 @@ static void _crc32(Request& r, MethodPar
 	if(&r.get_self() == file_class) {
 		// ^file:crc32[file-name]
 		if(params.count()) {
-			const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+			const String& file_spec=params.as_file_name(0);
 			crc32=pa_crc32(r.full_disk_path(file_spec));
 		} else {
 			throw Exception(PARSER_RUNTIME, 0, FILE_NAME_MUST_BE_SPECIFIED);
@@ -1207,7 +1207,7 @@ static void _md5(Request& r, MethodParam
 	if(&r.get_self() == file_class) {
 		// ^file:md5[file-name]
 		if(params.count()) {
-			const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+			const String& file_spec=params.as_file_name(0);
 			md5=pa_md5(r.full_disk_path(file_spec));
 		} else {
 			throw Exception(PARSER_RUNTIME, 0, FILE_NAME_MUST_BE_SPECIFIED);