From e17aafd170768308bb0ac5fa2d35795b68887c0a Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@apple.com>
Date: Tue, 18 Feb 2003 18:24:05 +0000
Subject: [PATCH] * gcc.c (validate_switches): Don't scan past closing '}'.
From-SVN: r63046
---
gcc/ChangeLog | 4 ++++
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/cp-tree.h | 4 ----
gcc/gcc.c | 3 ++-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5500f28125af..fd9b2d113a55 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-18 Geoffrey Keating <geoffk@apple.com>
+
+ * gcc.c (validate_switches): Don't scan past closing '}'.
+
2003-02-18 Ben Elliston <bje@redhat.com>
PR c++/1607
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 069c0097d03e..61ed974aec3a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-18 Geoffrey Keating <geoffk@apple.com>
+
+ * cp-tree.h (rid_to_yy): Delete.
+ (C_RID_YYCODE): Delete.
+ (finish_file): Delete redundant declaration.
+
2003-02-18 Jason Merrill <jason@redhat.com>
PR c++/9623
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index a0c41341901a..02a724d89f6f 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -240,9 +240,6 @@ struct lang_identifier GTY(())
#define C_IS_RESERVED_WORD(ID) TREE_LANG_FLAG_5 (ID)
-extern const short rid_to_yy[RID_MAX];
-#define C_RID_YYCODE(ID) rid_to_yy[C_RID_CODE (ID)]
-
#define LANG_IDENTIFIER_CAST(NODE) \
((struct lang_identifier*)IDENTIFIER_NODE_CHECK (NODE))
@@ -3886,7 +3883,6 @@ extern tree build_cleanup (tree);
extern void finish_file (void);
extern tree build_expr_from_tree (tree);
extern tree build_cleanup (tree);
-extern void finish_file (void);
extern tree build_expr_from_tree (tree);
extern tree build_offset_ref_call_from_tree (tree, tree);
extern tree build_call_from_tree (tree, tree, bool);
diff --git a/gcc/gcc.c b/gcc/gcc.c
index b7aac2db625a..52ca42420213 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -6871,7 +6871,8 @@ next_member:
else if (p[0] == 'W' && p[1] == '{')
p = validate_switches (p+2);
}
- if (*p) p++;
+ else
+ p++;
}
if (*p) p++;
--
GitLab