drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-19 01:13:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve error codes for some invalid rounding args

Browse Source
This commit is contained in:
Landon Curt Noll
2021-09-26 23:50:45 -07:00
parent cf419fb329
commit d5de36841a
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
calcerr.tbl
View File

@@ -509,18 +509,24 @@ E_G2D1 Bad first argument converting gradians to degrees
E_D2DMS1 Non-lvalue arguments 2, 3 or 4 for d2dms E_D2DMS1 Non-lvalue arguments 2, 3 or 4 for d2dms
E_D2DMS2 Non-real-number arg 1 for d2dms E_D2DMS2 Non-real-number arg 1 for d2dms
E_D2DMS3 No-assign-to argument 2, 3 or 4 for d2dms E_D2DMS3 No-assign-to argument 2, 3 or 4 for d2dms
E_D2DMS4 Invalid rounding arg 5 for d2dms
E_D2DM1 Non-lvalue arguments 2 or 3 for d2dm E_D2DM1 Non-lvalue arguments 2 or 3 for d2dm
E_D2DM2 Non-real-number arg 1 for d2dm E_D2DM2 Non-real-number arg 1 for d2dm
E_D2DM3 No-assign-to argument 2 or 3 for d2dm E_D2DM3 No-assign-to argument 2 or 3 for d2dm
E_D2DM4 Invalid rounding arg 4 for d2dm
E_G2GMS1 Non-lvalue arguments 2, 3 or 4 for g2gms E_G2GMS1 Non-lvalue arguments 2, 3 or 4 for g2gms
E_G2GMS2 Non-real-number arg 1 for g2gms E_G2GMS2 Non-real-number arg 1 for g2gms
E_G2GMS3 No-assign-to argument 2 or 3 for g2gm E_G2GMS3 No-assign-to argument 2 or 3 for g2gms
E_G2GMS4 Invalid rounding arg 5 for g2gms
E_G2GM1 Non-lvalue arguments 2 or 3 for g2gm E_G2GM1 Non-lvalue arguments 2 or 3 for g2gm
E_G2GM2 Non-real-number arg 1 for g2gm E_G2GM2 Non-real-number arg 1 for g2gm
E_G2GM3 No-assign-to argument 2, 3 or 4 for g2gms E_G2GM3 No-assign-to argument 2, 3 or 4 for g2gm
E_G2GM4 Invalid rounding arg 4 for g2gm
E_H2HMS1 Non-lvalue arguments 2, 3 or 4 for h2hms E_H2HMS1 Non-lvalue arguments 2, 3 or 4 for h2hms
E_H2HMS2 Non-real-number arg 1 for h2hms E_H2HMS2 Non-real-number arg 1 for h2hms
E_H2HMS3 No-assign-to argument 2, 3 or 4 for h2hms E_H2HMS3 No-assign-to argument 2, 3 or 4 for h2hms
E_H2HMS4 Invalid rounding arg 5 for h2hms
E_H2HM1 Non-lvalue arguments 2 or 3 for h2hm E_H2HM1 Non-lvalue arguments 2 or 3 for h2hm
E_H2HM2 Non-real-number arg 1 for h2hm E_H2HM2 Non-real-number arg 1 for h2hm
E_H2HM3 No-assign-to argument 2 or 3 for h2hm E_H2HM3 No-assign-to argument 2 or 3 for h2hm
E_H2HM4 Invalid rounding arg 4 for h2hm

12
func.c
View File

@@ -3960,7 +3960,7 @@ f_d2dms(int count, VALUE **vals)
} }
if (v5->v_type != V_NUM || qisfrac(v5->v_num) || if (v5->v_type != V_NUM || qisfrac(v5->v_num) ||
qisneg(v5->v_num) || zge31b(v5->v_num->num)) { qisneg(v5->v_num) || zge31b(v5->v_num->num)) {
return error_value(E_D2DMS2); return error_value(E_D2DMS4);
} }
rnd = qtoi(v5->v_num); rnd = qtoi(v5->v_num);
} else { } else {
@@ -4079,7 +4079,7 @@ f_d2dm(int count, VALUE **vals)
} }
if (v4->v_type != V_NUM || qisfrac(v4->v_num) || if (v4->v_type != V_NUM || qisfrac(v4->v_num) ||
qisneg(v4->v_num) || zge31b(v4->v_num->num)) { qisneg(v4->v_num) || zge31b(v4->v_num->num)) {
return error_value(E_D2DM2); return error_value(E_D2DM4);
} }
rnd = qtoi(v4->v_num); rnd = qtoi(v4->v_num);
} else { } else {
@@ -4177,7 +4177,7 @@ f_g2gms(int count, VALUE **vals)
} }
if (v5->v_type != V_NUM || qisfrac(v5->v_num) || if (v5->v_type != V_NUM || qisfrac(v5->v_num) ||
qisneg(v5->v_num) || zge31b(v5->v_num->num)) { qisneg(v5->v_num) || zge31b(v5->v_num->num)) {
return error_value(E_G2GMS2); return error_value(E_G2GMS4);
} }
rnd = qtoi(v5->v_num); rnd = qtoi(v5->v_num);
} else { } else {
@@ -4296,7 +4296,7 @@ f_g2gm(int count, VALUE **vals)
} }
if (v4->v_type != V_NUM || qisfrac(v4->v_num) || if (v4->v_type != V_NUM || qisfrac(v4->v_num) ||
qisneg(v4->v_num) || zge31b(v4->v_num->num)) { qisneg(v4->v_num) || zge31b(v4->v_num->num)) {
return error_value(E_G2GM2); return error_value(E_G2GM4);
} }
rnd = qtoi(v4->v_num); rnd = qtoi(v4->v_num);
} else { } else {
@@ -4394,7 +4394,7 @@ f_h2hms(int count, VALUE **vals)
} }
if (v5->v_type != V_NUM || qisfrac(v5->v_num) || if (v5->v_type != V_NUM || qisfrac(v5->v_num) ||
qisneg(v5->v_num) || zge31b(v5->v_num->num)) { qisneg(v5->v_num) || zge31b(v5->v_num->num)) {
return error_value(E_H2HMS2); return error_value(E_H2HMS4);
} }
rnd = qtoi(v5->v_num); rnd = qtoi(v5->v_num);
} else { } else {
@@ -4513,7 +4513,7 @@ f_h2hm(int count, VALUE **vals)
} }
if (v4->v_type != V_NUM || qisfrac(v4->v_num) || if (v4->v_type != V_NUM || qisfrac(v4->v_num) ||
qisneg(v4->v_num) || zge31b(v4->v_num->num)) { qisneg(v4->v_num) || zge31b(v4->v_num->num)) {
return error_value(E_H2HM2); return error_value(E_H2HM4);
} }
rnd = qtoi(v4->v_num); rnd = qtoi(v4->v_num);
} else { } else {