Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 45b8391

Browse files
gvanrossumgvanrossum
committed
New form of PyFPE_END_PROTECT macro.
1 parent 1aeb104 commit 45b8391

12 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎Modules/_tkinter.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ Tkapp_ExprDouble (self, args)
730730
return NULL;
731731
PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
732732
retval = Tcl_ExprDouble (Tkapp_Interp (self), s, &v);
733-
PyFPE_END_PROTECT
733+
PyFPE_END_PROTECT(retval)
734734
if (retval == TCL_ERROR)
735735
return Tkinter_Error(self);
736736
return Py_BuildValue("d", v);

‎Modules/cmathmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ math_1(args, func)
249249
errno = 0;
250250
PyFPE_START_PROTECT("complex function", return 0)
251251
x = (*func)(x);
252-
PyFPE_END_PROTECT
252+
PyFPE_END_PROTECT(x)
253253
CHECK(x.real);
254254
CHECK(x.imag);
255255
if (errno != 0)

‎Modules/fpetestmodule.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ static double nest1(int i, double x)
120120
/* This (following) message is never seen. */
121121
PyFPE_START_PROTECT("Division by zero, inner zone", return 3.1416)
122122
a = 1./(1. - x);
123-
PyFPE_END_PROTECT
123+
PyFPE_END_PROTECT(a)
124124
}else if(i == 2){
125125
a = 1./(2. - x);
126126
}
127-
PyFPE_END_PROTECT
127+
PyFPE_END_PROTECT(a)
128128

129129
return a;
130130
}
@@ -140,7 +140,7 @@ static double nest2(int i, double x)
140140
}else if(i == 2){
141141
a = 1./(2. - x);
142142
}
143-
PyFPE_END_PROTECT
143+
PyFPE_END_PROTECT(a)
144144
return a;
145145
}
146146

@@ -150,7 +150,7 @@ static double nest3(double x)
150150
/* This (following) message is never seen. */
151151
PyFPE_START_PROTECT("Division by zero, nest3 error", return 3.1416)
152152
result = 1./(1. - x);
153-
PyFPE_END_PROTECT
153+
PyFPE_END_PROTECT(result)
154154
return result;
155155
}
156156

@@ -159,7 +159,7 @@ static double db0(double x)
159159
double a;
160160
PyFPE_START_PROTECT("Division by zero", return 3.1416)
161161
a = 1./x;
162-
PyFPE_END_PROTECT
162+
PyFPE_END_PROTECT(a)
163163
return a;
164164
}
165165

@@ -168,7 +168,7 @@ static double overflow(double b)
168168
double a;
169169
PyFPE_START_PROTECT("Overflow", return 3.1416)
170170
a = b*b;
171-
PyFPE_END_PROTECT
171+
PyFPE_END_PROTECT(a)
172172
return a;
173173
}
174174

‎Modules/imgfile.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ PyObject *args;
390390
PyFPE_START_PROTECT("readscaled", return 0)
391391
xfac = (float)xsize/(float)xwtd;
392392
yfac = (float)ysize/(float)ywtd;
393-
PyFPE_END_PROTECT
393+
PyFPE_END_PROTECT(yfac)
394394
cdatap = PyString_AsString(rv);
395395
idatap = (long *)cdatap;
396396

‎Modules/mathmodule.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ math_1(args, func)
8282
errno = 0;
8383
PyFPE_START_PROTECT("in math_1", return 0)
8484
x = (*func)(x);
85-
PyFPE_END_PROTECT
85+
PyFPE_END_PROTECT(x)
8686
CHECK(x);
8787
if (errno != 0)
8888
return math_error();
@@ -101,7 +101,7 @@ math_2(args, func)
101101
errno = 0;
102102
PyFPE_START_PROTECT("in math_2", return 0)
103103
x = (*func)(x, y);
104-
PyFPE_END_PROTECT
104+
PyFPE_END_PROTECT(x)
105105
CHECK(x);
106106
if (errno != 0)
107107
return math_error();
@@ -179,7 +179,7 @@ math_ldexp(self, args)
179179
errno = 0;
180180
PyFPE_START_PROTECT("ldexp", return 0)
181181
x = ldexp(x, (int)y);
182-
PyFPE_END_PROTECT
182+
PyFPE_END_PROTECT(x)
183183
CHECK(x);
184184
if (errno != 0)
185185
return math_error();

‎Modules/mpzmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ mpz_float(self)
14971497
mulstate *= multiplier;
14981498
mpz_div_2exp(&mpzscratch, &mpzscratch, BITS_PER_MP_LIMB);
14991499
}
1500-
PyFPE_END_PROTECT
1500+
PyFPE_END_PROTECT(mulstate)
15011501

15021502
assert(mpz_cmp_ui(&mpzscratch, (unsigned long int)0) == 0);
15031503
mpz_clear(&mpzscratch);

‎Objects/complexobject.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ complex_add(v, w)
367367
Py_complex result;
368368
PyFPE_START_PROTECT("complex_add", return 0)
369369
result = c_sum(v->cval,w->cval);
370-
PyFPE_END_PROTECT
370+
PyFPE_END_PROTECT(result)
371371
return newcomplexobject(result);
372372
}
373373

@@ -379,7 +379,7 @@ complex_sub(v, w)
379379
Py_complex result;
380380
PyFPE_START_PROTECT("complex_sub", return 0)
381381
result = c_diff(v->cval,w->cval);
382-
PyFPE_END_PROTECT
382+
PyFPE_END_PROTECT(result)
383383
return newcomplexobject(result);
384384
}
385385

@@ -391,7 +391,7 @@ complex_mul(v, w)
391391
Py_complex result;
392392
PyFPE_START_PROTECT("complex_mul", return 0)
393393
result = c_prod(v->cval,w->cval);
394-
PyFPE_END_PROTECT
394+
PyFPE_END_PROTECT(result)
395395
return newcomplexobject(result);
396396
}
397397

