aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/parser_keywords.cpp
diff options
context:
space:
mode:
authorGravatar Kurtis Rader <krader@skepticism.us>2016-05-02 17:22:44 -0700
committerGravatar Kurtis Rader <krader@skepticism.us>2016-05-02 19:24:52 -0700
commit80250c0729d382aa60b4c6ff6210b66b470ad40b (patch)
treed862929de8dc7bbbfdaa476292ef8bb65f5d120e /src/parser_keywords.cpp
parentca912f157ea9a6ba8690c83eecb72f1c50b23193 (diff)
restyle parser module to match project style
Reduces lint errors from 72 to 44 (-43%). Line count from 1698 to 1313 (-23%). Another step in resolving issue #2902.
Diffstat (limited to 'src/parser_keywords.cpp')
-rw-r--r--src/parser_keywords.cpp58
1 files changed, 12 insertions, 46 deletions
diff --git a/src/parser_keywords.cpp b/src/parser_keywords.cpp
index 5f9710ac..340a886f 100644
--- a/src/parser_keywords.cpp
+++ b/src/parser_keywords.cpp
@@ -1,56 +1,22 @@
-/** \file parser_keywords.c
-
-Functions having to do with parser keywords, like testing if a function is a block command.
-*/
-#include "fallback.h" // IWYU pragma: keep
-#include "common.h"
+// Functions having to do with parser keywords, like testing if a function is a block command.
#include "parser_keywords.h"
+#include "common.h"
+#include "fallback.h" // IWYU pragma: keep
-bool parser_keywords_skip_arguments(const wcstring &cmd)
-{
- return contains(cmd,
- L"else",
- L"begin");
+bool parser_keywords_skip_arguments(const wcstring &cmd) {
+ return contains(cmd, L"else", L"begin");
}
-
-bool parser_keywords_is_subcommand(const wcstring &cmd)
-{
-
+bool parser_keywords_is_subcommand(const wcstring &cmd) {
return parser_keywords_skip_arguments(cmd) ||
- contains(cmd,
- L"command",
- L"builtin",
- L"while",
- L"exec",
- L"if",
- L"and",
- L"or",
- L"not");
-
+ contains(cmd, L"command", L"builtin", L"while", L"exec", L"if", L"and", L"or", L"not");
}
-bool parser_keywords_is_block(const wcstring &word)
-{
- return contains(word,
- L"for",
- L"while",
- L"if",
- L"function",
- L"switch",
- L"begin");
+bool parser_keywords_is_block(const wcstring &word) {
+ return contains(word, L"for", L"while", L"if", L"function", L"switch", L"begin");
}
-bool parser_keywords_is_reserved(const wcstring &word)
-{
- return parser_keywords_is_block(word) ||
- parser_keywords_is_subcommand(word) ||
- contains(word,
- L"end",
- L"case",
- L"else",
- L"return",
- L"continue",
- L"break");
+bool parser_keywords_is_reserved(const wcstring &word) {
+ return parser_keywords_is_block(word) || parser_keywords_is_subcommand(word) ||
+ contains(word, L"end", L"case", L"else", L"return", L"continue", L"break");
}
-