diff --git a/calcerr.tbl b/calcerr.tbl index b99254f..5786d16 100644 --- a/calcerr.tbl +++ b/calcerr.tbl @@ -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_D2DMS2 Non-real-number arg 1 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_D2DM2 Non-real-number arg 1 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_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_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_H2HMS2 Non-real-number arg 1 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_H2HM2 Non-real-number arg 1 for h2hm E_H2HM3 No-assign-to argument 2 or 3 for h2hm +E_H2HM4 Invalid rounding arg 4 for h2hm diff --git a/func.c b/func.c index 31c2c8c..14ba51d 100644 --- a/func.c +++ b/func.c @@ -3960,7 +3960,7 @@ f_d2dms(int count, VALUE **vals) } if (v5->v_type != V_NUM || qisfrac(v5->v_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); } else { @@ -4079,7 +4079,7 @@ f_d2dm(int count, VALUE **vals) } if (v4->v_type != V_NUM || qisfrac(v4->v_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); } else { @@ -4177,7 +4177,7 @@ f_g2gms(int count, VALUE **vals) } if (v5->v_type != V_NUM || qisfrac(v5->v_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); } else { @@ -4296,7 +4296,7 @@ f_g2gm(int count, VALUE **vals) } if (v4->v_type != V_NUM || qisfrac(v4->v_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); } else { @@ -4394,7 +4394,7 @@ f_h2hms(int count, VALUE **vals) } if (v5->v_type != V_NUM || qisfrac(v5->v_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); } else { @@ -4513,7 +4513,7 @@ f_h2hm(int count, VALUE **vals) } if (v4->v_type != V_NUM || qisfrac(v4->v_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); } else {