summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/formatting.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/adt/formatting.c')
-rw-r--r--src/backend/utils/adt/formatting.c272
1 files changed, 136 insertions, 136 deletions
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 7877af2d6be..50254f23888 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -718,99 +718,99 @@ typedef enum
*/
static const KeyWord DCH_keywords[] = {
/* name, len, id, is_digit, date_mode */
- {"A.D.", 4, DCH_A_D, FALSE, FROM_CHAR_DATE_NONE}, /* A */
- {"A.M.", 4, DCH_A_M, FALSE, FROM_CHAR_DATE_NONE},
- {"AD", 2, DCH_AD, FALSE, FROM_CHAR_DATE_NONE},
- {"AM", 2, DCH_AM, FALSE, FROM_CHAR_DATE_NONE},
- {"B.C.", 4, DCH_B_C, FALSE, FROM_CHAR_DATE_NONE}, /* B */
- {"BC", 2, DCH_BC, FALSE, FROM_CHAR_DATE_NONE},
- {"CC", 2, DCH_CC, TRUE, FROM_CHAR_DATE_NONE}, /* C */
- {"DAY", 3, DCH_DAY, FALSE, FROM_CHAR_DATE_NONE}, /* D */
- {"DDD", 3, DCH_DDD, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"DD", 2, DCH_DD, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"DY", 2, DCH_DY, FALSE, FROM_CHAR_DATE_NONE},
- {"Day", 3, DCH_Day, FALSE, FROM_CHAR_DATE_NONE},
- {"Dy", 2, DCH_Dy, FALSE, FROM_CHAR_DATE_NONE},
- {"D", 1, DCH_D, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"FX", 2, DCH_FX, FALSE, FROM_CHAR_DATE_NONE}, /* F */
- {"HH24", 4, DCH_HH24, TRUE, FROM_CHAR_DATE_NONE}, /* H */
- {"HH12", 4, DCH_HH12, TRUE, FROM_CHAR_DATE_NONE},
- {"HH", 2, DCH_HH, TRUE, FROM_CHAR_DATE_NONE},
- {"IDDD", 4, DCH_IDDD, TRUE, FROM_CHAR_DATE_ISOWEEK}, /* I */
- {"ID", 2, DCH_ID, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"IW", 2, DCH_IW, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"IYYY", 4, DCH_IYYY, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"IYY", 3, DCH_IYY, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"IY", 2, DCH_IY, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"I", 1, DCH_I, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"J", 1, DCH_J, TRUE, FROM_CHAR_DATE_NONE}, /* J */
- {"MI", 2, DCH_MI, TRUE, FROM_CHAR_DATE_NONE}, /* M */
- {"MM", 2, DCH_MM, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"MONTH", 5, DCH_MONTH, FALSE, FROM_CHAR_DATE_GREGORIAN},
- {"MON", 3, DCH_MON, FALSE, FROM_CHAR_DATE_GREGORIAN},
- {"MS", 2, DCH_MS, TRUE, FROM_CHAR_DATE_NONE},
- {"Month", 5, DCH_Month, FALSE, FROM_CHAR_DATE_GREGORIAN},
- {"Mon", 3, DCH_Mon, FALSE, FROM_CHAR_DATE_GREGORIAN},
- {"OF", 2, DCH_OF, FALSE, FROM_CHAR_DATE_NONE}, /* O */
- {"P.M.", 4, DCH_P_M, FALSE, FROM_CHAR_DATE_NONE}, /* P */
- {"PM", 2, DCH_PM, FALSE, FROM_CHAR_DATE_NONE},
- {"Q", 1, DCH_Q, TRUE, FROM_CHAR_DATE_NONE}, /* Q */
- {"RM", 2, DCH_RM, FALSE, FROM_CHAR_DATE_GREGORIAN}, /* R */
- {"SSSS", 4, DCH_SSSS, TRUE, FROM_CHAR_DATE_NONE}, /* S */
- {"SS", 2, DCH_SS, TRUE, FROM_CHAR_DATE_NONE},
- {"TZ", 2, DCH_TZ, FALSE, FROM_CHAR_DATE_NONE}, /* T */
- {"US", 2, DCH_US, TRUE, FROM_CHAR_DATE_NONE}, /* U */
- {"WW", 2, DCH_WW, TRUE, FROM_CHAR_DATE_GREGORIAN}, /* W */
- {"W", 1, DCH_W, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"Y,YYY", 5, DCH_Y_YYY, TRUE, FROM_CHAR_DATE_GREGORIAN}, /* Y */
- {"YYYY", 4, DCH_YYYY, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"YYY", 3, DCH_YYY, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"YY", 2, DCH_YY, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"Y", 1, DCH_Y, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"a.d.", 4, DCH_a_d, FALSE, FROM_CHAR_DATE_NONE}, /* a */
- {"a.m.", 4, DCH_a_m, FALSE, FROM_CHAR_DATE_NONE},
- {"ad", 2, DCH_ad, FALSE, FROM_CHAR_DATE_NONE},
- {"am", 2, DCH_am, FALSE, FROM_CHAR_DATE_NONE},
- {"b.c.", 4, DCH_b_c, FALSE, FROM_CHAR_DATE_NONE}, /* b */
- {"bc", 2, DCH_bc, FALSE, FROM_CHAR_DATE_NONE},
- {"cc", 2, DCH_CC, TRUE, FROM_CHAR_DATE_NONE}, /* c */
- {"day", 3, DCH_day, FALSE, FROM_CHAR_DATE_NONE}, /* d */
- {"ddd", 3, DCH_DDD, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"dd", 2, DCH_DD, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"dy", 2, DCH_dy, FALSE, FROM_CHAR_DATE_NONE},
- {"d", 1, DCH_D, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"fx", 2, DCH_FX, FALSE, FROM_CHAR_DATE_NONE}, /* f */
- {"hh24", 4, DCH_HH24, TRUE, FROM_CHAR_DATE_NONE}, /* h */
- {"hh12", 4, DCH_HH12, TRUE, FROM_CHAR_DATE_NONE},
- {"hh", 2, DCH_HH, TRUE, FROM_CHAR_DATE_NONE},
- {"iddd", 4, DCH_IDDD, TRUE, FROM_CHAR_DATE_ISOWEEK}, /* i */
- {"id", 2, DCH_ID, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"iw", 2, DCH_IW, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"iyyy", 4, DCH_IYYY, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"iyy", 3, DCH_IYY, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"iy", 2, DCH_IY, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"i", 1, DCH_I, TRUE, FROM_CHAR_DATE_ISOWEEK},
- {"j", 1, DCH_J, TRUE, FROM_CHAR_DATE_NONE}, /* j */
- {"mi", 2, DCH_MI, TRUE, FROM_CHAR_DATE_NONE}, /* m */
- {"mm", 2, DCH_MM, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"month", 5, DCH_month, FALSE, FROM_CHAR_DATE_GREGORIAN},
- {"mon", 3, DCH_mon, FALSE, FROM_CHAR_DATE_GREGORIAN},
- {"ms", 2, DCH_MS, TRUE, FROM_CHAR_DATE_NONE},
- {"p.m.", 4, DCH_p_m, FALSE, FROM_CHAR_DATE_NONE}, /* p */
- {"pm", 2, DCH_pm, FALSE, FROM_CHAR_DATE_NONE},
- {"q", 1, DCH_Q, TRUE, FROM_CHAR_DATE_NONE}, /* q */
- {"rm", 2, DCH_rm, FALSE, FROM_CHAR_DATE_GREGORIAN}, /* r */
- {"ssss", 4, DCH_SSSS, TRUE, FROM_CHAR_DATE_NONE}, /* s */
- {"ss", 2, DCH_SS, TRUE, FROM_CHAR_DATE_NONE},
- {"tz", 2, DCH_tz, FALSE, FROM_CHAR_DATE_NONE}, /* t */
- {"us", 2, DCH_US, TRUE, FROM_CHAR_DATE_NONE}, /* u */
- {"ww", 2, DCH_WW, TRUE, FROM_CHAR_DATE_GREGORIAN}, /* w */
- {"w", 1, DCH_W, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"y,yyy", 5, DCH_Y_YYY, TRUE, FROM_CHAR_DATE_GREGORIAN}, /* y */
- {"yyyy", 4, DCH_YYYY, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"yyy", 3, DCH_YYY, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"yy", 2, DCH_YY, TRUE, FROM_CHAR_DATE_GREGORIAN},
- {"y", 1, DCH_Y, TRUE, FROM_CHAR_DATE_GREGORIAN},
+ {"A.D.", 4, DCH_A_D, false, FROM_CHAR_DATE_NONE}, /* A */
+ {"A.M.", 4, DCH_A_M, false, FROM_CHAR_DATE_NONE},
+ {"AD", 2, DCH_AD, false, FROM_CHAR_DATE_NONE},
+ {"AM", 2, DCH_AM, false, FROM_CHAR_DATE_NONE},
+ {"B.C.", 4, DCH_B_C, false, FROM_CHAR_DATE_NONE}, /* B */
+ {"BC", 2, DCH_BC, false, FROM_CHAR_DATE_NONE},
+ {"CC", 2, DCH_CC, true, FROM_CHAR_DATE_NONE}, /* C */
+ {"DAY", 3, DCH_DAY, false, FROM_CHAR_DATE_NONE}, /* D */
+ {"DDD", 3, DCH_DDD, true, FROM_CHAR_DATE_GREGORIAN},
+ {"DD", 2, DCH_DD, true, FROM_CHAR_DATE_GREGORIAN},
+ {"DY", 2, DCH_DY, false, FROM_CHAR_DATE_NONE},
+ {"Day", 3, DCH_Day, false, FROM_CHAR_DATE_NONE},
+ {"Dy", 2, DCH_Dy, false, FROM_CHAR_DATE_NONE},
+ {"D", 1, DCH_D, true, FROM_CHAR_DATE_GREGORIAN},
+ {"FX", 2, DCH_FX, false, FROM_CHAR_DATE_NONE}, /* F */
+ {"HH24", 4, DCH_HH24, true, FROM_CHAR_DATE_NONE}, /* H */
+ {"HH12", 4, DCH_HH12, true, FROM_CHAR_DATE_NONE},
+ {"HH", 2, DCH_HH, true, FROM_CHAR_DATE_NONE},
+ {"IDDD", 4, DCH_IDDD, true, FROM_CHAR_DATE_ISOWEEK}, /* I */
+ {"ID", 2, DCH_ID, true, FROM_CHAR_DATE_ISOWEEK},
+ {"IW", 2, DCH_IW, true, FROM_CHAR_DATE_ISOWEEK},
+ {"IYYY", 4, DCH_IYYY, true, FROM_CHAR_DATE_ISOWEEK},
+ {"IYY", 3, DCH_IYY, true, FROM_CHAR_DATE_ISOWEEK},
+ {"IY", 2, DCH_IY, true, FROM_CHAR_DATE_ISOWEEK},
+ {"I", 1, DCH_I, true, FROM_CHAR_DATE_ISOWEEK},
+ {"J", 1, DCH_J, true, FROM_CHAR_DATE_NONE}, /* J */
+ {"MI", 2, DCH_MI, true, FROM_CHAR_DATE_NONE}, /* M */
+ {"MM", 2, DCH_MM, true, FROM_CHAR_DATE_GREGORIAN},
+ {"MONTH", 5, DCH_MONTH, false, FROM_CHAR_DATE_GREGORIAN},
+ {"MON", 3, DCH_MON, false, FROM_CHAR_DATE_GREGORIAN},
+ {"MS", 2, DCH_MS, true, FROM_CHAR_DATE_NONE},
+ {"Month", 5, DCH_Month, false, FROM_CHAR_DATE_GREGORIAN},
+ {"Mon", 3, DCH_Mon, false, FROM_CHAR_DATE_GREGORIAN},
+ {"OF", 2, DCH_OF, false, FROM_CHAR_DATE_NONE}, /* O */
+ {"P.M.", 4, DCH_P_M, false, FROM_CHAR_DATE_NONE}, /* P */
+ {"PM", 2, DCH_PM, false, FROM_CHAR_DATE_NONE},
+ {"Q", 1, DCH_Q, true, FROM_CHAR_DATE_NONE}, /* Q */
+ {"RM", 2, DCH_RM, false, FROM_CHAR_DATE_GREGORIAN}, /* R */
+ {"SSSS", 4, DCH_SSSS, true, FROM_CHAR_DATE_NONE}, /* S */
+ {"SS", 2, DCH_SS, true, FROM_CHAR_DATE_NONE},
+ {"TZ", 2, DCH_TZ, false, FROM_CHAR_DATE_NONE}, /* T */
+ {"US", 2, DCH_US, true, FROM_CHAR_DATE_NONE}, /* U */
+ {"WW", 2, DCH_WW, true, FROM_CHAR_DATE_GREGORIAN}, /* W */
+ {"W", 1, DCH_W, true, FROM_CHAR_DATE_GREGORIAN},
+ {"Y,YYY", 5, DCH_Y_YYY, true, FROM_CHAR_DATE_GREGORIAN}, /* Y */
+ {"YYYY", 4, DCH_YYYY, true, FROM_CHAR_DATE_GREGORIAN},
+ {"YYY", 3, DCH_YYY, true, FROM_CHAR_DATE_GREGORIAN},
+ {"YY", 2, DCH_YY, true, FROM_CHAR_DATE_GREGORIAN},
+ {"Y", 1, DCH_Y, true, FROM_CHAR_DATE_GREGORIAN},
+ {"a.d.", 4, DCH_a_d, false, FROM_CHAR_DATE_NONE}, /* a */
+ {"a.m.", 4, DCH_a_m, false, FROM_CHAR_DATE_NONE},
+ {"ad", 2, DCH_ad, false, FROM_CHAR_DATE_NONE},
+ {"am", 2, DCH_am, false, FROM_CHAR_DATE_NONE},
+ {"b.c.", 4, DCH_b_c, false, FROM_CHAR_DATE_NONE}, /* b */
+ {"bc", 2, DCH_bc, false, FROM_CHAR_DATE_NONE},
+ {"cc", 2, DCH_CC, true, FROM_CHAR_DATE_NONE}, /* c */
+ {"day", 3, DCH_day, false, FROM_CHAR_DATE_NONE}, /* d */
+ {"ddd", 3, DCH_DDD, true, FROM_CHAR_DATE_GREGORIAN},
+ {"dd", 2, DCH_DD, true, FROM_CHAR_DATE_GREGORIAN},
+ {"dy", 2, DCH_dy, false, FROM_CHAR_DATE_NONE},
+ {"d", 1, DCH_D, true, FROM_CHAR_DATE_GREGORIAN},
+ {"fx", 2, DCH_FX, false, FROM_CHAR_DATE_NONE}, /* f */
+ {"hh24", 4, DCH_HH24, true, FROM_CHAR_DATE_NONE}, /* h */
+ {"hh12", 4, DCH_HH12, true, FROM_CHAR_DATE_NONE},
+ {"hh", 2, DCH_HH, true, FROM_CHAR_DATE_NONE},
+ {"iddd", 4, DCH_IDDD, true, FROM_CHAR_DATE_ISOWEEK}, /* i */
+ {"id", 2, DCH_ID, true, FROM_CHAR_DATE_ISOWEEK},
+ {"iw", 2, DCH_IW, true, FROM_CHAR_DATE_ISOWEEK},
+ {"iyyy", 4, DCH_IYYY, true, FROM_CHAR_DATE_ISOWEEK},
+ {"iyy", 3, DCH_IYY, true, FROM_CHAR_DATE_ISOWEEK},
+ {"iy", 2, DCH_IY, true, FROM_CHAR_DATE_ISOWEEK},
+ {"i", 1, DCH_I, true, FROM_CHAR_DATE_ISOWEEK},
+ {"j", 1, DCH_J, true, FROM_CHAR_DATE_NONE}, /* j */
+ {"mi", 2, DCH_MI, true, FROM_CHAR_DATE_NONE}, /* m */
+ {"mm", 2, DCH_MM, true, FROM_CHAR_DATE_GREGORIAN},
+ {"month", 5, DCH_month, false, FROM_CHAR_DATE_GREGORIAN},
+ {"mon", 3, DCH_mon, false, FROM_CHAR_DATE_GREGORIAN},
+ {"ms", 2, DCH_MS, true, FROM_CHAR_DATE_NONE},
+ {"p.m.", 4, DCH_p_m, false, FROM_CHAR_DATE_NONE}, /* p */
+ {"pm", 2, DCH_pm, false, FROM_CHAR_DATE_NONE},
+ {"q", 1, DCH_Q, true, FROM_CHAR_DATE_NONE}, /* q */
+ {"rm", 2, DCH_rm, false, FROM_CHAR_DATE_GREGORIAN}, /* r */
+ {"ssss", 4, DCH_SSSS, true, FROM_CHAR_DATE_NONE}, /* s */
+ {"ss", 2, DCH_SS, true, FROM_CHAR_DATE_NONE},
+ {"tz", 2, DCH_tz, false, FROM_CHAR_DATE_NONE}, /* t */
+ {"us", 2, DCH_US, true, FROM_CHAR_DATE_NONE}, /* u */
+ {"ww", 2, DCH_WW, true, FROM_CHAR_DATE_GREGORIAN}, /* w */
+ {"w", 1, DCH_W, true, FROM_CHAR_DATE_GREGORIAN},
+ {"y,yyy", 5, DCH_Y_YYY, true, FROM_CHAR_DATE_GREGORIAN}, /* y */
+ {"yyyy", 4, DCH_YYYY, true, FROM_CHAR_DATE_GREGORIAN},
+ {"yyy", 3, DCH_YYY, true, FROM_CHAR_DATE_GREGORIAN},
+ {"yy", 2, DCH_YY, true, FROM_CHAR_DATE_GREGORIAN},
+ {"y", 1, DCH_Y, true, FROM_CHAR_DATE_GREGORIAN},
/* last */
{NULL, 0, 0, 0, 0}
@@ -1102,7 +1102,7 @@ NUMDesc_prepare(NUMDesc *num, FormatNode *n)
case NUM_D:
num->flag |= NUM_F_LDECIMAL;
- num->need_locale = TRUE;
+ num->need_locale = true;
/* FALLTHROUGH */
case NUM_DEC:
if (IS_DECIMAL(num))
@@ -1133,13 +1133,13 @@ NUMDesc_prepare(NUMDesc *num, FormatNode *n)
{
num->lsign = NUM_LSIGN_PRE;
num->pre_lsign_num = num->pre;
- num->need_locale = TRUE;
+ num->need_locale = true;
num->flag |= NUM_F_LSIGN;
}
else if (num->lsign == NUM_LSIGN_NONE)
{
num->lsign = NUM_LSIGN_POST;
- num->need_locale = TRUE;
+ num->need_locale = true;
num->flag |= NUM_F_LSIGN;
}
break;
@@ -1188,7 +1188,7 @@ NUMDesc_prepare(NUMDesc *num, FormatNode *n)
case NUM_L:
case NUM_G:
- num->need_locale = TRUE;
+ num->need_locale = true;
break;
case NUM_V:
@@ -2066,17 +2066,17 @@ dump_index(const KeyWord *k, const int *index)
#endif /* DEBUG */
/* ----------
- * Return TRUE if next format picture is not digit value
+ * Return true if next format picture is not digit value
* ----------
*/
static bool
is_next_separator(FormatNode *n)
{
if (n->type == NODE_TYPE_END)
- return FALSE;
+ return false;
if (n->type == NODE_TYPE_ACTION && S_THth(n->suffix))
- return TRUE;
+ return true;
/*
* Next node
@@ -2085,19 +2085,19 @@ is_next_separator(FormatNode *n)
/* end of format string is treated like a non-digit separator */
if (n->type == NODE_TYPE_END)
- return TRUE;
+ return true;
if (n->type == NODE_TYPE_ACTION)
{
if (n->key->is_digit)
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
else if (isdigit((unsigned char) n->character))
- return FALSE;
+ return false;
- return TRUE; /* some non-digit input (separator) */
+ return true; /* some non-digit input (separator) */
}
@@ -3391,7 +3391,7 @@ datetime_to_char_body(TmToChar *tmtc, text *fmt, bool is_interval, Oid collid)
* Allocate new memory if format picture is bigger than static cache
* and do not use cache (call parser always)
*/
- incache = FALSE;
+ incache = false;
format = (FormatNode *) palloc((fmt_len + 1) * sizeof(FormatNode));
@@ -3405,7 +3405,7 @@ datetime_to_char_body(TmToChar *tmtc, text *fmt, bool is_interval, Oid collid)
*/
DCHCacheEntry *ent = DCH_cache_fetch(fmt_str);
- incache = TRUE;
+ incache = true;
format = ent->format;
}
@@ -3636,7 +3636,7 @@ do_to_timestamp(text *date_txt, text *fmt,
* Allocate new memory if format picture is bigger than static
* cache and do not use cache (call parser always)
*/
- incache = FALSE;
+ incache = false;
format = (FormatNode *) palloc((fmt_len + 1) * sizeof(FormatNode));
@@ -3650,7 +3650,7 @@ do_to_timestamp(text *date_txt, text *fmt,
*/
DCHCacheEntry *ent = DCH_cache_fetch(fmt_str);
- incache = TRUE;
+ incache = true;
format = ent->format;
}
@@ -4239,7 +4239,7 @@ get_last_relevant_decnum(char *num)
static void
NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
{
- bool isread = FALSE;
+ bool isread = false;
#ifdef DEBUG_TO_FROM_CHAR
elog(DEBUG_elog_output, " --- scan start --- id=%s",
@@ -4340,13 +4340,13 @@ NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
else
Np->read_pre++;
- isread = TRUE;
+ isread = true;
#ifdef DEBUG_TO_FROM_CHAR
elog(DEBUG_elog_output, "Read digit (%c)", *Np->inout_p);
#endif
}
- else if (IS_DECIMAL(Np->Num) && Np->read_dec == FALSE)
+ else if (IS_DECIMAL(Np->Num) && Np->read_dec == false)
{
/*
* We need not test IS_LDECIMAL(Np->Num) explicitly here, because
@@ -4364,8 +4364,8 @@ NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
Np->inout_p += x - 1;
*Np->number_p = '.';
Np->number_p++;
- Np->read_dec = TRUE;
- isread = TRUE;
+ Np->read_dec = true;
+ isread = true;
}
}
@@ -4423,11 +4423,11 @@ NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
*
* FM9.999999MI -> 5.01-
*
- * if (.... && IS_LSIGN(Np->Num)==FALSE) prevents read wrong formats
+ * if (.... && IS_LSIGN(Np->Num)==false) prevents read wrong formats
* like to_number('1 -', '9S') where sign is not anchored to last
* number.
*/
- else if (isread == FALSE && IS_LSIGN(Np->Num) == FALSE &&
+ else if (isread == false && IS_LSIGN(Np->Num) == false &&
(IS_PLUS(Np->Num) || IS_MINUS(Np->Num)))
{
#ifdef DEBUG_TO_FROM_CHAR
@@ -4445,7 +4445,7 @@ NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
}
#define IS_PREDEC_SPACE(_n) \
- (IS_ZERO((_n)->Num)==FALSE && \
+ (IS_ZERO((_n)->Num)==false && \
(_n)->number == (_n)->number_p && \
*(_n)->number == '0' && \
(_n)->Num->post != 0)
@@ -4477,15 +4477,15 @@ NUM_numpart_to_char(NUMProc *Np, int id)
Np->number_p,
Np->inout);
#endif
- Np->num_in = FALSE;
+ Np->num_in = false;
/*
* Write sign if real number will write to output Note: IS_PREDEC_SPACE()
* handle "9.9" --> " .1"
*/
- if (Np->sign_wrote == FALSE &&
+ if (Np->sign_wrote == false &&
(Np->num_curr >= Np->out_pre_spaces || (IS_ZERO(Np->Num) && Np->Num->zero_start == Np->num_curr)) &&
- (IS_PREDEC_SPACE(Np) == FALSE || (Np->last_relevant && *Np->last_relevant == '.')))
+ (IS_PREDEC_SPACE(Np) == false || (Np->last_relevant && *Np->last_relevant == '.')))
{
if (IS_LSIGN(Np->Num))
{
@@ -4496,14 +4496,14 @@ NUM_numpart_to_char(NUMProc *Np, int id)
else
strcpy(Np->inout_p, Np->L_positive_sign);
Np->inout_p += strlen(Np->inout_p);
- Np->sign_wrote = TRUE;
+ Np->sign_wrote = true;
}
}
else if (IS_BRACKET(Np->Num))
{
*Np->inout_p = Np->sign == '+' ? ' ' : '<';
++Np->inout_p;
- Np->sign_wrote = TRUE;
+ Np->sign_wrote = true;
}
else if (Np->sign == '+')
{
@@ -4512,13 +4512,13 @@ NUM_numpart_to_char(NUMProc *Np, int id)
*Np->inout_p = ' '; /* Write + */
++Np->inout_p;
}
- Np->sign_wrote = TRUE;
+ Np->sign_wrote = true;
}
else if (Np->sign == '-')
{ /* Write - */
*Np->inout_p = '-';
++Np->inout_p;
- Np->sign_wrote = TRUE;
+ Np->sign_wrote = true;
}
}
@@ -4549,7 +4549,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
*/
*Np->inout_p = '0'; /* Write '0' */
++Np->inout_p;
- Np->num_in = TRUE;
+ Np->num_in = true;
}
else
{
@@ -4607,7 +4607,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
{
*Np->inout_p = *Np->number_p; /* Write DIGIT */
++Np->inout_p;
- Np->num_in = TRUE;
+ Np->num_in = true;
}
}
/* do no exceed string length */
@@ -4622,7 +4622,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
if (Np->num_curr + 1 == end)
{
- if (Np->sign_wrote == TRUE && IS_BRACKET(Np->Num))
+ if (Np->sign_wrote == true && IS_BRACKET(Np->Num))
{
*Np->inout_p = Np->sign == '+' ? ' ' : '>';
++Np->inout_p;
@@ -4659,7 +4659,7 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
Np->last_relevant = NULL;
Np->read_post = 0;
Np->read_pre = 0;
- Np->read_dec = FALSE;
+ Np->read_dec = false;
if (Np->Num->zero_start)
--Np->Num->zero_start;
@@ -4706,10 +4706,10 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
/* MI/PL/SG - write sign itself and not in number */
if (IS_PLUS(Np->Num) || IS_MINUS(Np->Num))
{
- if (IS_PLUS(Np->Num) && IS_MINUS(Np->Num) == FALSE)
- Np->sign_wrote = FALSE; /* need sign */
+ if (IS_PLUS(Np->Num) && IS_MINUS(Np->Num) == false)
+ Np->sign_wrote = false; /* need sign */
else
- Np->sign_wrote = TRUE; /* needn't sign */
+ Np->sign_wrote = true; /* needn't sign */
}
else
{
@@ -4723,17 +4723,17 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
else if (Np->sign != '+' && IS_PLUS(Np->Num))
Np->Num->flag &= ~NUM_F_PLUS;
- if (Np->sign == '+' && IS_FILLMODE(Np->Num) && IS_LSIGN(Np->Num) == FALSE)
- Np->sign_wrote = TRUE; /* needn't sign */
+ if (Np->sign == '+' && IS_FILLMODE(Np->Num) && IS_LSIGN(Np->Num) == false)
+ Np->sign_wrote = true; /* needn't sign */
else
- Np->sign_wrote = FALSE; /* need sign */
+ Np->sign_wrote = false; /* need sign */
if (Np->Num->lsign == NUM_LSIGN_PRE && Np->Num->pre == Np->Num->pre_lsign_num)
Np->Num->lsign = NUM_LSIGN_POST;
}
}
else
- Np->sign = FALSE;
+ Np->sign = false;
/*
* Count
@@ -4762,7 +4762,7 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
}
}
- if (Np->sign_wrote == FALSE && Np->out_pre_spaces == 0)
+ if (Np->sign_wrote == false && Np->out_pre_spaces == 0)
++Np->num_count;
}
else
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-19 16:22:27 +0000