Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | scan: all JDN/JD are signed, so allow parse negative Julian days |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | clock-astronomical-jdn |
| Files: | files | file ages | folders |
| SHA3-256: |
7be9cada9474b040ced17bb9b5661302 |
| User & Date: | sebres 2019-03-13 00:24:44.550 |
Context
|
2019-03-13
| ||
| 00:33 | integrate branch clock-astronomical-jdn: merge pull request #16 from sebres/astronomical-jdn (https:... check-in: 39a21f437a user: sebres tags: sebres-8-6-clock-speedup-cr2 | |
| 00:24 | scan: all JDN/JD are signed, so allow parse negative Julian days Closed-Leaf check-in: 7be9cada94 user: sebres tags: clock-astronomical-jdn | |
| 00:24 | format: add support of new JDN-tokens (calendar JD `%EJ`, astronomical JD `%Ej`) with time fraction.... check-in: 2194d065f7 user: sebres tags: clock-astronomical-jdn | |
Changes
Changes to generic/tclClockFmt.c.
| ︙ | ︙ | |||
1592 1593 1594 1595 1596 1597 1598 |
Tcl_WideInt intJD; int fractJD = 0, fractJDDiv = 1;
DetermineGreedySearchLen(opts, info, tok, &minLen, &maxLen);
end = yyInput + maxLen;
/* currently positive astronomic dates only */
| | | | 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 |
Tcl_WideInt intJD; int fractJD = 0, fractJDDiv = 1;
DetermineGreedySearchLen(opts, info, tok, &minLen, &maxLen);
end = yyInput + maxLen;
/* currently positive astronomic dates only */
if (*p == '+' || *p == '-') { p++; };
s = p;
while (p < end && isdigit(UCHAR(*p))) {
p++;
}
if ( _str2wideInt(&intJD, s, p, (*yyInput != '-' ? 1 : -1)) != TCL_OK) {
return TCL_RETURN;
};
yyInput = p;
if (p >= end || *p++ != '.') { /* allow pure integer JDN */
/* by astronomical JD the seconds of day offs is 12 hours */
if (tok->map->offs) {
goto done;
|
| ︙ | ︙ | |||
1640 1641 1642 1643 1644 1645 1646 |
yydate.julianDay = intJD;
yydate.seconds =
-210866803200L
+ ( SECONDS_PER_DAY * intJD )
+ ( fractJD );
| | | 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 |
yydate.julianDay = intJD;
yydate.seconds =
-210866803200L
+ ( SECONDS_PER_DAY * intJD )
+ ( fractJD );
info->flags |= CLF_POSIXSEC;
return TCL_OK;
}
static int
ClockScnToken_TimeZone_Proc(ClockFmtScnCmdArgs *opts,
DateInfo *info, ClockScanToken *tok)
|
| ︙ | ︙ | |||
1834 1835 1836 1837 1838 1839 1840 |
/* %S */
{CTOKT_INT, CLF_TIME, 0, 1, 2, TclOffset(DateInfo, date.secondOfMin),
NULL},
/* %p %P */
{CTOKT_PARSER, 0, 0, 0, 0xffff, 0,
ClockScnToken_amPmInd_Proc, NULL},
/* %J */
| | | 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 |
/* %S */
{CTOKT_INT, CLF_TIME, 0, 1, 2, TclOffset(DateInfo, date.secondOfMin),
NULL},
/* %p %P */
{CTOKT_PARSER, 0, 0, 0, 0xffff, 0,
ClockScnToken_amPmInd_Proc, NULL},
/* %J */
{CTOKT_WIDE, CLF_JULIANDAY | CLF_SIGNED, 0, 1, 0xffff, TclOffset(DateInfo, date.julianDay),
NULL},
/* %j */
{CTOKT_INT, CLF_DAYOFYEAR, 0, 1, 3, TclOffset(DateInfo, date.dayOfYear),
NULL},
/* %C */
{CTOKT_INT, CLF_CENTURY|CLF_ISO8601CENTURY, 0, 1, 2, TclOffset(DateInfo, dateCentury),
NULL},
|
| ︙ | ︙ | |||
1883 1884 1885 1886 1887 1888 1889 |
static const char *ScnETokenMapIndex =
"EJjys";
static ClockScanTokenMap ScnETokenMap[] = {
/* %EE */
{CTOKT_PARSER, 0, 0, 0, 0xffff, TclOffset(DateInfo, date.year),
ClockScnToken_LocaleERA_Proc, (void *)MCLIT_LOCALE_NUMERALS},
/* %EJ */
| | | | 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 |
static const char *ScnETokenMapIndex =
"EJjys";
static ClockScanTokenMap ScnETokenMap[] = {
/* %EE */
{CTOKT_PARSER, 0, 0, 0, 0xffff, TclOffset(DateInfo, date.year),
ClockScnToken_LocaleERA_Proc, (void *)MCLIT_LOCALE_NUMERALS},
/* %EJ */
{CTOKT_PARSER, CLF_JULIANDAY | CLF_SIGNED, 0, 1, 0xffff, 0, /* calendar JDN starts at midnight */
ClockScnToken_JDN_Proc, NULL},
/* %Ej */
{CTOKT_PARSER, CLF_JULIANDAY | CLF_SIGNED, 0, 1, 0xffff, (SECONDS_PER_DAY/2), /* astro JDN starts at noon */
ClockScnToken_JDN_Proc, NULL},
/* %Ey */
{CTOKT_PARSER, 0, 0, 0, 0xffff, 0, /* currently no capture, parse only token */
ClockScnToken_LocaleListMatcher_Proc, (void *)MCLIT_LOCALE_NUMERALS},
/* %Es */
{CTOKT_WIDE, CLF_LOCALSEC | CLF_SIGNED, 0, 1, 0xffff, TclOffset(DateInfo, date.localSeconds),
NULL},
|
| ︙ | ︙ |
Changes to tests/clock.test.
| ︙ | ︙ | |||
18970 18971 18972 18973 18974 18975 18976 18977 18978 18979 18980 18981 18982 18983 |
[clock scan {0 2440589} -format {%s %Ej} -gmt true]
} {86400 0 43200 129600}
test clock-7.19 {Astronomical JDN/JD, two values} {
clock scan {2440588 2440589} -format {%Ej %Ej} -gmt true
} 129600
# BEGIN testcases8
# Test parsing of ccyymmdd
test clock-8.1 {parse ccyymmdd} {
clock scan {1970 Jan 02} -format {%C%y %b %d} -locale en_US_roman -gmt 1
} 86400
| > > > > > > > > > > > | 18970 18971 18972 18973 18974 18975 18976 18977 18978 18979 18980 18981 18982 18983 18984 18985 18986 18987 18988 18989 18990 18991 18992 18993 18994 |
[clock scan {0 2440589} -format {%s %Ej} -gmt true]
} {86400 0 43200 129600}
test clock-7.19 {Astronomical JDN/JD, two values} {
clock scan {2440588 2440589} -format {%Ej %Ej} -gmt true
} 129600
test clock-7.20 {all JDN/JD are signed (and extended accept floats)} {
set res {}
foreach i {%J %EJ %Ej} {
lappend res [clock scan "-1" -format $i -gmt 1]
}
foreach i {%EJ %Ej} {
lappend res [clock scan "-1.5" -format $i -gmt 1]
}
set res
} {-210866889600 -210866889600 -210866846400 -210866846400 -210866803200}
# BEGIN testcases8
# Test parsing of ccyymmdd
test clock-8.1 {parse ccyymmdd} {
clock scan {1970 Jan 02} -format {%C%y %b %d} -locale en_US_roman -gmt 1
} 86400
|
| ︙ | ︙ |