aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/ChangeLog8
-rw-r--r--libical/src/libical/icalyacc.y9
-rw-r--r--libical/src/libicalvcal/vcc.c6
3 files changed, 16 insertions, 7 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 46b70066b0..577da04a9b 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-07 Dan Winship <danw@helixcode.com>
+
+ * src/libical/icalyacc.y (weekday_list): Fix the semicolons in
+ this rule. Noticed by x-virge.
+
+ * src/test/Makefile.in: While I'm here, remove this from CVS, as
+ it's a generated file.
+
2000-09-12 Ettore Perazzoli <ettore@helixcode.com>
* configure.in: AC_OUTPUT the Makefile in `src' before the stuff
diff --git a/libical/src/libical/icalyacc.y b/libical/src/libical/icalyacc.y
index ce78a439d0..8363594288 100644
--- a/libical/src/libical/icalyacc.y
+++ b/libical/src/libical/icalyacc.y
@@ -6,7 +6,7 @@
DESCRIPTION:
- $Id: icalyacc.y,v 1.6 2000/09/01 15:24:30 jpr Exp $
+ $Id: icalyacc.y,v 1.7 2000/10/07 21:57:08 danw Exp $
$Locker: $
(C) COPYRIGHT 1999 Eric Busboom
@@ -377,10 +377,11 @@ weekday:
weekday_list:
- weekday {dow_pos = 0};
+ weekday {dow_pos = 0}
| DIGITS weekday { dow_pos = atoi($1)}
- | weekday_list COMMA weekday {dow_pos = 0};
- | weekday_list COMMA DIGITS weekday { dow_pos = atoi($3)}
+ | weekday_list COMMA weekday {dow_pos = 0}
+ | weekday_list COMMA DIGITS weekday { dow_pos = atoi($3)}
+ ;
recur_list:
diff --git a/libical/src/libicalvcal/vcc.c b/libical/src/libicalvcal/vcc.c
index b6de83cda4..cb57b6ed58 100644
--- a/libical/src/libicalvcal/vcc.c
+++ b/libical/src/libicalvcal/vcc.c
@@ -368,7 +368,7 @@ static const short yycheck[] = { 7,
41, 11, 57, 23
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/lib/bison.simple"
+#line 3 "/usr/pkg/share/bison.simple"
/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
@@ -582,7 +582,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#endif
#endif
-#line 217 "/usr/lib/bison.simple"
+#line 217 "/usr/pkg/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -1071,7 +1071,7 @@ case 46:
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/lib/bison.simple"
+#line 543 "/usr/pkg/share/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;