--- parser3/src/classes/math.C	2015/10/06 22:20:50	1.78
+++ parser3/src/classes/math.C	2016/12/29 15:24:48	1.84
@@ -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.78 2015/10/06 22:20:50 moko Exp $";
+volatile const char * IDENT_MATH_C="$Id: math.C,v 1.84 2016/12/29 15:24:48 moko Exp $";
 
 // defines
 
@@ -31,27 +31,24 @@ 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
 
 static void _random(Request& r, MethodParams& params) {
 	double top=params.as_double(0, "range must be expression", r);
-	if(top<=0 || top>MAX_UINT)
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"top(%g) must be [1..%u]", top, MAX_UINT);
-	
-	r.write_no_lang(*new VInt(_random(uint(top))));
+	if(top<1 || top>INT32_MAX)
+		throw Exception(PARSER_RUNTIME, 0, "top(%.15g) must be [1..%u]", top, INT32_MAX);
+	r.write(*new VInt(_random(uint(top))));
 }
 
 
@@ -63,7 +60,7 @@ static double radians(double param) { re
 static void math1(Request& r, MethodParams& params, math1_func_ptr func) {
 	double param=params.as_double(0, "parameter must be expression", r);
 	double result=func(param);
-	r.write_no_lang(*new VDouble(result));
+	r.write(*new VDouble(result));
 }
 
 #define MATH1(name) \
@@ -102,7 +99,7 @@ static void math2(Request& r, MethodPara
 	double a=params.as_double(0, "parameter must be expression", r);
 	double b=params.as_double(1, "parameter must be expression", r);
 	double result=func(a, b);
-	r.write_no_lang(*new VDouble(result));
+	r.write(*new VDouble(result));
 }
 
 #define MATH2(name) \
@@ -156,7 +153,7 @@ static void _crypt(Request& r, MethodPar
 		pa_MD5Encode((const unsigned char *)password,
 				(const unsigned char *)normal_salt, sample_buf, sample_size);
 		String sample(sample_buf);
-		r.write_pass_lang(sample);
+		r.write(sample);
 	} else {
 #ifdef HAVE_CRYPT
 		const char* static_sample_buf=crypt(password, normal_salt);
@@ -167,7 +164,7 @@ static void _crypt(Request& r, MethodPar
 				0,
 				"crypt on this platform does not support '%.*s' salt prefix", prefix_size, normal_salt);
 		
-		r.write_pass_lang(String(pa_strdup(static_sample_buf)));
+		r.write(String(pa_strdup(static_sample_buf)));
 #else
 		throw Exception(PARSER_RUNTIME,
 			0,
@@ -185,7 +182,7 @@ static void _md5(Request& r, MethodParam
 	pa_MD5Update(&context, (const unsigned char*)string, strlen(string));
 	pa_MD5Final(digest, &context);
 
-	r.write_pass_lang(*new String(hex_string(digest, sizeof(digest), false)));
+	r.write(*new String(hex_string(digest, sizeof(digest), false)));
 }
 
 
@@ -337,7 +334,7 @@ static void _sha1(Request& r, MethodPara
 	SHA1Input (&c, (const unsigned char*)string, strlen(string));
 	SHA1ReadDigest(digest, &c);
 
-	r.write_pass_lang(*new String(hex_string(digest, sizeof(digest), false)));
+	r.write(*new String(hex_string(digest, sizeof(digest), false)));
 }
 
 void memxor(char *dest, const char *src, size_t n){
@@ -472,45 +469,32 @@ static void _digest(Request& r, MethodPa
 	}
 
 	if(format == F_HEX){
-		r.write_pass_lang(*new String(hex_string((unsigned char *)digest.str, digest.length, false)));
+		r.write(*new String(hex_string((unsigned char *)digest.str, digest.length, false)));
 	}
 	if(format == F_BASE64){
-		r.write_pass_lang(*new String(pa_base64_encode(digest.str, digest.length)));
+		r.write(*new String(pa_base64_encode(digest.str, digest.length)));
 	}
 }
 
 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(*new String(get_uuid_cstr()));
 }
 
 static void _uid64(Request& r, MethodParams& /*params*/) {
-
 	unsigned char id[64/8];
 	random(&id, sizeof(id));
 
-	r.write_pass_lang(*new String(hex_string(id, sizeof(id), true)));
+	r.write(*new String(hex_string(id, sizeof(id), true)));
 }
 
 static void _crc32(Request& r, MethodParams& params) {
 	const char *string=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr();
-	r.write_no_lang(*new VInt(pa_crc32(string, strlen(string))));
+	r.write(*new VInt(pa_crc32(string, strlen(string))));
 }
 
 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];
@@ -550,7 +534,7 @@ static void _convert(Request& r, MethodP
 
 	toBase(value, base_to, ptr);
 	*ptr=0;
-	r.write_pass_lang(*new String(pa_strdup(result_cstr)));
+	r.write(*new String(pa_strdup(result_cstr)));
 }
 
 // constructor