CHUTIL: replace exception by Result

Author: sipma

CodeHawk/CH/chutil/cHFileIO.ml

@@ -33,6 +33,8 @@ open CHPretty
 
 (* chutil *)
 open CHPrettyUtil
+open CHTraceResult
+
 
 exception CHIOFailure of string
 
@@ -242,7 +244,7 @@ let absolute_name (s: string): string =
     s
 
 
-let rec normalize_path (s: string): string =
+let rec normalize_path (s: string): string traceresult =
   let has_directory_dot s =
     (String.contains s '.')
     && (let dotindex = String.index s '.' in
@@ -252,7 +254,7 @@ let rec normalize_path (s: string): string =
             || ((slashindex - dotindex = 2) && String.get s (dotindex+1) = '.'))) in
   let len = String.length s in
   if len <= 1 then
-    s
+    Ok s
   else
     if has_directory_dot s then
       let dotindex = String.index s '.' in
@@ -268,16 +270,16 @@ let rec normalize_path (s: string): string =
             normalize_path (String.concat "" [s1; s2])
           else if slsindex > 0 then
             normalize_path (String.sub s (dotindex + 3) (len - (dotindex + 3)))
-          else    (* no second slash found *)
-            raise (CHFailure (LBLOCK [STR "Error in normalize_path: "; STR s]))
+          else  (* no second slash found *)
+            Error ["normalize_path: " ^ s ^ "; expected second slash"]
         else      (* no first slash found *)
-          raise (CHFailure (LBLOCK [STR "Error in normalize_path: "; STR s]))
+          Error ["normalize_path: " ^ s ^ "; expected a slash"]
       else        (* just one dot *)
         if dotindex + 1 < len && String.get s (dotindex+1) = '/' then
           let s1 = String.sub s 0 dotindex in
           let s2 = String.sub s (dotindex + 2) (len - (dotindex + 2)) in
           normalize_path (String.concat "" [s1; s2])
         else
-          raise (CHFailure (LBLOCK [STR "Error in normalize_path: "; STR s]))
+          Error ["normalize_path: " ^ s ^ "; multiple dots"]
     else   (* no dots *)
-      s
+      Ok s

CodeHawk/CH/chutil/cHFileIO.mli

@@ -3,7 +3,7 @@
    Author: Henny Sipma
    ------------------------------------------------------------------------------
    The MIT License (MIT)
- 
+
    Copyright (c) 2005-2019 Kestrel Technology LLC
    Copyright (c) 2020-2021 Henny B. Sipma
    Copyright (c) 2022-2024 Aarno Labs LLC
@@ -14,10 +14,10 @@
    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
@@ -30,6 +30,10 @@
 (* chlib *)
 open CHPretty
 
+(* chutil *)
+open CHTraceResult
+
+
 exception CHIOFailure of string
 
 class type file_output_int =
@@ -48,12 +52,13 @@ val relativize_filename: string -> string -> string
 (* returns the filename relative to the given directory;
    if the filename is absolute, but not in a subdirectory
    of the given directory the function fails *)
-  
+
+
 val absolute_name: string -> string
 (* add the current working directory to the filename *)
 
-val normalize_path: string -> string
+
+val normalize_path: string -> string traceresult
 (* remove . and .. from path names; if the filename
    is relative the function fails if removing .. would result
    in a parent directory of the path *)
-