From 63c2d5de0fa3237edad53913dca35abda6a36f2d Mon Sep 17 00:00:00 2001 From: Marc Autret Date: Fri, 31 Aug 2001 16:01:53 +0000 Subject: [PATCH] * src/reader.c (read_additionnal_code): Rename %%user_code to %%epilogue. * src/output.c (output): Rename %%declarations to %%prologue. * src/bison.simple: Echo modifications. --- ChangeLog | 7 +++++++ TODO | 7 +++++-- src/bison.simple | 4 ++-- src/output.c | 2 +- src/reader.c | 12 ++++++------ 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2c7fad..08dd0e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-08-31 Pascal Bart , Marc Autret + + * src/reader.c (read_additionnal_code): Rename %%user_code to + %%epilogue. + * src/output.c (output): Rename %%declarations to %%prologue. + * src/bison.simple: Echo modifications. + 2001-08-31 Marc Autret * src/reader.c (readgram): CleanUp. diff --git a/TODO b/TODO index 8eddcdc..7f58a43 100644 --- a/TODO +++ b/TODO @@ -6,7 +6,7 @@ * src/output.c ** Output sub-skeleton files. ** Cleanup dirty CPP-out code. -** s/definitions/prologue/ s/user_code/epilogue/ +** s/definitions/prologue/ s/user_code/epilogue/ [ok]. ** s/macro/muscle/ * src/getargs.c src/lex.c @@ -17,4 +17,7 @@ ** s/macro/muscle/ * src/print_graph.c -** Find the best graph parameters. \ No newline at end of file +** Find the best graph parameters. + +* doc/bison.texinfo +** Echo modifications of prologue and epilogue. \ No newline at end of file diff --git a/src/bison.simple b/src/bison.simple index d626863..74040d4 100644 --- a/src/bison.simple +++ b/src/bison.simple @@ -34,7 +34,7 @@ #include /* Copy the user declarations. */ -%%definitions +%%prologue #ifndef __cplusplus # ifndef __STDC__ @@ -977,5 +977,5 @@ yyabortlab: return 1; } -%%user_code +%%epilogue diff --git a/src/output.c b/src/output.c index b4d4437..944ebb5 100644 --- a/src/output.c +++ b/src/output.c @@ -1114,7 +1114,7 @@ output (void) #endif prepare (); /* Copy definitions in directive. */ - macro_insert ("definitions", obstack_finish (&attrs_obstack)); + macro_insert ("prologue", obstack_finish (&attrs_obstack)); output_parser (); obstack_free (¯o_obstack, 0); diff --git a/src/reader.c b/src/reader.c index 31af907..22eedc8 100644 --- a/src/reader.c +++ b/src/reader.c @@ -1666,21 +1666,21 @@ readgram (void) } /* At the end of the grammar file, some C source code must - be stored. It is going to be associated to the user_code + be stored. It is going to be associated to the epilogue directive. */ static void read_additionnal_code (void) { char c; - struct obstack uc_obstack; + struct obstack el_obstack; - obstack_init (&uc_obstack); + obstack_init (&el_obstack); while ((c = getc (finput)) != EOF) - obstack_1grow (&uc_obstack, c); + obstack_1grow (&el_obstack, c); - obstack_1grow (&uc_obstack, 0); - macro_insert ("user_code", obstack_finish (&uc_obstack)); + obstack_1grow (&el_obstack, 0); + macro_insert ("epilogue", obstack_finish (&el_obstack)); } -- 2.7.4