diff options
| author | Christopher Pulte | 2016-10-06 17:23:28 +0100 |
|---|---|---|
| committer | Christopher Pulte | 2016-10-06 17:23:28 +0100 |
| commit | 99fdb2e003b7433dc06372d2ffebd6d5111ce46d (patch) | |
| tree | f48c22ae3529fccd854877fa1b5490fea70d3ecb /src/pretty_print.ml | |
| parent | 1d105202240057e8a1c5c835a2655cf8112167fe (diff) | |
move type definitions that both interpreter and shallow embedding use to sail_impl_base, add sail_impl_base.outcome, add interp_inter_imp auxiliary functions, make prompt use sail_impl_base.outcome
Diffstat (limited to 'src/pretty_print.ml')
| -rw-r--r-- | src/pretty_print.ml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/pretty_print.ml b/src/pretty_print.ml index 7f9866f4..b73cb6e1 100644 --- a/src/pretty_print.ml +++ b/src/pretty_print.ml @@ -2079,7 +2079,7 @@ let doc_id_lem_type (Id_aux(i,_)) = let doc_id_lem_ctor (Id_aux(i,_)) = match i with - | Id("bit") -> string "bit" + | Id("bit") -> string "bitU" | Id("int") -> string "integer" | Id("nat") -> string "integer" | Id("Some") -> string "Just" @@ -2145,7 +2145,9 @@ let doc_typ_lem, doc_atomic_typ_lem = if atyp_needed then parens tpp else tpp | _ -> atomic_typ atyp_needed regtypes ty and atomic_typ atyp_needed regtypes ((Typ_aux (t, _)) as ty) = match t with - | Typ_id (Id_aux (Id "bool",_)) -> string "bit" + | Typ_id (Id_aux (Id "bool",_)) -> string "bitU" + | Typ_id (Id_aux (Id "boolean",_)) -> string "bitU" + | Typ_id (Id_aux (Id "bit",_)) -> string "bitU" | Typ_id ((Id_aux (Id name,_)) as id) -> if List.exists ((=) name) regtypes then string "register" @@ -3037,7 +3039,7 @@ let reg_decls (Defs defs) = (separate space [string "type";string "regstate";equals]) (anglebars ((separate_map (semi ^^ break 1)) - (fun (reg,_) -> separate space [string (String.lowercase reg);colon;string "vector bit"]) + (fun (reg,_) -> separate space [string (String.lowercase reg);colon;string "vector bitU"]) regs )) in |