[dovecot-cvs] dovecot-lda/src/libsieve Makefile.am, 1.3, 1.4 addr-lex.c, 1.1, 1.2 lex.addr.c, 1.1.1.1, NONE sieve-lex.c, 1.1, 1.2 sieve-lex.l, 1.1.1.1, 1.2

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot-lda/src/libsieve
In directory talvi:/tmp/cvs-serv1025/src/libsieve

Modified Files:
	Makefile.am addr-lex.c sieve-lex.c sieve-lex.l 
Removed Files:
	lex.addr.c 
Log Message:
Compiling fixes



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/libsieve/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	29 Jul 2005 08:31:34 -0000	1.3
+++ Makefile.am	14 Oct 2005 20:11:42 -0000	1.4
@@ -1,16 +1,18 @@
 noinst_LIBRARIES = libsieve.a
 
-CFLAGS = -g -O2 -Wall
-
-AM_YFLAGS = -d
+AM_YFLAGS = -d -p $*
 
 AM_CPPFLAGS = \
 	-I$(dovecotdir) \
 	-I$(dovecotdir)/src/lib \
 	-I$(top_srcdir)/src
 
+# Don't know how to put these into this file..
+#flex -t -Paddr addr-lex.l > addr-lex.c
+#flex -t sieve-lex.l > sieve-lex.c
+
 libsieve_a_SOURCES = \
-	addr.c \
+	addr.y \
 	addr-lex.c \
 	bc_dump.c \
 	bc_emit.c \
@@ -22,21 +24,11 @@
 	message.c \
 	parseaddr.c \
 	script.c \
-	sieve.c \
+	sieve.y \
 	sieve-lex.c \
 	sieve_err.c \
 	tree.c
 
-addr.c addr.h: addr.y
-	$(YACC) $(AM_YFLAGS) -p addr addr.y
-	mv -f y.tab.c addr.c
-	mv -f y.tab.h addr.h
-
-sieve.c sieve.h: sieve.y
-	$(YACC) $(AM_YFLAGS) sieve.y
-	mv -f y.tab.c sieve.c
-	mv -f y.tab.h sieve.h
-
 noinst_HEADERS = \
 	addr.h \
 	bytecode.h \

Index: addr-lex.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/libsieve/addr-lex.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- addr-lex.c	29 Mar 2005 18:42:50 -0000	1.1
+++ addr-lex.c	14 Oct 2005 20:11:42 -0000	1.2
@@ -1,171 +1,84 @@
-#ifndef YY_REENTRANT
-#define yytext addrtext
-#define yyleng addrleng
-#define yyin addrin
-#define yyout addrout
-#define yy_flex_debug addr_flex_debug
-#endif
 #define yy_create_buffer addr_create_buffer
 #define yy_delete_buffer addr_delete_buffer
 #define yy_scan_buffer addr_scan_buffer
 #define yy_scan_string addr_scan_string
[...2010 lines suppressed...]
-int main ()
+int main()
 	{
-
 	yylex();
-
 	return 0;
 	}
 #endif
-#endif /* !addrIN_HEADER YY-END-DISCARD-FROM-HEADER */
 #line 77 "addr-lex.l"
-#ifndef addrIN_HEADER /* YY-DISCARD-FROM-HEADER */
 
 
 /* take input from address string provided by sieve parser */
@@ -2055,4 +1718,3 @@
     }
     return n;
 }
-#endif /* !addrIN_HEADER YY-END-DISCARD-FROM-HEADER */

--- lex.addr.c DELETED ---

Index: sieve-lex.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/libsieve/sieve-lex.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sieve-lex.c	29 Mar 2005 18:42:50 -0000	1.1
+++ sieve-lex.c	14 Oct 2005 20:11:42 -0000	1.2
@@ -1,129 +1,67 @@
-#define  YY_USE_LINENO 1
-#define  YY_INT_ALIGNED short int
-
-
 /* A lexical scanner generated by flex */
 
+/* Scanner skeleton version:
+ * $Header$
+ */
+
 #define FLEX_SCANNER
[...2561 lines suppressed...]
+int main()
 	{
-
 	yylex();
-
 	return 0;
 	}
 #endif
-#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */
-#line 139 "sieve-lex.l"
-#ifndef yyIN_HEADER /* YY-DISCARD-FROM-HEADER */
+#line 143 "sieve-lex.l"
 
 /*  */
 static int tonum(char *c)
@@ -2442,4 +2150,3 @@
     if (!str) return xstrdup("");
     else return str;
 }
-#endif /* !yyIN_HEADER YY-END-DISCARD-FROM-HEADER */

Index: sieve-lex.l
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/libsieve/sieve-lex.l,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sieve-lex.l	29 Mar 2005 18:37:59 -0000	1.1.1.1
+++ sieve-lex.l	14 Oct 2005 20:11:42 -0000	1.2
@@ -36,6 +36,10 @@
 #include "tree.h"
 #include "sieve.h"
 
+#define yylval sievelval
+#define yylex sievelex
+#define yyerror sieveerror
+
 static int tonum(char *c);
 static char *chkstr(char *);
 static char *mlbuf;