From c199f609bd5d19acfbfe72a7404bcfe85499df21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Fri, 4 May 2018 15:59:14 +0200 Subject: [PATCH] Enable all processing steps by default This enables completion, simplification, and integer variable detection by default, because these options are be used more often than not. The change log is updated according to this change. --- CHANGELOG.md | 8 ++++++-- app/main.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54027b2..0a46521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,14 @@ ## (unreleased) +### Changes + +* turns on completion and simplification by default, which can now be switched off with `--no-complete` and `--no-simplify` + ### Features -* optional detection of integer variables and integer predicate parameters -* command-line option `--detect-integers` to enable integer variable detection +* detection of integer variables and integer predicate parameters +* command-line option `--no-detect-integers` to disable integer variable detection * new simplification rule applying to integer variables * support for declaring functions integer with the `#external` directive diff --git a/app/main.cpp b/app/main.cpp index 71c7cc5..fce0ed2 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -16,9 +16,9 @@ int main(int argc, char **argv) ("h,help", "Display this help message") ("v,version", "Display version information") ("i,input", "Input files", cxxopts::value>()) - ("s,simplify", "Simplify the output") - ("c,complete", "Perform completion") - ("d,detect-integers", "Detect integer variables") + ("no-simplify", "Do not simplify the output") + ("no-complete", "Do not perform completion") + ("no-detect-integers", "Do not detect integer variables") ("color", "Colorize output (always, never, auto)", cxxopts::value()->default_value("auto")) ("parentheses", "Parenthesis style (normal, full)", cxxopts::value()->default_value("normal")) ("p,log-priority", "Log messages starting from this priority (debug, info, warning, error)", cxxopts::value()->default_value("info")); @@ -49,9 +49,9 @@ int main(int argc, char **argv) if (parseResult.count("input") > 0) inputFiles = parseResult["input"].as>(); - context.performSimplification = (parseResult.count("simplify") > 0); - context.performCompletion = (parseResult.count("complete") > 0); - context.performIntegerDetection = (parseResult.count("detect-integers") > 0); + context.performSimplification = (parseResult.count("no-simplify") == 0); + context.performCompletion = (parseResult.count("no-complete") == 0); + context.performIntegerDetection = (parseResult.count("no-detect-integers") == 0); colorPolicyString = parseResult["color"].as(); parenthesisStyleString = parseResult["parentheses"].as(); logPriorityString = parseResult["log-priority"].as();