cli: error exit code for process if error diagnostic was emitted

Author: Philipp15b

src/main.rs

@@ -482,7 +482,13 @@ fn finalize_verify_result(
     let (timeout, mem_limit) = (rlimit_options.timeout(), rlimit_options.mem_limit());
     match verify_result {
         #[allow(clippy::bool_to_int_with_if)]
-        Ok(all_verified) => ExitCode::from(if all_verified { 0 } else { 1 }),
+        Ok(all_verified) => {
+            let server_exit_code = server.lock().unwrap().exit_code();
+            if server_exit_code != ExitCode::SUCCESS {
+                return server_exit_code;
+            }
+            ExitCode::from(if all_verified { 0 } else { 1 })
+        }
         Err(VerifyError::Diagnostic(diagnostic)) => {
             server.lock().unwrap().add_diagnostic(diagnostic).unwrap();
             ExitCode::from(1)

src/servers/cli.rs

@@ -1,9 +1,9 @@
 use std::{
-    io::{self, IsTerminal},
-    path::PathBuf,
-    sync::{Arc, Mutex},
+    io::{self, IsTerminal}, path::PathBuf, process::ExitCode, sync::{Arc, Mutex}
 };
 
+use ariadne::ReportKind;
+
 use crate::{
     ast::{Diagnostic, FileId, Files, SourceFilePath, Span, StoredFile},
     driver::{SmtVcCheckResult, SourceUnitName},
@@ -17,13 +17,15 @@ use super::{unless_fatal_error, Server, ServerError};
 pub struct CliServer {
     werr: bool,
     files: Arc<Mutex<Files>>,
+    has_emitted_errors: bool,
 }
 
 impl CliServer {
     pub fn new(input_options: &InputOptions) -> Self {
         CliServer {
             werr: input_options.werr,
             files: Default::default(),
+            has_emitted_errors: false,
         }
     }
 
@@ -62,6 +64,8 @@ impl Server for CliServer {
     }
 
     fn add_diagnostic(&mut self, diagnostic: Diagnostic) -> Result<(), VerifyError> {
+        self.has_emitted_errors =
+            self.has_emitted_errors || self.werr || diagnostic.kind() == ReportKind::Error;
         let files = self.files.lock().unwrap();
         print_diagnostic(&files, diagnostic)?;
         Ok(())
@@ -97,6 +101,14 @@ impl Server for CliServer {
         // Not relevant for CLI
         Ok(())
     }
+
+    fn exit_code(&self) -> ExitCode {
+        if self.has_emitted_errors {
+            ExitCode::FAILURE
+        } else {
+            ExitCode::SUCCESS
+        }
+    }
 }
 
 fn print_diagnostic(mut files: &Files, diagnostic: Diagnostic) -> io::Result<()> {

src/servers/mod.rs

@@ -1,6 +1,5 @@
 use std::{
-    error::Error,
-    sync::{Arc, Mutex},
+    error::Error, process::ExitCode, sync::{Arc, Mutex}
 };
 
 use crate::{
@@ -81,6 +80,13 @@ pub trait Server: Send {
 
     /// Sends an unknown verification result for the not checked proc with the given span.
     fn handle_not_checked(&mut self, span: Span) -> Result<(), ServerError>;
+
+    /// Return an exit code for the process.
+    ///
+    /// Default implementation returns `ExitCode::SUCCESS`.
+    fn exit_code(&self) -> ExitCode {
+        ExitCode::SUCCESS
+    }
 }
 
 fn unless_fatal_error(werr: bool, diagnostic: Diagnostic) -> Result<Diagnostic, VerifyError> {