diff options
author | ddomingo <ddomingo@redhat.com> | 2008-09-02 09:59:14 +1000 |
---|---|---|
committer | ddomingo <ddomingo@redhat.com> | 2008-09-02 09:59:14 +1000 |
commit | 6e2fec6199616ddd76cee89e7347af8b9bc75525 (patch) | |
tree | 12a39cdad7bc79ab3df6559b430e118ae9b0e738 /parse.h | |
parent | ca947d81acf86cd346f139316e1287dcf42160de (diff) | |
parent | e491a713fa72f536955be51c0222a3f0b1befc82 (diff) | |
download | systemtap-steved-6e2fec6199616ddd76cee89e7347af8b9bc75525.tar.gz systemtap-steved-6e2fec6199616ddd76cee89e7347af8b9bc75525.tar.xz systemtap-steved-6e2fec6199616ddd76cee89e7347af8b9bc75525.zip |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'parse.h')
-rw-r--r-- | parse.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -33,7 +33,7 @@ enum parse_context }; -enum token_type +enum token_type { tok_junk, tok_identifier, tok_operator, tok_string, tok_number, tok_embedded, tok_keyword @@ -55,11 +55,11 @@ struct parse_error: public std::runtime_error { const token* tok; bool skip_some; - parse_error (const std::string& msg): + parse_error (const std::string& msg): runtime_error (msg), tok (0), skip_some (true) {} - parse_error (const std::string& msg, const token* t): + parse_error (const std::string& msg, const token* t): runtime_error (msg), tok (t), skip_some (true) {} - parse_error (const std::string& msg, bool skip): + parse_error (const std::string& msg, bool skip): runtime_error (msg), tok (0), skip_some (skip) {} }; @@ -141,7 +141,7 @@ private: const token* last_t; // the last value returned by peek() or next() const token* next_t; // lookahead token - + // expectations const token* expect_known (token_type tt, std::string const & expected); const token* expect_unknown (token_type tt, std::string & target); |