[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs lib/getdate.c src/ChangeLog src/sanity.sh
|
From: |
Derek Robert Price |
|
Subject: |
[Cvs-cvs] ccvs lib/getdate.c src/ChangeLog src/sanity.sh |
|
Date: |
Wed, 21 Dec 2005 02:18:43 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Derek Robert Price <address@hidden> 05/12/21 02:18:43
Modified files:
lib : getdate.c
src : ChangeLog sanity.sh
Log message:
* sanity.sh (config3): Accept `.' in paths.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/getdate.c.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3329&tr2=1.3330&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1105&tr2=1.1106&r1=text&r2=text
Patches:
Index: ccvs/lib/getdate.c
diff -u ccvs/lib/getdate.c:1.42 ccvs/lib/getdate.c:1.43
--- ccvs/lib/getdate.c:1.42 Tue Oct 4 02:34:53 2005
+++ ccvs/lib/getdate.c Wed Dec 21 02:18:42 2005
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.0. */
+/* A Bison parser, made by GNU Bison 1.875d. */
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software
Foundation, Inc.
@@ -331,7 +331,7 @@
struct timespec timespec;
relative_time rel;
} YYSTYPE;
-/* Line 190 of yacc.c. */
+/* Line 191 of yacc.c. */
#line 336 "getdate.c"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -343,7 +343,7 @@
/* Copy the second part of user declarations. */
-/* Line 213 of yacc.c. */
+/* Line 214 of yacc.c. */
#line 348 "getdate.c"
#if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -359,10 +359,14 @@
# ifdef YYSTACK_USE_ALLOCA
# if YYSTACK_USE_ALLOCA
+# define YYSTACK_ALLOC alloca
+# endif
+# else
+# if defined (alloca) || defined (_ALLOCA_H)
+# define YYSTACK_ALLOC alloca
+# else
# ifdef __GNUC__
# define YYSTACK_ALLOC __builtin_alloca
-# else
-# define YYSTACK_ALLOC alloca
# endif
# endif
# endif
@@ -755,53 +759,20 @@
} \
while (0)
-
#define YYTERROR 1
#define YYERRCODE 256
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+ are run). */
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
- If N is 0, then set CURRENT to the empty location which ends
- the previous symbol: RHS[0] (always defined). */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (N) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
- while (0)
-#endif
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
- This macro was not mandated originally: define only if we know
- we won't break user code: when these are the locations we know. */
-
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
-# else
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ ((Current).first_line = (Rhs)[1].first_line, \
+ (Current).first_column = (Rhs)[1].first_column, \
+ (Current).last_line = (Rhs)[N].last_line, \
+ (Current).last_column = (Rhs)[N].last_column)
#endif
-
/* YYLEX -- calling `yylex' with the right arguments. */
#ifdef YYLEX_PARAM
@@ -824,13 +795,19 @@
YYFPRINTF Args; \
} while (0)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+# define YYDSYMPRINT(Args) \
+do { \
+ if (yydebug) \
+ yysymprint Args; \
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location) \
do { \
if (yydebug) \
{ \
YYFPRINTF (stderr, "%s ", Title); \
yysymprint (stderr, \
- Type, Value); \
+ Token, Value); \
YYFPRINTF (stderr, "\n"); \
} \
} while (0)
@@ -897,7 +874,8 @@
int yydebug;
#else /* !YYDEBUG */
# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
# define YY_STACK_PRINT(Bottom, Top)
# define YY_REDUCE_PRINT(Rule)
#endif /* !YYDEBUG */
@@ -915,6 +893,10 @@
SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
evaluated with infinite-precision integer arithmetic. */
+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
#ifndef YYMAXDEPTH
# define YYMAXDEPTH 10000
#endif
@@ -996,15 +978,15 @@
(void) yyvaluep;
if (yytype < YYNTOKENS)
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+ {
+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+ }
else
YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-# ifdef YYPRINT
- if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
switch (yytype)
{
default:
@@ -1020,11 +1002,10 @@
#if defined (__STDC__) || defined (__cplusplus)
static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (int yytype, YYSTYPE *yyvaluep)
#else
static void
-yydestruct (yymsg, yytype, yyvaluep)
- const char *yymsg;
+yydestruct (yytype, yyvaluep)
int yytype;
YYSTYPE *yyvaluep;
#endif
@@ -1032,10 +1013,6 @@
/* Pacify ``unused variable'' warnings. */
(void) yyvaluep;
- if (!yymsg)
- yymsg = "Deleting";
- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
switch (yytype)
{
@@ -1055,7 +1032,7 @@
# endif
#else /* ! YYPARSE_PARAM */
#if defined (__STDC__) || defined (__cplusplus)
-int yyparse (parser_control *pc);
+int yyparse ( parser_control *pc );
#else
int yyparse ();
#endif
@@ -1080,18 +1057,18 @@
#else /* ! YYPARSE_PARAM */
#if defined (__STDC__) || defined (__cplusplus)
int
-yyparse (parser_control *pc)
+yyparse ( parser_control *pc )
#else
int
yyparse (pc)
- parser_control *pc;
+ parser_control *pc ;
#endif
#endif
{
- /* The look-ahead symbol. */
+ /* The lookahead symbol. */
int yychar;
-/* The semantic value of the look-ahead symbol. */
+/* The semantic value of the lookahead symbol. */
YYSTYPE yylval;
/* Number of syntax errors so far. */
@@ -1102,7 +1079,7 @@
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
- /* Look-ahead token as an internal (translated) token number. */
+ /* Lookahead token as an internal (translated) token number. */
int yytoken = 0;
/* Three stacks and their tools:
@@ -1154,8 +1131,6 @@
yyvsp = yyvs;
- yyvsp[0] = yylval;
-
goto yysetstate;
/*------------------------------------------------------------.
@@ -1245,18 +1220,18 @@
yybackup:
/* Do appropriate processing given the current state. */
-/* Read a look-ahead token if we need one and don't already have one. */
+/* Read a lookahead token if we need one and don't already have one. */
/* yyresume: */
- /* First try to decide what to do without reference to look-ahead token. */
+ /* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a look-ahead token if don't already have one. */
+ /* Not known => get a lookahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1271,7 +1246,7 @@
else
{
yytoken = YYTRANSLATE (yychar);
- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+ YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
}
/* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1291,8 +1266,8 @@
if (yyn == YYFINAL)
YYACCEPT;
- /* Shift the look-ahead token. */
- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+ /* Shift the lookahead token. */
+ YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
/* Discard the token being shifted unless it is eof. */
if (yychar != YYEOF)
@@ -1344,7 +1319,7 @@
case 4:
#line 254 "getdate.y"
{
- pc->seconds = (yyvsp[0].timespec);
+ pc->seconds = yyvsp[0].timespec;
pc->timespec_seen = true;
}
break;
@@ -1382,65 +1357,65 @@
case 14:
#line 283 "getdate.y"
{
- pc->hour = (yyvsp[-1].textintval).value;
+ pc->hour = yyvsp[-1].textintval.value;
pc->minutes = 0;
pc->seconds.tv_sec = 0;
pc->seconds.tv_nsec = 0;
- pc->meridian = (yyvsp[0].intval);
+ pc->meridian = yyvsp[0].intval;
}
break;
case 15:
#line 291 "getdate.y"
{
- pc->hour = (yyvsp[-3].textintval).value;
- pc->minutes = (yyvsp[-1].textintval).value;
+ pc->hour = yyvsp[-3].textintval.value;
+ pc->minutes = yyvsp[-1].textintval.value;
pc->seconds.tv_sec = 0;
pc->seconds.tv_nsec = 0;
- pc->meridian = (yyvsp[0].intval);
+ pc->meridian = yyvsp[0].intval;
}
break;
case 16:
#line 299 "getdate.y"
{
- pc->hour = (yyvsp[-4].textintval).value;
- pc->minutes = (yyvsp[-2].textintval).value;
+ pc->hour = yyvsp[-4].textintval.value;
+ pc->minutes = yyvsp[-2].textintval.value;
pc->seconds.tv_sec = 0;
pc->seconds.tv_nsec = 0;
pc->meridian = MER24;
pc->zones_seen++;
- pc->time_zone = time_zone_hhmm ((yyvsp[-1].textintval),
(yyvsp[0].intval));
+ pc->time_zone = time_zone_hhmm (yyvsp[-1].textintval, yyvsp[0].intval);
}
break;
case 17:
#line 309 "getdate.y"
{
- pc->hour = (yyvsp[-5].textintval).value;
- pc->minutes = (yyvsp[-3].textintval).value;
- pc->seconds = (yyvsp[-1].timespec);
- pc->meridian = (yyvsp[0].intval);
+ pc->hour = yyvsp[-5].textintval.value;
+ pc->minutes = yyvsp[-3].textintval.value;
+ pc->seconds = yyvsp[-1].timespec;
+ pc->meridian = yyvsp[0].intval;
}
break;
case 18:
#line 316 "getdate.y"
{
- pc->hour = (yyvsp[-6].textintval).value;
- pc->minutes = (yyvsp[-4].textintval).value;
- pc->seconds = (yyvsp[-2].timespec);
+ pc->hour = yyvsp[-6].textintval.value;
+ pc->minutes = yyvsp[-4].textintval.value;
+ pc->seconds = yyvsp[-2].timespec;
pc->meridian = MER24;
pc->zones_seen++;
- pc->time_zone = time_zone_hhmm ((yyvsp[-1].textintval),
(yyvsp[0].intval));
+ pc->time_zone = time_zone_hhmm (yyvsp[-1].textintval, yyvsp[0].intval);
}
break;
case 19:
#line 328 "getdate.y"
{
- pc->local_isdst = (yyvsp[0].intval);
- pc->dsts_seen += (0 < (yyvsp[0].intval));
+ pc->local_isdst = yyvsp[0].intval;
+ pc->dsts_seen += (0 < yyvsp[0].intval);
}
break;
@@ -1448,48 +1423,48 @@
#line 333 "getdate.y"
{
pc->local_isdst = 1;
- pc->dsts_seen += (0 < (yyvsp[-1].intval)) + 1;
+ pc->dsts_seen += (0 < yyvsp[-1].intval) + 1;
}
break;
case 21:
#line 341 "getdate.y"
- { pc->time_zone = (yyvsp[0].intval); }
+ { pc->time_zone = yyvsp[0].intval; }
break;
case 22:
#line 343 "getdate.y"
- { pc->time_zone = (yyvsp[-1].intval);
- pc->rel.ns += (yyvsp[0].rel).ns;
- pc->rel.seconds += (yyvsp[0].rel).seconds;
- pc->rel.minutes += (yyvsp[0].rel).minutes;
- pc->rel.hour += (yyvsp[0].rel).hour;
- pc->rel.day += (yyvsp[0].rel).day;
- pc->rel.month += (yyvsp[0].rel).month;
- pc->rel.year += (yyvsp[0].rel).year;
+ { pc->time_zone = yyvsp[-1].intval;
+ pc->rel.ns += yyvsp[0].rel.ns;
+ pc->rel.seconds += yyvsp[0].rel.seconds;
+ pc->rel.minutes += yyvsp[0].rel.minutes;
+ pc->rel.hour += yyvsp[0].rel.hour;
+ pc->rel.day += yyvsp[0].rel.day;
+ pc->rel.month += yyvsp[0].rel.month;
+ pc->rel.year += yyvsp[0].rel.year;
pc->rels_seen = true; }
break;
case 23:
#line 353 "getdate.y"
- { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm
((yyvsp[-1].textintval), (yyvsp[0].intval)); }
+ { pc->time_zone = yyvsp[-2].intval + time_zone_hhmm (yyvsp[-1].textintval,
yyvsp[0].intval); }
break;
case 24:
#line 355 "getdate.y"
- { pc->time_zone = (yyvsp[0].intval) + 60; }
+ { pc->time_zone = yyvsp[0].intval + 60; }
break;
case 25:
#line 357 "getdate.y"
- { pc->time_zone = (yyvsp[-1].intval) + 60; }
+ { pc->time_zone = yyvsp[-1].intval + 60; }
break;
case 26:
#line 362 "getdate.y"
{
pc->day_ordinal = 1;
- pc->day_number = (yyvsp[0].intval);
+ pc->day_number = yyvsp[0].intval;
}
break;
@@ -1497,31 +1472,31 @@
#line 367 "getdate.y"
{
pc->day_ordinal = 1;
- pc->day_number = (yyvsp[-1].intval);
+ pc->day_number = yyvsp[-1].intval;
}
break;
case 28:
#line 372 "getdate.y"
{
- pc->day_ordinal = (yyvsp[-1].intval);
- pc->day_number = (yyvsp[0].intval);
+ pc->day_ordinal = yyvsp[-1].intval;
+ pc->day_number = yyvsp[0].intval;
}
break;
case 29:
#line 377 "getdate.y"
{
- pc->day_ordinal = (yyvsp[-1].textintval).value;
- pc->day_number = (yyvsp[0].intval);
+ pc->day_ordinal = yyvsp[-1].textintval.value;
+ pc->day_number = yyvsp[0].intval;
}
break;
case 30:
#line 385 "getdate.y"
{
- pc->month = (yyvsp[-2].textintval).value;
- pc->day = (yyvsp[0].textintval).value;
+ pc->month = yyvsp[-2].textintval.value;
+ pc->day = yyvsp[0].textintval.value;
}
break;
@@ -1533,17 +1508,17 @@
The goal in recognizing YYYY/MM/DD is solely to support legacy
machine-generated dates like those in an RCS log listing. If
you want portability, use the ISO 8601 format. */
- if (4 <= (yyvsp[-4].textintval).digits)
+ if (4 <= yyvsp[-4].textintval.digits)
{
- pc->year = (yyvsp[-4].textintval);
- pc->month = (yyvsp[-2].textintval).value;
- pc->day = (yyvsp[0].textintval).value;
+ pc->year = yyvsp[-4].textintval;
+ pc->month = yyvsp[-2].textintval.value;
+ pc->day = yyvsp[0].textintval.value;
}
else
{
- pc->month = (yyvsp[-4].textintval).value;
- pc->day = (yyvsp[-2].textintval).value;
- pc->year = (yyvsp[0].textintval);
+ pc->month = yyvsp[-4].textintval.value;
+ pc->day = yyvsp[-2].textintval.value;
+ pc->year = yyvsp[0].textintval;
}
}
break;
@@ -1552,9 +1527,9 @@
#line 410 "getdate.y"
{
/* ISO 8601 format. YYYY-MM-DD. */
- pc->year = (yyvsp[-2].textintval);
- pc->month = -(yyvsp[-1].textintval).value;
- pc->day = -(yyvsp[0].textintval).value;
+ pc->year = yyvsp[-2].textintval;
+ pc->month = -yyvsp[-1].textintval.value;
+ pc->day = -yyvsp[0].textintval.value;
}
break;
@@ -1562,10 +1537,10 @@
#line 417 "getdate.y"
{
/* e.g. 17-JUN-1992. */
- pc->day = (yyvsp[-2].textintval).value;
- pc->month = (yyvsp[-1].intval);
- pc->year.value = -(yyvsp[0].textintval).value;
- pc->year.digits = (yyvsp[0].textintval).digits;
+ pc->day = yyvsp[-2].textintval.value;
+ pc->month = yyvsp[-1].intval;
+ pc->year.value = -yyvsp[0].textintval.value;
+ pc->year.digits = yyvsp[0].textintval.digits;
}
break;
@@ -1573,241 +1548,241 @@
#line 425 "getdate.y"
{
/* e.g. JUN-17-1992. */
- pc->month = (yyvsp[-2].intval);
- pc->day = -(yyvsp[-1].textintval).value;
- pc->year.value = -(yyvsp[0].textintval).value;
- pc->year.digits = (yyvsp[0].textintval).digits;
+ pc->month = yyvsp[-2].intval;
+ pc->day = -yyvsp[-1].textintval.value;
+ pc->year.value = -yyvsp[0].textintval.value;
+ pc->year.digits = yyvsp[0].textintval.digits;
}
break;
case 35:
#line 433 "getdate.y"
{
- pc->month = (yyvsp[-1].intval);
- pc->day = (yyvsp[0].textintval).value;
+ pc->month = yyvsp[-1].intval;
+ pc->day = yyvsp[0].textintval.value;
}
break;
case 36:
#line 438 "getdate.y"
{
- pc->month = (yyvsp[-3].intval);
- pc->day = (yyvsp[-2].textintval).value;
- pc->year = (yyvsp[0].textintval);
+ pc->month = yyvsp[-3].intval;
+ pc->day = yyvsp[-2].textintval.value;
+ pc->year = yyvsp[0].textintval;
}
break;
case 37:
#line 444 "getdate.y"
{
- pc->day = (yyvsp[-1].textintval).value;
- pc->month = (yyvsp[0].intval);
+ pc->day = yyvsp[-1].textintval.value;
+ pc->month = yyvsp[0].intval;
}
break;
case 38:
#line 449 "getdate.y"
{
- pc->day = (yyvsp[-2].textintval).value;
- pc->month = (yyvsp[-1].intval);
- pc->year = (yyvsp[0].textintval);
+ pc->day = yyvsp[-2].textintval.value;
+ pc->month = yyvsp[-1].intval;
+ pc->year = yyvsp[0].textintval;
}
break;
case 39:
#line 458 "getdate.y"
{
- pc->rel.ns -= (yyvsp[-1].rel).ns;
- pc->rel.seconds -= (yyvsp[-1].rel).seconds;
- pc->rel.minutes -= (yyvsp[-1].rel).minutes;
- pc->rel.hour -= (yyvsp[-1].rel).hour;
- pc->rel.day -= (yyvsp[-1].rel).day;
- pc->rel.month -= (yyvsp[-1].rel).month;
- pc->rel.year -= (yyvsp[-1].rel).year;
+ pc->rel.ns -= yyvsp[-1].rel.ns;
+ pc->rel.seconds -= yyvsp[-1].rel.seconds;
+ pc->rel.minutes -= yyvsp[-1].rel.minutes;
+ pc->rel.hour -= yyvsp[-1].rel.hour;
+ pc->rel.day -= yyvsp[-1].rel.day;
+ pc->rel.month -= yyvsp[-1].rel.month;
+ pc->rel.year -= yyvsp[-1].rel.year;
}
break;
case 40:
#line 468 "getdate.y"
{
- pc->rel.ns += (yyvsp[0].rel).ns;
- pc->rel.seconds += (yyvsp[0].rel).seconds;
- pc->rel.minutes += (yyvsp[0].rel).minutes;
- pc->rel.hour += (yyvsp[0].rel).hour;
- pc->rel.day += (yyvsp[0].rel).day;
- pc->rel.month += (yyvsp[0].rel).month;
- pc->rel.year += (yyvsp[0].rel).year;
+ pc->rel.ns += yyvsp[0].rel.ns;
+ pc->rel.seconds += yyvsp[0].rel.seconds;
+ pc->rel.minutes += yyvsp[0].rel.minutes;
+ pc->rel.hour += yyvsp[0].rel.hour;
+ pc->rel.day += yyvsp[0].rel.day;
+ pc->rel.month += yyvsp[0].rel.month;
+ pc->rel.year += yyvsp[0].rel.year;
}
break;
case 41:
#line 481 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].intval); }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.year = yyvsp[-1].intval; }
break;
case 42:
#line 483 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.year =
yyvsp[-1].textintval.value; }
break;
case 43:
#line 485 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.year = 1; }
break;
case 44:
#line 487 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].intval); }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.month = yyvsp[-1].intval; }
break;
case 45:
#line 489 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.month =
yyvsp[-1].textintval.value; }
break;
case 46:
#line 491 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.month = 1; }
break;
case 47:
#line 493 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].intval) *
(yyvsp[0].intval); }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.day = yyvsp[-1].intval *
yyvsp[0].intval; }
break;
case 48:
#line 495 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day =
(yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.day = yyvsp[-1].textintval.value
* yyvsp[0].intval; }
break;
case 49:
#line 497 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.day = yyvsp[0].intval; }
break;
case 50:
#line 499 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].intval); }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.hour = yyvsp[-1].intval; }
break;
case 51:
#line 501 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.hour =
yyvsp[-1].textintval.value; }
break;
case 52:
#line 503 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.hour = 1; }
break;
case 53:
#line 505 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].intval);
}
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.minutes = yyvsp[-1].intval; }
break;
case 54:
#line 507 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.minutes =
yyvsp[-1].textintval.value; }
break;
case 55:
#line 509 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.minutes = 1; }
break;
case 56:
#line 511 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].intval);
}
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.seconds = yyvsp[-1].intval; }
break;
case 57:
#line 513 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.seconds =
yyvsp[-1].textintval.value; }
break;
case 58:
#line 515 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.seconds =
yyvsp[-1].timespec.tv_sec; yyval.rel.ns = yyvsp[-1].timespec.tv_nsec; }
break;
case 59:
#line 517 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.seconds =
yyvsp[-1].timespec.tv_sec; yyval.rel.ns = yyvsp[-1].timespec.tv_nsec; }
break;
case 60:
#line 519 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.seconds = 1; }
break;
case 62:
#line 525 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.year =
yyvsp[-1].textintval.value; }
break;
case 63:
#line 527 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.month =
yyvsp[-1].textintval.value; }
break;
case 64:
#line 529 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day =
(yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.day = yyvsp[-1].textintval.value
* yyvsp[0].intval; }
break;
case 65:
#line 531 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.hour =
yyvsp[-1].textintval.value; }
break;
case 66:
#line 533 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.minutes =
yyvsp[-1].textintval.value; }
break;
case 67:
#line 535 "getdate.y"
- { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds =
(yyvsp[-1].textintval).value; }
+ { yyval.rel = RELATIVE_TIME_0; yyval.rel.seconds =
yyvsp[-1].textintval.value; }
break;
case 71:
#line 543 "getdate.y"
- { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value;
(yyval.timespec).tv_nsec = 0; }
+ { yyval.timespec.tv_sec = yyvsp[0].textintval.value;
yyval.timespec.tv_nsec = 0; }
break;
case 73:
#line 549 "getdate.y"
- { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value;
(yyval.timespec).tv_nsec = 0; }
+ { yyval.timespec.tv_sec = yyvsp[0].textintval.value;
yyval.timespec.tv_nsec = 0; }
break;
case 74:
#line 554 "getdate.y"
{
if (pc->dates_seen && ! pc->year.digits
- && ! pc->rels_seen && (pc->times_seen || 2 <
(yyvsp[0].textintval).digits))
- pc->year = (yyvsp[0].textintval);
+ && ! pc->rels_seen && (pc->times_seen || 2 <
yyvsp[0].textintval.digits))
+ pc->year = yyvsp[0].textintval;
else
{
- if (4 < (yyvsp[0].textintval).digits)
+ if (4 < yyvsp[0].textintval.digits)
{
pc->dates_seen++;
- pc->day = (yyvsp[0].textintval).value % 100;
- pc->month = ((yyvsp[0].textintval).value / 100) % 100;
- pc->year.value = (yyvsp[0].textintval).value / 10000;
- pc->year.digits = (yyvsp[0].textintval).digits - 4;
+ pc->day = yyvsp[0].textintval.value % 100;
+ pc->month = (yyvsp[0].textintval.value / 100) % 100;
+ pc->year.value = yyvsp[0].textintval.value / 10000;
+ pc->year.digits = yyvsp[0].textintval.digits - 4;
}
else
{
pc->times_seen++;
- if ((yyvsp[0].textintval).digits <= 2)
+ if (yyvsp[0].textintval.digits <= 2)
{
- pc->hour = (yyvsp[0].textintval).value;
+ pc->hour = yyvsp[0].textintval.value;
pc->minutes = 0;
}
else
{
- pc->hour = (yyvsp[0].textintval).value / 100;
- pc->minutes = (yyvsp[0].textintval).value % 100;
+ pc->hour = yyvsp[0].textintval.value / 100;
+ pc->minutes = yyvsp[0].textintval.value % 100;
}
pc->seconds.tv_sec = 0;
pc->seconds.tv_nsec = 0;
@@ -1819,29 +1794,29 @@
case 75:
#line 591 "getdate.y"
- { (yyval.intval) = -1; }
+ { yyval.intval = -1; }
break;
case 76:
#line 593 "getdate.y"
- { (yyval.intval) = (yyvsp[0].textintval).value; }
+ { yyval.intval = yyvsp[0].textintval.value; }
break;
case 77:
#line 598 "getdate.y"
- { (yyval.intval) = MER24; }
+ { yyval.intval = MER24; }
break;
case 78:
#line 600 "getdate.y"
- { (yyval.intval) = (yyvsp[0].intval); }
+ { yyval.intval = yyvsp[0].intval; }
break;
}
-/* Line 1037 of yacc.c. */
-#line 1845 "getdate.c"
+/* Line 1010 of yacc.c. */
+#line 1820 "getdate.c"
yyvsp -= yylen;
yyssp -= yylen;
@@ -1941,7 +1916,7 @@
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse look-ahead token after an
+ /* If just tried and failed to reuse lookahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -1951,22 +1926,23 @@
if (yychar == YYEOF)
for (;;)
{
-
YYPOPSTACK;
if (yyssp == yyss)
YYABORT;
- yydestruct ("Error: popping",
- yystos[*yyssp], yyvsp);
+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+ yydestruct (yystos[*yyssp], yyvsp);
}
}
else
{
- yydestruct ("Error: discarding", yytoken, &yylval);
+ YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+ yydestruct (yytoken, &yylval);
yychar = YYEMPTY;
+
}
}
- /* Else will try to reuse look-ahead token after shifting the error
+ /* Else will try to reuse lookahead token after shifting the error
token. */
goto yyerrlab1;
@@ -1983,7 +1959,7 @@
goto yyerrorlab;
#endif
-yyvsp -= yylen;
+ yyvsp -= yylen;
yyssp -= yylen;
yystate = *yyssp;
goto yyerrlab1;
@@ -2013,8 +1989,8 @@
if (yyssp == yyss)
YYABORT;
-
- yydestruct ("Error: popping", yystos[yystate], yyvsp);
+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+ yydestruct (yystos[yystate], yyvsp);
YYPOPSTACK;
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -2023,11 +1999,10 @@
if (yyn == YYFINAL)
YYACCEPT;
- *++yyvsp = yylval;
+ YYDPRINTF ((stderr, "Shifting error token, "));
+ *++yyvsp = yylval;
- /* Shift the error token. */
- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
yystate = yyn;
goto yynewstate;
@@ -2044,9 +2019,6 @@
| yyabortlab -- YYABORT comes here. |
`-----------------------------------*/
yyabortlab:
- yydestruct ("Error: discarding lookahead",
- yytoken, &yylval);
- yychar = YYEMPTY;
yyresult = 1;
goto yyreturn;
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3329 ccvs/src/ChangeLog:1.3330
--- ccvs/src/ChangeLog:1.3329 Wed Dec 21 02:17:09 2005
+++ ccvs/src/ChangeLog Wed Dec 21 02:18:42 2005
@@ -1,5 +1,7 @@
2005-12-20 Derek Price <address@hidden>
+ * sanity.sh (config3): Accept `.' in paths.
+
* admin.c (admin): Don't pass the global optind to getopt_long as
longindex - it causes infinite loops on some systems.
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1105 ccvs/src/sanity.sh:1.1106
--- ccvs/src/sanity.sh:1.1105 Wed Nov 30 19:04:18 2005
+++ ccvs/src/sanity.sh Wed Dec 21 02:18:42 2005
@@ -20388,7 +20388,7 @@
cd ..
dotest config3-7 "$testcvs history -ea" \
-"A [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.1 newfile config3 ==
[-_/a-zA-Z0-9<>]*
+"A [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.1 newfile config3 ==
[-_/a-zA-Z0-9<>.]*
T [0-9-]* [0-9:]* ${PLUS}0000 $username config3 \[testtag:A\]"
dokeep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs lib/getdate.c src/ChangeLog src/sanity.sh,
Derek Robert Price <=