From 0c218afb69ed53355a69e4264cbc5584908d65b4 Mon Sep 17 00:00:00 2001 From: hiramatu Date: Mon, 3 Dec 2007 21:30:31 +0000 Subject: 2007-12-03 Masami Hiramatsu PR 5376 * parse.cxx (lexer::scan): Treat '*' as an alphabet if the wildcard flag is true. (parser::parse_probe_point): Call parser::next() with wildcard = true. (parser::scan_pp): Add wildcard flag and pass it to lexer::scan. (parser::next): Ditto. (parser::peek): Ditto. * parse.h : Ditto. * testsuites/perseko/twentytwo.stp: Change testcase to the wildcarded probe points with spaces. --- parse.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'parse.h') diff --git a/parse.h b/parse.h index c81559dd..557fa4c5 100644 --- a/parse.h +++ b/parse.h @@ -69,7 +69,7 @@ struct systemtap_session; class lexer { public: - token* scan (bool expand_args=true); + token* scan (bool wildcard=false, bool expand_args=true); lexer (std::istream&, const std::string&, systemtap_session&); private: @@ -132,12 +132,12 @@ private: // preprocessing subordinate std::vector enqueued_pp; - const token* scan_pp (bool expand_args=true); + const token* scan_pp (bool wildcard=false, bool expand_args=true); // scanning state const token* last (); - const token* next (); - const token* peek (); + const token* next (bool wildcard=false); + const token* peek (bool wildcard=false); const token* last_t; // the last value returned by peek() or next() const token* next_t; // lookahead token -- cgit