From 8247d49d993777d0721c1aebeec0909dacd1a2cb Mon Sep 17 00:00:00 2001
From: Brian Campbell
Date: Tue, 24 Oct 2017 10:11:08 +0100
Subject: Remove special case for boolean (as opposed to bool)

---
 src/pretty_print_lem.ml | 1 -
 src/spec_analysis.ml    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/pretty_print_lem.ml b/src/pretty_print_lem.ml
index 0cb95db1..ac766e89 100644
--- a/src/pretty_print_lem.ml
+++ b/src/pretty_print_lem.ml
@@ -212,7 +212,6 @@ let doc_typ_lem, doc_atomic_typ_lem =
       | _ -> atomic_typ sequential mwords atyp_needed ty
     and atomic_typ sequential mwords atyp_needed ((Typ_aux (t, _)) as ty) = match t with
       | Typ_id (Id_aux (Id "bool",_)) -> string "bool"
-      | Typ_id (Id_aux (Id "boolean",_)) -> string "bool"
       | Typ_id (Id_aux (Id "bit",_)) -> string "bitU"
       | Typ_id (id) ->
          (*if List.exists ((=) (string_of_id id)) regtypes
diff --git a/src/spec_analysis.ml b/src/spec_analysis.ml
index c896f07a..c9e4c6e7 100644
--- a/src/spec_analysis.ml
+++ b/src/spec_analysis.ml
@@ -189,7 +189,7 @@ let is_within_machine64 candidate constraints = is_within_range candidate int64_
 let conditional_add typ_or_exp bound used id =
   let known_list =
     if typ_or_exp (*true for typ*)
-    then ["bit";"vector";"unit";"string";"int";"bool";"boolean"]
+    then ["bit";"vector";"unit";"string";"int";"bool"]
     else ["=="; "!="; "|";"~";"&";"add_int"] in
   let i = (string_of_id id) in
   if Nameset.mem i bound || List.mem i known_list
-- 
cgit v1.2.3