diff options
| author | Robert Norton | 2017-05-08 13:36:43 +0100 |
|---|---|---|
| committer | Robert Norton | 2017-05-08 15:29:55 +0100 |
| commit | ff73bbca7cc4962ce5d4d87e4c664410ed530a31 (patch) | |
| tree | a4071967cc3ff5d090b7bda4d8a41cb2a907016a /src/pretty_print_ocaml.ml | |
| parent | 3406e50f3f4acd5c3535d0e324e5e2e00ba76759 (diff) | |
add some missing things in sail_values and make big_int version the default for set_vector_subrange_bit.
Diffstat (limited to 'src/pretty_print_ocaml.ml')
| -rw-r--r-- | src/pretty_print_ocaml.ml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/pretty_print_ocaml.ml b/src/pretty_print_ocaml.ml index 0ce8d782..3772f549 100644 --- a/src/pretty_print_ocaml.ml +++ b/src/pretty_print_ocaml.ml @@ -52,10 +52,13 @@ open Pretty_print_common let star_sp = star ^^ space +let sanitize_name s = + "_" ^ s + let doc_id_ocaml (Id_aux(i,_)) = match i with | Id("bit") -> string "vbit" - | Id i -> string ("_" ^ i) + | Id i -> string (sanitize_name i) | DeIid x -> (* add an extra space through empty to avoid a closing-comment * token in case of x ending with star. *) @@ -64,7 +67,7 @@ let doc_id_ocaml (Id_aux(i,_)) = let doc_id_ocaml_type (Id_aux(i,_)) = match i with | Id("bit") -> string "vbit" - | Id i -> string ("_" ^ i) + | Id i -> string (sanitize_name i) | DeIid x -> (* add an extra space through empty to avoid a closing-comment * token in case of x ending with star. *) @@ -308,16 +311,16 @@ let doc_exp_ocaml, doc_let_ocaml = let field_f = match t.t with | Tid "bit" | Tabbrev(_,{t=Tid "bit"}) -> string "get_register_field_bit" | _ -> string "get_register_field_vec" in - parens (separate space [field_f; string (String.uncapitalize reg); string_lit (string field)]) + parens (separate space [field_f; string (sanitize_name reg); string_lit (string field)]) | Alias_extract(reg,start,stop) -> if start = stop - then parens (separate space [string "bit_vector_access";string (String.uncapitalize reg);doc_int start]) + then parens (separate space [string "bit_vector_access";string (sanitize_name reg);doc_int start]) else parens - (separate space [string "vector_subrange"; string (String.uncapitalize reg); doc_int start; doc_int stop]) + (separate space [string "vector_subrange"; string (sanitize_name reg); doc_int start; doc_int stop]) | Alias_pair(reg1,reg2) -> parens (separate space [string "vector_concat"; - string (String.uncapitalize reg1); - string (String.uncapitalize reg2)])) + string (sanitize_name reg1); + string (sanitize_name reg2)])) | _ -> doc_id_ocaml id) | E_lit lit -> doc_lit_ocaml false lit | E_cast(typ,e) -> @@ -509,7 +512,7 @@ let doc_exp_ocaml, doc_let_ocaml = (match alias_info with | Alias_field(reg,field) -> parens ((if is_bit then string "set_register_field_bit" else string "set_register_field_v") ^^ space ^^ - string (String.uncapitalize reg) ^^ space ^^string_lit (string field) ^^ space ^^ exp e_new_v) + string (sanitize_name reg) ^^ space ^^string_lit (string field) ^^ space ^^ exp e_new_v) | Alias_extract(reg,start,stop) -> if start = stop then |