--- parser3/src/classes/math.C	2015/05/08 15:52:53	1.73
+++ parser3/src/classes/math.C	2016/07/21 17:05:37	1.82
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b math parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru>(http://paf.design.ru)
 
 	portions from gen_uuid.c,
@@ -22,7 +22,7 @@
 extern "C" char *crypt(const char* , const char* );
 #endif
 
-volatile const char * IDENT_MATH_C="$Id: math.C,v 1.73 2015/05/08 15:52:53 moko Exp $";
+volatile const char * IDENT_MATH_C="$Id: math.C,v 1.82 2016/07/21 17:05:37 moko Exp $";
 
 // defines
 
@@ -31,16 +31,16 @@ volatile const char * IDENT_MATH_C="$Id:
 // class
 
 class MMath: public Methoded {
-public:
-	MMath();
-
 public: // Methoded
 	bool used_directly() { return false; }
+
+public:
+	MMath();
 };
 
 // global variables
 
-DECLARE_CLASS_VAR(math, 0 /*fictive*/, new MMath);
+DECLARE_CLASS_VAR(math, new MMath);
 
 // methods
 
@@ -70,20 +70,31 @@ static void math1(Request& r, MethodPara
 	static void _##name(Request& r, MethodParams& params) {\
 		math1(r, params, &name);\
 	}
+
 #define MATH1P(name_parser, name_c) \
 	static void _##name_parser(Request& r, MethodParams& params) {\
 		math1(r, params, &name_c);\
 	}
-MATH1(round);	MATH1(floor);	MATH1P(ceiling, ceil);
-MATH1(trunc);	MATH1(frac);
-MATH1P(abs, fabs);	MATH1(sign);
-MATH1(exp);	
-MATH1(log);	MATH1(log10);
-MATH1(sin);	MATH1(asin);	
-MATH1(cos);	MATH1(acos);	
-MATH1(tan);	MATH1(atan);
-MATH1(degrees);	MATH1(radians);
-MATH1(sqrt);
+
+MATH1(round)
+MATH1(floor)
+MATH1P(ceiling, ceil)
+MATH1(trunc)
+MATH1(frac)
+MATH1P(abs, fabs)
+MATH1(sign)
+MATH1(exp)
+MATH1(log)
+MATH1(log10)
+MATH1(sin)
+MATH1(asin)
+MATH1(cos)
+MATH1(acos)
+MATH1(tan)
+MATH1(atan)
+MATH1(degrees)
+MATH1(radians)
+MATH1(sqrt)
 
 
 typedef double (*math2_func_ptr)(double, double);
@@ -98,11 +109,13 @@ static void math2(Request& r, MethodPara
 	static void _##name(Request& r, MethodParams& params) {\
 		math2(r, params, &name);\
 	}
-MATH2(pow);
 
-inline bool is_salt_body_char(int c) {
+MATH2(pow)
+
+inline bool is_salt_body_char(unsigned char c) {
 	return pa_isalnum(c) || c == '.' || c=='/';
 }
+
 static size_t calc_prefix_size(const char* salt) {
 	if(strlen(salt)) {
 		if(!is_salt_body_char((unsigned char)salt[0])) { // $...  {...
@@ -467,23 +480,10 @@ static void _digest(Request& r, MethodPa
 }
 
 static void _uuid(Request& r, MethodParams& /*params*/) {
-	uuid uuid=get_uuid();
-
-	const size_t bufsize=36+1/*zero-teminator*/+1/*for faulty snprintfs*/;
-	char* cstr=new(PointerFreeGC) char[bufsize];
-
-	snprintf(cstr, bufsize,
-			"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-			uuid.time_low, uuid.time_mid, uuid.time_hi_and_version,
-			uuid.clock_seq >> 8, uuid.clock_seq & 0xFF,
-			uuid.node[0], uuid.node[1], uuid.node[2],
-			uuid.node[3], uuid.node[4], uuid.node[5]);
-
-	r.write_pass_lang(*new String(cstr));
+	r.write_pass_lang(*new String(get_uuid_cstr()));
 }
 
 static void _uid64(Request& r, MethodParams& /*params*/) {
-
 	unsigned char id[64/8];
 	random(&id, sizeof(id));
 
@@ -495,9 +495,9 @@ static void _crc32(Request& r, MethodPar
 	r.write_no_lang(*new VInt(pa_crc32(string, strlen(string))));
 }
 
-static void toBase(unsigned int value, unsigned int base, char*& ptr){
+static void toBase(unsigned long long int value, unsigned int base, char*& ptr){
 	static const char* hex="0123456789ABCDEF";
-	int rest = value % base;
+	unsigned int rest = (unsigned int)(value % base);
 	if(value >= base)
 		toBase( (value-rest)/base, base, ptr);
 	*ptr++=(char)hex[rest];
@@ -528,9 +528,9 @@ static void _convert(Request& r, MethodP
 		str++;
 	}
 
-	unsigned int value=pa_atoui(str, base_from);
+	unsigned long long int value=pa_atoul(str, base_from);
 
-	char result_cstr[sizeof(unsigned int)*8+1/*minus for negative number*/+1/*terminator*/];
+	char result_cstr[sizeof(unsigned long long int)*8+1/*minus for negative number*/+1/*terminator*/];
 	char* ptr=result_cstr;
 	if(negative)
 		*ptr++='-';