libical.la -> libical-evolution.la

2003-09-22  Hans Petter Jansson  <hpj@ximian.com>

	* calendar/cal-util/Makefile.am (libical_util_la_LIBADD):
	libical.la -> libical-evolution.la

	* calendar/importers/Makefile.am
	(libevolution_calendar_importers_la_LIBADD):
	libicalvcal.la -> libicalvcal-evolution.la

	* shell/Makefile.am (evolution_LDADD):
	libical.la -> libical-evolution.la

	* libical/configure.in: Require flex 2.5.31 and add a test for it.
	Rename WITH_CXX conditional to WITH_CXX_BINDINGS.

	* libical/examples/Makefile.am (doesnothing_LDADD): Add -evolution to
	lib names.

	* libical/src/test/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
	-evolution to lib names.

	* libical/src/test/regression.c (main): WITH_CXX -> WITH_CXX_BINDINGS.

	* libical/src/libicalcap/Makefile.am: Add -evolution to lib names.
	Install to Evolution's priv dirs.

	* libical/src/libicalvcal/Makefile.am: Ditto.

	* libical/src/libical/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add
	-evolution to lib names. Install in privlibdir. Install includes to
	$(privincludedir)/libical.

	* libical/src/libicalss/Makefile.am: Ditto.

	* libical/src/libicalss/icalsslexer.l: Replace option reentrant-bison
	with reentrant and bison-bridge. Use new Flex variable names.

	* libical/src/libical/icallexer.l:
	* libical/src/libical/icalyacc.y:
	* libical/src/libicalss/icalsslexer.c:
	* libical/src/libicalss/icalssyacc.c:
	* libical/src/libicalss/icalssyacc.h: Removed from repository.

svn path=/trunk/; revision=22633

12 files changed, 58 insertions, 4550 deletions

diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index e96d26a778..8c6fa80653 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.37 2003/09/12 18:14:01 hansp Exp $
+#  $Id: Makefile.am,v 1.38 2003/09/22 07:32:29 hansp Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -26,19 +26,19 @@
 DESIGNDATA = $(top_srcdir)/design-data
 ICALSCRIPTS = $(top_srcdir)/scripts
 
-if WITH_CXX
-cxx_lib=libical_cxx.la
+if WITH_CXX_BINDINGS
+cxx_lib=libical-evolution_cxx.la
 cxx_headers=vcomponent.h icalparameter_cxx.h icalproperty_cxx.h icalvalue_cxx.h icptrholder.h
 else
 cxx_lib=
 cxx_headers=
 endif
 
-lib_LTLIBRARIES = libical.la $(cxx_lib)
+privlib_LTLIBRARIES = libical-evolution.la $(cxx_lib)
 
-noinst_LTLIBRARIES = libical-static.la
-libical_static_la_SOURCES = $(libical_la_SOURCES)
-libical_static_la_LDFLAGS = --all-static
+noinst_LTLIBRARIES = libical-evolution-static.la
+libical_evolution_static_la_SOURCES = $(libical_evolution_la_SOURCES)
+libical_evolution_static_la_LDFLAGS = --all-static
 
 CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(privdatadir)"\"
 
@@ -52,10 +52,10 @@ INCLUDES =			\
 	-I$(top_builddir)/src	\
 	-I$(srcdir)
 
-libical_la_LDFLAGS = -version-info 0:0:0
+libical_evolution_la_LDFLAGS = -version-info 0:0:0
 
 
-libical_la_SOURCES =		\
+libical_evolution_la_SOURCES =		\
 	$(BUILT_SOURCES)	\
 	icalarray.c		\
 	icalarray.h		\
@@ -105,9 +105,9 @@ libical_la_SOURCES =		\
 	caldate.c \
 	astime.h 
 
-if WITH_CXX
-libical_cxx_la_SOURCES =	\
-	$(libical_la_SOURCES)	\
+if WITH_CXX_BINDINGS
+libical_evolution_cxx_la_SOURCES =	\
+	$(libical_evolution_la_SOURCES)	\
 	vcomponent.h		\
 	vcomponent.cpp		\
 	icalproperty_cxx.h	\
@@ -119,9 +119,9 @@ libical_cxx_la_SOURCES =	\
 	icptrholder.h
 endif
 
-libicalincludedir = $(includedir)
+libical_evolutionincludedir = $(privincludedir)/libical
 
-libicalinclude_HEADERS = ical.h icalmemory.h icalerror.h $(cxx_headers)
+libical_evolutioninclude_HEADERS = ical.h icalmemory.h icalerror.h $(cxx_headers)
 
 # ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering. It
 # is required to make the combined header ical.h properly
