diff options
| author | Alastair Reid | 2018-07-26 13:12:42 +0100 |
|---|---|---|
| committer | Alastair Reid | 2018-07-26 13:12:42 +0100 |
| commit | 86e29bcbb1597c4ef1f6cae8edbeed42f9a31414 (patch) | |
| tree | 4d60fab5758c6cf5226800fe9779f0f6b4d60564 /src | |
| parent | 7173035868aa45773c86cc555ff88de6dc9b0999 (diff) | |
Warnings: deal with all the deprecation warnings
Changes are:
- String.capitalize -> String.capitalize_ascii
- String.uppercase -> String.uppercase_ascii
- String.lowercase -> String.lowercase_ascii
Basically just making the change that the warning message suggested.
Diffstat (limited to 'src')
| -rw-r--r-- | src/latex.ml | 2 | ||||
| -rw-r--r-- | src/lem_interp/printing_functions.ml | 2 | ||||
| -rw-r--r-- | src/ocaml_backend.ml | 2 | ||||
| -rw-r--r-- | src/pretty_print_lem.ml | 2 | ||||
| -rw-r--r-- | src/process_file.ml | 6 | ||||
| -rw-r--r-- | src/rewriter.ml | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/latex.ml b/src/latex.ml index 0520d074..39db43db 100644 --- a/src/latex.ml +++ b/src/latex.ml @@ -126,7 +126,7 @@ let rec latex_command ?prefix:(prefix="") ?label:(label=None) dir cmd no_loc ((l | Some l -> Printf.sprintf "\\label{%s}" l in let cmd = !opt_prefix_latex ^ prefix ^ cmd in - let lcmd = String.lowercase cmd in (* lowercase to avoid file names differing only by case *) + let lcmd = String.lowercase_ascii cmd in (* lowercase to avoid file names differing only by case *) if StringSet.mem lcmd !commands then latex_command ~label:label dir (cmd ^ "v") no_loc annot else diff --git a/src/lem_interp/printing_functions.ml b/src/lem_interp/printing_functions.ml index a5cb96ff..c17e879f 100644 --- a/src/lem_interp/printing_functions.ml +++ b/src/lem_interp/printing_functions.ml @@ -481,7 +481,7 @@ let rec instr_parms_to_string ps = let pad n s = if String.length s < n then s ^ String.make (n-String.length s) ' ' else s let instruction_to_string (name, parms) = - ((*pad 5*) (String.lowercase name)) ^ " " ^ instr_parms_to_string parms + ((*pad 5*) (String.lowercase_ascii name)) ^ " " ^ instr_parms_to_string parms let print_backtrace_compact printer (IState(stack,_)) = List.iter (fun (e,(env,mem)) -> print_exp printer env mem true e) (compact_stack stack) diff --git a/src/ocaml_backend.ml b/src/ocaml_backend.ml index 236c4222..3e4dc650 100644 --- a/src/ocaml_backend.ml +++ b/src/ocaml_backend.ml @@ -673,7 +673,7 @@ let ocaml_main spec sail_dir = with | End_of_file -> close_in chan; lines := List.rev !lines end; - (("open " ^ String.capitalize spec ^ ";;\n\n") :: !lines + (("open " ^ String.capitalize_ascii spec ^ ";;\n\n") :: !lines @ [ " zinitializze_registers ();"; if !opt_trace_ocaml then " Sail_lib.opt_trace := true;" else " ();"; " Printexc.record_backtrace true;"; diff --git a/src/pretty_print_lem.ml b/src/pretty_print_lem.ml index 99ab2b54..a4d446d3 100644 --- a/src/pretty_print_lem.ml +++ b/src/pretty_print_lem.ml @@ -128,7 +128,7 @@ let doc_id_lem_ctor (Id_aux(i,_)) = | Id("nat") -> string "integer" | Id("Some") -> string "Just" | Id("None") -> string "Nothing" - | Id i -> string (fix_id false (String.capitalize i)) + | Id i -> string (fix_id false (String.capitalize_ascii i)) | DeIid x -> string (Util.zencode_string ("op " ^ x)) let deinfix = function diff --git a/src/process_file.ml b/src/process_file.ml index 958720ea..5fdd3d24 100644 --- a/src/process_file.ml +++ b/src/process_file.ml @@ -271,14 +271,14 @@ let output_lem filename libs defs = operators_module ] @ monad_modules in - let isa_thy_name = String.capitalize filename ^ "_lemmas" in + let isa_thy_name = String.capitalize_ascii filename ^ "_lemmas" in let isa_lemmas = separate hardline [ string ("theory " ^ isa_thy_name); string " imports"; string " Sail.Sail2_values_lemmas"; string " Sail.Sail2_state_lemmas"; - string (" " ^ String.capitalize filename); + string (" " ^ String.capitalize_ascii filename); string "begin"; string ""; State.generate_isa_lemmas !Pretty_print_lem.opt_mwords defs; @@ -292,7 +292,7 @@ let output_lem filename libs defs = open_output_with_check_unformatted (filename ^ ".lem") in (Pretty_print.pp_defs_lem (ot, base_imports) - (o, base_imports @ (String.capitalize types_module :: libs)) + (o, base_imports @ (String.capitalize_ascii types_module :: libs)) defs generated_line); close_output_with_check ext_ot; close_output_with_check ext_o; diff --git a/src/rewriter.ml b/src/rewriter.ml index 0f8bb905..1fb89dee 100644 --- a/src/rewriter.ml +++ b/src/rewriter.ml @@ -266,7 +266,7 @@ let vector_string_to_bit_list l lit = | _ -> raise (Reporting_basic.err_unreachable l "hexchar_to_binlist given unrecognized character") in let s_bin = match lit with - | L_hex s_hex -> List.flatten (List.map hexchar_to_binlist (explode (String.uppercase s_hex))) + | L_hex s_hex -> List.flatten (List.map hexchar_to_binlist (explode (String.uppercase_ascii s_hex))) | L_bin s_bin -> explode s_bin | _ -> raise (Reporting_basic.err_unreachable l "s_bin given non vector literal") in |
