parser3/src/classes/math.C - diff

Return to math.C CVS log

Up to [parser3project] / parser3 / src / classes

Diff for /parser3/src/classes/math.C between versions 1.103 and 1.110

version 1.103, 2023/11/16 23:54:54	version 1.110, 2025/08/31 18:46:29
Line 1	Line 1
/** @file	/** @file
Parser: @b math parser class.	Parser: @b math parser class.

Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>

portions from gen_uuid.c,	portions from gen_uuid.c,
Line 109 static void math2(Request& r, MethodPara	Line 109 static void math2(Request& r, MethodPara
}	}

MATH2(pow)	MATH2(pow)
	MATH2(atan2)

	static inline uint64_t ulp_key_double(double x) {
	union { double d; uint64_t u; } v = { .d = x};
	return (v.u & (1ull << 63)) ? (~v.u + 1ull) : (v.u \| (1ull << 63));
	}

	static inline uint64_t ulp_distance_double(double a, double b) {
	if (a == b) return 0;
	uint64_t ka = ulp_key_double(a);
	uint64_t kb = ulp_key_double(b);
	return (ka > kb) ? (ka - kb) : (kb - ka);
	}

	static void _eq(Request& r, MethodParams& params) {
	double a=params.as_double(0, "parameter must be expression", r);
	double b=params.as_double(1, "parameter must be expression", r);
	uint64_t max_ulp=3;
	if(params.count() == 3)
	max_ulp=params.as_int(2, "max distance must be integer", r);
	r.write(VBool::get(ulp_distance_double(a,b)<=max_ulp));
	}

inline bool is_salt_body_char(unsigned char c) {	inline bool is_salt_body_char(unsigned char c) {
return pa_isalnum(c) \|\| c == '.' \|\| c=='/';	return pa_isalnum(c) \|\| c == '.' \|\| c=='/';
Line 317 void SHA1PadMessage(SHA1Context *context	Line 339 void SHA1PadMessage(SHA1Context *context
void SHA1ReadDigest(void buf, SHA1Context c)	void SHA1ReadDigest(void buf, SHA1Context c)
{	{
if(!SHA1Result(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)[0] = SWAP(c->Message_Digest[0]);
((uint32_t *)buf)[1] = SWAP(c->Message_Digest[1]);	((uint32_t *)buf)[1] = SWAP(c->Message_Digest[1]);
Line 355 void memxor(char dest, const char src,	Line 377 void memxor(char dest, const char src,
#define IPAD 0x36	#define IPAD 0x36
#define OPAD 0x5c	#define OPAD 0x5c

#define HMAC(key,init,update,final,blocklen,digestlen){ \	#define HMAC(key,keylen,init,update,final,blocklen,digestlen){ \
unsigned char tempdigest[digestlen], keydigest[digestlen]; \	unsigned char tempdigest[digestlen], keydigest[digestlen]; \
size_t keylen=strlen(key); \
/* Reduce the key's size, so that it becomes <= blocklen bytes. */ \	/* Reduce the key's size, so that it becomes <= blocklen bytes. */ \
if (keylen > blocklen){ \	if (keylen > blocklen){ \
init(&c); \	init(&c); \
update(&c,(const unsigned char*)hmac, keylen); \	update(&c,(const unsigned char*)key, keylen); \
final(keydigest, &c); \	final(keydigest, &c); \
key = (char *)keydigest; \	key = (char *)keydigest; \
keylen = digestlen; \	keylen = digestlen; \
Line 396 static void _digest(Request& r, MethodPa	Line 417 static void _digest(Request& r, MethodPa
else throw Exception(PARSER_RUNTIME, &smethod, "must be 'md5' or 'sha1' or 'sha256' or 'sha512'");	else throw Exception(PARSER_RUNTIME, &smethod, "must be 'md5' or 'sha1' or 'sha256' or 'sha512'");

const char *hmac=0;	const char *hmac=0;
enum Format { F_HEX, F_BASE64 } format = F_HEX;	size_t hmac_len=0;

	enum Format { F_HEX, F_BASE64, F_FILE } format = F_HEX;

if(params.count() == 3)	if(params.count() == 3)
if(HashStringValue* options=params.as_hash(2)) {	if(HashStringValue* options=params.as_hash(2)) {
int valid_options=0;	int valid_options=0;
if(Value* value=options->get("hmac")) {	if(Value* value=options->get("hmac")) {
hmac=value->as_string().cstr();	if(VFile* vfile=dynamic_cast<VFile *>(value)){
	hmac=(const char* )vfile->value_ptr();
	hmac_len=vfile->value_size();
	} else {
	hmac=value->as_string().cstr();
	hmac_len=strlen(hmac);
	}
valid_options++;	valid_options++;
}	}
if(Value* value=options->get("format")) {	if(Value* value=options->get("format")) {
const String& sformat=value->as_string();	const String& sformat=value->as_string();
if (sformat == "hex") format = F_HEX;	if (sformat == "hex") format = F_HEX;
else if (sformat == "base64" ) format = F_BASE64;	else if (sformat == "base64" ) format = F_BASE64;
	else if (sformat == "file" ) format = F_FILE;
else throw Exception(PARSER_RUNTIME, &sformat, "must be 'hex' or 'base64'");	else throw Exception(PARSER_RUNTIME, &sformat, "must be 'hex' or 'base64'");
valid_options++;	valid_options++;
}	}
Line 421 static void _digest(Request& r, MethodPa	Line 451 static void _digest(Request& r, MethodPa
if(method == M_MD5){	if(method == M_MD5){
PA_MD5_CTX c;	PA_MD5_CTX c;
if(hmac){	if(hmac){
HMAC(hmac, pa_MD5Init, pa_MD5Update, pa_MD5Final, 64, 16);	HMAC(hmac, hmac_len, pa_MD5Init, pa_MD5Update, pa_MD5Final, 64, 16);
} else {	} else {
pa_MD5Init(&c);	pa_MD5Init(&c);
pa_MD5Update(&c, (const unsigned char*)data.str, data.length);	pa_MD5Update(&c, (const unsigned char*)data.str, data.length);
Line 434 static void _digest(Request& r, MethodPa	Line 464 static void _digest(Request& r, MethodPa
if(method == M_SHA1){	if(method == M_SHA1){
SHA1Context c;	SHA1Context c;
if(hmac){	if(hmac){
HMAC(hmac, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20);	HMAC(hmac, hmac_len, SHA1Reset, SHA1Input, SHA1ReadDigest, 64, 20);
} else {	} else {
SHA1Reset(&c);	SHA1Reset(&c);
SHA1Input(&c, (const unsigned char*)data.str, data.length);	SHA1Input(&c, (const unsigned char*)data.str, data.length);
Line 447 static void _digest(Request& r, MethodPa	Line 477 static void _digest(Request& r, MethodPa
if(method == M_SHA256){	if(method == M_SHA256){
SHA256_CTX c;	SHA256_CTX c;
if(hmac){	if(hmac){
HMAC(hmac, pa_SHA256_Init, pa_SHA256_Update, pa_SHA256_Final, 64, SHA256_DIGEST_LENGTH);	HMAC(hmac, hmac_len, pa_SHA256_Init, pa_SHA256_Update, pa_SHA256_Final, 64, SHA256_DIGEST_LENGTH);
} else {	} else {
pa_SHA256_Init(&c);	pa_SHA256_Init(&c);
pa_SHA256_Update(&c, (const unsigned char*)data.str, data.length);	pa_SHA256_Update(&c, (const unsigned char*)data.str, data.length);
Line 460 static void _digest(Request& r, MethodPa	Line 490 static void _digest(Request& r, MethodPa
if(method == M_SHA512){	if(method == M_SHA512){
SHA512_CTX c;	SHA512_CTX c;
if(hmac){	if(hmac){
HMAC(hmac, pa_SHA512_Init, pa_SHA512_Update, pa_SHA512_Final, 128, SHA512_DIGEST_LENGTH);	HMAC(hmac, hmac_len, pa_SHA512_Init, pa_SHA512_Update, pa_SHA512_Final, 128, SHA512_DIGEST_LENGTH);
} else {	} else {
pa_SHA512_Init(&c);	pa_SHA512_Init(&c);
pa_SHA512_Update(&c, (const unsigned char*)data.str, data.length);	pa_SHA512_Update(&c, (const unsigned char*)data.str, data.length);
Line 476 static void _digest(Request& r, MethodPa	Line 506 static void _digest(Request& r, MethodPa
if(format == F_BASE64){	if(format == F_BASE64){
r.write(new String(pa_base64_encode(digest.str, digest.length, Base64Options(false /no wrap*/))));	r.write(new String(pa_base64_encode(digest.str, digest.length, Base64Options(false /no wrap*/))));
}	}
	if(format == F_FILE){
	VFile& result=*new VFile;
	result.set_binary(true, digest.str, digest.length);
	r.write(result);
	}
}	}

static void _uuid(Request& r, MethodParams& params) {	static void _uuid(Request& r, MethodParams& params) {
Line 633 static void _convert(Request& r, MethodP	Line 668 static void _convert(Request& r, MethodP
}	}

bool negative=false;	bool negative=false;
bool sign=false;

// converting digits to their numeric values	// converting digits to their numeric values

Line 647 static void _convert(Request& r, MethodP	Line 681 static void _convert(Request& r, MethodP
for(c=src;c<src_end;c++) {	for(c=src;c<src_end;c++) {
unsigned char digit=lookup[*c];	unsigned char digit=lookup[*c];
if(!digit && *c != abc_from[0])	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;	*c=digit;
}	}

Line 659 static void _convert(Request& r, MethodP	Line 693 static void _convert(Request& r, MethodP

if(src[0]=='-') {	if(src[0]=='-') {
negative=true;	negative=true;
sign=true;
src++;	src++;
	if(!src \|\| isspace(src))
	throw Exception("number.format", 0, "'-' is an invalid number");
} else if(src[0]=='+') {	} else if(src[0]=='+') {
sign=true;
src++;	src++;
	if(!src \|\| isspace(src))
	throw Exception("number.format", 0, "'+' is an invalid number");
}	}

for(c=src;c<src_end;c++) {	for(c=src;c<src_end;c++) {
Line 671 static void _convert(Request& r, MethodP	Line 707 static void _convert(Request& r, MethodP
if(!digit && *c != abc_from[0] \|\| digit>=base_from) {	if(!digit && *c != abc_from[0] \|\| digit>=base_from) {
for(unsigned char *s=c;s<src_end;s++)	for(unsigned char *s=c;s<src_end;s++)
if(!isspace(*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;	src_end=c;
break;	break;
}	}
Line 681 static void _convert(Request& r, MethodP	Line 717 static void _convert(Request& r, MethodP
}	}

if(src==src_end) {	if(src==src_end) {
if(sign)
throw Exception("number.format", 0, "'%c' is invalid number", negative ? '-' : '+');
if(result_file)	if(result_file)
r.write(*result_file);	r.write(*result_file);
return;	return;
Line 736 static void _convert(Request& r, MethodP	Line 770 static void _convert(Request& r, MethodP

MMath::MMath(): Methoded("math") {	MMath::MMath(): Methoded("math") {
// ^FUNC(expr)	// ^FUNC(expr)
#define ADDX(name, X) \	#define ADDN(name, N) \
add_native_method(#name, Method::CT_STATIC, _##name, X, X)	add_native_method(#name, Method::CT_STATIC, _##name, N, N)
#define ADD0(name) ADDX(name, 0)	#define ADD1(name) ADDN(name, 1)
#define ADD1(name) ADDX(name, 1)
#define ADD2(name) ADDX(name, 2)

ADD1(round); ADD1(floor); ADD1(ceiling);	ADD1(round); ADD1(floor); ADD1(ceiling);
ADD1(trunc); ADD1(frac);	ADD1(trunc); ADD1(frac);
Line 749 MMath::MMath(): Methoded("math") {	Line 781 MMath::MMath(): Methoded("math") {
ADD1(log); ADD1(log10);	ADD1(log); ADD1(log10);
ADD1(sin); ADD1(asin);	ADD1(sin); ADD1(asin);
ADD1(cos); ADD1(acos);	ADD1(cos); ADD1(acos);
ADD1(tan); ADD1(atan);	ADD1(tan); ADD1(atan); ADDN(atan2, 2);
ADD1(degrees); ADD1(radians);	ADD1(degrees); ADD1(radians);
ADD1(sqrt);	ADD1(sqrt);
ADD1(random);	ADD1(random);

// ^math:pow(x;y)	// ^math:pow(x;y)
ADD2(pow);	ADDN(pow, 2);

	// ^math:eq(a;b[;precision])
	add_native_method("eq", Method::CT_STATIC, _eq, 2, 3);

// ^math:crypt[password;salt]	// ^math:crypt[password;salt]
ADD2(crypt);	ADDN(crypt, 2);

// ^math:md5[string]	// ^math:md5[string]
ADD1(md5);	ADD1(md5);

E-mail:

Removed from v.1.103
changed lines
	Added in v.1.110