--- parser3/src/classes/regex.C	2018/01/19 00:27:43	1.12
+++ parser3/src/classes/regex.C	2024/11/04 03:53:25	1.18
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b int parser class.
 
-	Copyright (c) 2001-2017 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"
@@ -12,7 +12,7 @@
 #include "pa_vint.h"
 #include "pa_vregex.h"
 
-volatile const char * IDENT_REGEX_C="$Id: regex.C,v 1.12 2018/01/19 00:27:43 moko Exp $";
+volatile const char * IDENT_REGEX_C="$Id: regex.C,v 1.18 2024/11/04 03:53:25 moko Exp $";
 
 // class
 
@@ -30,20 +30,16 @@ DECLARE_CLASS_VAR(regex, new MRegex);
 // methods
 
 static void _create(Request& r, MethodParams& params) {
-	const String& pattern=params.as_string(0, "regexp must not be code");
-
 	VRegex& vregex=GET_SELF(r, VRegex);
 
-	if(VRegex* aregex = static_cast<VRegex*>(params[0].as(VREGEX_TYPE))){
-		if(params.count()>1)
-			throw Exception(PARSER_RUNTIME, 0, "options can't be specified");
+	if(VRegex* aregex = dynamic_cast<VRegex*>(&params[0])){
 		vregex.set(*aregex);
 	} else {
+		const String& pattern=params.as_string(0, "regexp must not be code");
 		vregex.set(r.charsets.source(), &pattern, params.count()>1 ? &params.as_string(1, OPTIONS_MUST_NOT_BE_CODE) : 0);
 	}
 
 	vregex.compile();
-
 	vregex.study();
 }