diff options
| -rw-r--r-- | aarch64/Machregsaux.ml | 2 | ||||
| -rw-r--r-- | arm/Machregsaux.ml | 2 | ||||
| -rw-r--r-- | cparser/Bitfields.ml | 3 | ||||
| -rw-r--r-- | lib/Readconfig.mll | 2 | ||||
| -rw-r--r-- | powerpc/Machregsaux.ml | 2 | ||||
| -rw-r--r-- | riscV/Machregsaux.ml | 2 | ||||
| -rw-r--r-- | tools/modorder.ml | 2 | ||||
| -rw-r--r-- | x86/Machregsaux.ml | 2 |
8 files changed, 8 insertions, 9 deletions
diff --git a/aarch64/Machregsaux.ml b/aarch64/Machregsaux.ml index d7f10b9b..39008965 100644 --- a/aarch64/Machregsaux.ml +++ b/aarch64/Machregsaux.ml @@ -27,7 +27,7 @@ let is_scratch_register s = let name_of_register r = - try Some (Hashtbl.find register_names r) with Not_found -> None + Hashtbl.find_opt register_names r let register_by_name s = Machregs.register_by_name (coqstring_uppercase_ascii_of_camlstring s) diff --git a/arm/Machregsaux.ml b/arm/Machregsaux.ml index ce5c67f6..21425851 100644 --- a/arm/Machregsaux.ml +++ b/arm/Machregsaux.ml @@ -25,7 +25,7 @@ let _ = let is_scratch_register s = s = "R14" || s = "r14" let name_of_register r = - try Some (Hashtbl.find register_names r) with Not_found -> None + Hashtbl.find_opt register_names r let register_by_name s = Machregs.register_by_name (coqstring_uppercase_ascii_of_camlstring s) diff --git a/cparser/Bitfields.ml b/cparser/Bitfields.ml index 9ca40e70..7a00f719 100644 --- a/cparser/Bitfields.ml +++ b/cparser/Bitfields.ml @@ -50,8 +50,7 @@ let bitfield_table = (Hashtbl.create 57: (ident * string, bitfield_info) Hashtbl.t) let is_bitfield structid fieldname = - try Some (Hashtbl.find bitfield_table (structid, fieldname)) - with Not_found -> None + Hashtbl.find_opt bitfield_table (structid, fieldname) (* Mapping struct/union identifier -> list of members after transformation, including the carrier fields, but without the bit fields. diff --git a/lib/Readconfig.mll b/lib/Readconfig.mll index 7b98255e..8abcc407 100644 --- a/lib/Readconfig.mll +++ b/lib/Readconfig.mll @@ -20,7 +20,7 @@ let key_val_tbl : (string, string list) Hashtbl.t = Hashtbl.create 17 let key_val key = - try Some(Hashtbl.find key_val_tbl key) with Not_found -> None + Hashtbl.find_opt key_val_tbl key (* Auxiliaries for parsing *) diff --git a/powerpc/Machregsaux.ml b/powerpc/Machregsaux.ml index 664f71a0..711eb623 100644 --- a/powerpc/Machregsaux.ml +++ b/powerpc/Machregsaux.ml @@ -25,7 +25,7 @@ let _ = let is_scratch_register s = s = "R0" || s = "r0" let name_of_register r = - try Some (Hashtbl.find register_names r) with Not_found -> None + Hashtbl.find_opt register_names r let register_by_name s = Machregs.register_by_name (coqstring_uppercase_ascii_of_camlstring s) diff --git a/riscV/Machregsaux.ml b/riscV/Machregsaux.ml index 473e0602..82d3803e 100644 --- a/riscV/Machregsaux.ml +++ b/riscV/Machregsaux.ml @@ -25,7 +25,7 @@ let _ = let is_scratch_register r = false let name_of_register r = - try Some (Hashtbl.find register_names r) with Not_found -> None + Hashtbl.find_opt register_names r let register_by_name s = Machregs.register_by_name (coqstring_uppercase_ascii_of_camlstring s) diff --git a/tools/modorder.ml b/tools/modorder.ml index d1203568..7ca6a9e9 100644 --- a/tools/modorder.ml +++ b/tools/modorder.ml @@ -84,7 +84,7 @@ let filename_suffix s = let emit_dependencies deps targets = let rec dsort target suff = - match (try Some(Hashtbl.find deps target) with Not_found -> None) with + match Hashtbl.find_opt deps target with | None -> () | Some node -> match node.status with diff --git a/x86/Machregsaux.ml b/x86/Machregsaux.ml index 473e0602..82d3803e 100644 --- a/x86/Machregsaux.ml +++ b/x86/Machregsaux.ml @@ -25,7 +25,7 @@ let _ = let is_scratch_register r = false let name_of_register r = - try Some (Hashtbl.find register_names r) with Not_found -> None + Hashtbl.find_opt register_names r let register_by_name s = Machregs.register_by_name (coqstring_uppercase_ascii_of_camlstring s) |