Start conditions now generated in a single place.

7 files changed, 37 insertions, 7 deletions

diff --git a/TODO b/TODO
index a6bd11f..aa24d46 100644
--- a/TODO
+++ b/TODO
@@ -68,8 +68,6 @@
 
 ** token-type and token buffer support
 
-** put start conditions in the header
-
 ** check if we still need to #undef macros at the end of a header
 
 * C++
diff --git a/buf.c b/buf.c
index 53f2fa8..833837e 100644
--- a/buf.c
+++ b/buf.c
@@ -66,6 +66,17 @@ struct Buf *buf_prints (struct Buf *buf, const char *fmt, const char *s)
 	return buf;
 }
 
+/** Append the contents of @a src to @a dest.
+ * @param @a dest the destination buffer
+ * @param @a dest the source buffer
+ * @return @a dest
+ */
+struct Buf *buf_concat(struct Buf* dest, const struct Buf* src)
+{
+    buf_append(dest, src->elts, src->nelts);
+    return dest;
+}
+
 
 /* Appends n characters in str to buf. */
 struct Buf *buf_strnappend (buf, str, n)
diff --git a/configure.in b/configure.in
index 821596a..2a684b2 100644
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,7 @@ else
 fi
 
 dnl checks for libraries
+AC_CHECK_LIB(m, log)
 
 dnl checks for header files
 
diff --git a/flex.skl b/flex.skl
index 36ea6e3..4b3c7f2 100644
--- a/flex.skl
+++ b/flex.skl
@@ -642,6 +642,10 @@ static void yy_fatal_error YY_PARAMS(( yyconst char msg[] M4_YY_PROTO_LAST_ARG )
 %% [4.0] data tables for the DFA and the user's section 1 definitions go here
 %ok-for-header
 
+m4_ifdef( [[M4_YY_IN_HEADER]], [[#ifdef YY_HEADER_EXPORT_START_CONDITIONS]])
+M4_YY_SC_DEFS
+m4_ifdef( [[M4_YY_IN_HEADER]], [[#endif]])
+
 /* 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.
@@ -3079,6 +3083,8 @@ int main ()
 #undef yy_set_bol
 #undef yy_new_buffer
 #undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
 
 #ifdef YY_DECL_IS_OURS
 #undef YY_DECL_IS_OURS
diff --git a/flexdef.h b/flexdef.h
index 9f66e28..dc9a651 100644
--- a/flexdef.h
+++ b/flexdef.h
@@ -46,6 +46,7 @@
 #include <setjmp.h>
 #include <ctype.h>
 #include <string.h>
+#include <math.h>
 #endif
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
@@ -1082,6 +1083,7 @@ extern void buf_init PROTO ((struct Buf * buf, size_t elem_size));
 extern void buf_destroy PROTO ((struct Buf * buf));
 extern struct Buf *buf_append
 PROTO ((struct Buf * buf, const void *ptr, int n_elem));
+extern struct Buf *buf_concat PROTO((struct Buf* dest, const struct Buf* src));
 extern struct Buf *buf_strappend PROTO ((struct Buf *, const char *str));
 extern struct Buf *buf_strnappend
 PROTO ((struct Buf *, const char *str, int nchars));
diff --git a/main.c b/main.c
index 5fc42f8..c2be713 100644
--- a/main.c
+++ b/main.c
@@ -419,6 +419,22 @@ void check_options ()
 	buf_strdefine (&userdef_buf, "YY_INT_ALIGNED",
 		       long_align ? "long int" : "short int");
 
+    /* Define the start condition macros. */
+    {
+        struct Buf tmpbuf;
+        buf_init(&tmpbuf, sizeof(char));
+        for (i = 1; i <= lastsc; i++) {
+             char *str, *fmt = "#define %s %d\n";
+             
+             str = (char*)flex_alloc(strlen(fmt) + strlen(scname[i]) + (int)(1 + log(i)/log(2)) + 2);
+             sprintf(str, fmt,      scname[i], i - 1);
+             buf_strappend(&tmpbuf, str);
+             free(str);
+        }
+        buf_m4_define(&m4defs_buf, "M4_YY_SC_DEFS", tmpbuf.elts);
+        buf_destroy(&tmpbuf);
+    }
+
     /* Dump the m4 definitions. */
     buf_print_strings(&m4defs_buf, stdout);
     m4defs_buf.nelts = 0; /* memory leak here. */
@@ -467,8 +483,7 @@ void flexend (exit_status)
 		fprintf (header_out,
 			 "#undef INITIAL\n#define INITIAL 0\n");
 		for (i = 2; i <= lastsc; i++)
-			fprintf (header_out, "#define %s %d\n", scname[i],
-				 i - 1);
+			fprintf (header_out, "#define %s %d\n", scname[i], i - 1);
 		fprintf (header_out,
 			 "#endif /* YY_HEADER_EXPORT_START_CONDITIONS */\n\n");
 
diff --git a/sym.c b/sym.c
index 20cecba..7aecae9 100644
--- a/sym.c
+++ b/sym.c
@@ -243,9 +243,6 @@ void    scinstal (str, xcluflg)
      int     xcluflg;
 {
 
-	/* Generate start condition definition, for use in BEGIN et al. */
-	action_define (str, lastsc);
-
 	if (++lastsc >= current_max_scs)
 		scextend ();