--- parser3/src/classes/math.C	2021/11/08 11:44:19	1.99
+++ parser3/src/classes/math.C	2023/11/23 01:27:12	1.104
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b math parser class.
 
-	Copyright (c) 2001-2020 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>
 
 	portions from gen_uuid.c,
 	Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o.
@@ -23,7 +23,7 @@
 extern "C" char *crypt(const char* , const char* );
 #endif
 
-volatile const char * IDENT_MATH_C="$Id: math.C,v 1.99 2021/11/08 11:44:19 moko Exp $";
+volatile const char * IDENT_MATH_C="$Id: math.C,v 1.104 2023/11/23 01:27:12 moko Exp $";
 
 // defines
 
@@ -47,8 +47,8 @@ DECLARE_CLASS_VAR(math, new MMath);
 
 static void _random(Request& r, MethodParams& params) {
 	double top=params.as_double(0, "range must be expression", r);
-	if(top<1 || top>INT32_MAX)
-		throw Exception(PARSER_RUNTIME, 0, "top(%.15g) must be [1..%u]", top, INT32_MAX);
+	if(top<1 || top>INT_MAX)
+		throw Exception(PARSER_RUNTIME, 0, "top(%.15g) must be [1..%u]", top, INT_MAX);
 	r.write(*new VInt(_random(uint(top))));
 }
 
@@ -500,6 +500,28 @@ static void _uuid(Request& r, MethodPara
 	r.write(*new String(get_uuid_cstr(lower, solid)));
 }
 
+static void _uuid7(Request& r, MethodParams& params) {
+	bool lower=false;
+	bool solid=false;
+
+	if (params.count() == 1)
+		if (HashStringValue* options = params.as_hash(0)) {
+			int valid_options = 0;
+			if (Value* vlower = options->get("lower")) {
+				lower = r.process(*vlower).as_bool();
+				valid_options++;
+			}
+			if (Value* vsolid = options->get("solid")) {
+				solid = r.process(*vsolid).as_bool();
+				valid_options++;
+			}
+			if (valid_options != options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
+
+	r.write(*new String(get_uuid7_cstr(lower, solid)));
+}
+
 static void _uid64(Request& r, MethodParams& params) {
 	bool lower = false;
 
@@ -522,7 +544,7 @@ static void _uid64(Request& r, MethodPar
 
 static void _crc32(Request& r, MethodParams& params) {
 	const char *string=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr();
-	r.write(*new VInt(pa_crc32(string, strlen(string))));
+	r.write(*new VDouble((uint)pa_crc32(string, strlen(string))));
 }
 
 static const char* abc_hex = "0123456789ABCDEF";
@@ -611,7 +633,6 @@ static void _convert(Request& r, MethodP
 		}
 
 	bool negative=false;
-	bool sign=false;
 
 	// converting digits to their numeric values
 
@@ -637,11 +658,13 @@ static void _convert(Request& r, MethodP
 
 		if(src[0]=='-') {
 			negative=true;
-			sign=true;
 			src++;
+			if(!*src || isspace(*src))
+				throw Exception("number.format", 0,  "'-' is invalid number");
 		} else if(src[0]=='+') {
-			sign=true;
 			src++;
+			if(!*src || isspace(*src))
+				throw Exception("number.format", 0,  "'+' is invalid number");
 		}
 
 		for(c=src;c<src_end;c++) {
@@ -659,8 +682,6 @@ static void _convert(Request& r, MethodP
 	}
 
 	if(src==src_end) {
-		if(sign)
-			throw Exception("number.format", 0,  "'%c' is invalid number", negative ? '-' : '+');
 		if(result_file)
 			r.write(*result_file);
 		return;
@@ -754,6 +775,10 @@ MMath::MMath(): Methoded("math") {
 	// ^math:uuid[options hash]
 	add_native_method("uuid", Method::CT_STATIC, _uuid, 0, 1);
 
+	// ^math:uuid7[]
+	// ^math:uuid7[options hash]
+	add_native_method("uuid7", Method::CT_STATIC, _uuid7, 0, 1);
+
 	// ^math:uid64[]
 	// ^math:uid64[options hash]
 	add_native_method("uid64", Method::CT_STATIC, _uid64, 0, 1);