[Python-checkins] cpython: Whitespace.
stefan.krah
python-checkins at python.org
Wed Mar 21 20:29:18 CET 2012
http://hg.python.org/cpython/rev/82bef37f579d
changeset: 75862:82bef37f579d
parent: 75851:3d5ef57742d3
user: Stefan Krah <skrah at bytereef.org>
date: Wed Mar 21 20:21:20 2012 +0100
summary:
Whitespace.
files:
Modules/_decimal/_decimal.c | 4 +-
Modules/_decimal/libmpdec/context.c | 230 +++++++-------
Modules/_decimal/libmpdec/io.c | 48 +-
Modules/_decimal/libmpdec/mpdecimal.c | 2 +-
Modules/_decimal/libmpdec/mpdecimal.h | 14 +-
Modules/_decimal/libmpdec/typearith.h | 32 +-
6 files changed, 165 insertions(+), 165 deletions(-)
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -1585,14 +1585,14 @@
#define CURRENT_CONTEXT(ctxobj) \
ctxobj = current_context(); \
if (ctxobj == NULL) { \
- return NULL; \
+ return NULL; \
}
/* ctx := pointer to the mpd_context_t struct of the current context */
#define CURRENT_CONTEXT_ADDR(ctx) { \
PyObject *_c_t_x_o_b_j = current_context(); \
if (_c_t_x_o_b_j == NULL) { \
- return NULL; \
+ return NULL; \
} \
ctx = CTX(_c_t_x_o_b_j); \
}
diff --git a/Modules/_decimal/libmpdec/context.c b/Modules/_decimal/libmpdec/context.c
--- a/Modules/_decimal/libmpdec/context.c
+++ b/Modules/_decimal/libmpdec/context.c
@@ -35,7 +35,7 @@
void
mpd_dflt_traphandler(mpd_context_t *ctx UNUSED)
{
- raise(SIGFPE);
+ raise(SIGFPE);
}
void (* mpd_traphandler)(mpd_context_t *) = mpd_dflt_traphandler;
@@ -48,239 +48,239 @@
void
mpd_setminalloc(mpd_ssize_t n)
{
- static int minalloc_is_set = 0;
+ static int minalloc_is_set = 0;
- if (minalloc_is_set) {
- mpd_err_warn("mpd_setminalloc: ignoring request to set "
- "MPD_MINALLOC a second time\n");
- return;
- }
- if (n < MPD_MINALLOC_MIN || n > MPD_MINALLOC_MAX) {
- mpd_err_fatal("illegal value for MPD_MINALLOC"); /* GCOV_NOT_REACHED */
- }
- MPD_MINALLOC = n;
- minalloc_is_set = 1;
+ if (minalloc_is_set) {
+ mpd_err_warn("mpd_setminalloc: ignoring request to set "
+ "MPD_MINALLOC a second time\n");
+ return;
+ }
+ if (n < MPD_MINALLOC_MIN || n > MPD_MINALLOC_MAX) {
+ mpd_err_fatal("illegal value for MPD_MINALLOC"); /* GCOV_NOT_REACHED */
+ }
+ MPD_MINALLOC = n;
+ minalloc_is_set = 1;
}
void
mpd_init(mpd_context_t *ctx, mpd_ssize_t prec)
{
- mpd_ssize_t ideal_minalloc;
+ mpd_ssize_t ideal_minalloc;
- mpd_defaultcontext(ctx);
+ mpd_defaultcontext(ctx);
- if (!mpd_qsetprec(ctx, prec)) {
- mpd_addstatus_raise(ctx, MPD_Invalid_context);
- return;
- }
+ if (!mpd_qsetprec(ctx, prec)) {
+ mpd_addstatus_raise(ctx, MPD_Invalid_context);
+ return;
+ }
- ideal_minalloc = 2 * ((prec+MPD_RDIGITS-1) / MPD_RDIGITS);
- if (ideal_minalloc < MPD_MINALLOC_MIN) ideal_minalloc = MPD_MINALLOC_MIN;
- if (ideal_minalloc > MPD_MINALLOC_MAX) ideal_minalloc = MPD_MINALLOC_MAX;
+ ideal_minalloc = 2 * ((prec+MPD_RDIGITS-1) / MPD_RDIGITS);
+ if (ideal_minalloc < MPD_MINALLOC_MIN) ideal_minalloc = MPD_MINALLOC_MIN;
+ if (ideal_minalloc > MPD_MINALLOC_MAX) ideal_minalloc = MPD_MINALLOC_MAX;
- mpd_setminalloc(ideal_minalloc);
+ mpd_setminalloc(ideal_minalloc);
}
void
mpd_maxcontext(mpd_context_t *ctx)
{
- ctx->prec=MPD_MAX_PREC;
- ctx->emax=MPD_MAX_EMAX;
- ctx->emin=MPD_MIN_EMIN;
- ctx->round=MPD_ROUND_HALF_EVEN;
- ctx->traps=MPD_Traps;
- ctx->status=0;
- ctx->newtrap=0;
- ctx->clamp=0;
- ctx->allcr=1;
+ ctx->prec=MPD_MAX_PREC;
+ ctx->emax=MPD_MAX_EMAX;
+ ctx->emin=MPD_MIN_EMIN;
+ ctx->round=MPD_ROUND_HALF_EVEN;
+ ctx->traps=MPD_Traps;
+ ctx->status=0;
+ ctx->newtrap=0;
+ ctx->clamp=0;
+ ctx->allcr=1;
}
void
mpd_defaultcontext(mpd_context_t *ctx)
{
- ctx->prec=2*MPD_RDIGITS;
- ctx->emax=MPD_MAX_EMAX;
- ctx->emin=MPD_MIN_EMIN;
- ctx->round=MPD_ROUND_HALF_UP;
- ctx->traps=MPD_Traps;
- ctx->status=0;
- ctx->newtrap=0;
- ctx->clamp=0;
- ctx->allcr=1;
+ ctx->prec=2*MPD_RDIGITS;
+ ctx->emax=MPD_MAX_EMAX;
+ ctx->emin=MPD_MIN_EMIN;
+ ctx->round=MPD_ROUND_HALF_UP;
+ ctx->traps=MPD_Traps;
+ ctx->status=0;
+ ctx->newtrap=0;
+ ctx->clamp=0;
+ ctx->allcr=1;
}
void
mpd_basiccontext(mpd_context_t *ctx)
{
- ctx->prec=9;
- ctx->emax=MPD_MAX_EMAX;
- ctx->emin=MPD_MIN_EMIN;
- ctx->round=MPD_ROUND_HALF_UP;
- ctx->traps=MPD_Traps|MPD_Clamped;
- ctx->status=0;
- ctx->newtrap=0;
- ctx->clamp=0;
- ctx->allcr=1;
+ ctx->prec=9;
+ ctx->emax=MPD_MAX_EMAX;
+ ctx->emin=MPD_MIN_EMIN;
+ ctx->round=MPD_ROUND_HALF_UP;
+ ctx->traps=MPD_Traps|MPD_Clamped;
+ ctx->status=0;
+ ctx->newtrap=0;
+ ctx->clamp=0;
+ ctx->allcr=1;
}
int
mpd_ieee_context(mpd_context_t *ctx, int bits)
{
- if (bits <= 0 || bits > MPD_IEEE_CONTEXT_MAX_BITS || bits % 32) {
- return -1;
- }
+ if (bits <= 0 || bits > MPD_IEEE_CONTEXT_MAX_BITS || bits % 32) {
+ return -1;
+ }
- ctx->prec = 9 * (bits/32) - 2;
- ctx->emax = 3 * ((mpd_ssize_t)1<<(bits/16+3));
- ctx->emin = 1 - ctx->emax;
- ctx->round=MPD_ROUND_HALF_EVEN;
- ctx->traps=0;
- ctx->status=0;
- ctx->newtrap=0;
- ctx->clamp=1;
- ctx->allcr=1;
+ ctx->prec = 9 * (bits/32) - 2;
+ ctx->emax = 3 * ((mpd_ssize_t)1<<(bits/16+3));
+ ctx->emin = 1 - ctx->emax;
+ ctx->round=MPD_ROUND_HALF_EVEN;
+ ctx->traps=0;
+ ctx->status=0;
+ ctx->newtrap=0;
+ ctx->clamp=1;
+ ctx->allcr=1;
- return 0;
+ return 0;
}
mpd_ssize_t
mpd_getprec(const mpd_context_t *ctx)
{
- return ctx->prec;
+ return ctx->prec;
}
mpd_ssize_t
mpd_getemax(const mpd_context_t *ctx)
{
- return ctx->emax;
+ return ctx->emax;
}
mpd_ssize_t
mpd_getemin(const mpd_context_t *ctx)
{
- return ctx->emin;
+ return ctx->emin;
}
int
mpd_getround(const mpd_context_t *ctx)
{
- return ctx->round;
+ return ctx->round;
}
uint32_t
mpd_gettraps(const mpd_context_t *ctx)
{
- return ctx->traps;
+ return ctx->traps;
}
uint32_t
mpd_getstatus(const mpd_context_t *ctx)
{
- return ctx->status;
+ return ctx->status;
}
int
mpd_getclamp(const mpd_context_t *ctx)
{
- return ctx->clamp;
+ return ctx->clamp;
}
int
mpd_getcr(const mpd_context_t *ctx)
{
- return ctx->allcr;
+ return ctx->allcr;
}
int
mpd_qsetprec(mpd_context_t *ctx, mpd_ssize_t prec)
{
- if (prec <= 0 || prec > MPD_MAX_PREC) {
- return 0;
- }
- ctx->prec = prec;
- return 1;
+ if (prec <= 0 || prec > MPD_MAX_PREC) {
+ return 0;
+ }
+ ctx->prec = prec;
+ return 1;
}
int
mpd_qsetemax(mpd_context_t *ctx, mpd_ssize_t emax)
{
- if (emax < 0 || emax > MPD_MAX_EMAX) {
- return 0;
- }
- ctx->emax = emax;
- return 1;
+ if (emax < 0 || emax > MPD_MAX_EMAX) {
+ return 0;
+ }
+ ctx->emax = emax;
+ return 1;
}
int
mpd_qsetemin(mpd_context_t *ctx, mpd_ssize_t emin)
{
- if (emin > 0 || emin < MPD_MIN_EMIN) {
- return 0;
- }
- ctx->emin = emin;
- return 1;
+ if (emin > 0 || emin < MPD_MIN_EMIN) {
+ return 0;
+ }
+ ctx->emin = emin;
+ return 1;
}
int
mpd_qsetround(mpd_context_t *ctx, int round)
{
- if (!(0 <= round && round < MPD_ROUND_GUARD)) {
- return 0;
- }
- ctx->round = round;
- return 1;
+ if (!(0 <= round && round < MPD_ROUND_GUARD)) {
+ return 0;
+ }
+ ctx->round = round;
+ return 1;
}
int
mpd_qsettraps(mpd_context_t *ctx, uint32_t traps)
{
- if (traps > MPD_Max_status) {
- return 0;
- }
- ctx->traps = traps;
- return 1;
+ if (traps > MPD_Max_status) {
+ return 0;
+ }
+ ctx->traps = traps;
+ return 1;
}
int
mpd_qsetstatus(mpd_context_t *ctx, uint32_t flags)
{
- if (flags > MPD_Max_status) {
- return 0;
- }
- ctx->status = flags;
- return 1;
+ if (flags > MPD_Max_status) {
+ return 0;
+ }
+ ctx->status = flags;
+ return 1;
}
int
mpd_qsetclamp(mpd_context_t *ctx, int c)
{
- if (c != 0 && c != 1) {
- return 0;
- }
- ctx->clamp = c;
- return 1;
+ if (c != 0 && c != 1) {
+ return 0;
+ }
+ ctx->clamp = c;
+ return 1;
}
int
mpd_qsetcr(mpd_context_t *ctx, int c)
{
- if (c != 0 && c != 1) {
- return 0;
- }
- ctx->allcr = c;
- return 1;
+ if (c != 0 && c != 1) {
+ return 0;
+ }
+ ctx->allcr = c;
+ return 1;
}
void
mpd_addstatus_raise(mpd_context_t *ctx, uint32_t flags)
{
- ctx->status |= flags;
- if (flags&ctx->traps) {
- ctx->newtrap = (flags&ctx->traps);
- mpd_traphandler(ctx);
- }
+ ctx->status |= flags;
+ if (flags&ctx->traps) {
+ ctx->newtrap = (flags&ctx->traps);
+ mpd_traphandler(ctx);
+ }
}
diff --git a/Modules/_decimal/libmpdec/io.c b/Modules/_decimal/libmpdec/io.c
--- a/Modules/_decimal/libmpdec/io.c
+++ b/Modules/_decimal/libmpdec/io.c
@@ -328,33 +328,33 @@
static inline char *
word_to_string(char *s, mpd_uint_t x, int n, char *dot)
{
- switch(n) {
+ switch(n) {
#ifdef CONFIG_64
- case 20: EXTRACT_DIGIT(s, x, 10000000000000000000ULL, dot); /* GCOV_NOT_REACHED */
- case 19: EXTRACT_DIGIT(s, x, 1000000000000000000ULL, dot);
- case 18: EXTRACT_DIGIT(s, x, 100000000000000000ULL, dot);
- case 17: EXTRACT_DIGIT(s, x, 10000000000000000ULL, dot);
- case 16: EXTRACT_DIGIT(s, x, 1000000000000000ULL, dot);
- case 15: EXTRACT_DIGIT(s, x, 100000000000000ULL, dot);
- case 14: EXTRACT_DIGIT(s, x, 10000000000000ULL, dot);
- case 13: EXTRACT_DIGIT(s, x, 1000000000000ULL, dot);
- case 12: EXTRACT_DIGIT(s, x, 100000000000ULL, dot);
- case 11: EXTRACT_DIGIT(s, x, 10000000000ULL, dot);
+ case 20: EXTRACT_DIGIT(s, x, 10000000000000000000ULL, dot); /* GCOV_NOT_REACHED */
+ case 19: EXTRACT_DIGIT(s, x, 1000000000000000000ULL, dot);
+ case 18: EXTRACT_DIGIT(s, x, 100000000000000000ULL, dot);
+ case 17: EXTRACT_DIGIT(s, x, 10000000000000000ULL, dot);
+ case 16: EXTRACT_DIGIT(s, x, 1000000000000000ULL, dot);
+ case 15: EXTRACT_DIGIT(s, x, 100000000000000ULL, dot);
+ case 14: EXTRACT_DIGIT(s, x, 10000000000000ULL, dot);
+ case 13: EXTRACT_DIGIT(s, x, 1000000000000ULL, dot);
+ case 12: EXTRACT_DIGIT(s, x, 100000000000ULL, dot);
+ case 11: EXTRACT_DIGIT(s, x, 10000000000ULL, dot);
#endif
- case 10: EXTRACT_DIGIT(s, x, 1000000000UL, dot);
- case 9: EXTRACT_DIGIT(s, x, 100000000UL, dot);
- case 8: EXTRACT_DIGIT(s, x, 10000000UL, dot);
- case 7: EXTRACT_DIGIT(s, x, 1000000UL, dot);
- case 6: EXTRACT_DIGIT(s, x, 100000UL, dot);
- case 5: EXTRACT_DIGIT(s, x, 10000UL, dot);
- case 4: EXTRACT_DIGIT(s, x, 1000UL, dot);
- case 3: EXTRACT_DIGIT(s, x, 100UL, dot);
- case 2: EXTRACT_DIGIT(s, x, 10UL, dot);
- default: if (s == dot) *s++ = '.'; *s++ = '0' + (char)x;
- }
+ case 10: EXTRACT_DIGIT(s, x, 1000000000UL, dot);
+ case 9: EXTRACT_DIGIT(s, x, 100000000UL, dot);
+ case 8: EXTRACT_DIGIT(s, x, 10000000UL, dot);
+ case 7: EXTRACT_DIGIT(s, x, 1000000UL, dot);
+ case 6: EXTRACT_DIGIT(s, x, 100000UL, dot);
+ case 5: EXTRACT_DIGIT(s, x, 10000UL, dot);
+ case 4: EXTRACT_DIGIT(s, x, 1000UL, dot);
+ case 3: EXTRACT_DIGIT(s, x, 100UL, dot);
+ case 2: EXTRACT_DIGIT(s, x, 10UL, dot);
+ default: if (s == dot) *s++ = '.'; *s++ = '0' + (char)x;
+ }
- *s = '0円';
- return s;
+ *s = '0円';
+ return s;
}
/* Print exponent x to string s. Undefined for MPD_SSIZE_MIN. */
diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
--- a/Modules/_decimal/libmpdec/mpdecimal.c
+++ b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -6192,7 +6192,7 @@
mpd_qdivint(&texp, &texp, &two, &maxcontext, status);
}
if (mpd_isspecial(&texp) || mpd_isspecial(&tbase) ||
- mpd_isspecial(&tmod) || mpd_isspecial(result)) {
+ mpd_isspecial(&tmod) || mpd_isspecial(result)) {
/* MPD_Malloc_error */
goto mpd_errors;
}
diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h
--- a/Modules/_decimal/libmpdec/mpdecimal.h
+++ b/Modules/_decimal/libmpdec/mpdecimal.h
@@ -749,14 +749,14 @@
/******************************************************************************/
#define mpd_err_fatal(...) \
- do {fprintf(stderr, "%s:%d: error: ", __FILE__, __LINE__); \
- fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); \
- exit(1); \
- } while (0)
+ do {fprintf(stderr, "%s:%d: error: ", __FILE__, __LINE__); \
+ fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); \
+ exit(1); \
+ } while (0)
#define mpd_err_warn(...) \
- do {fprintf(stderr, "%s:%d: warning: ", __FILE__, __LINE__); \
- fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); \
- } while (0)
+ do {fprintf(stderr, "%s:%d: warning: ", __FILE__, __LINE__); \
+ fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); \
+ } while (0)
/******************************************************************************/
diff --git a/Modules/_decimal/libmpdec/typearith.h b/Modules/_decimal/libmpdec/typearith.h
--- a/Modules/_decimal/libmpdec/typearith.h
+++ b/Modules/_decimal/libmpdec/typearith.h
@@ -207,10 +207,10 @@
{
mpd_uint_t h, l;
- asm ( "mulq %3\n\t"
- : "=d" (h), "=a" (l)
- : "%a" (a), "rm" (b)
- : "cc"
+ asm ( "mulq %3\n\t"
+ : "=d" (h), "=a" (l)
+ : "%a" (a), "rm" (b)
+ : "cc"
);
*hi = h;
@@ -223,10 +223,10 @@
{
mpd_uint_t qq, rr;
- asm ( "divq %4\n\t"
- : "=a" (qq), "=d" (rr)
- : "a" (lo), "d" (hi), "rm" (d)
- : "cc"
+ asm ( "divq %4\n\t"
+ : "=a" (qq), "=d" (rr)
+ : "a" (lo), "d" (hi), "rm" (d)
+ : "cc"
);
*q = qq;
@@ -464,10 +464,10 @@
{
mpd_uint_t h, l;
- asm ( "mull %3\n\t"
- : "=d" (h), "=a" (l)
- : "%a" (a), "rm" (b)
- : "cc"
+ asm ( "mull %3\n\t"
+ : "=d" (h), "=a" (l)
+ : "%a" (a), "rm" (b)
+ : "cc"
);
*hi = h;
@@ -480,10 +480,10 @@
{
mpd_uint_t qq, rr;
- asm ( "divl %4\n\t"
- : "=a" (qq), "=d" (rr)
- : "a" (lo), "d" (hi), "rm" (d)
- : "cc"
+ asm ( "divl %4\n\t"
+ : "=a" (qq), "=d" (rr)
+ : "a" (lo), "d" (hi), "rm" (d)
+ : "cc"
);
*q = qq;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list