mirror of
https://github.com/lcn2/calc.git
synced 2025-08-16 01:03:29 +03:00
changed C source to use C booleans with backward compatibility
Fix "Under source code control" date for new version.h file. Sorted the order of symbols printed by "make env". Test if <stdbool.h> exists and set HAVE_STDBOOL_H accordingly in have_stdbool.h. Added HAVE_STDBOOL_H to allow one to force this value. Added "bool.h" include file to support use of boolean symbols, true and false for pre-c99 C compilers. The "bool.h" include file defines TRUE as true, FALSE as false, and BOOL as bool: for backward compatibility. The sign in a ZVALUE is now of type SIGN, whcih is either SB32 when CALC2_COMPAT is defined, or a bool. Replaced in C source, TRUE with true, FALSE with false, and BOOL with bool.
This commit is contained in:
18
qio.c
18
qio.c
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* qio - scanf and printf routines for arbitrary precision rational numbers
|
||||
*
|
||||
* Copyright (C) 1999-2007,2021,2022 David I. Bell
|
||||
* Copyright (C) 1999-2007,2021-2023 David I. Bell
|
||||
*
|
||||
* Calc is open software; you can redistribute it and/or modify it under
|
||||
* the terms of the version 2.1 of the GNU Lesser General Public License
|
||||
@@ -114,7 +114,7 @@ qprintf(char *fmt, ...)
|
||||
case 'r':
|
||||
case 'R':
|
||||
q = va_arg(ap, NUMBER *);
|
||||
qprintfr(q, width, (BOOL) (ch == 'R'));
|
||||
qprintfr(q, width, (bool) (ch == 'R'));
|
||||
break;
|
||||
case 'N':
|
||||
q = va_arg(ap, NUMBER *);
|
||||
@@ -227,7 +227,7 @@ qprintnum(NUMBER *q, int outmode, LEN outdigits)
|
||||
break;
|
||||
|
||||
case MODE_FRAC:
|
||||
qprintfr(q, 0L, FALSE);
|
||||
qprintfr(q, 0L, false);
|
||||
break;
|
||||
|
||||
case MODE_EXP:
|
||||
@@ -416,7 +416,7 @@ qprintfe(NUMBER *q, long UNUSED(width), long precision)
|
||||
* Example: 397/37
|
||||
*/
|
||||
void
|
||||
qprintfr(NUMBER *q, long width, BOOL force)
|
||||
qprintfr(NUMBER *q, long width, bool force)
|
||||
{
|
||||
zprintval(q->num, 0L, width);
|
||||
if (force || qisfrac(q)) {
|
||||
@@ -526,18 +526,18 @@ str2q(char *s)
|
||||
register char *t;
|
||||
ZVALUE div, newnum, newden, tmp;
|
||||
long decimals, exp;
|
||||
BOOL hex, negexp;
|
||||
bool hex, negexp;
|
||||
|
||||
q = qalloc();
|
||||
decimals = 0;
|
||||
exp = 0;
|
||||
negexp = FALSE;
|
||||
hex = FALSE;
|
||||
negexp = false;
|
||||
hex = false;
|
||||
t = s;
|
||||
if ((*t == '+') || (*t == '-'))
|
||||
t++;
|
||||
if ((*t == '0') && ((t[1] == 'x') || (t[1] == 'X'))) {
|
||||
hex = TRUE;
|
||||
hex = true;
|
||||
t += 2;
|
||||
}
|
||||
while (((*t >= '0') && (*t <= '9')) || (hex &&
|
||||
@@ -562,7 +562,7 @@ str2q(char *s)
|
||||
if (*t == '+')
|
||||
t++;
|
||||
else if (*t == '-') {
|
||||
negexp = TRUE;
|
||||
negexp = true;
|
||||
t++;
|
||||
}
|
||||
while ((*t >= '0') && (*t <= '9')) {
|
||||
|
Reference in New Issue
Block a user