Fixed boolean return value of Cidre.check and Cidre.make so that it i…

…s true if there were no warnings (or errors).
rowandavies · Jul 4, 2013 · 6bbb964 · 6bbb964
1 parent 735606b
commit 6bbb964
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/Cidre/Cidre.sml b/src/Cidre/Cidre.sml
@@ -188,7 +188,8 @@ structure Cidre = struct
            (case ParseElab.parse_elab {infB=infB0, elabB=B.plus_rT(B0,rT0), prjid=atbdec, file=atbdec}
               of SUCCESS {report, infB, elabB, topdec} => 
                    (if print_flag then print_result_report report 
-                                  else (Flags.report_warnings(); Flags.reset_warnings();warned:=true);
+                                  else ( warned := ((!warned) orelse (Flags.get_warned())) ;
+                                         Flags.report_warnings(); Flags.reset_warnings()   );
                     ( B.to_rT elabB, (infB, BE.empty, B.no_rT elabB), BC0 ) )
                | FAILURE (report, error_codes) =>
                    (Flags.report_warnings();  (* Print warnings even if there are errors.  *)

diff --git a/src/Common/FLAGS-sig.sml b/src/Common/FLAGS-sig.sml
@@ -14,6 +14,7 @@ signature FLAGS =
     val warn_string : string -> unit
     val report_warnings : unit -> unit
     val reset_warnings : unit -> unit
+    val get_warned : unit -> bool
 
     (*Warnings are collected during compilation and printed all at once at
      the end of the compilation of a program.  The printing is done in

diff --git a/src/Common/Flags.sml b/src/Common/Flags.sml
@@ -184,6 +184,8 @@ functor Flags (structure Crash : CRASH
       fun warn report = warnings := report :: !warnings
       val warn_string = warn o Report.line
 
+      fun get_warned () = case (!warnings) of [] => false | _::_ => true 
+
       fun report_warnings () = 
 	    (case !warnings of
 	       [] =>  ()