Disable get_color true when --no-color command-line option is pre…

…sent. Also update saw-core to GaloisInc/saw-core#113 to prevent output of ANSI escape sequences when `get_color` is disabled. Fixes #957.
GaloisInc · Dec 8, 2020 · 3514dac · 3514dac
1 parent 9208c87
commit 3514dac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/deps/saw-core b/deps/saw-core
diff --git a/src/SAWScript/Interpreter.hs b/src/SAWScript/Interpreter.hs
@@ -562,7 +562,10 @@ set_base b = do
 set_color :: Bool -> TopLevel ()
 set_color b = do
   rw <- getTopLevelRW
-  putTopLevelRW rw { rwPPOpts = (rwPPOpts rw) { ppOptsColor = b } }
+  opts <- getOptions
+  -- Keep color disabled if `--no-color` command-line option is present
+  let b' = b && useColor opts
+  putTopLevelRW rw { rwPPOpts = (rwPPOpts rw) { ppOptsColor = b' } }
 
 print_value :: Value -> TopLevel ()
 print_value (VString s) = printOutLnTop Info s