+3

CHANGES.md

··· 4 * Introduce [Re.Pcre.get_named_substring_opt]. A non raising version of 5 [Re.Pcre.get_named_substring] (#525) 6 0 0 0 7 1.13.1 (30-Sep-2024) 8 -------------------- 9

··· 4 * Introduce [Re.Pcre.get_named_substring_opt]. A non raising version of 5 [Re.Pcre.get_named_substring] (#525) 6 7 + * Introduce parsing functions in `Re.{Perl,Pcre,Emacs,Glob}` that return a 8 + result instead of raising. (#542) 9 + 10 1.13.1 (30-Sep-2024) 11 -------------------- 12

+7

lib/emacs.ml

··· 121 if case then r else Re.no_case r 122 ;; 123 0 0 0 0 0 0 0 124 let compile = Re.compile 125 let compile_pat ?(case = true) s = compile (re ~case s)

··· 121 if case then r else Re.no_case r 122 ;; 123 124 + let re_result ?case s = 125 + match re ?case s with 126 + | s -> Ok s 127 + | exception Not_supported -> Error `Not_supported 128 + | exception Parse_error -> Error `Parse_error 129 + ;; 130 + 131 let compile = Re.compile 132 let compile_pat ?(case = true) s = compile (re ~case s)

+2

lib/emacs.mli

··· 30 (** Parsing of an Emacs-style regular expression *) 31 val re : ?case:bool -> string -> Core.t 32 0 0 33 (** Regular expression compilation *) 34 val compile : Core.t -> Core.re 35

··· 30 (** Parsing of an Emacs-style regular expression *) 31 val re : ?case:bool -> string -> Core.t 32 33 + val re_result : ?case:bool -> string -> (Core.t, [ `Not_supported | `Parse_error ]) result 34 + 35 (** Regular expression compilation *) 36 val compile : Core.t -> Core.re 37

+16

lib/glob.ml

··· 316 if expand_braces then Re.alt (List.map to_re (explode s)) else to_re s 317 ;; 318 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 319 let glob' ?anchored period s = glob ?anchored ~period s 320 let globx ?anchored s = glob ?anchored ~expand_braces:true s 321 let globx' ?anchored period s = glob ?anchored ~expand_braces:true ~period s

··· 316 if expand_braces then Re.alt (List.map to_re (explode s)) else to_re s 317 ;; 318 319 + let glob_result 320 + ?anchored 321 + ?pathname 322 + ?match_backslashes 323 + ?period 324 + ?expand_braces 325 + ?double_asterisk 326 + s 327 + = 328 + match 329 + glob ?anchored ?pathname ?match_backslashes ?period ?expand_braces ?double_asterisk s 330 + with 331 + | re -> Ok re 332 + | exception Parse_error -> Error `Parse_error 333 + ;; 334 + 335 let glob' ?anchored period s = glob ?anchored ~period s 336 let globx ?anchored s = glob ?anchored ~expand_braces:true s 337 let globx' ?anchored period s = glob ?anchored ~expand_braces:true ~period s

+10

lib/glob.mli

··· 68 -> string 69 -> Core.t 70 0 0 0 0 0 0 0 0 0 0 71 (** Same, but allows to choose whether dots at the beginning of a 72 file name need to be explicitly matched (true) or not (false) 73

··· 68 -> string 69 -> Core.t 70 71 + val glob_result 72 + : ?anchored:bool 73 + -> ?pathname:bool 74 + -> ?match_backslashes:bool 75 + -> ?period:bool 76 + -> ?expand_braces:bool 77 + -> ?double_asterisk:bool 78 + -> string 79 + -> (Core.t, [ `Parse_error ]) result 80 + 81 (** Same, but allows to choose whether dots at the beginning of a 82 file name need to be explicitly matched (true) or not (false) 83

+7

lib/pcre.ml

··· 33 Perl.re ~opts pat 34 ;; 35 0 0 0 0 0 0 0 36 let regexp ?flags pat = Re.compile (re ?flags pat) 37 let extract ~rex s = Re.Group.all (Re.exec rex s) 38 let exec ~rex ?pos s = Re.exec rex ?pos s

··· 33 Perl.re ~opts pat 34 ;; 35 36 + let re_result ?flags s = 37 + match re ?flags s with 38 + | s -> Ok s 39 + | exception Not_supported -> Error `Not_supported 40 + | exception Parse_error -> Error `Parse_error 41 + ;; 42 + 43 let regexp ?flags pat = Re.compile (re ?flags pat) 44 let extract ~rex s = Re.Group.all (Re.exec rex s) 45 let exec ~rex ?pos s = Re.exec rex ?pos s

+5

lib/pcre.mli

··· 24 (** [re ~flags s] creates the regexp [s] using the pcre syntax. *) 25 val re : ?flags:flag list -> string -> Core.t 26 0 0 0 0 0 27 (** [re ~flags s] compiles the regexp [s] using the pcre syntax. *) 28 val regexp : ?flags:flag list -> string -> regexp 29

··· 24 (** [re ~flags s] creates the regexp [s] using the pcre syntax. *) 25 val re : ?flags:flag list -> string -> Core.t 26 27 + val re_result 28 + : ?flags:flag list 29 + -> string 30 + -> (Core.t, [ `Not_supported | `Parse_error ]) result 31 + 32 (** [re ~flags s] compiles the regexp [s] using the pcre syntax. *) 33 val regexp : ?flags:flag list -> string -> regexp 34

+7

lib/perl.ml

··· 338 339 let compile = Re.compile 340 let compile_pat ?(opts = []) s = compile (re ~opts s) 0 0 0 0 0 0 0

··· 338 339 let compile = Re.compile 340 let compile_pat ?(opts = []) s = compile (re ~opts s) 341 + 342 + let re_result ?opts s = 343 + match re ?opts s with 344 + | s -> Ok s 345 + | exception Not_supported -> Error `Not_supported 346 + | exception Parse_error -> Error `Parse_error 347 + ;;

+5

lib/perl.mli

··· 39 (** Parsing of a Perl-style regular expression *) 40 val re : ?opts:opt list -> string -> Core.t 41 0 0 0 0 0 42 (** (Same as [Re.compile]) *) 43 val compile : Core.t -> Core.re 44

··· 39 (** Parsing of a Perl-style regular expression *) 40 val re : ?opts:opt list -> string -> Core.t 41 42 + val re_result 43 + : ?opts:opt list 44 + -> string 45 + -> (Core.t, [ `Not_supported | `Parse_error ]) result 46 + 47 (** (Same as [Re.compile]) *) 48 val compile : Core.t -> Core.re 49