diff --git a/libical/src/libical/icallexer.l b/libical/src/libical/icallexer.l
deleted file mode 100644
index d76a7938e3..0000000000
--- a/libical/src/libical/icallexer.l
+++ /dev/null
@@ -1,161 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icallexer.l
-  CREATOR: eric 10 June 1999
-  
-  DESCRIPTION:
-  
-  $Id: icallexer.l,v 1.8 2001/01/23 20:22:33 jpr Exp $
-  $Locker:  $
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icalitip.y
-
-
-
-  ======================================================================*/
-#include "icalparser.h"
-#include "icalenums.h"
-#include "icalmemory.h"
-#include "assert.h"
-#include "icalyacc.h"
-
-#include <string.h> /* For strdup() */
-
-int icalparser_flex_input(char* buf, int max_size);
-void icalparser_clear_flex_input(void);
-
-
-#define ICAL_MAX_STR_CONST 1024
-
-#undef YY_INPUT
-#define YY_INPUT(b,r,ms) ( r= icalparser_flex_input(b,ms))
-#undef yywrap
-
-#undef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) ical_yyerror(msg)
-
-icalvalue_kind value_kind=ICAL_NO_VALUE;
-void set_parser_value_state(icalvalue_kind kind);
-extern int yydebug; 
-
-void ical_yyerror(char *s);
-
-void init_str_buf(void);
-
-int last_state;
-
-char *str_buf;
-char *str_buf_p;
-size_t buf_sz; /* = ICAL_MAX_STR_CONST;*/
-
-%}
-
-crlf		\x0D?\x0A
-space		[ ]
-qsafechar	[^\x00-\x1F\"]
-safechar	[^\x00-\x1F\"\:\;\,]
-tsafechar	[\x20-\x21\x23-\x2B\x2D-\x39\x3C-\x5B\x5D-\x7E]
-valuechar	[^\x00-\x08\x10-\x1F]
-xname		X-[a-zA-Z0-9\-]+
-xname2          [a-zA-Z0-9\-\ ]
-paramtext	{safechar}+
-value		{valuechar}+
-quotedstring	\"{qsafechar}+\"
-digit		[0-9]
-
-%array /* Make yytext an array. Slow, but handy. HACK */
-
-%option caseless
-
-%s quoted_string
-%s binary_value boolean_value uri_value time_value duration_value number_value period_value recur_value text_value utcoffset_value
-%s enum_param_value string_param_value stringlist_param_value keyword line_start component seperator parameter end_of_value paramtext
-
-
-
-%%
-
-%{
-%}
-
-
-<time_value>{
-{digit}+		 { ical_yylval.v_string =icalmemory_tmp_copy(yytext) ;
-                           return DIGITS; }
-T			 { return TIME_CHAR; }
-Z			 { return UTC_CHAR; }
-[\/\+\-PWHMSD]		 { return yytext[0]; }
-{crlf}                   { return EOL;}
-
-}
-
-<utcoffset_value>{
-{crlf}                   { return EOL;}
-\-|\+			 { return yytext[0]; }
-{digit}{digit}		 { ical_yylval.v_int=atoi(yytext); return INTNUMBER; }
-
-}
-
-<enum_param_value>{
-.			 { return CHARACTER; }
-{crlf}                   { return EOL;}
-
-}
-
-<seperator>{
-,       { BEGIN(last_state); return COMMA; } 
-}
-
-
-%% 
-
-int yywrap()
-{
-     return 1;
-}
-
-
-void set_parser_value_state(icalvalue_kind kind)
-{
-
-    switch (kind){
-
-	case ICAL_UTCOFFSET_VALUE:
-	    {BEGIN(utcoffset_value);break;}
-
-	case ICAL_DATETIMEPERIOD_VALUE:
-	case ICAL_DURATION_VALUE:
-	case ICAL_PERIOD_VALUE:
-	    {BEGIN(time_value);break;}
-
-	default:
-	{
-	   assert(1==0);
-	}
-    }
-}
-
-void init_str_buf(void)
-{
-   str_buf = icalmemory_tmp_buffer(ICAL_MAX_STR_CONST);
-   str_buf_p = str_buf;
-   buf_sz = ICAL_MAX_STR_CONST;
-
-
-}
-
diff --git a/libical/src/libical/icalyacc.y b/libical/src/libical/icalyacc.y
deleted file mode 100644
index 51a03d6028..0000000000
--- a/libical/src/libical/icalyacc.y
+++ /dev/null
@@ -1,417 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalitip.y
-  CREATOR: eric 10 June 1999
-  
-  DESCRIPTION:
-  
-  $Id: icalyacc.y,v 1.14 2002/11/27 00:33:20 rodrigo Exp $
-  $Locker:  $
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icalitip.y
-
-
-
-  =======================================================================*/
-
-#include <stdlib.h>
-#include <string.h> /* for strdup() */
-#include "icalparser.h"
-#include "pvl.h"
-
-icalvalue *icalparser_yy_value; /* Current Value */
-
-void ical_yyerror(char* s);
-void icalparser_clear_flex_input();  
-int ical_yy_lex(void);
-
-/* Globals for UTCOFFSET values */
-int utc; 
-int utc_b; 
-int utcsign;
-
-/* Globals for DURATION values */
-struct icaldurationtype duration;
-
-/* Globals for TRIGGER values */
-struct icaltriggertype trigger;
-
-void copy_list(short* array, size_t size);
-void add_prop(icalproperty_kind);
-void icalparser_fill_date(struct tm* t, char* dstr);
-void icalparser_fill_time(struct tm* t, char* tstr);
-void set_value_type(icalvalue_kind kind);
-void set_parser_value_state();
-struct icaltimetype fill_datetime(char* d, char* t);
-void ical_yy_error(char *s); /* Don't know why I need this.... */
-int yylex(void); /* Or this. */
-
-
-
-/* Set the state of the lexer so it will interpret values ( iCAL
-   VALUEs, that is, ) correctly. */
-
-%}
-
-%union {
-	float v_float;
-	int   v_int;
-	char* v_string;
-}
-
-
-  /* Renaming hack */
-
-/*
-#define    yymaxdepth ical_yy_maxdepth
-#define    yyparse ical_yy_parse
-#define    yyerror ical_yy_error
-#define    yylval  ical_yy_lval
-#define    yychar  ical_yy_char
-#define    yydebug ical_yy_debug
-#define    yypact  ical_yy_pact
-#define    yyr1    ical_yy_r1
-#define    yyr2    ical_yy_r2
-#define    yydef   ical_yy_def
-#define    yychk   ical_yy_chk
-#define    yypgo   ical_yy_pgo
-#define    yyact   ical_yy_act
-#define    yyexca  ical_yy_exca
-#define yyerrflag ical_yy_errflag
-#define yynerrs    ical_yy_nerrs
-#define    yyps    ical_yy_ps
-#define    yypv    ical_yy_pv
-#define    yys     ical_yy_s
-#define    yy_yys  ical_yy_yys
-#define    yystate ical_yy_state
-#define    yytmp   ical_yy_tmp
-#define    yyv     ical_yy_v
-#define    yy_yyv  ical_yy_yyv
-#define    yyval   ical_yy_val
-#define    yylloc  ical_yy_lloc
-#define yyreds     ical_yy_reds
-#define yytoks     ical_yy_toks
-#define yylhs      ical_yy_yylhs
-#define yylen      ical_yy_yylen
-#define yydefred ical_yy_yydefred
-#define yydgoto    ical_yy_yydgoto
-#define yydefred ical_yy_yydefred
-#define yydgoto    ical_yy_yydgoto
-#define yysindex ical_yy_yysindex
-#define yyrindex ical_yy_yyrindex
-#define yygindex ical_yy_yygindex
-#define yytable     ical_yy_yytable
-#define yycheck     ical_yy_yycheck
-#define yyname   ical_yy_yyname
-#define yyrule   ical_yy_yyrule
-#define yy_scan_bytes ical_yy_scan_bytes
-#define yy_scan_string ical_yy_scan_string
-#define yy_scan_buffer ical_yy_scan_buffer
-*/
-
-/* These are redefined with the -P option to flex */
-/*
-#define yy_create_buffer  ical_yy_create_buffer 
-#define yy_delete_buffer ical_yy_delete_buffer
-#define yy_flex_debug ical_yy_flex_debug
-#define yy_init_buffer ical_yy_init_buffer
-#define yy_flush_buffer ical_yy_flush_buffer
-#define yy_load_buffer_state ical_yy_load_buffer_state
-#define yy_switch_to_buffer ical_yy_switch_to_buffer
-#define yyin ical_yyin
-#define yyleng ical_yyleng
-#define yylex ical_yylex
-#define yylineno ical_yylineno
-#define yyout ical_yyout
-#define yyrestart ical_yyrestart
-#define yytext ical_yytext
-#define yywrap ical_yywrap             
-*/
-
-
-%token <v_string> DIGITS
-%token <v_int> INTNUMBER
-%token <v_float> FLOATNUMBER
-%token <v_string> STRING   
-%token EOL EQUALS CHARACTER COLON COMMA SEMICOLON MINUS TIMESEPERATOR 
-
-%token TRUE FALSE
-
-%token FREQ BYDAY BYHOUR BYMINUTE BYMONTH BYMONTHDAY BYSECOND BYSETPOS BYWEEKNO
-%token BYYEARDAY DAILY MINUTELY MONTHLY SECONDLY WEEKLY HOURLY YEARLY
-%token INTERVAL COUNT UNTIL WKST MO SA SU TU WE TH FR 
-
-%token BIT8 ACCEPTED ADD AUDIO BASE64 BINARY BOOLEAN BUSY BUSYTENTATIVE
-%token BUSYUNAVAILABLE CALADDRESS CANCEL CANCELLED CHAIR CHILD COMPLETED
-%token CONFIDENTIAL CONFIRMED COUNTER DATE DATETIME DECLINECOUNTER DECLINED
-%token DELEGATED DISPLAY DRAFT DURATION EMAIL END FINAL FLOAT FREE GREGORIAN
-%token GROUP INDIVIDUAL INPROCESS INTEGER NEEDSACTION NONPARTICIPANT
-%token OPAQUE OPTPARTICIPANT PARENT PERIOD PRIVATE PROCEDURE PUBLIC PUBLISH
-%token RECUR REFRESH REPLY REQPARTICIPANT REQUEST RESOURCE ROOM SIBLING
-%token START TENTATIVE TEXT THISANDFUTURE THISANDPRIOR TIME TRANSPAENT
-%token UNKNOWN UTCOFFSET XNAME
-
-%token ALTREP CN CUTYPE DAYLIGHT DIR ENCODING EVENT FBTYPE FMTTYPE LANGUAGE 
-%token MEMBER PARTSTAT RANGE RELATED RELTYPE ROLE RSVP SENTBY STANDARD URI
-
-%token TIME_CHAR UTC_CHAR
-
-
-%%
-
-value:
-	date_value
-	| datetime_value
-	| duration_value
-	| period_value
-        | utcoffset_value
-        | error { 
-                  icalparser_yy_value = 0;
-		  icalparser_clear_flex_input();
-                  yyclearin;
-                  }
-;
-
-
-date_value: DIGITS
-        {
-	    struct icaltimetype stm;
-
-	    stm = fill_datetime($1,0);
-
-	    stm.hour = -1;
-	    stm.minute = -1;
-	    stm.second = -1;
-	    stm.is_utc = 0;
-	    stm.is_date = 1;
-
-	    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
-        {
-	    struct  icaltimetype stm;
-	    stm = fill_datetime($1, $3);
-	    stm.is_utc = utc;
-	    stm.is_date = 0;
-
-	    icalparser_yy_value = 
-		icalvalue_new_datetime(stm);
-	}
-;
-
-
-/* Duration */
-
-
-dur_date: dur_day
-	| dur_day dur_time
-;
-
-dur_week: DIGITS 'W'
-	{
-	    duration.weeks = atoi($1);
-	}
-;
-
-dur_time: TIME_CHAR dur_hour 
-	{
-	}
-	| TIME_CHAR dur_minute
-	{
-	}
-	| TIME_CHAR dur_second
-	{
-	}
-;
-
-dur_hour: DIGITS 'H'
-	{
-	    duration.hours = atoi($1);
-	}
-	| DIGITS 'H' dur_minute
-	{
-	    duration.hours = atoi($1);
-	}
-;
-
-dur_minute: DIGITS 'M'
-	{
-	    duration.minutes = atoi($1);
-	}
-	| DIGITS 'M' dur_second
-	{
-	    duration.minutes = atoi($1);
-	}
-;
-
-dur_second: DIGITS 'S'
-	{
-	    duration.seconds = atoi($1);
-	}
-;
-
-dur_day: DIGITS 'D'
-	{
-	    duration.days = atoi($1);
-	}
-;
-
-dur_prefix: /* empty */
-	{
-	    duration.is_neg = 0;
-	} 
-	| '+'
-	{
-	    duration.is_neg = 0;
-	}
-	| '-'
-	{ 
-	    duration.is_neg = 1;
-	}
-;
-
-duration_value: dur_prefix 'P' dur_date
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-	| dur_prefix 'P' dur_time
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-	| dur_prefix 'P' dur_week
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-;
-
-
-/* Period */
-
-period_value:  DIGITS TIME_CHAR DIGITS utc_char '/'  DIGITS TIME_CHAR DIGITS utc_char_b
-	{
-            struct icalperiodtype p;
-        
-	    p.start = fill_datetime($1,$3);
-	    p.start.is_utc = utc;
-	    p.start.is_date = 0;
-
-
-	    p.end = fill_datetime($6,$8);
-	    p.end.is_utc = utc_b;
-	    p.end.is_date = 0;
-		
-	    p.duration.days = -1;
-	    p.duration.weeks = -1;
-	    p.duration.hours = -1;
-	    p.duration.minutes = -1;
-	    p.duration.seconds = -1;
-
-	    icalparser_yy_value = icalvalue_new_period(p);
-	}
-	| DIGITS TIME_CHAR DIGITS utc_char '/'  duration_value
-	{
-            struct icalperiodtype p;
-	    
-	    p.start = fill_datetime($1,$3);
-	    p.start.is_utc = utc;
-	    p.start.is_date = 0;
-
-	    p.end.year = -1;
-	    p.end.month = -1;
-	    p.end.day = -1;
-	    p.end.hour = -1;
-	    p.end.minute = -1;
-	    p.end.second = -1;
-		   
-	    /* The duration_value rule setes the global 'duration'
-               variable, but it also creates a new value in
-               icalparser_yy_value. So, free that, then copy
-               'duration' into the icalperiodtype struct. */
-
-	    p.duration = icalvalue_get_duration(icalparser_yy_value);
-	    icalvalue_free(icalparser_yy_value);
-	    icalparser_yy_value = 0;
-
-	    icalparser_yy_value = icalvalue_new_period(p);
-
-	}
-;
-
-
-/* UTC Offset */
-
-plusminus: '+' { utcsign = 1; }
-	| '-' { utcsign = -1; }
-;
-
-utcoffset_value: 
-	plusminus INTNUMBER INTNUMBER
-	{
-	    icalparser_yy_value = icalvalue_new_utcoffset( utcsign * (($2*3600) + ($3*60)) );
-  	}
-
-	| plusminus INTNUMBER INTNUMBER INTNUMBER
-	{
-	    icalparser_yy_value = icalvalue_new_utcoffset(utcsign * (($2*3600) + ($3*60) +($4)));
-  	}
-;
-
-%%
-
-struct icaltimetype fill_datetime(char* datestr, char* timestr)
-{
-	    struct icaltimetype stm;
-
-	    memset(&stm,0,sizeof(stm));
-
-	    if (datestr != 0){
-		sscanf(datestr,"%4d%2d%2d",&(stm.year), &(stm.month), 
-		       &(stm.day));
-	    }
-
-	    if (timestr != 0){
-		sscanf(timestr,"%2d%2d%2d", &(stm.hour), &(stm.minute), 
-		       &(stm.second));
-	    }
-
-	    return stm;
-
-}
-
-void ical_yyerror(char* s)
-{
-    /*fprintf(stderr,"Parse error \'%s\'\n", s);*/
-}
-
diff --git a/libical/src/libicalcap/Makefile.am b/libical/src/libicalcap/Makefile.am
index b03a6717e4..00af6a8589 100644
--- a/libical/src/libicalcap/Makefile.am
+++ b/libical/src/libicalcap/Makefile.am
@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: acampi 
 #  
-#  $Id: Makefile.am,v 1.1 2003/09/11 22:04:28 hansp Exp $
+#  $Id: Makefile.am,v 1.2 2003/09/22 07:32:30 hansp Exp $
 #
 #
 # (C) COPYRIGHT 2003, Andrea Campi, mailto:a.campi@inet.it
@@ -23,11 +23,11 @@
 #======================================================================
 
 
-lib_LTLIBRARIES = libicalcap.la
+lib_LTLIBRARIES = libicalcap-evolution.la
 
-noinst_LTLIBRARIES = libicalcap-static.la
-libicalcap_static_la_SOURCES = $(libicalcap_la_SOURCES)
-libicalcap_static_la_LDFLAGS = --all-static
+noinst_LTLIBRARIES = libicalcap-evolution-static.la
+libicalcap_evolution_static_la_SOURCES = $(libicalcap_evolution_la_SOURCES)
+libicalcap_evolution_static_la_LDFLAGS = --all-static
 
 INCLUDES =			\
 	-I$(top_builddir)	\
@@ -38,10 +38,10 @@ INCLUDES =			\
 	-I$(srcdir)		\
 	-DWITH_RR $(RRCAP_CFLAGS)
 
-libicalcap_la_LDFLAGS = $(RRCAP_LIBS) -version-info 0:0:0
+libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 0:0:0
 
 
-libicalcap_la_SOURCES =		\
+libicalcap_evolution_la_SOURCES =		\
 	icalcap.c		\
 	icalcap.h		\
 	icalcap_impl.h		\
@@ -56,9 +56,9 @@ libicalcap_la_SOURCES =		\
 	icalcap_session_impl.h	\
 	icalcap_utils.c
 
-libicalcapincludedir = $(includedir)
+libicalcap_evolutionincludedir = $(includedir)
 
-libicalcapinclude_HEADERS =	\
+libicalcap_evolutioninclude_HEADERS =	\
 	icalcap.h		\
 	icalcap_impl.h		\
 	icalcap_message_impl.h	\
@@ -70,7 +70,7 @@ libicalcapinclude_HEADERS =	\
 
 noinst_PROGRAMS = client
 
-LDADD =  ../libicalss/.libs/libicalss.a ../libicalvcal/.libs/libicalvcal.a $(cxx_libs) ../libical/.libs/libical.a libicalcap.la $(RRCAP_LIBS)
+LDADD =  ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolution.la $(cxx_libs) ../libical/libical-evolution.la libicalcap-evolution.la $(RRCAP_LIBS)
 
 
 client_SOURCES = client.c
diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
index ebb755c95a..359b1f029a 100644
--- a/libical/src/libicalss/Makefile.am
+++ b/libical/src/libicalss/Makefile.am
@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.19 2003/09/11 22:04:30 hansp Exp $
+#  $Id: Makefile.am,v 1.20 2003/09/22 07:32:31 hansp Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -46,15 +46,15 @@ BDB_SOURCEFILES=
 BDB_HEADERFILES=
 endif
 
-if WITH_CXX
-cxx_lib=libicalss_cxx.la
+if WITH_CXX_BINDINGS
+cxx_lib=libicalss-evolution_cxx.la
 cxx_headers=icalspanlist_cxx.h
 else
 cxx_lib=
 cxx_headers=
 endif
 
-lib_LTLIBRARIES = libicalss.la $(cxx_lib)
+privlib_LTLIBRARIES = libicalss-evolution.la $(cxx_lib)
 
 INCLUDES =			\
 	-I$(top_srcdir)/src	\
@@ -63,16 +63,16 @@ INCLUDES =			\
 	-I$(top_builddir)/libical \
 	$(BDB_INCLUDE)
 
-libicalss_la_LDFLAGS = -version-info 0:0:0
-libicalss_la_LIBADD = $(BDB_LIBFILES)
+libicalss_evolution_la_LDFLAGS = -version-info 0:0:0
+libicalss_evolution_la_LIBADD = $(BDB_LIBFILES)
 
 if DEV
-libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
+libicalss_evolution_la_DEVSOURCES = icalsslexer.l icalssyacc.y
 else
-libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
+libicalss_evolution_la_DEVSOURCES = icalsslexer.c icalssyacc.c
 endif
 
-libicalss_la_SOURCES =		\
+libicalss_evolution_la_SOURCES =		\
 	icalcalendar.c		\
 	icalcalendar.h		\
 	icalclassify.c		\
@@ -97,9 +97,9 @@ libicalss_la_SOURCES =		\
 	icalmessage.c		\
 	icalmessage.h		\
 	$(BDB_SOURCEFILES)	\
-	$(libicalss_la_DEVSOURCES)
+	$(libicalss_evolution_la_DEVSOURCES)
 
-libicalssincludedir = $(includedir)
+libicalssincludedir = $(privincludedir)/libical
 
 COMBINEDHEADERS = \
         $(srcdir)/icalgauge.h \
@@ -130,9 +130,9 @@ icalss.h: $(COMBINEDHEADERS)
 	echo '#endif'                     >> icalss.h
 
 
-if WITH_CXX
-libicalss_cxx_la_SOURCES =	\
-	$(libicalss_la_SOURCES)	\
+if WITH_CXX_BINDINGS
+libicalss_evolution_cxx_la_SOURCES =	\
+	$(libicalss_evolution_la_SOURCES)	\
 	icalspanlist_cxx.h	\
 	icalspanlist_cxx.cpp
 
diff --git a/libical/src/libicalss/icalsslexer.c b/libical/src/libicalss/icalsslexer.c
deleted file mode 100644
index 28d1b66afd..0000000000
--- a/libical/src/libicalss/icalsslexer.c
+++ /dev/null
@@ -1,2485 +0,0 @@
-#define YY_REENTRANT 1
-#define YY_TEXT_IS_ARRAY
-#define YY_REENTRANT_BISON_PURE 1
-#ifndef YY_REENTRANT
-#define yytext sstext
-#define yyleng ssleng
-#define yyin ssin
-#define yyout ssout
-#endif
-#define yy_create_buffer ss_create_buffer
-#define yy_delete_buffer ss_delete_buffer
-#define yy_scan_buffer ss_scan_buffer
-#define yy_scan_string ss_scan_string
-#define yy_scan_bytes ss_scan_bytes
-#define yy_flex_debug ss_flex_debug
-#define yy_init_buffer ss_init_buffer
-#define yy_flush_buffer ss_flush_buffer
-#define yy_load_buffer_state ss_load_buffer_state
-#define yy_switch_to_buffer ss_switch_to_buffer
-#define yylex sslex
-#define yyrestart ssrestart
-#define yylex_init sslex_init
-#define yylex_destroy sslex_destroy
-#define yyget_extra ssget_extra
-#define yyset_extra ssset_extra
-#define yyget_in ssget_in
-#define yyset_in ssset_in
-#define yyget_out ssget_out
-#define yyset_out ssset_out
-#define yyget_leng ssget_leng
-#define yyget_text ssget_text
-#define yyget_lineno ssget_lineno
-#define yyset_lineno ssset_lineno
-#ifdef YY_REENTRANT_BISON_PURE
-#define yyget_lval ssget_lval
-#define yyset_lval ssset_lval
-#ifdef YYLTYPE
-#define yyget_lloc ssget_lloc
-#define yyset_lloc ssset_lloc
-#endif
-#endif
-#define yywrap sswrap
-
-/* -*-C-*- */
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-/* %- */
-/* begin standard C headers. */
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-/* end standard C headers. */
-/* %+ */
-/* %* */
-
-#ifdef __cplusplus
-
-/* %+ */
-/* %* */
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-
-#ifdef YY_REENTRANT
-
-/* An opaque pointer. */
-#ifndef YY_TYPEDEF_YY_SCANNER_T
-#define YY_TYPEDEF_YY_SCANNER_T
-typedef void* yyscan_t;
-#endif
-
-/* For use wherever a Global is accessed or assigned. */
-#define YY_G(var) (((struct yy_globals_t*)yy_globals)->var)
-
-/* For use in function prototypes to append the additional argument. */
-#ifdef YY_USE_PROTOS
-#define YY_LAST_ARG , yyscan_t yy_globals
-#define YY_ONLY_ARG    yyscan_t yy_globals
-#else
-#define YY_LAST_ARG , yy_globals
-#define YY_ONLY_ARG    yy_globals
-#define YY_DECL_LAST_ARG yyscan_t yy_globals;
-#endif
-
-/* For use in function calls to pass the additional argument. */
-#define YY_CALL_LAST_ARG  , yy_globals
-#define YY_CALL_ONLY_ARG   yy_globals
-
-/* For convenience, these vars (plus the bison vars far below)
-   are macros in the reentrant scanner. */
-#define yyin YY_G(yyin_r)
-#define yyout YY_G(yyout_r)
-#define yyextra YY_G(yyextra_r)
-#define yyleng YY_G(yyleng_r)
-#define yytext YY_G(yytext_r)
-#define yylineno YY_G(yylineno_r)
-
-int yylex_init YY_PROTO((yyscan_t* scanner));
-int yylex_destroy YY_PROTO((yyscan_t scanner));
-
-#else /* not YY_REENTRANT */
-
-  /* Define these macros to be no-ops. */
-#define YY_G(var) (var)
-#define YY_LAST_ARG
-#define YY_ONLY_ARG  void
-#define YY_CALL_LAST_ARG
-#define YY_CALL_ONLY_ARG
-#define YY_DECL_LAST_ARG
-#endif
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN YY_G(yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((YY_G(yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin YY_CALL_LAST_ARG )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#ifndef YY_REENTRANT
-extern size_t yyleng;
-#endif
-
-/* %- */
-#ifndef YY_REENTRANT
-extern FILE *yyin, *yyout;
-#endif
-/* %* */
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = YY_G(yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		YY_G(yy_c_buf_p) = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, YY_G(yytext_ptr) YY_CALL_LAST_ARG )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-/* %- */
-	FILE *yy_input_file;
-/* %+ */
-/* %* */
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* %- Standard (non-C++) definition */
-/* %c */
-#ifndef ssIN_HEADER
-#ifndef YY_REENTRANT
-static YY_BUFFER_STATE yy_current_buffer = 0;
-#endif
-/* %e */
-#endif /* !ssIN_HEADER */
-/* %* */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* %- Standard (non-C++) definition */
-
-#ifndef YY_REENTRANT
-/* %c */
-#ifndef ssIN_HEADER
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-size_t yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-/* %e */
-#endif /* !ssIN_HEADER */
-#endif /* end !YY_REENTRANT */
-
-void yyrestart YY_PROTO(( FILE *input_file YY_LAST_ARG ));
-
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer YY_LAST_ARG ));
-void yy_load_buffer_state YY_PROTO(( YY_ONLY_ARG ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size YY_LAST_ARG ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b YY_LAST_ARG ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file YY_LAST_ARG ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b YY_LAST_ARG ));
-
-#define YY_FLUSH_BUFFER yy_flush_buffer( YY_G(yy_current_buffer) YY_CALL_LAST_ARG)
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size YY_LAST_ARG ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str YY_LAST_ARG ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len YY_LAST_ARG ));
-
-/* %* */
-
-/* %c */
-#ifndef ssIN_HEADER
-static void *yy_flex_alloc YY_PROTO(( yy_size_t YY_LAST_ARG ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t YY_LAST_ARG ));
-static void yy_flex_free YY_PROTO(( void * YY_LAST_ARG ));
-/* %e */
-#endif /* !ssIN_HEADER */
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_G(yy_current_buffer) ) \
-		YY_G(yy_current_buffer) =    \
-            yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); \
-	YY_G(yy_current_buffer)->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_G(yy_current_buffer) ) \
-		YY_G(yy_current_buffer) =    \
-            yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG); \
-	YY_G(yy_current_buffer)->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_G(yy_current_buffer)->yy_at_bol)
-
-/* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */
-/* Begin user sect3 */
-#ifndef ssIN_HEADER
-typedef unsigned char YY_CHAR;
-#endif /* !ssIN_HEADER */
-#ifndef ssIN_HEADER
-#ifndef YY_REENTRANT
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-#endif
-#endif /* !ssIN_HEADER */
-#ifndef ssIN_HEADER
-typedef int yy_state_type;
-#endif /* !ssIN_HEADER */
-
-/* %- Standard (non-C++) definition */
-/* %c */
-#ifndef ssIN_HEADER
-static yy_state_type yy_get_previous_state YY_PROTO(( YY_ONLY_ARG ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state  YY_LAST_ARG));
-static int yy_get_next_buffer YY_PROTO(( YY_ONLY_ARG ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-/* %e */
-#endif /* !ssIN_HEADER */
-/* %* */
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	YY_G(yytext_ptr) = yy_bp; \
-/* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	YY_G(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-/* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
-	if ( yyleng >= YYLMAX ) \
-		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-	yy_flex_strncpy( yytext, YY_G(yytext_ptr), yyleng + 1 YY_CALL_LAST_ARG); \
-	YY_G(yy_c_buf_p) = yy_cp;
-
-/* %* */
-
-/* %c */
-#ifndef ssIN_HEADER
-/* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
-#define YY_NUM_RULES 23
-#define YY_END_OF_BUFFER 24
-static yyconst short int yy_accept[56] =
-    {   0,
-        0,    0,    0,    0,    0,    0,   24,   22,   18,   18,
-       22,   17,   21,    4,   19,    8,    5,    9,   21,   21,
-       21,   21,   21,   21,   21,   18,    7,    0,   21,   10,
-        6,   11,   21,   21,   14,   21,   21,   13,   21,   21,
-       20,   12,   21,   15,   21,   21,   21,    2,   16,   21,
-       21,   21,    3,    1,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    4,    5,    1,    1,    1,    1,    1,    6,    1,
-        1,    7,    1,    8,    7,    7,    1,    7,    7,    7,
-        7,    7,    7,    7,    7,    7,    7,    9,   10,   11,
-       12,   13,    1,    7,   14,    7,   15,   16,   17,   18,
-        7,   19,   20,    7,    7,   21,   22,   23,   24,    7,
-        7,   25,   26,   27,   28,    7,   29,    7,    7,    7,
-        1,    1,    1,    1,    1,    1,   14,    7,   15,   16,
-
-       17,   18,    7,   19,   20,    7,    7,   21,   22,   23,
-       24,    7,    7,   25,   26,   27,   28,    7,   29,    7,
-        7,    7,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[30] =
-    {   0,
-        1,    1,    1,    2,    1,    1,    3,    1,    2,    1,
-        1,    1,    1,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3
-    } ;
-
-static yyconst short int yy_base[58] =
-    {   0,
-        0,    0,    0,    0,    0,    0,   68,   69,   28,   31,
-       55,    0,    0,   69,   69,   54,   53,   52,   40,   37,
-       35,   12,   35,   42,   39,   35,   69,   51,    0,   69,
-       69,   69,   40,   31,    0,   27,   32,    0,   31,   34,
-       69,    0,   28,    0,   28,   31,   22,    0,    0,   31,
-       28,   17,    0,    0,   69,   39,   40
-    } ;
-
-static yyconst short int yy_def[58] =
-    {   0,
-       55,    1,    1,    1,    1,    1,   55,   55,   55,   55,
-       55,   56,   57,   55,   55,   55,   55,   55,   57,   57,
-       57,   57,   57,   57,   57,   55,   55,   56,   57,   55,
-       55,   55,   57,   57,   57,   57,   57,   57,   57,   57,
-       55,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,    0,   55,   55
-    } ;
-
-static yyconst short int yy_nxt[99] =
-    {   0,
-        8,    9,   10,    9,   11,   12,   13,   14,    8,   15,
-       16,   17,   18,   19,   13,   13,   13,   20,   13,   21,
-       13,   13,   22,   23,   13,   24,   13,   13,   25,   26,
-       26,   26,   26,   26,   26,   36,   26,   26,   26,   37,
-       28,   28,   29,   54,   53,   52,   51,   50,   49,   48,
-       47,   46,   45,   44,   43,   42,   41,   40,   39,   38,
-       35,   34,   33,   32,   31,   30,   27,   55,    7,   55,
-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55
-
-    } ;
-
-static yyconst short int yy_chk[99] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    9,
-        9,    9,   10,   10,   10,   22,   26,   26,   26,   22,
-       56,   56,   57,   52,   51,   50,   47,   46,   45,   43,
-       40,   39,   37,   36,   34,   33,   28,   25,   24,   23,
-       21,   20,   19,   18,   17,   16,   11,    7,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   55,   55,   55,   55,   55,   55
-
-    } ;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-#ifndef YYLMAX
-#define YYLMAX 8192
-#endif
-
-#ifndef YY_REENTRANT
-char yytext[YYLMAX];
-char *yytext_ptr;
-#endif
-#line 1 "icalsslexer.l"
-#define INITIAL 0
-#line 2 "icalsslexer.l"
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalsslexer.l
-  CREATOR: eric 8 Aug 2000
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-  ======================================================================*/
-
-#include "icalssyacc.h"
-#include "icalgaugeimpl.h"
-#include "assert.h"
-
-#include <string.h> /* For strdup() */
-
-#undef YYPURE
-#define YYPURE
-
-#undef SS_FATAL_ERROR
-#define SS_FATAL_ERROR(msg) sserror(msg)
-
-#define sql 1
-#define string_value 2
-
-#line 596 "lex.ss.c"
-/* %e */
-#endif /* !ssIN_HEADER */
-
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#ifndef YY_NO_UNISTD_H
-/* %- */
-#include <unistd.h>
-/* %+ */
-/* %* */
-#endif /* !YY_NO_UNISTD_H */
-
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-/* %- Reentrant structure and macros (non-C++). */
-#ifdef YY_REENTRANT
-
-/* %c */
-#ifndef ssIN_HEADER
-struct yy_globals_t
-    {
-
-    /* User-defined. Not touched by flex. */
-    YY_EXTRA_TYPE yyextra_r;
-
-    /* The rest are the same as the globals declared in the non-reentrant scanner. */
-    FILE *yyin_r, *yyout_r;
-    YY_BUFFER_STATE yy_current_buffer;
-    char yy_hold_char;
-    int yy_n_chars;
-    int yyleng_r;
-    char *yy_c_buf_p;
-    int yy_init;
-    int yy_start;
-    int yy_did_buffer_switch_on_eof;
-    int yy_start_stack_ptr;
-    int yy_start_stack_depth;
-    int *yy_start_stack;
-    yy_state_type yy_last_accepting_state;
-    char* yy_last_accepting_cpos;
-
-    int yylineno_r;
-
-#ifdef YY_TEXT_IS_ARRAY
-    char yytext_r[YYLMAX];
-    char *yytext_ptr;
-    int yy_more_offset;
-    int yy_prev_more_offset;
-#else
-    char *yytext_r;
-    int yy_more_flag;
-    int yy_more_len;
-#endif
-
-#ifdef YY_REENTRANT_BISON_PURE
-    YYSTYPE * yylval_r;
-#ifdef YYLTYPE
-    YYLTYPE * yylloc_r;
-#endif
-#endif
-
-    };
-/* %e */
-#endif /* !ssIN_HEADER */
-
-/* %c */
-#ifndef ssIN_HEADER
-static int yy_init_globals YY_PROTO(( yyscan_t ));
-/* %e */
-#endif /* !ssIN_HEADER */
-
-/* This must go here because YYSTYPE and YYLSTYPE are included
- * from bison output in section 1.*/
-#ifdef YY_REENTRANT_BISON_PURE
-#    define yylval YY_G(yylval_r)
-#  ifdef YYLTYPE
-#    define yylloc YY_G(yylloc_r)
-#  endif
-#endif /* YY_REENTRANT_BISON_PURE */
-
-#endif /* end if YY_REENTRANT */
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-#ifndef YY_NO_GET_EXTRA
-YY_EXTRA_TYPE yyget_extra YY_PROTO(( YY_ONLY_ARG ));
-#endif
-
-#ifndef YY_NO_SET_EXTRA
-void yyset_extra YY_PROTO(( YY_EXTRA_TYPE user_defined YY_LAST_ARG ));
-#endif
-
-#ifndef YY_NO_GET_IN
-FILE *yyget_in YY_PROTO(( YY_ONLY_ARG ));
-#endif
-
-#ifndef YY_NO_SET_IN
-void yyset_in  YY_PROTO(( FILE * in_str YY_LAST_ARG ));
-#endif
-
-#ifndef YY_NO_GET_OUT
-FILE *yyget_out YY_PROTO(( YY_ONLY_ARG ));
-#endif
-
-#ifndef YY_NO_SET_OUT
-void yyset_out  YY_PROTO(( FILE * out_str YY_LAST_ARG ));
-#endif
-
-#ifndef YY_NO_GET_LENG
-int yyget_leng YY_PROTO(( YY_ONLY_ARG ));
-#endif
-
-#ifndef YY_NO_GET_TEXT
-char *yyget_text YY_PROTO(( YY_ONLY_ARG ));
-#endif
-
-#ifndef YY_NO_GET_LINENO
-int yyget_lineno YY_PROTO(( YY_ONLY_ARG ));
-#endif
-
-#ifndef YY_NO_SET_LINENO
-void yyset_lineno YY_PROTO(( int line_number YY_LAST_ARG ));
-#endif
-
-#ifdef YY_REENTRANT_BISON_PURE
-#ifndef YY_NO_GET_LVAL
-YYSTYPE * yyget_lval YY_PROTO(( YY_ONLY_ARG ));
-#endif
-void yyset_lval YY_PROTO(( YYSTYPE * yylvalp YY_LAST_ARG ));
-#ifdef YYLTYPE
-#ifndef YY_NO_GET_LLOC
-   YYLTYPE *yyget_lloc YY_PROTO(( YY_ONLY_ARG ));
-#endif
-#ifndef YY_NO_SET_LLOC
-    void yyset_lloc YY_PROTO(( YYLTYPE * yyllocp YY_LAST_ARG ));
-#endif
-#endif /* YYLTYPE */
-#endif /* YY_REENTRANT_BISON_PURE */
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( YY_ONLY_ARG ));
-#else
-extern int yywrap YY_PROTO(( YY_ONLY_ARG ));
-#endif
-#endif
-
-/* %- */
-/* %c */
-#ifndef ssIN_HEADER
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr  YY_LAST_ARG));
-#endif
-/* %e */
-#endif /* !ssIN_HEADER */
-/* %* */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int YY_LAST_ARG));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * YY_LAST_ARG));
-#endif
-
-#ifndef YY_NO_INPUT
-/* %- Standard (non-C++) definition */
-/* %c */
-#ifndef ssIN_HEADER
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( YY_ONLY_ARG ));
-#else
-static int input YY_PROTO(( YY_ONLY_ARG ));
-#endif
-/* %e */
-#endif /* !ssIN_HEADER */
-/* %* */
-#endif
-
-#if YY_STACK_USED
-#ifndef YY_REENTRANT
-/* %c */
-#ifndef ssIN_HEADER
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-/* %e */
-#endif /* !ssIN_HEADER */
-#endif
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state YY_LAST_ARG));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( YY_ONLY_ARG ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( YY_ONLY_ARG ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-/* %- Standard (non-C++) definition */
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-/* %+ C++ definition */
-/* %* */
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-/* %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \ */\
-	if ( YY_G(yy_current_buffer)->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		size_t n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}
-/* %+ C++ definition \ */\
-/* %* */
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-/* %- */
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-/* %+ */
-/* %* */
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-/* %- Standard (non-C++) definition */
-
-/* If the bison pure parser is used, then bison will provide
-   one or two additional arguments. */
-
-#ifdef YY_REENTRANT_BISON_PURE
-#  ifdef YYLTYPE 
-#    ifdef YY_USE_PROTOS
-#        define YY_LEX_ARGS (YYSTYPE * yylvalp, YYLTYPE * yyllocp YY_LAST_ARG)
-#    else
-#        define YY_LEX_ARGS (yylvalp, yyllocp YY_LAST_ARG) \
-                             YYSTYPE * yylvalp; YYLTYPE * yyllocp; YY_DECL_LAST_ARG
-#    endif
-#  else
-#    ifdef YY_USE_PROTOS
-#        define YY_LEX_ARGS (YYSTYPE * yylvalp YY_LAST_ARG)
-#    else
-#        define YY_LEX_ARGS (yylvalp YY_LAST_ARG) \
-                             YYSTYPE * yylvalp; YY_DECL_LAST_ARG
-#    endif
-#  endif
-#else
-#  ifdef YY_USE_PROTOS
-#      define YY_LEX_ARGS (YY_ONLY_ARG)
-#  else
-#      define YY_LEX_ARGS (YY_ONLY_ARG) YY_DECL_LAST_ARG
-#  endif
-#endif
-
-
-extern int yylex YY_PROTO( YY_LEX_ARGS );
-
-#define YY_DECL int yylex YY_LEX_ARGS
-/* %+ C++ definition */
-/* %* */
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-/* %% [6.0] YY_RULE_SETUP definition goes here */
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-/* %c */
-#ifndef ssIN_HEADER
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-/* %% [7.0] user's declarations go here */
-#line 66 "icalsslexer.l"
-
-
-
-
-
-
-#line 959 "lex.ss.c"
-
-#ifdef YY_REENTRANT_BISON_PURE
-    yylval = yylvalp;
-#ifdef YYLTYPE
-    yylloc = yyllocp;
-#endif
-#endif
-
-	if ( YY_G(yy_init) )
-		{
-		YY_G(yy_init) = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! YY_G(yy_start) )
-			YY_G(yy_start) = 1;	/* first start state */
-
-		if ( ! yyin )
-/* %- */
-			yyin = stdin;
-/* %+ */
-/* %* */
-
-		if ( ! yyout )
-/* %- */
-			yyout = stdout;
-/* %+ */
-/* %* */
-
-		if ( ! YY_G(yy_current_buffer) )
-			YY_G(yy_current_buffer) =
-				yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG);
-
-		yy_load_buffer_state( YY_CALL_ONLY_ARG );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-/* %% [8.0] yymore()-related code goes here */
-		yy_cp = YY_G(yy_c_buf_p);
-
-		/* Support of yytext. */
-		*yy_cp = YY_G(yy_hold_char);
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-/* %% [9.0] code to set up and find next match goes here */
-		yy_current_state = YY_G(yy_start);
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				YY_G(yy_last_accepting_state) = yy_current_state;
-				YY_G(yy_last_accepting_cpos) = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 56 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 69 );
-
-yy_find_action:
-/* %% [10.0] code to find the action number goes here */
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = YY_G(yy_last_accepting_cpos);
-			yy_current_state = YY_G(yy_last_accepting_state);
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-/* %% [11.0] code for yylineno update goes here */
-
-do_action:	/* This label is used only to access EOF actions. */
-
-/* %% [12.0] debug code goes here */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-/* %% [13.0] actions go here */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = YY_G(yy_hold_char);
-			yy_cp = YY_G(yy_last_accepting_cpos);
-			yy_current_state = YY_G(yy_last_accepting_state);
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 72 "icalsslexer.l"
-{ return SELECT; }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 73 "icalsslexer.l"
-{ return FROM; }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 74 "icalsslexer.l"
-{ return WHERE; }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 75 "icalsslexer.l"
-{ return COMMA; }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 76 "icalsslexer.l"
-{ return EQUALS; }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 77 "icalsslexer.l"
-{ return EQUALS; }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 78 "icalsslexer.l"
-{ return NOTEQUALS; }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 79 "icalsslexer.l"
-{ return LESS; }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 80 "icalsslexer.l"
-{ return GREATER; }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 81 "icalsslexer.l"
-{ return LESSEQUALS; }
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 82 "icalsslexer.l"
-{ return GREATEREQUALS; }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 83 "icalsslexer.l"
-{ return AND; }
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 84 "icalsslexer.l"
-{ return OR; }
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 85 "icalsslexer.l"
-{ return IS; }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 86 "icalsslexer.l"
-{ return NOT; }
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 87 "icalsslexer.l"
-{ return SQLNULL; }
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 88 "icalsslexer.l"
-{ return QUOTE; }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 89 "icalsslexer.l"
-;			
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 90 "icalsslexer.l"
-{ return EOL; }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 92 "icalsslexer.l"
-{
-	int c = input(yy_globals);
-	unput(c);
-	if(c!='\''){
-		yylvalp->v_string= icalmemory_tmp_copy(yytext);
-		return STRING;
-	} else {
-		/*ssmore();*/
-	}
-}
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 103 "icalsslexer.l"
-{
-        yylval->v_string= icalmemory_tmp_copy(yytext);
-	return STRING; 
-}
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 109 "icalsslexer.l"
-{ return yytext[0]; }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 111 "icalsslexer.l"
-ECHO;
-	YY_BREAK
-#line 1188 "lex.ss.c"
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(sql):
-case YY_STATE_EOF(string_value):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - YY_G(yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = YY_G(yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_G(yy_current_buffer)->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_n_chars;
-			YY_G(yy_current_buffer)->yy_input_file = yyin;
-			YY_G(yy_current_buffer)->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( YY_G(yy_c_buf_p) <= &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state YY_CALL_LAST_ARG);
-
-			yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++YY_G(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-/* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */
-				yy_cp = YY_G(yy_c_buf_p);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer( YY_CALL_ONLY_ARG ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				YY_G(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( yywrap( YY_CALL_ONLY_ARG ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! YY_G(yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				YY_G(yy_c_buf_p) =
-					YY_G(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG );
-
-				yy_cp = YY_G(yy_c_buf_p);
-				yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				YY_G(yy_c_buf_p) =
-				&YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)];
-
-				yy_current_state = yy_get_previous_state( YY_CALL_ONLY_ARG );
-
-				yy_cp = YY_G(yy_c_buf_p);
-				yy_bp = YY_G(yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-/* %e */
-#endif /* !ssIN_HEADER */
-/* %+ */
-/* %c */
-#ifndef ssIN_HEADER
-/* %e */
-#endif /* !ssIN_HEADER */
-/* %* */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-/* %- */
-/* %c */
-#ifndef ssIN_HEADER
-#ifdef YY_USE_PROTOS
-static int yy_get_next_buffer(YY_ONLY_ARG)
-#else
-static int yy_get_next_buffer(YY_ONLY_ARG)
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	register char *dest = YY_G(yy_current_buffer)->yy_ch_buf;
-	register char *source = YY_G(yytext_ptr);
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( YY_G(yy_c_buf_p) > &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars) + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_G(yy_current_buffer)->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( YY_G(yy_c_buf_p) - YY_G(yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_G(yy_current_buffer)->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars) = 0;
-
-	else
-		{
-			size_t num_to_read =
-			YY_G(yy_current_buffer)->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_G(yy_current_buffer);
-
-			int yy_c_buf_p_offset =
-				(int) (YY_G(yy_c_buf_p) - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 YY_CALL_LAST_ARG );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			YY_G(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = YY_G(yy_current_buffer)->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_G(yy_current_buffer)->yy_ch_buf[number_to_move]),
-			YY_G(yy_n_chars), num_to_read );
-
-		YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars);
-		}
-
-	if ( YY_G(yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin  YY_CALL_LAST_ARG);
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_G(yy_current_buffer)->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	YY_G(yy_n_chars) += number_to_move;
-	YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-	YY_G(yytext_ptr) = &YY_G(yy_current_buffer)->yy_ch_buf[0];
-
-	return ret_val;
-	}
-/* %e */
-#endif /* !ssIN_HEADER */
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-/* %- */
-/* %c */
-#ifndef ssIN_HEADER
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_get_previous_state(YY_ONLY_ARG)
-#else
-static yy_state_type yy_get_previous_state(YY_ONLY_ARG)
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-/* %% [15.0] code to get the start state into yy_current_state goes here */
-	yy_current_state = YY_G(yy_start);
-
-	for ( yy_cp = YY_G(yytext_ptr) + YY_MORE_ADJ; yy_cp < YY_G(yy_c_buf_p); ++yy_cp )
-		{
-/* %% [16.0] code to find the next state goes here */
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			YY_G(yy_last_accepting_state) = yy_current_state;
-			YY_G(yy_last_accepting_cpos) = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 56 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-/* %- */
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state YY_LAST_ARG )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state YY_LAST_ARG )
-yy_state_type yy_current_state;
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	register int yy_is_jam;
-/* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
-	register char *yy_cp = YY_G(yy_c_buf_p);
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		YY_G(yy_last_accepting_state) = yy_current_state;
-		YY_G(yy_last_accepting_cpos) = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 56 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 55);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-/* %- */
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp YY_LAST_ARG )
-#else
-static void yyunput( c, yy_bp YY_LAST_ARG)
-int c;
-register char *yy_bp;
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	register char *yy_cp = YY_G(yy_c_buf_p);
-
-	/* undo effects of setting up yytext */
-	*yy_cp = YY_G(yy_hold_char);
-
-	if ( yy_cp < YY_G(yy_current_buffer)->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = YY_G(yy_n_chars) + 2;
-		register char *dest = &YY_G(yy_current_buffer)->yy_ch_buf[
-					YY_G(yy_current_buffer)->yy_buf_size + 2];
-		register char *source =
-				&YY_G(yy_current_buffer)->yy_ch_buf[number_to_move];
-
-		while ( source > YY_G(yy_current_buffer)->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		YY_G(yy_current_buffer)->yy_n_chars =
-			YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_buf_size;
-
-		if ( yy_cp < YY_G(yy_current_buffer)->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-/* %% [18.0] update yylineno here */
-
-	YY_G(yytext_ptr) = yy_bp;
-	YY_G(yy_hold_char) = *yy_cp;
-	YY_G(yy_c_buf_p) = yy_cp;
-	}
-/* %- */
-#endif	/* ifndef YY_NO_UNPUT */
-/* %* */
-
-
-/* %- */
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput(YY_ONLY_ARG)
-#else
-#ifdef YY_USE_PROTOS
-static int input(YY_ONLY_ARG)
-#else
-static int input(YY_ONLY_ARG)
-    YY_DECL_LAST_ARG
-#endif
-#endif
-/* %+ */
-/* %* */
-	{
-	int c;
-
-	*YY_G(yy_c_buf_p) = YY_G(yy_hold_char);
-
-	if ( *YY_G(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( YY_G(yy_c_buf_p) < &YY_G(yy_current_buffer)->yy_ch_buf[YY_G(yy_n_chars)] )
-			/* This was really a NUL. */
-			*YY_G(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			int offset = YY_G(yy_c_buf_p) - YY_G(yytext_ptr);
-			++YY_G(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer( YY_CALL_ONLY_ARG ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin YY_CALL_LAST_ARG);
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap( YY_CALL_ONLY_ARG ) )
-						return EOF;
-
-					if ( ! YY_G(yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput(YY_CALL_ONLY_ARG);
-#else
-					return input(YY_CALL_ONLY_ARG);
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					YY_G(yy_c_buf_p) = YY_G(yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) YY_G(yy_c_buf_p);	/* cast for 8-bit char's */
-	*YY_G(yy_c_buf_p) = '\0';	/* preserve yytext */
-	YY_G(yy_hold_char) = *++YY_G(yy_c_buf_p);
-
-/* %% [19.0] update BOL and yylineno */
-
-	return c;
-	}
-/* %- */
-#endif	/* ifndef YY_NO_INPUT */
-/* %* */
-
-/* %- */
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file YY_LAST_ARG)
-#else
-void yyrestart( input_file YY_LAST_ARG)
-FILE *input_file;
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	if ( ! YY_G(yy_current_buffer) )
-		YY_G(yy_current_buffer) =
-            yy_create_buffer( yyin, YY_BUF_SIZE YY_CALL_LAST_ARG);
-
-	yy_init_buffer( YY_G(yy_current_buffer), input_file YY_CALL_LAST_ARG);
-	yy_load_buffer_state( YY_CALL_ONLY_ARG );
-	}
-
-
-/* %- */
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer YY_LAST_ARG )
-#else
-void yy_switch_to_buffer( new_buffer YY_LAST_ARG )
-YY_BUFFER_STATE new_buffer;
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	if ( YY_G(yy_current_buffer) == new_buffer )
-		return;
-
-	if ( YY_G(yy_current_buffer) )
-		{
-		/* Flush out information for old buffer. */
-		*YY_G(yy_c_buf_p) = YY_G(yy_hold_char);
-		YY_G(yy_current_buffer)->yy_buf_pos = YY_G(yy_c_buf_p);
-		YY_G(yy_current_buffer)->yy_n_chars = YY_G(yy_n_chars);
-		}
-
-	YY_G(yy_current_buffer) = new_buffer;
-	yy_load_buffer_state( YY_CALL_ONLY_ARG );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	YY_G(yy_did_buffer_switch_on_eof) = 1;
-	}
-
-
-/* %- */
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( YY_ONLY_ARG )
-#else
-void yy_load_buffer_state(YY_ONLY_ARG )
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	YY_G(yy_n_chars) = YY_G(yy_current_buffer)->yy_n_chars;
-	YY_G(yytext_ptr) = YY_G(yy_c_buf_p) = YY_G(yy_current_buffer)->yy_buf_pos;
-	yyin = YY_G(yy_current_buffer)->yy_input_file;
-	YY_G(yy_hold_char) = *YY_G(yy_c_buf_p);
-	}
-
-
-/* %- */
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size YY_LAST_ARG)
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size YY_LAST_ARG)
-FILE *file;
-int size;
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) YY_CALL_LAST_ARG );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 YY_CALL_LAST_ARG );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file YY_CALL_LAST_ARG);
-
-	return b;
-	}
-
-
-/* %- */
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b YY_LAST_ARG)
-#else
-void yy_delete_buffer( b YY_LAST_ARG)
-YY_BUFFER_STATE b;
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	if ( ! b )
-		return;
-
-	if ( b == YY_G(yy_current_buffer) )
-		YY_G(yy_current_buffer) = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf YY_CALL_LAST_ARG );
-
-	yy_flex_free( (void *) b YY_CALL_LAST_ARG );
-	}
-
-
-/* %- */
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-#ifdef __cplusplus
-extern "C" int isatty YY_PROTO(( int ));
-#else
-extern int isatty YY_PROTO(( int ));
-#endif /* __cplusplus */
-#endif /* !YY_NEVER_INTERACTIVE */
-#endif /* !YY_ALWAYS_INTERACTIVE */
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file YY_LAST_ARG)
-#else
-void yy_init_buffer( b, file YY_LAST_ARG)
-YY_BUFFER_STATE b;
-FILE *file;
-YY_DECL_LAST_ARG
-#endif
-
-/* %+ */
-/* %* */
-
-	{
-	int oerrno = errno;
-
-	yy_flush_buffer( b YY_CALL_LAST_ARG);
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-/* %- */
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-/* %+ */
-/* %* */
-	errno = oerrno;
-	}
-
-
-/* %- */
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b YY_LAST_ARG )
-#else
-void yy_flush_buffer( b YY_LAST_ARG )
-YY_BUFFER_STATE b;
-YY_DECL_LAST_ARG
-#endif
-
-/* %+ */
-/* %* */
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_G(yy_current_buffer) )
-		yy_load_buffer_state( YY_CALL_ONLY_ARG );
-	}
-/* %* */
-
-
-#ifndef YY_NO_SCAN_BUFFER
-/* %- */
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size YY_LAST_ARG )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size YY_LAST_ARG )
-char *base;
-yy_size_t size;
-YY_DECL_LAST_ARG
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) YY_CALL_LAST_ARG );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b YY_CALL_LAST_ARG );
-
-	return b;
-	}
-/* %* */
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-/* %- */
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str YY_LAST_ARG )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str YY_LAST_ARG)
-yyconst char *yy_str;
-YY_DECL_LAST_ARG
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len YY_CALL_LAST_ARG);
-	}
-/* %* */
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-/* %- */
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len YY_LAST_ARG)
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len YY_LAST_ARG)
-yyconst char *bytes;
-YY_DECL_LAST_ARG
-int len;
-#endif
-	{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n YY_CALL_LAST_ARG );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
-
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n YY_CALL_LAST_ARG);
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-	}
-/* %* */
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-/* %- */
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state YY_LAST_ARG)
-#else
-static void yy_push_state( new_state YY_LAST_ARG)
-int new_state;
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	if ( YY_G(yy_start_stack_ptr) >= YY_G(yy_start_stack_depth) )
-		{
-		yy_size_t new_size;
-
-		YY_G(yy_start_stack_depth) += YY_START_STACK_INCR;
-		new_size = YY_G(yy_start_stack_depth) * sizeof( int );
-
-		if ( ! YY_G(yy_start_stack) )
-			YY_G(yy_start_stack) = (int *) yy_flex_alloc( new_size YY_CALL_LAST_ARG );
-
-		else
-			YY_G(yy_start_stack) = (int *) yy_flex_realloc(
-					(void *) YY_G(yy_start_stack), new_size YY_CALL_LAST_ARG );
-
-		if ( ! YY_G(yy_start_stack) )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-/* %- */
-#ifdef YY_USE_PROTOS
-static void yy_pop_state( YY_ONLY_ARG )
-#else
-static void yy_pop_state( YY_ONLY_ARG )
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	if ( --YY_G(yy_start_stack_ptr) < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-/* %- */
-#ifdef YY_USE_PROTOS
-static int yy_top_state( YY_ONLY_ARG )
-#else
-static int yy_top_state( YY_ONLY_ARG )
-YY_DECL_LAST_ARG
-#endif
-/* %+ */
-/* %* */
-	{
-	return YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr) - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-/* %- */
-static void yy_fatal_error( yyconst char msg[] )
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
-
-/* %+ */
-/* %* */
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = YY_G(yy_hold_char); \
-		YY_G(yy_c_buf_p) = yytext + n; \
-		YY_G(yy_hold_char) = *YY_G(yy_c_buf_p); \
-		*YY_G(yy_c_buf_p) = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-
-#ifdef YY_REENTRANT
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-#ifndef YY_NO_GET_EXTRA
-#ifdef YY_USE_PROTOS
-YY_EXTRA_TYPE yyget_extra( YY_ONLY_ARG )
-#else
-YY_EXTRA_TYPE yyget_extra( YY_ONLY_ARG )
-    YY_DECL_LAST_ARG
-#endif
-{
-    return yyextra;
-}
-#endif /* !YY_NO_GET_EXTRA */
-
-#ifndef YY_NO_GET_LINENO
-#  ifdef YY_USE_PROTOS
-int yyget_lineno( YY_ONLY_ARG )
-#  else
-int yyget_lineno( YY_ONLY_ARG )
-    YY_DECL_LAST_ARG
-#  endif
-{
-    return yylineno;
-}
-#endif /* !YY_NO_GET_LINENO */
-
-#ifndef YY_NO_GET_IN
-#ifdef YY_USE_PROTOS
-FILE *yyget_in( YY_ONLY_ARG )
-#else
-FILE *yyget_in( YY_ONLY_ARG )
-    YY_DECL_LAST_ARG
-#endif
-{
-    return yyin;
-}
-#endif /* !YY_NO_GET_IN */
-
-#ifndef YY_NO_GET_OUT
-#ifdef YY_USE_PROTOS
-FILE *yyget_out( YY_ONLY_ARG )
-#else
-FILE *yyget_out( YY_ONLY_ARG )
-    YY_DECL_LAST_ARG
-#endif
-{
-    return yyout;
-}
-#endif /* !YY_NO_GET_OUT */
-
-#ifndef YY_NO_GET_LENG
-#ifdef YY_USE_PROTOS
-int yyget_leng( YY_ONLY_ARG )
-#else
-int yyget_leng( YY_ONLY_ARG )
-    YY_DECL_LAST_ARG
-#endif
-{
-    return yyleng;
-}
-#endif /* !YY_NO_GET_LENG */
-
-#ifndef YY_NO_GET_TEXT
-#ifdef YY_USE_PROTOS
-char *yyget_text( YY_ONLY_ARG )
-#else
-char *yyget_text( YY_ONLY_ARG )
-    YY_DECL_LAST_ARG
-#endif
-{
-    return yytext;
-}
-#endif /* !YY_NO_GET_TEXT */
-
-#ifndef YY_NO_SET_EXTRA
-#ifdef YY_USE_PROTOS
-void yyset_extra( YY_EXTRA_TYPE user_defined YY_LAST_ARG )
-#else
-void yyset_extra( user_defined YY_LAST_ARG )
-    YY_EXTRA_TYPE user_defined;
-    YY_DECL_LAST_ARG
-#endif
-{
-    yyextra = user_defined ;
-}
-#endif /* !YY_NO_SET_EXTRA */
-
-#ifndef YY_NO_SET_LINENO
-#  ifdef YY_USE_PROTOS
-void yyset_lineno( int line_number YY_LAST_ARG )
-#  else
-void yyset_lineno( line_number YY_LAST_ARG )
-    int line_number;
-    YY_DECL_LAST_ARG
-#  endif
-{
-    yylineno = line_number;
-}
-#endif /* !YY_NO_SET_LINENO */
-
-
-#ifndef YY_NO_SET_IN
-#ifdef YY_USE_PROTOS
-void yyset_in( FILE * in_str YY_LAST_ARG )
-#else
-void yyset_in( in_str YY_LAST_ARG )
-    FILE * in_str;
-    YY_DECL_LAST_ARG
-#endif
-{
-    yyin = in_str ;
-}
-#endif /* !YY_NO_SET_IN */
-
-#ifndef YY_NO_SET_OUT
-#ifdef YY_USE_PROTOS
-void yyset_out( FILE * out_str YY_LAST_ARG )
-#else
-void yyset_out( out_str YY_LAST_ARG )
-    FILE * out_str;
-    YY_DECL_LAST_ARG
-#endif
-{
-    yyout = out_str ;
-}
-#endif /* !YY_NO_SET_OUT */
-
-/* Accessor methods for yylval and yylloc */
-
-#ifdef YY_REENTRANT_BISON_PURE
-#ifndef YY_NO_GET_LVAL
-#ifdef YY_USE_PROTOS
-YYSTYPE * yyget_lval( YY_ONLY_ARG )
-#else
-YYSTYPE * yyget_lval( YY_ONLY_ARG )
-    YY_DECL_LAST_ARG
-#endif
-{
-    return yylval;
-}
-#endif /* !YY_NO_GET_LVAL */
-
-#ifndef YY_NO_SET_LVAL
-#ifdef YY_USE_PROTOS
-void yyset_lval( YYSTYPE * yylvalp YY_LAST_ARG )
-#else
-void yyset_lval( yylvalp YY_LAST_ARG )
-    YYSTYPE * yylvalp;
-    YY_DECL_LAST_ARG
-#endif
-{
-    yylval = yylvalp;
-}
-#endif /* !YY_NO_SET_LVAL */
-
-#ifdef YYLTYPE
-#ifndef YY_NO_GET_LLOC
-#ifdef YY_USE_PROTOS
-YYLTYPE *yyget_lloc( YY_ONLY_ARG )
-#else
-YYLTYPE *yyget_lloc( YY_ONLY_ARG )
-    YY_DECL_LAST_ARG
-#endif
-{
-    return yylloc;
-}
-#endif /* !YY_NO_GET_LLOC */
-
-#ifndef YY_NO_SET_LLOC
-#ifdef YY_USE_PROTOS
-void yyset_lloc( YYLTYPE * yyllocp YY_LAST_ARG )
-#else
-void yyset_lloc( yyllocp YY_LAST_ARG )
-    YYLTYPE * yyllocp;
-    YY_DECL_LAST_ARG
-#endif
-{
-    yylloc = yyllocp;
-}
-#endif /* !YY_NO_SET_LLOC */
-
-#endif /* YYLTYPE */
-#endif /* YY_REENTRANT_BISON_PURE */
-
-
-#ifdef YY_USE_PROTOS
-static int yy_init_globals( yyscan_t yy_globals)
-#else
-static int yy_init_globals( yy_globals )
-    yyscan_t yy_globals;
-#endif
-    {
-    /* Initialization is the same as for the non-reentrant scanner.
-       This function is called once per scanner lifetime. */
-
-  /* We do not touch yylineno unless the option is enabled. */
-#ifdef YY_USE_LINENO
-    yylineno =  1;
-#endif
-    YY_G(yy_current_buffer) = 0;
-    YY_G(yy_c_buf_p) = (char *) 0;
-    YY_G(yy_init) = 1;
-    YY_G(yy_start) = 0;
-    YY_G(yy_start_stack_ptr) = 0;
-    YY_G(yy_start_stack_depth) = 0;
-    YY_G(yy_start_stack) = (int *) 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-    return 0;
-    }
-
-/* User-visible API */
-#ifdef YY_USE_PROTOS
-int yylex_init( yyscan_t* ptr_yy_globals)
-#else
-int yylex_init( ptr_yy_globals )
-    yyscan_t* ptr_yy_globals;
-#endif
-    {
-    *ptr_yy_globals = (yyscan_t) yy_flex_alloc ( sizeof( struct yy_globals_t ), NULL );
-    yy_init_globals ( *ptr_yy_globals );
-    return 0;
-    }
-
-#ifdef YY_USE_PROTOS
-int yylex_destroy( yyscan_t yy_globals )
-#else
-int yylex_destroy( yy_globals )
-    yyscan_t yy_globals;
-#endif
-    {
-    if( yy_globals )
-        {
-
-            /* Destroy the current (main) buffer. */
-            yy_delete_buffer( YY_G(yy_current_buffer) YY_CALL_LAST_ARG );
-            YY_G(yy_current_buffer) = NULL;
-
-            /* Destroy the start condition stack. */
-            if( YY_G(yy_start_stack) ) {
-                yy_flex_free( YY_G(yy_start_stack) YY_CALL_LAST_ARG );
-                YY_G(yy_start_stack) = NULL;
-            }
-
-            /* Destroy the main struct. */
-            yy_flex_free ( yy_globals YY_CALL_LAST_ARG );
-        }
-    return 0;
-    }
-
-#endif /* End YY_REENTRANT */
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n YY_LAST_ARG)
-#else
-static void yy_flex_strncpy( s1, s2, n YY_LAST_ARG)
-char *s1;
-yyconst char *s2;
-int n;
-YY_DECL_LAST_ARG
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s YY_LAST_ARG)
-#else
-static int yy_flex_strlen( s YY_LAST_ARG)
-yyconst char *s;
-YY_DECL_LAST_ARG
-#endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size YY_LAST_ARG )
-#else
-static void *yy_flex_alloc( size YY_LAST_ARG )
-yy_size_t size;
-YY_DECL_LAST_ARG
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size YY_LAST_ARG )
-#else
-static void *yy_flex_realloc( ptr, size YY_LAST_ARG )
-void *ptr;
-yy_size_t size;
-YY_DECL_LAST_ARG
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr YY_LAST_ARG )
-#else
-static void yy_flex_free( ptr YY_LAST_ARG )
-void *ptr;
-YY_DECL_LAST_ARG
-#endif
-	{
-	free( (char *) ptr );	/* see yy_flex_realloc() for (char *) cast */
-	}
-
-#if YY_MAIN
-int main()
-	{
-
-#ifdef YY_REENTRANT
-    yyscan_t lexer;
-    yylex_init(&lexer);
-    yylex( lexer );
-    yylex_destroy( lexer);
-
-#else
-	yylex();
-#endif
-
-	return 0;
-	}
-#endif
-/* %e */
-#endif /* !ssIN_HEADER */
-#line 111 "icalsslexer.l"
-#ifndef ssIN_HEADER
-
-
-int yywrap(yyscan_t yy_globals)
-{
-     return 1;
-}
-
-#endif /* !ssIN_HEADER */
diff --git a/libical/src/libicalss/icalsslexer.l b/libical/src/libicalss/icalsslexer.l
index 6ea9f0ef2a..be1dc553cd 100644
--- a/libical/src/libicalss/icalsslexer.l
+++ b/libical/src/libicalss/icalsslexer.l
@@ -6,7 +6,7 @@
   
   DESCRIPTION:
   
