2006-07-13 David Smith <dsmith@redhat.com>

	* parse.cxx (parser::expect_unknown2): New function that looks for
	2 possible token types.
	* parse.cxx (parser::expect_ident_or_keyword): New function that
	calls parser::expect_unknown2.
	* parse.cxx (parser::parse_symbol): Calls
	parser::expect_ident_or_keyword to allow keywords to appear when
	expanding target symbols (Bugzilla #2913).
	* parse.h: Added prototypes for parser::expect_unknown2 and
	parser::expect_ident_or_keyword.
	* testsuite/parseok/seventeen.stp: New test to check for allowing
	keywords when expanding target symbols.

1 files changed, 3 insertions, 0 deletions

diff --git a/parse.h b/parse.h
index 0dcf30a2..a3b337c1 100644
--- a/parse.h
+++ b/parse.h
@@ -112,12 +112,15 @@ private:
   // expectations
   const token* expect_known (token_type tt, std::string const & expected);
   const token* expect_unknown (token_type tt, std::string & target);
+  const token* expect_unknown2 (token_type tt1, token_type tt2,
+				std::string & target);
 
   // convenience forms
   const token* expect_op (std::string const & expected);
   const token* expect_kw (std::string const & expected);
   const token* expect_number (int64_t & expected);
   const token* expect_ident (std::string & target);
+  const token* expect_ident_or_keyword (std::string & target);
   bool peek_op (std::string const & op);
   bool peek_kw (std::string const & kw);