
diff -r efbdfcaa6258 -r e12779b8f5b6 src/HOL/Data_Structures/Trie_Map.thy
--- a/src/HOL/Data_Structures/Trie_Map.thy	Fri May 10 11:20:02 2019 +0200
+++ b/src/HOL/Data_Structures/Trie_Map.thy	Sat May 11 15:27:11 2019 +0200
@@ -13,7 +13,7 @@
 
 type_synonym 'a mapi = "'a rbt"
 
-datatype 'a trie_map = Lf | Nd bool "('a * 'a trie_map) mapi"
+datatype 'a trie_map = Nd bool "('a * 'a trie_map) mapi"
 
 text \<open>In principle one should be able to given an implementation of tries
 once and for all for any map implementation and not just for a specific one (RBT) as done here.
@@ -30,19 +30,15 @@
 done
 
 fun isin :: "('a::linorder) trie_map \<Rightarrow> 'a list \<Rightarrow> bool" where
-"isin Lf xs = False" |
 "isin (Nd b m) [] = b" |
 "isin (Nd b m) (x # xs) = (case lookup m x of None \<Rightarrow> False | Some t \<Rightarrow> isin t xs)"
 
 fun insert :: "('a::linorder) list \<Rightarrow> 'a trie_map \<Rightarrow> 'a trie_map" where
-"insert [] Lf = Nd True empty" |
 "insert [] (Nd b m) = Nd True m" |
-"insert (x#xs) Lf = Nd False (update x (insert xs Lf) empty)" |
 "insert (x#xs) (Nd b m) =
-  Nd b (update x (insert xs (case lookup m x of None \<Rightarrow> Lf | Some t \<Rightarrow> t)) m)"
+  Nd b (update x (insert xs (case lookup m x of None \<Rightarrow> Nd False Leaf | Some t \<Rightarrow> t)) m)"
 
 fun delete :: "('a::linorder) list \<Rightarrow> 'a trie_map \<Rightarrow> 'a trie_map" where
-"delete xs Lf = Lf" |
 "delete [] (Nd b m) = Nd False m" |
 "delete (x#xs) (Nd b m) = Nd b
    (case lookup m x of
@@ -55,31 +51,29 @@
 text \<open>Proof by stepwise refinement. First abstract to type @{typ "'a trie"}.\<close>
 
 fun abs :: "'a::linorder trie_map \<Rightarrow> 'a trie" where
-"abs Lf = Trie_Fun.Lf" |
-"abs (Nd b t) = Trie_Fun.Nd b (\<lambda>a. map_option abs (lookup t a))"
+"abs (Nd b t) = Trie_Fun0.Nd b (\<lambda>a. map_option abs (lookup t a))"
 
 fun invar :: "('a::linorder)trie_map \<Rightarrow> bool" where
-"invar Lf = True" |
 "invar (Nd b m) = (M.invar m \<and> (\<forall>a t. lookup m a = Some t \<longrightarrow> invar t))"
 
-lemma isin_abs: "isin t xs = Trie_Fun.isin (abs t) xs"
+lemma isin_abs: "isin t xs = Trie_Fun0.isin (abs t) xs"
 apply(induction t xs rule: isin.induct)
 apply(auto split: option.split)
 done
 
-lemma abs_insert: "invar t \<Longrightarrow> abs(insert xs t) = Trie_Fun.insert xs (abs t)"
+lemma abs_insert: "invar t \<Longrightarrow> abs(insert xs t) = Trie_Fun0.insert xs (abs t)"
 apply(induction xs t rule: insert.induct)
-apply(auto simp: M.map_specs split: option.split)
+apply(auto simp: M.map_specs RBT_Set.empty_def[symmetric] split: option.split)
 done
 
-lemma abs_delete: "invar t \<Longrightarrow> abs(delete xs t) = Trie_Fun.delete xs (abs t)"
+lemma abs_delete: "invar t \<Longrightarrow> abs(delete xs t) = Trie_Fun0.delete xs (abs t)"
 apply(induction xs t rule: delete.induct)
 apply(auto simp: M.map_specs split: option.split)
 done
 
 lemma invar_insert: "invar t \<Longrightarrow> invar (insert xs t)"
 apply(induction xs t rule: insert.induct)
-apply(auto simp: M.map_specs split: option.split)
+apply(auto simp: M.map_specs RBT_Set.empty_def[symmetric] split: option.split)
 done
 
 lemma invar_delete: "invar t \<Longrightarrow> invar (delete xs t)"
@@ -90,7 +84,7 @@
 text \<open>Overall correctness w.r.t. the \<open>Set\<close> ADT:\<close>
 
 interpretation S2: Set
-where empty = Lf and isin = isin and insert = insert and delete = delete
+where empty = "Nd False Leaf" and isin = isin and insert = insert and delete = delete
 and set = "set o abs" and invar = invar
 proof (standard, goal_cases)
   case 1 show ?case by (simp)
@@ -101,7 +95,7 @@
 next
   case 4 thus ?case by (simp add: set_delete abs_delete)
 next
-  case 5 thus ?case by (simp)
+  case 5 thus ?case by (simp add: M.map_specs RBT_Set.empty_def[symmetric])
 next
   case 6 thus ?case by (simp add: invar_insert)
 next