-  $Id: icalsslexer.l,v 1.2 2003/09/11 22:04:30 hansp Exp $
+  $Id: icalsslexer.l,v 1.3 2003/09/22 07:32:31 hansp Exp $
   $Locker:  $
 
 (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -57,7 +57,8 @@ digit		[0-9]
 %array /* Make yytext an array. Slow, but handy. HACK */
 
 %option caseless
-%option reentrant-bison
+%option reentrant bison-bridge
+%option yylineno
 
 %s sql string_value
 
@@ -90,10 +91,10 @@ NULL			{ return SQLNULL; }
 ;			{ return EOL; }
 
 \'[\@\*A-Za-z0-9\-\.\:\ ]+\' {
-	int c = input(yy_globals);
+	int c = input(yyscanner);
 	unput(c);
 	if(c!='\''){
-		yylvalp->v_string= icalmemory_tmp_copy(yytext);
+		yylval_param->v_string= icalmemory_tmp_copy(yytext);
 		return STRING;
 	} else {
 		/*ssmore();*/
@@ -110,7 +111,7 @@ NULL			{ return SQLNULL; }
 
 %% 
 
-int yywrap(yyscan_t yy_globals)
+int yywrap(yyscan_t yyscanner)
 {
      return 1;
 }
diff --git a/libical/src/libicalss/icalssyacc.c b/libical/src/libicalss/icalssyacc.c
deleted file mode 100644
index 3d8cdc12a9..0000000000
--- a/libical/src/libicalss/icalssyacc.c
+++ /dev/null
@@ -1,1399 +0,0 @@
-/* A Bison parser, made from icalssyacc.y
-   by GNU bison 1.34.  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define yyparse ssparse
-#define yylex sslex
-#define yyerror sserror
-#define yylval sslval
-#define yychar sschar
-#define yydebug ssdebug
-#define yynerrs ssnerrs
-# define	STRING	257
-# define	SELECT	258
-# define	FROM	259
-# define	WHERE	260
-# define	COMMA	261
-# define	QUOTE	262
-# define	EQUALS	263
-# define	NOTEQUALS	264
-# define	LESS	265
-# define	GREATER	266
-# define	LESSEQUALS	267
-# define	GREATEREQUALS	268
-# define	AND	269
-# define	OR	270
-# define	EOL	271
-# define	END	272
-# define	IS	273
-# define	NOT	274
-# define	SQLNULL	275
-
-#line 3 "icalssyacc.y"
-
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalssyacc.y
-  CREATOR: eric 08 Aug 2000
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-  ======================================================================*/
-/*#define YYDEBUG 1*/
-#include <stdlib.h>
-#include <string.h> /* for strdup() */
-#include <limits.h> /* for SHRT_MAX*/
-#include "ical.h"
-#include "icalgauge.h"
-#include "icalgaugeimpl.h"
-
-
-#define YYPARSE_PARAM yy_globals
-#define YYLEX_PARAM yy_globals
-#define YY_EXTRA_TYPE  icalgauge_impl*
-  /* ick...*/
-#define yyextra ((struct icalgauge_impl*)ssget_extra(yy_globals))
-
-
-static void ssyacc_add_where(struct icalgauge_impl* impl, char* prop, 
-			icalgaugecompare compare , char* value);
-static void ssyacc_add_select(struct icalgauge_impl* impl, char* str1);
-static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1);
-static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l);
-void sserror(char *s); /* Don't know why I need this.... */
-
-
-#line 56 "icalssyacc.y"
-#ifndef YYSTYPE
-typedef union {
-	char* v_string;
-} yystype;
-# define YYSTYPE yystype
-#endif
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-
-
-#define	YYFINAL		38
-#define	YYFLAG		-32768
-#define	YYNTBASE	22
-
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 275 ? yytranslate[x] : 27)
-
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     7,    12,    14,    16,    20,    22,    26,    27,
-      31,    35,    40,    44,    48,    52,    56,    60,    62,    66
-};
-static const short yyrhs[] =
-{
-       4,    23,     5,    24,     6,    26,     0,     4,    23,     5,
-      24,     0,     1,     0,     3,     0,    23,     7,     3,     0,
-       3,     0,    24,     7,     3,     0,     0,     3,     9,     3,
-       0,     3,    19,    21,     0,     3,    19,    20,    21,     0,
-       3,    10,     3,     0,     3,    11,     3,     0,     3,    12,
-       3,     0,     3,    13,     3,     0,     3,    14,     3,     0,
-      25,     0,    26,    15,    25,     0,    26,    16,    25,     0
-};
-
-#endif
-
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
-{
-       0,    67,    68,    69,    75,    77,    81,    83,    86,    88,
-      89,    90,    91,    92,    93,    94,    95,    98,   100,   101
-};
-#endif
-
-
-#if (YYDEBUG) || defined YYERROR_VERBOSE
-
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
-static const char *const yytname[] =
-{
-  "$", "error", "$undefined.", "STRING", "SELECT", "FROM", "WHERE", "COMMA", 
-  "QUOTE", "EQUALS", "NOTEQUALS", "LESS", "GREATER", "LESSEQUALS", 
-  "GREATEREQUALS", "AND", "OR", "EOL", "END", "IS", "NOT", "SQLNULL", 
-  "query_min", "select_list", "from_list", "where_clause", "where_list", 0
-};
-#endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
-{
-       0,    22,    22,    22,    23,    23,    24,    24,    25,    25,
-      25,    25,    25,    25,    25,    25,    25,    26,    26,    26
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const short yyr2[] =
-{
-       0,     6,     4,     1,     1,     3,     1,     3,     0,     3,
-       3,     4,     3,     3,     3,     3,     3,     1,     3,     3
-};
-
-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error. */
-static const short yydefact[] =
-{
-       0,     3,     0,     4,     0,     0,     0,     6,     2,     5,
-       8,     0,     0,    17,     1,     7,     0,     0,     0,     0,
-       0,     0,     0,     8,     8,     9,    12,    13,    14,    15,
-      16,     0,    10,    18,    19,    11,     0,     0,     0
-};
-
-static const short yydefgoto[] =
-{
-      36,     4,     8,    13,    14
-};
-
-static const short yypact[] =
-{
-       5,-32768,     9,-32768,     6,    17,    18,-32768,     1,-32768,
-      19,    20,    -9,-32768,    -1,-32768,    21,    22,    23,    24,
-      25,    26,    -4,    19,    19,-32768,-32768,-32768,-32768,-32768,
-  -32768,    10,-32768,-32768,-32768,-32768,    30,    32,-32768
-};
-
-static const short yypgoto[] =
-{
-  -32768,-32768,-32768,    -5,-32768
-};
-
-
-#define	YYLAST		32
-
-
-static const short yytable[] =
-{
-      16,    17,    18,    19,    20,    21,     1,    10,    11,     2,
-      22,     5,     3,     6,    23,    24,    31,    32,    33,    34,
-       7,     9,    12,    15,    25,    26,    27,    28,    29,    30,
-      37,    35,    38
-};
-
-static const short yycheck[] =
-{
-       9,    10,    11,    12,    13,    14,     1,     6,     7,     4,
-      19,     5,     3,     7,    15,    16,    20,    21,    23,    24,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       0,    21,     0
-};
-#define YYPURE 1
-
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/share/bison/bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
-# endif
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short yyss;
-  YYSTYPE yyvs;
-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# if YYLSP_NEEDED
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
-      + 2 * YYSTACK_GAP_MAX)
-# else
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAX)
-# endif
-
-/* Relocate the TYPE STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Type, Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	yymemcpy ((char *) yyptr, (char *) (Stack),			\
-		  yysize * (YYSIZE_T) sizeof (Type));			\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (Type) + YYSTACK_GAP_MAX;	\
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (0)
-
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
-
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");			\
-      YYERROR;							\
-    }								\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
-
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
-   Current.last_line   = Rhs[N].last_line;	\
-   Current.last_column = Rhs[N].last_column;
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#if YYPURE
-# if YYLSP_NEEDED
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval, &yylloc)
-#  endif
-# else /* !YYLSP_NEEDED */
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval)
-#  endif
-# endif /* !YYLSP_NEEDED */
-#else /* !YYPURE */
-# define YYLEX			yylex ()
-#endif /* !YYPURE */
-
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (0)
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-#endif /* !YYDEBUG */
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-#if ! defined (yyoverflow) && ! defined (yymemcpy)
-# if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#  define yymemcpy __builtin_memcpy
-# else				/* not GNU C or C++ */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-#  if defined (__STDC__) || defined (__cplusplus)
-yymemcpy (char *yyto, const char *yyfrom, YYSIZE_T yycount)
-#  else
-yymemcpy (yyto, yyfrom, yycount)
-     char *yyto;
-     const char *yyfrom;
-     YYSIZE_T yycount;
-#  endif
-{
-  register const char *yyf = yyfrom;
-  register char *yyt = yyto;
-  register YYSIZE_T yyi = yycount;
-
-  while (yyi-- != 0)
-    *yyt++ = *yyf++;
-}
-# endif
-#endif
-
-#ifdef YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
-yystrlen (const char *yystr)
-#   else
-yystrlen (yystr)
-     const char *yystr;
-#   endif
-{
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
-    continue;
-
-  return yys - yystr - 1;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-#   if defined (__STDC__) || defined (__cplusplus)
-yystpcpy (char *yydest, const char *yysrc)
-#   else
-yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
-{
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-#endif
-
-#line 319 "/usr/local/share/bison/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 *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
-# else
-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
-int yyparse (void);
-# endif
-#endif
-
-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
-
-#define YY_DECL_NON_LSP_VARIABLES			\
-/* The lookahead symbol.  */				\
-int yychar;						\
-							\
-/* The semantic value of the lookahead symbol. */	\
-YYSTYPE yylval;						\
-							\
-/* Number of parse errors so far.  */			\
-int yynerrs;
-
-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES			\
-						\
-/* Location data for the lookahead symbol.  */	\
-YYLTYPE yylloc;
-#else
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES
-#endif
-
-
-/* If nonreentrant, generate the variables here. */
-
-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
-int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  /* If reentrant, generate the variables here. */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
-  register int yystate;
-  register int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yychar1 = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack. */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
-
-#if YYLSP_NEEDED
-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-#endif
-
-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-#if YYLSP_NEEDED
-  YYLTYPE yyloc;
-#endif
-
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule. */
-  int yylen;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-#if YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack. Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  */
-# if YYLSP_NEEDED
-	YYLTYPE *yyls1 = yyls;
-	/* This used to be a conditional around just the two extra args,
-	   but that might be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yyls1, yysize * sizeof (*yylsp),
-		    &yystacksize);
-	yyls = yyls1;
-# else
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-# endif
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	goto yyoverflowlab;
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	short *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyoverflowlab;
-	YYSTACK_RELOCATE (short, yyss);
-	YYSTACK_RELOCATE (YYSTYPE, yyvs);
-# if YYLSP_NEEDED
-	YYSTACK_RELOCATE (YYLTYPE, yyls);
-# endif
-# undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-#if YYLSP_NEEDED
-      yylsp = yyls + yysize - 1;
-#endif
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  goto yybackup;
-
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* 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 lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE (yychar);
-
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-	which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-	{
-	  YYFPRINTF (stderr, "Next token is %d (%s",
-		     yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise
-	     meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-# endif
-	  YYFPRINTF (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-	      yychar, yytname[yychar1]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-#endif
-
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
-    {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
-	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-  switch (yyn) {
-
-case 3:
-#line 69 "icalssyacc.y"
-{ 
-                 yyclearin;
-		 YYABORT;
-           }
-    break;
-case 4:
-#line 76 "icalssyacc.y"
-{ssyacc_add_select(yyextra,yyvsp[0].v_string);}
-    break;
-case 5:
-#line 77 "icalssyacc.y"
-{ssyacc_add_select(yyextra,yyvsp[0].v_string);}
-    break;
-case 6:
-#line 82 "icalssyacc.y"
-{ssyacc_add_from(yyextra,yyvsp[0].v_string);}
-    break;
-case 7:
-#line 83 "icalssyacc.y"
-{ssyacc_add_from(yyextra,yyvsp[0].v_string);}
-    break;
-case 9:
-#line 88 "icalssyacc.y"
-{ssyacc_add_where(yyextra,yyvsp[-2].v_string,ICALGAUGECOMPARE_EQUAL,yyvsp[0].v_string); }
-    break;
-case 10:
-#line 89 "icalssyacc.y"
-{ssyacc_add_where(yyextra,yyvsp[-2].v_string,ICALGAUGECOMPARE_ISNULL,""); }
-    break;
-case 11:
-#line 90 "icalssyacc.y"
-{ssyacc_add_where(yyextra,yyvsp[-3].v_string,ICALGAUGECOMPARE_ISNOTNULL,""); }
-    break;
-case 12:
-#line 91 "icalssyacc.y"
-{ssyacc_add_where(yyextra,yyvsp[-2].v_string,ICALGAUGECOMPARE_NOTEQUAL,yyvsp[0].v_string); }
-    break;
-case 13:
-#line 92 "icalssyacc.y"
-{ssyacc_add_where(yyextra,yyvsp[-2].v_string,ICALGAUGECOMPARE_LESS,yyvsp[0].v_string); }
-    break;
-case 14:
-#line 93 "icalssyacc.y"
-{ssyacc_add_where(yyextra,yyvsp[-2].v_string,ICALGAUGECOMPARE_GREATER,yyvsp[0].v_string); }
-    break;
-case 15:
-#line 94 "icalssyacc.y"
-{ssyacc_add_where(yyextra,yyvsp[-2].v_string,ICALGAUGECOMPARE_LESSEQUAL,yyvsp[0].v_string); }
-    break;
-case 16:
-#line 95 "icalssyacc.y"
-{ssyacc_add_where(yyextra,yyvsp[-2].v_string,ICALGAUGECOMPARE_GREATEREQUAL,yyvsp[0].v_string); }
-    break;
-case 17:
-#line 99 "icalssyacc.y"
-{set_logic(yyextra,ICALGAUGELOGIC_NONE);}
-    break;
-case 18:
-#line 100 "icalssyacc.y"
-{set_logic(yyextra,ICALGAUGELOGIC_AND);}
-    break;
-case 19:
-#line 101 "icalssyacc.y"
-{set_logic(yyextra,ICALGAUGELOGIC_OR);}
-    break;
-}
-
-#line 705 "/usr/local/share/bison/bison.simple"
-
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#if YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-#if YYLSP_NEEDED
-  *++yylsp = yyloc;
-#endif
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exhausted");
-	}
-      else
-#endif /* defined (YYERROR_VERBOSE) */
-	yyerror ("parse error");
-    }
-  goto yyerrlab1;
-
-
-/*--------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action |
-`--------------------------------------------------*/
-yyerrlab1:
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-		  yychar, yytname[yychar1]));
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-
-/*-------------------------------------------------------------------.
-| yyerrdefault -- current state does not do anything special for the |
-| error token.                                                       |
-`-------------------------------------------------------------------*/
-yyerrdefault:
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-
-  /* If its default is to accept any token, ok.  Otherwise pop it.  */
-  yyn = yydefact[yystate];
-  if (yyn)
-    goto yydefault;
-#endif
-
-
-/*---------------------------------------------------------------.
-| yyerrpop -- pop the current state because it cannot handle the |
-| error token                                                    |
-`---------------------------------------------------------------*/
-yyerrpop:
-  if (yyssp == yyss)
-    YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#if YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "Error: state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
-
-/*--------------.
-| yyerrhandle.  |
-`--------------*/
-yyerrhandle:
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
-  yyresult = 2;
-  /* Fall through.  */
-
-yyreturn:
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-  return yyresult;
-}
-#line 105 "icalssyacc.y"
-
-
-static void ssyacc_add_where(struct icalgauge_impl* impl, char* str1, 
-	icalgaugecompare compare , char* value_str)
-{
-
-    struct icalgauge_where *where;
-    char *compstr, *propstr, *c, *s,*l;
-    
-    if ( (where = malloc(sizeof(struct icalgauge_where))) ==0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    memset(where,0,sizeof(struct icalgauge_where));
-    where->logic = ICALGAUGELOGIC_NONE;
-    where->compare = ICALGAUGECOMPARE_NONE;
-    where->comp = ICAL_NO_COMPONENT;
-    where->prop = ICAL_NO_PROPERTY;
-
-    /* remove enclosing quotes */
-    s = value_str;
-    if(*s == '\''){
-	s++;
-    }
-    l = s+strlen(s)-1;
-    if(*l == '\''){
-	*l=0;
-    }
-	
-    where->value = strdup(s);
-
-    /* Is there a period in str1 ? If so, the string specified both a
-       component and a property*/
-    if( (c = strrchr(str1,'.')) != 0){
-	compstr = str1;
-	propstr = c+1;
-	*c = '\0';
-    } else {
-	compstr = 0;
-	propstr = str1;
-    }
-
-
-    /* Handle the case where a component was specified */
-    if(compstr != 0){
-	where->comp = icalenum_string_to_component_kind(compstr);
-    } else {
-	where->comp = ICAL_NO_COMPONENT;
-    }
-
-    where->prop = icalenum_string_to_property_kind(propstr);    
-
-    where->compare = compare;
-
-    if(where->value == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	free(where->value);
-	return;
-    }
-
-    pvl_push(impl->where,where);
-}
-
-static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l)
-{
-    pvl_elem e = pvl_tail(impl->where);
-    struct icalgauge_where *where = pvl_data(e);
-
-    where->logic = l;
-   
-}
-
-
-
-static void ssyacc_add_select(struct icalgauge_impl* impl, char* str1)
-{
-    char *c, *compstr, *propstr;
-    struct icalgauge_where *where;
-    
-    /* Uses only the prop and comp fields of the where structure */
-    if ( (where = malloc(sizeof(struct icalgauge_where))) ==0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    memset(where,0,sizeof(struct icalgauge_where));
-    where->logic = ICALGAUGELOGIC_NONE;
-    where->compare = ICALGAUGECOMPARE_NONE;
-    where->comp = ICAL_NO_COMPONENT;
-    where->prop = ICAL_NO_PROPERTY;
-
-    /* Is there a period in str1 ? If so, the string specified both a
-       component and a property*/
-    if( (c = strrchr(str1,'.')) != 0){
-	compstr = str1;
-	propstr = c+1;
-	*c = '\0';
-    } else {
-	compstr = 0;
-	propstr = str1;
-    }
-
-
-    /* Handle the case where a component was specified */
-    if(compstr != 0){
-	where->comp = icalenum_string_to_component_kind(compstr);
-    } else {
-	where->comp = ICAL_NO_COMPONENT;
-    }
-
-
-    /* If the property was '*', then accept all properties */
-    if(strcmp("*",propstr) == 0) {
-	where->prop = ICAL_ANY_PROPERTY; 	    
-    } else {
-	where->prop = icalenum_string_to_property_kind(propstr);    
-    }
-    
-
-    if(where->prop == ICAL_NO_PROPERTY){
-      free(where);
-      icalerror_set_errno(ICAL_BADARG_ERROR);
-      return;
-    }
-
-    pvl_push(impl->select,where);
-}
-
-static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1)
-{
-    icalcomponent_kind ckind;
-
-    ckind = icalenum_string_to_component_kind(str1);
-
-    if(ckind == ICAL_NO_COMPONENT){
-	assert(0);
-    }
-
-    pvl_push(impl->from,(void*)ckind);
-
-}
-
-
-void sserror(char *s){
-  fprintf(stderr,"Parse error \'%s\'\n", s);
-  icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-}
diff --git a/libical/src/libicalss/icalssyacc.h b/libical/src/libicalss/icalssyacc.h
deleted file mode 100644
index 6d03a0f5ae..0000000000
--- a/libical/src/libicalss/icalssyacc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef BISON_Y_TAB_H
-# define BISON_Y_TAB_H
-
-#ifndef YYSTYPE
-typedef union {
-	char* v_string;
-} yystype;
-# define YYSTYPE yystype
-#endif
-# define	STRING	257
-# define	SELECT	258
-# define	FROM	259
-# define	WHERE	260
-# define	COMMA	261
-# define	QUOTE	262
-# define	EQUALS	263
-# define	NOTEQUALS	264
-# define	LESS	265
-# define	GREATER	266
-# define	LESSEQUALS	267
-# define	GREATEREQUALS	268
-# define	AND	269
-# define	OR	270
-# define	EOL	271
-# define	END	272
-# define	IS	273
-# define	NOT	274
-# define	SQLNULL	275
-
-
-#endif /* not BISON_Y_TAB_H */
diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am
index bd0320b09a..414265181c 100644
--- a/libical/src/libicalvcal/Makefile.am
+++ b/libical/src/libicalvcal/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libicalvcal.la
+privlib_LTLIBRARIES = libicalvcal-evolution.la
 
 INCLUDES =			\
 	-I$(top_builddir)	\
