[FA-commits] libical/src/libicalss Makefile.in, 1.7, 1.8 icalfileset.c, 1.33, 1.34 icalsslexer.c, 1.11, 1.12 icalsslexer.l, 1.8, 1.9

[Art C. <art...@us...>]

Update of /cvsroot/freeassociation/libical/src/libicalss
In directory sc8-pr-cvs17:/tmp/cvs-serv13440/src/libicalss

Modified Files:
	Makefile.in icalfileset.c icalsslexer.c icalsslexer.l 
Log Message:
* Applied more patches sent in by Ross Burton (again, from EDS)
* Updated icalsslexer.l to newer flex conventions (NEEDS LOTS OF TESTING!)


Index: Makefile.in
===================================================================
RCS file: /cvsroot/freeassociation/libical/src/libicalss/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.in	31 May 2007 20:01:21 -0000	1.7
+++ Makefile.in	31 May 2007 21:26:15 -0000	1.8
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -107,11 +107,11 @@
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
 LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)

Index: icalsslexer.l
===================================================================
RCS file: /cvsroot/freeassociation/libical/src/libicalss/icalsslexer.l,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- icalsslexer.l	30 Apr 2007 13:57:49 -0000	1.8
+++ icalsslexer.l	31 May 2007 21:26:15 -0000	1.9
@@ -59,7 +59,7 @@
 %option caseless
 /* See http://lists.ximian.com/archives/public/evolution-hackers/2003-September/001304.html
    if you run into problems with this option. */
-%option reentrant-bison
+%option bison-bridge
 
 %s sql string_value
 
@@ -92,10 +92,11 @@
 ;			{ return EOL; }
 
 \'[\@\*A-Za-z0-9\-\.\:\ ]+\' {
-	int c = input(yy_globals);
+	/* int c = input(yy_globals);    removed this variable, does it work? */
+	int c = input();
 	unput(c);
 	if(c!='\''){
-		yylvalp->v_string= icalmemory_tmp_copy(yytext);
+		yylval_param->v_string= icalmemory_tmp_copy(yytext);
 		return STRING;
 	} else {
 		/*ssmore();*/
@@ -112,7 +113,8 @@
 
 %% 
 
-int yywrap(yyscan_t yy_globals)
+/* int yywrap(yyscan_t yy_globals) */
+int yywrap()
 {
      return 1;
 }

Index: icalfileset.c
===================================================================
RCS file: /cvsroot/freeassociation/libical/src/libicalss/icalfileset.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- icalfileset.c	30 Apr 2007 13:57:48 -0000	1.33
+++ icalfileset.c	31 May 2007 21:26:15 -0000	1.34
@@ -180,13 +180,13 @@
 char* icalfileset_read_from_file(char *s, size_t size, void *d)
 {
     char* p = s;
-    int fd = (int)d;
+    icalfileset *set = d;
 
     /* Simulate fgets -- read single characters and stop at '\n' */
 
     for(p=s; p<s+size-1;p++){
 	
-	if(read(fd,p,1) != 1 || *p=='\n'){
+	if(read(set->fd,p,1) != 1 || *p=='\n'){
 	    p++;
 	    break;
 	} 
@@ -209,7 +209,7 @@
   
     parser = icalparser_new();
 
-    icalparser_set_gen_data(parser,(void*)set->fd);
+    icalparser_set_gen_data(parser, set);
     set->cluster = icalparser_parse(parser,icalfileset_read_from_file);
     icalparser_free(parser);
 

Index: icalsslexer.c
===================================================================
RCS file: /cvsroot/freeassociation/libical/src/libicalss/icalsslexer.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- icalsslexer.c	30 Apr 2007 13:57:48 -0000	1.11
+++ icalsslexer.c	31 May 2007 21:26:15 -0000	1.12
@@ -1,69 +1,92 @@
-#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
[...3019 lines suppressed...]
+#line 114 "icalsslexer.l"
 
-	return 0;
-	}
-#endif
-/* %e */
-#endif /* !ssIN_HEADER */
-#line 111 "icalsslexer.l"
-#ifndef ssIN_HEADER
 
 
-int yywrap(yyscan_t yy_globals)
+/* int sswrap(yyscan_t yy_globals) */
+int sswrap()
 {
      return 1;
 }
 
-#endif /* !ssIN_HEADER */
+