summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2018-10-03 07:52:44 +0000
committerStephen Kelly <steveire@gmail.com>2018-10-03 07:52:44 +0000
commit42668a4d032f5f648058a0cead85a35b79247e9d (patch)
tree9525862e796ca7a4388ced4593e5e87bfdc4ac28
parenta27014b85169692442ed857312473afad701c1f7 (diff)
downloadbcm5719-llvm-42668a4d032f5f648058a0cead85a35b79247e9d.tar.gz
bcm5719-llvm-42668a4d032f5f648058a0cead85a35b79247e9d.zip
[clang-query] Add single-letter 'q' alias for 'quit'
Reviewers: aaron.ballman, pcc Reviewed By: aaron.ballman Subscribers: Szelethus, cfe-commits Differential Revision: https://reviews.llvm.org/D52746 llvm-svn: 343664
-rw-r--r--clang-tools-extra/clang-query/Query.cpp2
-rw-r--r--clang-tools-extra/clang-query/QueryParser.cpp1
-rw-r--r--clang-tools-extra/unittests/clang-query/QueryParserTest.cpp3
3 files changed, 5 insertions, 1 deletions
diff --git a/clang-tools-extra/clang-query/Query.cpp b/clang-tools-extra/clang-query/Query.cpp
index 072ee6b9c72..63b4f3579b9 100644
--- a/clang-tools-extra/clang-query/Query.cpp
+++ b/clang-tools-extra/clang-query/Query.cpp
@@ -45,7 +45,7 @@ bool HelpQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const {
"Set whether to print bindings as diagnostics,\n"
" "
"AST pretty prints or AST dumps.\n"
- " quit "
+ " quit, q "
"Terminates the query session.\n\n";
return true;
}
diff --git a/clang-tools-extra/clang-query/QueryParser.cpp b/clang-tools-extra/clang-query/QueryParser.cpp
index d05a0ba1c09..ddedd1ece7a 100644
--- a/clang-tools-extra/clang-query/QueryParser.cpp
+++ b/clang-tools-extra/clang-query/QueryParser.cpp
@@ -166,6 +166,7 @@ QueryRef QueryParser::doParse() {
.Case("let", PQK_Let)
.Case("m", PQK_Match, /*IsCompletion=*/false)
.Case("match", PQK_Match)
+ .Case("q", PQK_Quit, /*IsCompletion=*/false)
.Case("quit", PQK_Quit)
.Case("set", PQK_Set)
.Case("unlet", PQK_Unlet)
diff --git a/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp b/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
index 4304aa980cd..729862b5fda 100644
--- a/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
+++ b/clang-tools-extra/unittests/clang-query/QueryParserTest.cpp
@@ -51,6 +51,9 @@ TEST_F(QueryParserTest, Quit) {
QueryRef Q = parse("quit");
ASSERT_TRUE(isa<QuitQuery>(Q));
+ Q = parse("q");
+ ASSERT_TRUE(isa<QuitQuery>(Q));
+
Q = parse("quit me");
ASSERT_TRUE(isa<InvalidQuery>(Q));
EXPECT_EQ("unexpected extra input: ' me'", cast<InvalidQuery>(Q)->ErrStr);
OpenPOWER on IntegriCloud