@@ -6,16 +6,16 @@ INCLUDES =			\
 	-I$(top_builddir)/src/libical	\
 	-I$(top_srcdir)/src/libicalss
 
-libicalvcal_la_LDFLAGS = -version-info 0:0:0
+libicalvcal_evolution_la_LDFLAGS = -version-info 0:0:0
 
 if DEV
-libicalvcal_la_DEVSOURCES = vcc.y
+libicalvcal_evolution_la_DEVSOURCES = vcc.y
 else
-libicalvcal_la_DEVSOURCES = vcc.c
+libicalvcal_evolution_la_DEVSOURCES = vcc.c
 endif
 
 
-libicalvcal_la_SOURCES =	\
+libicalvcal_evolution_la_SOURCES =	\
 	icalvcal.h		\
 	icalvcal.c		\
 	port.h			\
@@ -24,11 +24,11 @@ libicalvcal_la_SOURCES =	\
 	vobject.c		\
 	vcaltmp.h		\
 	vcaltmp.c		\
-	$(libicalvcal_la_DEVSOURCES)
+	$(libicalvcal_evolution_la_DEVSOURCES)
 
-libicalvcalincludedir = $(includedir)/libicalvcal
+libicalvcal_evolutionincludedir = $(privincludedir)/libical
 
-#libicalvcalinclude_HEADERS =	\
+#libicalvcal_evolutioninclude_HEADERS =	\
 #	icalvcal.h		\
 #	port.h			\
 #	vcc.h			\
diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am
index 4892507869..8b7f3e9672 100644
--- a/libical/src/test/Makefile.am
+++ b/libical/src/test/Makefile.am
@@ -1,12 +1,12 @@
-if WITH_CXX
-cxx_inc=-DWITH_CXX
-cxx_libs=../libical/libical_cxx.la
+if WITH_CXX_BINDINGS
+cxx_inc=-DWITH_CXX_BINDINGS
+cxx_libs=../libical/libical-evolution_cxx.la
 regression_cxx = regression-cxx.cpp
 else
 cxx_inc=
 cxx_libs=
 regression_cxx = 
-CXX=@CC@
+AM_CXX=@CC@
 endif
 
 if WITH_BDB4
@@ -19,7 +19,7 @@ endif
 
 noinst_PROGRAMS = copycluster regression parser stow recur testmime testvcal process
 
-LDADD =  ../libicalss/libicalss.la ../libicalvcal/libicalvcal.la $(cxx_libs) ../libical/libical.la $(bdb4_libs)
+LDADD =  ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolution.la $(cxx_libs) ../libical/libical-evolution.la $(bdb4_libs)
 
 LIBS = @PTHREAD_LIBS@
 
diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c
index 1e9fc8e2c5..d4fc276e6b 100644
--- a/libical/src/test/regression.c
+++ b/libical/src/test/regression.c
@@ -3646,7 +3646,7 @@ int main(int argc, char *argv[])
 
     /** OPTIONAL TESTS go here... **/
 
-#ifdef WITH_CXX
+#ifdef WITH_CXX_BINDINGS
     test_run("Test C++ API", test_cxx, do_test, do_header);
 #endif