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, 8 insertions, 0 deletions

diff --git a/testsuite/parseok/seventeen.stp b/testsuite/parseok/seventeen.stp
new file mode 100755
index 00000000..395b29aa
--- /dev/null
+++ b/testsuite/parseok/seventeen.stp
@@ -0,0 +1,8 @@
+#! stap -p1
+
+# Make sure you can use keywords in target symbol structure
+# references (Bugzilla 2193).
+
+probe kernel.function("add_timer_on") {
+    printf("%x\n", $timer->function)
+}