From 80250c0729d382aa60b4c6ff6210b66b470ad40b Mon Sep 17 00:00:00 2001
From: Kurtis Rader <krader@skepticism.us>
Date: Mon, 2 May 2016 17:22:44 -0700
Subject: 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.
---
 src/parser_keywords.cpp | 58 ++++++++++---------------------------------------
 1 file changed, 12 insertions(+), 46 deletions(-)

(limited to 'src/parser_keywords.cpp')

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");
 }
-
-- 
cgit v1.2.3