@@ -404,7 +404,7 @@ complex_div(v, w)
404404
PyFPE_START_PROTECT("complex_div", return 0)
405405
c_error = 0;
406406
quot = c_quot(v->cval,w->cval);
407-
PyFPE_END_PROTECT
407+
PyFPE_END_PROTECT(quot)
408408
if (c_error == 1) {
409409
err_setstr(ZeroDivisionError, "complex division");
410410
return NULL;
@@ -480,7 +480,7 @@ complex_pow(v, w, z)
480480
else
481481
p = c_pow(v->cval,exponent);
482482

483-
PyFPE_END_PROTECT
483+
PyFPE_END_PROTECT(p)
484484
if (c_error == 2) {
485485
err_setstr(ValueError, "0.0 to a negative or complex power");
486486
return NULL;
@@ -514,7 +514,7 @@ complex_abs(v)
514514
double result;
515515
PyFPE_START_PROTECT("complex_abs", return 0)
516516
result = hypot(v->cval.real,v->cval.imag);
517-
PyFPE_END_PROTECT
517+
PyFPE_END_PROTECT(result)
518518
return newfloatobject(result);
519519
}
520520

‎Objects/floatobject.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ float_add(v, w)
260260
double result;
261261
PyFPE_START_PROTECT("add", return 0)
262262
result = v->ob_fval + w->ob_fval;
263-
PyFPE_END_PROTECT
263+
PyFPE_END_PROTECT(result)
264264
return newfloatobject(result);
265265
}
266266

@@ -272,7 +272,7 @@ float_sub(v, w)
272272
double result;
273273
PyFPE_START_PROTECT("subtract", return 0)
274274
result = v->ob_fval - w->ob_fval;
275-
PyFPE_END_PROTECT
275+
PyFPE_END_PROTECT(result)
276276
return newfloatobject(result);
277277
}
278278

@@ -285,7 +285,7 @@ float_mul(v, w)
285285

286286
PyFPE_START_PROTECT("multiply", return 0)
287287
result = v->ob_fval * w->ob_fval;
288-
PyFPE_END_PROTECT
288+
PyFPE_END_PROTECT(result)
289289
return newfloatobject(result);
290290
}
291291

@@ -301,7 +301,7 @@ float_div(v, w)
301301
}
302302
PyFPE_START_PROTECT("divide", return 0)
303303
result = v->ob_fval / w->ob_fval;
304-
PyFPE_END_PROTECT
304+
PyFPE_END_PROTECT(result)
305305
return newfloatobject(result);
306306
}
307307

@@ -325,7 +325,7 @@ float_rem(v, w)
325325
mod += wx;
326326
/* div -= 1.0; */
327327
}
328-
PyFPE_END_PROTECT
328+
PyFPE_END_PROTECT(mod)
329329
return newfloatobject(mod);
330330
}
331331

@@ -349,7 +349,7 @@ float_divmod(v, w)
349349
mod += wx;
350350
div -= 1.0;
351351
}
352-
PyFPE_END_PROTECT
352+
PyFPE_END_PROTECT(div)
353353
return mkvalue("(dd)", div, mod);
354354
}
355355

@@ -394,7 +394,7 @@ float_pow(v, w, z)
394394
if (ix!=0 && z->ob_fval<0) ix+=z->ob_fval;
395395
}
396396
else ix=1.0;
397-
PyFPE_END_PROTECT
397+
PyFPE_END_PROTECT(ix)
398398
return newfloatobject(ix);
399399
}
400400
errno = 0;
@@ -403,7 +403,7 @@ float_pow(v, w, z)
403403
ix = powu(iv, intw);
404404
else
405405
ix = 1./powu(iv, -intw);
406-
PyFPE_END_PROTECT
406+
PyFPE_END_PROTECT(ix)
407407
}
408408
else {
409409
/* Sort out special cases here instead of relying on pow() */
@@ -423,7 +423,7 @@ float_pow(v, w, z)
423423
errno = 0;
424424
PyFPE_START_PROTECT("pow", return 0)
425425
ix = pow(iv, iw);
426-
PyFPE_END_PROTECT
426+
PyFPE_END_PROTECT(ix)
427427
}
428428
CHECK(ix);
429429
if (errno != 0) {
@@ -438,7 +438,7 @@ float_pow(v, w, z)
438438
((iv<0 && z->ob_fval>0) || (iv>0 && z->ob_fval<0) )) {
439439
ix+=z->ob_fval;
440440
}
441-
PyFPE_END_PROTECT
441+
PyFPE_END_PROTECT(ix)
442442
}
443443
return newfloatobject(ix);
444444
}

‎Objects/longobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ long_float(v)
14211421
double result;
14221422
PyFPE_START_PROTECT("long_float", return 0)
14231423
result = dgetlongvalue(v);
1424-
PyFPE_END_PROTECT
1424+
PyFPE_END_PROTECT(result)
14251425
return newfloatobject(result);
14261426
}
14271427

‎Python/compile.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -818,14 +818,14 @@ parsenumber(co, s)
818818
c.real = 0.;
819819
PyFPE_START_PROTECT("atof", return 0)
820820
c.imag = atof(s);
821-
PyFPE_END_PROTECT
821+
PyFPE_END_PROTECT(c)
822822
return newcomplexobject(c);
823823
}
824824
else {
825825
#endif
826826
PyFPE_START_PROTECT("atof", return 0)
827827
dx = atof(s);
828-
PyFPE_END_PROTECT
828+
PyFPE_END_PROTECT(dx)
829829
return newfloatobject(dx);
830830
}
831831
}

0 commit comments

Comments
 (0)