From: Pascal Bart <pascal.bart@epita.fr>
Date: Tue, 28 Aug 2001 18:35:33 +0000 (+0000)
Subject: * src/output.c (output_definitions): New function, which copies
X-Git-Tag: pre-merge-of-1-29-branch~50
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/d1a2daf76a5bac01d02a7d8b27fb4232412985a9?ds=inline

* src/output.c (output_definitions): New function, which copies
attrs_obstack in the '%%definitions' directive.
* src/bison.simple: Add `%%definitions'.
---

diff --git a/ChangeLog b/ChangeLog
index dd424dd1..346f48d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-28  Pascal Bart  <pascal.bart@epita.fr>
+
+	* src/output.c (output_definitions): New function, which copies 
+	attrs_obstack in the '%%definitions' directive.
+	* src/bison.simple: Add `%%definitions'.
+
 2001-08-28  Marc Autret  <autret_m@epita.fr>
 
 	* config/depcomp: New file.
diff --git a/src/bison.simple b/src/bison.simple
index 26a6a019..700a9edb 100644
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -33,6 +33,9 @@
 
 #include <stdio.h>
 
+/* Copy the user declarations.  */
+%%definitions
+
 #ifndef __cplusplus
 # ifndef __STDC__
 #  define const
diff --git a/src/output.c b/src/output.c
index be07ff6f..78496932 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1105,16 +1105,6 @@ output (void)
 {
   obstack_init (&output_obstack);
 
-#if 0
-  /* If using a simple parser the definition of YYSTYPE are put into
-     TABLE_OBSTACK.  */
-  if (!semantic_parser)
-    {
-      size_t size = obstack_object_size (&attrs_obstack);
-      obstack_grow (&table_obstack, obstack_finish (&attrs_obstack), size);
-    }
-#endif
-
   /* reader_output_yylsp (&table_obstack); */
   free_itemsets ();
 
@@ -1129,6 +1119,8 @@ output (void)
 
   /* if (!no_parser_flag) */
   prepare ();
+  /* Copy definitions in directive.  */
+  macro_insert ("definitions", obstack_finish (&attrs_obstack));
   output_parser ();
   output_program ();