Add missing set of braces, fixes --trace.

Also ensure // commented Debug() lines don't get included in Debug/Trace_tags.

diff --git a/src/options/Makefile.am b/src/options/Makefile.am
index 18b2c42f408829aab9262ab936167a07e8b4cd0c..018f66ca8c961ce94058123b10968cb1927e94dc 100644 (file)
--- a/src/options/Makefile.am
+++ b/src/options/Makefile.am
@@ -171,7 +171,7 @@ Debug_tags.tmp Trace_tags.tmp:
        $(AM_V_GEN)\
        grep '\<$(@:_tags.tmp=)\(\.isOn\)* *( *\".*\" *)' \
                `find @srcdir@/../ -name "*.cpp" -o -name "*.h" -o -name "*.cc" -o -name "*.g"` | \
-       sed 's/^$(@:_tags.tmp=)\(\.isOn\)* *( *\"\([^"]*\)\".*/\2/;s/.*[^a-zA-Z0-9_]$(@:_tags.tmp=)\(\.isOn\)* *( *\"\([^"]*\)\".*/\2/' | LC_ALL=C sort | uniq >"$@"
+       sed 's/\/\/.*//;s/^$(@:_tags.tmp=)\(\.isOn\)* *( *\"\([^"]*\)\".*/\2/;s/.*[^a-zA-Z0-9_]$(@:_tags.tmp=)\(\.isOn\)* *( *\"\([^"]*\)\".*/\2/' | LC_ALL=C sort | uniq >"$@"
 
 MOSTLYCLEANFILES = \
        Debug_tags \

diff --git a/src/options/base_options_handlers.h b/src/options/base_options_handlers.h
index e701ee13d7fefd02c618ef4109d7c31f9fde248f..dcf059234438a4c612017e2b56013e6a4013ca7b 100644 (file)
--- a/src/options/base_options_handlers.h
+++ b/src/options/base_options_handlers.h
@@ -120,7 +120,7 @@ inline std::string suggestTags(char const* const* validTags, std::string inputTa
 
 inline void addTraceTag(std::string option, std::string optarg, SmtEngine* smt) {
   if(Configuration::isTracingBuild()) {
-    if(!Configuration::isTraceTag(optarg.c_str()))
+    if(!Configuration::isTraceTag(optarg.c_str())) {
 
       if(optarg == "help") {
         printf("available tags:");
@@ -136,6 +136,7 @@ inline void addTraceTag(std::string option, std::string optarg, SmtEngine* smt)
       throw OptionException(std::string("trace tag ") + optarg +
                             std::string(" not available.") +
                             suggestTags(Configuration::getTraceTags(), optarg) );
+    }
   } else {
     throw OptionException("trace tags not available in non-tracing builds");
   }