diff options
Diffstat (limited to 'libical')
| -rw-r--r-- | libical/ChangeLog | 5 | ||||
| -rw-r--r-- | libical/src/libical/icalyacc.y | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog index 87f0dc4436..115ca75374 100644 --- a/libical/ChangeLog +++ b/libical/ChangeLog @@ -1,3 +1,8 @@ +2002-11-26 Rodrigo Moya <rodrigo@ximian.com> + + * src/libical/icalyacc.y: added missing ';' for new bison to not + complain. + 2002-10-25 Dan Winship <danw@ximian.com> * src/libical/icaltimezone.c diff --git a/libical/src/libical/icalyacc.y b/libical/src/libical/icalyacc.y index 87bcb3bec5..51a03d6028 100644 --- a/libical/src/libical/icalyacc.y +++ b/libical/src/libical/icalyacc.y @@ -6,7 +6,7 @@ DESCRIPTION: - $Id: icalyacc.y,v 1.13 2001/12/18 20:08:31 damon Exp $ + $Id: icalyacc.y,v 1.14 2002/11/27 00:33:20 rodrigo Exp $ $Locker: $ (C) COPYRIGHT 1999 Eric Busboom @@ -185,6 +185,7 @@ value: icalparser_clear_flex_input(); yyclearin; } +; date_value: DIGITS @@ -201,15 +202,18 @@ date_value: DIGITS icalparser_yy_value = icalvalue_new_date(stm); } +; utc_char: /*empty*/ {utc = 0;} | UTC_CHAR {utc = 1;} +; /* This is used in the period_value, where there may be two utc characters per rule. */ utc_char_b: /*empty*/ {utc_b = 0;} | UTC_CHAR {utc_b = 1;} +; datetime_value: DIGITS TIME_CHAR DIGITS utc_char @@ -222,6 +226,7 @@ datetime_value: icalparser_yy_value = icalvalue_new_datetime(stm); } +; /* Duration */ @@ -229,11 +234,13 @@ datetime_value: dur_date: dur_day | dur_day dur_time +; dur_week: DIGITS 'W' { duration.weeks = atoi($1); } +; dur_time: TIME_CHAR dur_hour { @@ -244,6 +251,7 @@ dur_time: TIME_CHAR dur_hour | TIME_CHAR dur_second { } +; dur_hour: DIGITS 'H' { @@ -253,6 +261,7 @@ dur_hour: DIGITS 'H' { duration.hours = atoi($1); } +; dur_minute: DIGITS 'M' { @@ -262,16 +271,19 @@ dur_minute: DIGITS 'M' { duration.minutes = atoi($1); } +; dur_second: DIGITS 'S' { duration.seconds = atoi($1); } +; dur_day: DIGITS 'D' { duration.days = atoi($1); } +; dur_prefix: /* empty */ { @@ -285,6 +297,7 @@ dur_prefix: /* empty */ { duration.is_neg = 1; } +; duration_value: dur_prefix 'P' dur_date { @@ -301,6 +314,7 @@ duration_value: dur_prefix 'P' dur_date icalparser_yy_value = icalvalue_new_duration(duration); memset(&duration,0, sizeof(duration)); } +; /* Period */ @@ -353,12 +367,14 @@ period_value: DIGITS TIME_CHAR DIGITS utc_char '/' DIGITS TIME_CHAR DIGITS utc icalparser_yy_value = icalvalue_new_period(p); } +; /* UTC Offset */ plusminus: '+' { utcsign = 1; } | '-' { utcsign = -1; } +; utcoffset_value: plusminus INTNUMBER INTNUMBER @@ -370,6 +386,7 @@ utcoffset_value: { icalparser_yy_value = icalvalue_new_utcoffset(utcsign * (($2*3600) + ($3*60) +($4))); } +; %% |