--- parser3/src/classes/math.C	2023/11/23 01:27:12	1.104
+++ parser3/src/classes/math.C	2024/10/27 17:50:59	1.107
@@ -23,7 +23,7 @@
 extern "C" char *crypt(const char* , const char* );
 #endif
 
-volatile const char * IDENT_MATH_C="$Id: math.C,v 1.104 2023/11/23 01:27:12 moko Exp $";
+volatile const char * IDENT_MATH_C="$Id: math.C,v 1.107 2024/10/27 17:50:59 moko Exp $";
 
 // defines
 
@@ -109,6 +109,7 @@ static void math2(Request& r, MethodPara
 	}
 
 MATH2(pow)
+MATH2(atan2)
 
 inline bool is_salt_body_char(unsigned char c) {
 	return pa_isalnum(c) || c == '.' || c=='/';
@@ -317,7 +318,7 @@ void SHA1PadMessage(SHA1Context *context
 void SHA1ReadDigest(void *buf, SHA1Context *c)
 {
 	if(!SHA1Result(c))
-		throw Exception (PARSER_RUNTIME, 0, "Can not compute SHA1");
+		throw Exception (PARSER_RUNTIME, 0, "Cannot compute SHA1");
 
 	((uint32_t *)buf)[0] = SWAP(c->Message_Digest[0]);
 	((uint32_t *)buf)[1] = SWAP(c->Message_Digest[1]);
@@ -646,7 +647,7 @@ static void _convert(Request& r, MethodP
 		for(c=src;c<src_end;c++) {
 			unsigned char digit=lookup[*c];
 			if(!digit && *c != abc_from[0])
-				throw Exception("number.format", 0, "'%c' is invalid digit", *c);
+				throw Exception("number.format", 0, "'%c' is an invalid digit", *c);
 			*c=digit;
 		}
 
@@ -660,11 +661,11 @@ static void _convert(Request& r, MethodP
 			negative=true;
 			src++;
 			if(!*src || isspace(*src))
-				throw Exception("number.format", 0,  "'-' is invalid number");
+				throw Exception("number.format", 0,  "'-' is an invalid number");
 		} else if(src[0]=='+') {
 			src++;
 			if(!*src || isspace(*src))
-				throw Exception("number.format", 0,  "'+' is invalid number");
+				throw Exception("number.format", 0,  "'+' is an invalid number");
 		}
 
 		for(c=src;c<src_end;c++) {
@@ -672,7 +673,7 @@ static void _convert(Request& r, MethodP
 			if(!digit && *c != abc_from[0] || digit>=base_from) {
 				for(unsigned char *s=c;s<src_end;s++)
 					if(!isspace(*s))
-						throw Exception("number.format", 0, "'%c' is invalid digit", *s);
+						throw Exception("number.format", 0, "'%c' is an invalid digit", *s);
 				src_end=c;
 				break;
 			}
@@ -735,11 +736,9 @@ static void _convert(Request& r, MethodP
 
 MMath::MMath(): Methoded("math") {
 	// ^FUNC(expr)	
-#define ADDX(name, X) \
-	add_native_method(#name, Method::CT_STATIC, _##name, X, X)
-#define ADD0(name) ADDX(name, 0)
-#define ADD1(name) ADDX(name, 1)
-#define ADD2(name) ADDX(name, 2)
+#define ADDN(name, N) \
+	add_native_method(#name, Method::CT_STATIC, _##name, N, N)
+#define ADD1(name) ADDN(name, 1)
 
 	ADD1(round);	ADD1(floor);	ADD1(ceiling);
 	ADD1(trunc);	ADD1(frac);
@@ -748,16 +747,16 @@ MMath::MMath(): Methoded("math") {
 	ADD1(log);	ADD1(log10);
 	ADD1(sin);	ADD1(asin);
 	ADD1(cos);	ADD1(acos);
-	ADD1(tan);	ADD1(atan);
+	ADD1(tan);	ADD1(atan);	ADDN(atan2, 2);
 	ADD1(degrees);	ADD1(radians);
 	ADD1(sqrt);
 	ADD1(random);
 
 	// ^math:pow(x;y)
-	ADD2(pow);
+	ADDN(pow, 2);
 
 	// ^math:crypt[password;salt]
-	ADD2(crypt);
+	ADDN(crypt, 2);
 
 	// ^math:md5[string]
 	ADD1(md5);