CHJ:jchstac: fix warnings and reformat

sipma · sipma · commit ecca7fec19e1 · 2025-02-19T00:51:18.000-08:00
diff --git a/CodeHawk/CHJ/jchcmdline/dune b/CodeHawk/CHJ/jchcmdline/dune
@@ -32,7 +32,3 @@
   (modules jCHXNativeMethodSignatures)
   (package exes)
   (public_name chj_native))
-
-(env
-  (dev
-    (flags (:standard -warn-error -A))))
diff --git a/CodeHawk/CHJ/jchcmdline/jCHXClassExperiment.ml b/CodeHawk/CHJ/jchcmdline/jCHXClassExperiment.ml
@@ -1,12 +1,12 @@
 (* =============================================================================
-   CodeHawk C Analyzer
+   CodeHawk Java Analyzer
    Author: Henny Sipma
    ------------------------------------------------------------------------------
    The MIT License (MIT)
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
    Copyright (c) 2020-2023 Henny B. Sipma
-   Copyright (c) 2024      Aarno Labs LLC
+   Copyright (c) 2024-2025 Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchcmdline/jCHXInspectSummaries.ml b/CodeHawk/CHJ/jchcmdline/jCHXInspectSummaries.ml
@@ -1,12 +1,12 @@
 (* =============================================================================
-   CodeHawk C Analyzer
+   CodeHawk Java Analyzer
    Author: Henny Sipma
    ------------------------------------------------------------------------------
    The MIT License (MIT)
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
    Copyright (c) 2020-2023 Henny Sipma
-   Copyright (c) 2024      Aarno Labs LLC
+   Copyright (c) 2024-2025 Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchcmdline/jCHXIntegrateSummaries.ml b/CodeHawk/CHJ/jchcmdline/jCHXIntegrateSummaries.ml
@@ -1,11 +1,11 @@
 (* =============================================================================
-   CodeHawk C Analyzer
+   CodeHawk Java Analyzer
    Author: Henny Sipma
    ------------------------------------------------------------------------------
    The MIT License (MIT)
 
    Copyright (c) 2005-2020  Kestrel Technology LLC
-   Copyright (c) 2020-2024  Henny B. Sipma
+   Copyright (c) 2020-2025  Henny B. Sipma
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchcmdline/jCHXNativeMethodSignatures.ml b/CodeHawk/CHJ/jchcmdline/jCHXNativeMethodSignatures.ml
@@ -1,12 +1,12 @@
 (* =============================================================================
-   CodeHawk C Analyzer
+   CodeHawk Java Analyzer
    Author: Henny Sipma
    ------------------------------------------------------------------------------
    The MIT License (MIT)
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
    Copyright (c) 2020-2023 Henny B. Sipma
-   Copyright (c) 2024      Aarno Labs LLC
+   Copyright (c) 2024-2025 Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchcmdline/jCHXTemplate.ml b/CodeHawk/CHJ/jchcmdline/jCHXTemplate.ml
@@ -1,10 +1,11 @@
 (* =============================================================================
-   CodeHawk C Analyzer
+   CodeHawk Java Analyzer
    Author: Henny Sipma
    ------------------------------------------------------------------------------
    The MIT License (MIT)
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
+   Copyright (c) 2020-2025 Henny B. Sipma
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchmuse/dune b/CodeHawk/CHJ/jchmuse/dune
@@ -25,7 +25,3 @@
   (modules jCHXCollectPatterns)
   (package exes)
   (public_name chj_patterns))
-
-(env
-  (dev
-    (flags (:standard -warn-error -A))))
diff --git a/CodeHawk/CHJ/jchmuse/jCHXClassPoly.ml b/CodeHawk/CHJ/jchmuse/jCHXClassPoly.ml
@@ -6,7 +6,7 @@
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
    Copyright (c) 2020-2023 Henny Sipma
-   Copyright (c) 2024      Aarno Labs LLC
+   Copyright (c) 2024-2025 Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchmuse/jCHXCollectPatterns.ml b/CodeHawk/CHJ/jchmuse/jCHXCollectPatterns.ml
@@ -5,7 +5,7 @@
    The MIT License (MIT)
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
-   Copyright (c) 2020-2024 Henny B. Sipma
+   Copyright (c) 2020-2025 Henny B. Sipma
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchmuse/jCHXExtractExprFeatures.ml b/CodeHawk/CHJ/jchmuse/jCHXExtractExprFeatures.ml
@@ -6,7 +6,7 @@
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
    Copyright (c) 2020-2023 Henny B. Sipma
-   Copyright (c) 2024      Aarno Labs LLC
+   Copyright (c) 2024-2025 Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchmuse/jCHXExtractFeatures.ml b/CodeHawk/CHJ/jchmuse/jCHXExtractFeatures.ml
@@ -6,7 +6,7 @@
 
    Copyright (c) 2005-2020 Kestrel Technology LLC
    Copyright (c) 2020-2023 Henny B. Sipma
-   Copyright (c) 2024      Aarno Labs LLC
+   Copyright (c) 2024-2025 Aarno Labs LLC
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
diff --git a/CodeHawk/CHJ/jchstac/dune b/CodeHawk/CHJ/jchstac/dune
@@ -25,7 +25,3 @@
   (modules jCHXTemplate)
   (package exes)
   (public_name chj_usertemplate))
-
-(env
-  (dev
-    (flags (:standard -warn-error -A))))
diff --git a/CodeHawk/CHJ/jchstac/jCHVersion.ml b/CodeHawk/CHJ/jchstac/jCHVersion.ml
@@ -5,6 +5,7 @@
    The MIT License (MIT)
  
    Copyright (c) 2005-2020 Kestrel Technology LLC
+   Copyright (c) 2020-2025 Henny B. Sipma
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -41,10 +42,11 @@ object (self)
   method get_date = date
 
   method toPretty =
-    LBLOCK [ STR (string_repeat "=" 80) ; NL ;
-	     STR "* CodeHawk Java Analyzer (STAC). Version " ; STR self#get_version ; NL ;
-	     STR "* Date: " ; STR self#get_date ; NL ;
-	     STR (string_repeat "=" 80) ; NL ]
+    LBLOCK [
+        STR (string_repeat "=" 80) ; NL ;
+	STR "* CodeHawk Java Analyzer (STAC). Version " ; STR self#get_version ; NL ;
+	STR "* Date: " ; STR self#get_date ; NL ;
+	STR (string_repeat "=" 80) ; NL ]
 end
 
 let version = new version_info_t
diff --git a/CodeHawk/CHJ/jchstac/jCHXClassInvariants.ml b/CodeHawk/CHJ/jchstac/jCHXClassInvariants.ml
@@ -3,20 +3,20 @@
    Author: Henny Sipma
    ------------------------------------------------------------------------------
    The MIT License (MIT)
- 
+
    Copyright (c) 2005-2020 Kestrel Technology LLC
-   Copyright (c) 2020-2023 Henny Sipma
+   Copyright (c) 2020-2025 Henny B. Sipma
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
    in the Software without restriction, including without limitation the rights
    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    copies of the Software, and to permit persons to whom the Software is
    furnished to do so, subject to the following conditions:
- 
+
    The above copyright notice and this permission notice shall be included in all
    copies or substantial portions of the Software.
-  
+
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,7 +37,6 @@ open CHUtil
 
 (* jchlib *)
 open JCHBasicTypes
-open JCHBasicTypesAPI
 open JCHDictionary
 open JCHFile
 open JCHJTerm
@@ -47,12 +46,8 @@ open JCHRawClass
 open JCHApplication
 open JCHClassLoader
 open JCHIFSystem
-open JCHFunctionSummary
-open JCHPreFileIO
 open JCHSystemSettings
 
-(* jchsys *)
-open JCHLoopUtils
 
 module H = Hashtbl
 
@@ -71,7 +66,7 @@ let is_file f =
   with Unix.Unix_error (Unix.ENOENT, _,_) -> false
 
 
-let usage_msg = 
+let usage_msg =
   "-----------------------------------------------------------------------\n" ^
   "CodeHawk Java Analyzer: Invariant generator for individual classes\n\n" ^
   "Invoke with: \n" ^
@@ -82,7 +77,7 @@ let usage_msg =
   "  chj_class_invariants -summaries jdk.jar MyClass.class\n" ^
   "  chj_class_invariants -summaries jdk.jar -classpath myjar.jar org.mydomain.MyClass\n" ^
   "-----------------------------------------------------------------------\n"
-  
+
 let read_args () = Arg.parse speclist   (fun s -> classname := s) usage_msg
 
 let has_invariants invs =
@@ -99,14 +94,14 @@ let report_invariants cInfo =
     if !methodname = "" || ms#name = !methodname then
       let msig = sanitize ms#to_signature_string in
       let msname = sanitize ms#name in
-      let fname = 
+      let fname =
 	if H.mem mnames msname then
-	  cname ^ "_" ^ msname ^ "_" ^ msig 
+	  cname ^ "_" ^ msname ^ "_" ^ msig
 	else
 	  begin H.add mnames msname true ; cname ^ "_" ^ msname end in
       let fInvs = fname ^ "_invs.txt" in
       let fBc = fname ^ "_bc.txt" in
-      
+
       let cms = make_cms cInfo#get_class_name ms in
       let mInfo = app#get_method cms in
 (*      let jproc = JCHSystem.jsystem#get_jproc_info_seq_no mInfo#get_index in *)
@@ -118,22 +113,22 @@ let report_invariants cInfo =
 	    List.iter (fun (pc,invs) ->
 	      match invs with
 	      | [] -> ()
-	      | _ -> 
+	      | _ ->
 		let pinvs = List.map relational_expr_to_pretty invs in
-		ppInvs := 
-		  LBLOCK ([ fixed_length_pretty ~alignment:StrRight (INT pc) 5 ; STR "  " ; 
-			    pretty_print_list pinvs (fun p -> LBLOCK [ INDENT (3,p) ; NL ]) 
+		ppInvs :=
+		  LBLOCK ([ fixed_length_pretty ~alignment:StrRight (INT pc) 5 ; STR "  " ;
+			    pretty_print_list pinvs (fun p -> LBLOCK [ INDENT (3,p) ; NL ])
 			      "" "       " "" ; NL ]) :: !ppInvs)
 	      invs
 	 else
 	    ppInvs := LBLOCK ([ STR "  --- No invariants generated --- " ; NL ]) :: !ppInvs) ;
-	pr_debug [ STR "Saving invariants and bytecode for " ; cms#toPretty ; 
+	pr_debug [ STR "Saving invariants and bytecode for " ; cms#toPretty ;
 		   STR " in " ; STR fInvs ; STR " and " ; STR fBc ; NL ] ;
 	file_output#saveFile fInvs (LBLOCK (List.rev !ppInvs)) ;
-	file_output#saveFile fBc mInfo#bytecode_to_pretty 
+	file_output#saveFile fBc mInfo#bytecode_to_pretty
       end)
     cInfo#get_methods_defined
-    
+
 let load () =
   if Filename.check_suffix !classname "class" then
     if is_file !classname then
diff --git a/CodeHawk/CHJ/jchstac/jCHXInitializeAnalysis.ml b/CodeHawk/CHJ/jchstac/jCHXInitializeAnalysis.ml
diff --git a/CodeHawk/CHJ/jchstac/jCHXTemplate.ml b/CodeHawk/CHJ/jchstac/jCHXTemplate.ml
diff --git a/CodeHawk/CHJ/jchstac/jCHXTranslateClass.ml b/CodeHawk/CHJ/jchstac/jCHXTranslateClass.ml
