/* -----------------------------------------------------------------------
* formatting.c
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.94 2005/07/27 12:44:09 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.95 2005/08/17 21:47:55 momjian Exp $
*
*
* Portions Copyright (c) 1999-2005, PostgreSQL Global Development Group
const char *name; /* keyword */
int len; /* keyword length */
int (*action) (int arg, char *inout, /* action for keyword */
- int suf, int flag,
+ int suf, bool is_to_char,
FormatNode *node, void *data);
int id; /* keyword id */
bool isitdigit; /* is expected output/input digit */
* Flags & Options:
* ----------
*/
-#define TO_CHAR 1
-#define FROM_CHAR 2
-
#define ONE_UPPER 1 /* Name */
#define ALL_UPPER 2 /* NAME */
#define ALL_LOWER 3 /* name */
* Flags for DCH version
* ----------
*/
-static int DCH_global_flag = 0;
-
-#define DCH_F_FX 0x01
-
-#define IS_FX (DCH_global_flag & DCH_F_FX)
+static bool DCH_global_fx = false;
/* ----------
* KeyWords definition & action
*****************************************************************************/
-static int dch_global(int arg, char *inout, int suf, int flag, FormatNode *node, void *data);
-static int dch_time(int arg, char *inout, int suf, int flag, FormatNode *node, void *data);
-static int dch_date(int arg, char *inout, int suf, int flag, FormatNode *node, void *data);
+static int dch_global(int arg, char *inout, int suf, bool is_to_char, FormatNode *node, void *data);
+static int dch_time(int arg, char *inout, int suf, bool is_to_char, FormatNode *node, void *data);
+static int dch_date(int arg, char *inout, int suf, bool is_to_char, FormatNode *node, void *data);
/* ----------
* Suffixes:
*/
typedef struct NUMProc
{
- int type; /* FROM_CHAR (TO_NUMBER) or TO_CHAR */
-
+ bool is_to_char;
NUMDesc *Num; /* number description */
int sign, /* '-' or '+' */
static void NUMDesc_prepare(NUMDesc *num, FormatNode *n);
static void parse_format(FormatNode *node, char *str, const KeyWord *kw,
KeySuffix *suf, const int *index, int ver, NUMDesc *Num);
-static char *DCH_processor(FormatNode *node, char *inout, int flag, void *data);
+static char *DCH_processor(FormatNode *node, char *inout, bool is_to_char, void *data);
#ifdef DEBUG_TO_FROM_CHAR
static void dump_index(const KeyWord *k, const int *index);
static void NUM_numpart_from_char(NUMProc *Np, int id, int plen);
static void NUM_numpart_to_char(NUMProc *Np, int id);
static char *NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
- int plen, int sign, int type);
+ int plen, int sign, bool is_to_char);
static DCHCacheEntry *DCH_cache_search(char *str);
static DCHCacheEntry *DCH_cache_getnew(char *str);
* ----------
*/
static char *
-DCH_processor(FormatNode *node, char *inout, int flag, void *data)
+DCH_processor(FormatNode *node, char *inout, bool is_to_char, void *data)
{
FormatNode *n;
char *s;
/*
* Zeroing global flags
*/
- DCH_global_flag = 0;
+ DCH_global_fx = false;
for (n = node, s = inout; n->type != NODE_TYPE_END; n++)
{
- if (flag == FROM_CHAR && *s == '\0')
+ if (!is_to_char && *s == '\0')
/*
* The input string is shorter than format picture, so it's
/*
* Call node action function
*/
- len = n->key->action(n->key->id, s, n->suffix, flag, n, data);
+ len = n->key->action(n->key->id, s, n->suffix, is_to_char, n, data);
if (len > 0)
s += len;
else if (len == -1)
/*
* Remove to output char from input in TO_CHAR
*/
- if (flag == TO_CHAR)
+ if (is_to_char)
*s = n->character;
-
else
{
/*
* Skip blank space in FROM_CHAR's input
*/
- if (isspace((unsigned char) n->character) && IS_FX == 0)
- {
+ if (isspace((unsigned char) n->character) && !DCH_global_fx)
while (*s != '\0' && isspace((unsigned char) *(s + 1)))
++s;
- }
}
}
-
- ++s; /* ! */
+ ++s;
}
- if (flag == TO_CHAR)
+ if (is_to_char)
*s = '\0';
return inout;
}
* ----------
*/
static int
-dch_global(int arg, char *inout, int suf, int flag, FormatNode *node, void *data)
+dch_global(int arg, char *inout, int suf, bool is_to_char, FormatNode *node, void *data)
{
if (arg == DCH_FX)
- DCH_global_flag |= DCH_F_FX;
+ DCH_global_fx = true;
return -1;
}
* ----------
*/
static int
-dch_time(int arg, char *inout, int suf, int flag, FormatNode *node, void *data)
+dch_time(int arg, char *inout, int suf, bool is_to_char, FormatNode *node, void *data)
{
char *p_inout = inout;
struct pg_tm *tm = NULL;
TmFromChar *tmfc = NULL;
TmToChar *tmtc = NULL;
- if (flag == TO_CHAR)
+ if (is_to_char)
{
tmtc = (TmToChar *) data;
tm = tmtcTm(tmtc);
{
case DCH_A_M:
case DCH_P_M:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
strcpy(inout, ((tm->tm_hour > 11
&& tm->tm_hour < HOURS_PER_DAY) ? P_M_STR : A_M_STR));
return 3;
}
- else if (flag == FROM_CHAR)
+ else
{
if (strncmp(inout, P_M_STR, 4) == 0)
tmfc->pm = TRUE;
break;
case DCH_AM:
case DCH_PM:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
strcpy(inout, ((tm->tm_hour > 11
&& tm->tm_hour < HOURS_PER_DAY) ? PM_STR : AM_STR));
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (strncmp(inout, PM_STR, 2) == 0)
tmfc->pm = TRUE;
break;
case DCH_a_m:
case DCH_p_m:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
strcpy(inout, ((tm->tm_hour > 11
&& tm->tm_hour < HOURS_PER_DAY) ? p_m_STR : a_m_STR));
return 3;
}
- else if (flag == FROM_CHAR)
+ else
{
if (strncmp(inout, p_m_STR, 4) == 0)
tmfc->pm = TRUE;
break;
case DCH_am:
case DCH_pm:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
strcpy(inout, ((tm->tm_hour > 11
&& tm->tm_hour < HOURS_PER_DAY) ? pm_STR : am_STR));
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (strncmp(inout, pm_STR, 2) == 0)
tmfc->pm = TRUE;
break;
case DCH_HH:
case DCH_HH12:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 2,
tm->tm_hour == 0 ? 12 :
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_HH24:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 2, tm->tm_hour);
if (S_THth(suf))
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_MI:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 2, tm->tm_min);
if (S_THth(suf))
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_SS:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 2, tm->tm_sec);
if (S_THth(suf))
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_MS: /* millisecond */
- if (flag == TO_CHAR)
+ if (is_to_char)
{
#ifdef HAVE_INT64_TIMESTAMP
sprintf(inout, "%03d", (int) (tmtc->fsec / INT64CONST(1000)));
return 2;
}
- else if (flag == FROM_CHAR)
+ else
{
int len,
x;
}
break;
case DCH_US: /* microsecond */
- if (flag == TO_CHAR)
+ if (is_to_char)
{
#ifdef HAVE_INT64_TIMESTAMP
sprintf(inout, "%06d", (int) tmtc->fsec);
else
return 5;
}
- else if (flag == FROM_CHAR)
+ else
{
int len,
x;
}
break;
case DCH_SSSS:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%d", tm->tm_hour * SECS_PER_HOUR +
tm->tm_min * SECS_PER_MINUTE +
str_numth(p_inout, inout, S_TH_TYPE(suf));
return strlen(p_inout) - 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
break;
case DCH_tz:
case DCH_TZ:
- if (flag == TO_CHAR && tmtcTzn(tmtc))
+ if (is_to_char && tmtcTzn(tmtc))
{
int siz = strlen(tmtcTzn(tmtc));
}
return siz - 1;
}
- else if (flag == FROM_CHAR)
+ else if (!is_to_char)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("\"TZ\"/\"tz\" not supported")));
* ----------
*/
static int
-dch_date(int arg, char *inout, int suf, int flag, FormatNode *node, void *data)
+dch_date(int arg, char *inout, int suf, bool is_to_char, FormatNode *node, void *data)
{
char buff[DCH_CACHE_SIZE],
workbuff[32],
TmFromChar *tmfc = NULL;
TmToChar *tmtc = NULL;
- if (flag == TO_CHAR)
+ if (is_to_char)
{
tmtc = (TmToChar *) data;
tm = tmtcTm(tmtc);
* or "january", all is before search convert to "first-upper". This
* convention is used for MONTH, MON, DAY, DY
*/
- if (flag == FROM_CHAR)
+ if (!is_to_char)
{
if (arg == DCH_MONTH || arg == DCH_Month || arg == DCH_month)
{
{
case DCH_A_D:
case DCH_B_C:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
strcpy(inout, (tm->tm_year <= 0 ? B_C_STR : A_D_STR));
return 3;
}
- else if (flag == FROM_CHAR)
+ else
{
if (strncmp(inout, B_C_STR, 4) == 0)
tmfc->bc = TRUE;
break;
case DCH_AD:
case DCH_BC:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
strcpy(inout, (tm->tm_year <= 0 ? BC_STR : AD_STR));
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (strncmp(inout, BC_STR, 2) == 0)
tmfc->bc = TRUE;
break;
case DCH_a_d:
case DCH_b_c:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
strcpy(inout, (tm->tm_year <= 0 ? b_c_STR : a_d_STR));
return 3;
}
- else if (flag == FROM_CHAR)
+ else
{
if (strncmp(inout, b_c_STR, 4) == 0)
tmfc->bc = TRUE;
break;
case DCH_ad:
case DCH_bc:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
strcpy(inout, (tm->tm_year <= 0 ? bc_STR : ad_STR));
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (strncmp(inout, bc_STR, 2) == 0)
tmfc->bc = TRUE;
return 2;
case DCH_MM:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 2, tm->tm_mon);
if (S_THth(suf))
else
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
return 2;
case DCH_DDD:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 3, tm->tm_yday);
if (S_THth(suf))
return 2;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_DD:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 2, tm->tm_mday);
if (S_THth(suf))
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_D:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%d", tm->tm_wday + 1);
if (S_THth(suf))
}
return 0;
}
- else if (flag == FROM_CHAR)
+ else
{
sscanf(inout, "%1d", &tmfc->d);
return 0 + SKIP_THth(suf);
}
break;
case DCH_WW:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 2,
(tm->tm_yday - 1) / 7 + 1);
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_IW:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%0*d", S_FM(suf) ? 0 : 2,
date2isoweek(tm->tm_year, tm->tm_mon, tm->tm_mday));
else
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_Q:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
if (!tm->tm_mon)
return -1;
}
return 0;
}
- else if (flag == FROM_CHAR)
+ else
{
sscanf(inout, "%1d", &tmfc->q);
return 0 + SKIP_THth(suf);
}
break;
case DCH_CC:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
i = tm->tm_year / 100 + 1;
if (i <= 99 && i >= -99)
return strlen(p_inout) - 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
}
break;
case DCH_Y_YYY:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
i = YEAR_ABS(tm->tm_year) / 1000;
sprintf(inout, "%d,%03d", i, YEAR_ABS(tm->tm_year) - (i * 1000));
str_numth(p_inout, inout, S_TH_TYPE(suf));
return strlen(p_inout) - 1;
}
- else if (flag == FROM_CHAR)
+ else
{
int cc;
break;
case DCH_YYYY:
case DCH_IYYY:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
if (tm->tm_year <= 9999 && tm->tm_year >= -9998)
sprintf(inout, "%0*d",
str_numth(p_inout, inout, S_TH_TYPE(suf));
return strlen(p_inout) - 1;
}
- else if (flag == FROM_CHAR)
+ else
{
if (S_FM(suf) || is_next_separator(node))
{
break;
case DCH_YYY:
case DCH_IYY:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
snprintf(buff, sizeof(buff), "%03d",
arg == DCH_YYY ?
return 2;
}
- else if (flag == FROM_CHAR)
+ else
{
sscanf(inout, "%03d", &tmfc->year);
break;
case DCH_YY:
case DCH_IY:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
snprintf(buff, sizeof(buff), "%02d",
arg == DCH_YY ?
return 1;
}
- else if (flag == FROM_CHAR)
+ else
{
sscanf(inout, "%02d", &tmfc->year);
break;
case DCH_Y:
case DCH_I:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
snprintf(buff, sizeof(buff), "%1d",
arg == DCH_Y ?
return 0;
}
- else if (flag == FROM_CHAR)
+ else
{
sscanf(inout, "%1d", &tmfc->year);
}
break;
case DCH_RM:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
if (!tm->tm_mon)
return -1;
return 3;
}
- else if (flag == FROM_CHAR)
+ else
{
tmfc->mm = 12 - seq_search(inout, rm_months_upper, ALL_UPPER, FULL_SIZ, &len);
CHECK_SEQ_SEARCH(len, "RM");
}
break;
case DCH_rm:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
if (!tm->tm_mon)
return -1;
return 3;
}
- else if (flag == FROM_CHAR)
+ else
{
tmfc->mm = 12 - seq_search(inout, rm_months_lower, ALL_LOWER, FULL_SIZ, &len);
CHECK_SEQ_SEARCH(len, "rm");
}
break;
case DCH_W:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%d", (tm->tm_mday - 1) / 7 + 1);
if (S_THth(suf))
}
return 0;
}
- else if (flag == FROM_CHAR)
+ else
{
sscanf(inout, "%1d", &tmfc->w);
return 0 + SKIP_THth(suf);
}
break;
case DCH_J:
- if (flag == TO_CHAR)
+ if (is_to_char)
{
sprintf(inout, "%d", date2j(tm->tm_year, tm->tm_mon, tm->tm_mday));
if (S_THth(suf))
str_numth(p_inout, inout, S_TH_TYPE(suf));
return strlen(p_inout) - 1;
}
- else if (flag == FROM_CHAR)
+ else
{
sscanf(inout, "%d", &tmfc->j);
return strdigits_len(inout) - 1 + SKIP_THth(suf);
format = ent->format;
}
- DCH_processor(format, result, TO_CHAR, (void *) tmtc);
+ DCH_processor(format, result, true, (void *) tmtc);
if (!incache)
pfree(format);
memcpy(date_str, VARDATA(date_txt), date_len);
*(date_str + date_len) = '\0';
- DCH_processor(format, date_str, FROM_CHAR, (void *) &tmfc);
+ DCH_processor(format, date_str, false, (void *) &tmfc);
pfree(date_str);
pfree(fmt_str);
*/
static char *
NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
- int plen, int sign, int type)
+ int plen, int sign, bool is_to_char)
{
FormatNode *n;
NUMProc _Np,
MemSet(Np, 0, sizeof(NUMProc));
Np->Num = Num;
- Np->type = type;
+ Np->is_to_char = is_to_char;
Np->number = number;
Np->inout = inout;
Np->last_relevant = NULL;
*/
if (IS_ROMAN(Np->Num))
{
- if (Np->type == FROM_CHAR)
+ if (!Np->is_to_char)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("\"RN\" not supported")));
/*
* Sign
*/
- if (type == FROM_CHAR)
- Np->sign = FALSE;
- else
+ if (is_to_char)
{
Np->sign = sign;
Np->Num->lsign = NUM_LSIGN_POST;
}
}
+ else
+ Np->sign = FALSE;
/*
* Count
*/
Np->num_count = Np->Num->post + Np->Num->pre - 1;
- if (type == TO_CHAR)
+ if (is_to_char)
{
Np->num_pre = plen;
/*
* Processor direct cycle
*/
- if (Np->type == FROM_CHAR)
- Np->number_p = Np->number + 1; /* first char is space for sign */
- else if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
Np->number_p = Np->number;
+ else
+ Np->number_p = Np->number + 1; /* first char is space for sign */
for (n = node, Np->inout_p = Np->inout; n->type != NODE_TYPE_END; n++)
{
-
- if (Np->type == FROM_CHAR)
+ if (!Np->is_to_char)
{
/*
* Check non-string inout end
case NUM_0:
case NUM_DEC:
case NUM_D:
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
{
NUM_numpart_to_char(Np, n->key->id);
continue; /* for() */
}
case NUM_COMMA:
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
{
if (!Np->num_in)
{
}
else
*Np->inout_p = ',';
-
}
- else if (Np->type == FROM_CHAR)
+ else
{
if (!Np->num_in)
{
break;
case NUM_G:
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
{
if (!Np->num_in)
{
}
}
- else if (Np->type == FROM_CHAR)
+ else
{
if (!Np->num_in)
{
break;
case NUM_L:
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
{
strcpy(Np->inout_p, Np->L_currency_symbol);
Np->inout_p += strlen(Np->inout_p) - 1;
}
- else if (Np->type == FROM_CHAR)
+ else
Np->inout_p += strlen(Np->L_currency_symbol) - 1;
break;
Np->sign == '-' || IS_DECIMAL(Np->Num))
continue;
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
strcpy(Np->inout_p, get_th(Np->number, TH_LOWER));
Np->inout_p += 1;
break;
Np->sign == '-' || IS_DECIMAL(Np->Num))
continue;
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
strcpy(Np->inout_p, get_th(Np->number, TH_UPPER));
Np->inout_p += 1;
break;
case NUM_MI:
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
{
if (Np->sign == '-')
*Np->inout_p = '-';
*Np->inout_p = ' ';
}
- else if (Np->type == FROM_CHAR)
+ else
{
if (*Np->inout_p == '-')
*Np->number = '-';
break;
case NUM_PL:
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
{
if (Np->sign == '+')
*Np->inout_p = '+';
*Np->inout_p = ' ';
}
- else if (Np->type == FROM_CHAR)
+ else
{
if (*Np->inout_p == '+')
*Np->number = '+';
break;
case NUM_SG:
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
*Np->inout_p = Np->sign;
- else if (Np->type == FROM_CHAR)
+ else
{
if (*Np->inout_p == '-')
*Np->number = '-';
/*
* Remove to output char from input in TO_CHAR
*/
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
*Np->inout_p = n->character;
}
Np->inout_p++;
}
- if (Np->type == TO_CHAR)
+ if (Np->is_to_char)
{
*Np->inout_p = '\0';
return Np->inout;
-
}
- else if (Np->type == FROM_CHAR)
+ else
{
if (*(Np->number_p - 1) == '.')
#define NUM_TOCHAR_finish \
do { \
NUM_processor(format, &Num, VARDATA(result), \
- numstr, plen, sign, TO_CHAR); \
+ numstr, plen, sign, true); \
pfree(orgnum); \
\
if (shouldFree) \
numstr = (char *) palloc((len * NUM_MAX_ITEM_SIZ) + 1);
NUM_processor(format, &Num, VARDATA(value), numstr,
- VARSIZE(value) - VARHDRSZ, 0, FROM_CHAR);
+ VARSIZE(value) - VARHDRSZ, 0, false);
scale = Num.post;
precision = Max(0, Num.pre) + scale;