From 0caee1c69faa2e378a0129736b782171be5e6ba9 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Tue, 2 Oct 2001 11:43:44 -0400
Subject: [PATCH] spew.c (end_input): No longer static.
* spew.c (end_input): No longer static.
* cp-tree.h: Declare it.
* parse.y (datadef): Add "error END_OF_SAVED_INPUT" expansion.
From-SVN: r45962
---
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/cp-tree.h | 1 +
gcc/cp/parse.y | 2 ++
gcc/cp/spew.c | 5 ++---
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 54db0bdd9e39..f4d2d20e9d07 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-02 Jason Merrill <jason_merrill@redhat.com>
+
+ * spew.c (end_input): No longer static.
+ * cp-tree.h: Declare it.
+ * parse.y (datadef): Add "error END_OF_SAVED_INPUT" expansion.
+
2001-10-02 Joseph S. Myers <jsm28@cam.ac.uk>
* call.c (build_over_call), typeck.c (build_function_call_real):
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index de58ee4b890f..b4fc016f46cf 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -4142,6 +4142,7 @@ extern void do_pending_defargs PARAMS ((void));
extern void done_pending_defargs PARAMS ((void));
extern void unprocessed_defarg_fn PARAMS ((tree));
extern void replace_defarg PARAMS ((tree, tree));
+extern void end_input PARAMS ((void));
/* in tree.c */
extern void init_tree PARAMS ((void));
diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y
index 9801c3817fa7..a7651b57468b 100644
--- a/gcc/cp/parse.y
+++ b/gcc/cp/parse.y
@@ -736,6 +736,8 @@ datadef:
}
| error ';'
| error '}'
+ | error END_OF_SAVED_INPUT
+ { end_input (); }
| ';'
| bad_decl
;
diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c
index 64cf48dd1607..14569718a997 100644
--- a/gcc/cp/spew.c
+++ b/gcc/cp/spew.c
@@ -113,7 +113,6 @@ static SPEW_INLINE void consume_token PARAMS ((void));
static SPEW_INLINE int read_process_identifier PARAMS ((YYSTYPE *));
static SPEW_INLINE void feed_input PARAMS ((struct unparsed_text *));
-static SPEW_INLINE void end_input PARAMS ((void));
static SPEW_INLINE void snarf_block PARAMS ((const char *, int));
static tree snarf_defarg PARAMS ((void));
static int frob_id PARAMS ((int, int, tree *));
@@ -358,7 +357,7 @@ read_token (t)
return t->yychar;
}
-static SPEW_INLINE void
+static void
feed_input (input)
struct unparsed_text *input;
{
@@ -397,7 +396,7 @@ feed_input (input)
feed = f;
}
-static SPEW_INLINE void
+void
end_input ()
{
struct feed *f = feed;
--
GitLab