--- a/src/HOL/Data_Structures/AVL_Map.thy Sat Dec 05 16:13:28 2015 +0100
+++ b/src/HOL/Data_Structures/AVL_Map.thy Sat Dec 05 16:33:20 2015 +0100
@@ -42,7 +42,7 @@
proof (standard, goal_cases)
case 1 show ?case by simp
next
- case 2 thus ?case by(simp add: lookup_eq)
+ case 2 thus ?case by(simp add: lookup_map_of)
next
case 3 thus ?case by(simp add: inorder_update)
next
--- a/src/HOL/Data_Structures/Lookup2.thy Sat Dec 05 16:13:28 2015 +0100
+++ b/src/HOL/Data_Structures/Lookup2.thy Sat Dec 05 16:33:20 2015 +0100
@@ -14,7 +14,8 @@
"lookup (Node _ l (a,b) r) x =
(case cmp x a of LT \<Rightarrow> lookup l x | GT \<Rightarrow> lookup r x | EQ \<Rightarrow> Some b)"
-lemma lookup_eq: "sorted1(inorder t) \<Longrightarrow> lookup t x = map_of (inorder t) x"
+lemma lookup_map_of:
+ "sorted1(inorder t) \<Longrightarrow> lookup t x = map_of (inorder t) x"
by(induction t) (auto simp: map_of_simps split: option.split)
end
\ No newline at end of file
--- a/src/HOL/Data_Structures/RBT_Map.thy Sat Dec 05 16:13:28 2015 +0100
+++ b/src/HOL/Data_Structures/RBT_Map.thy Sat Dec 05 16:33:20 2015 +0100
@@ -70,7 +70,7 @@
proof (standard, goal_cases)
case 1 show ?case by simp
next
- case 2 thus ?case by(simp add: lookup_eq)
+ case 2 thus ?case by(simp add: lookup_map_of)
next
case 3 thus ?case by(simp add: inorder_update)
next
--- a/src/HOL/Data_Structures/Tree234_Map.thy Sat Dec 05 16:13:28 2015 +0100
+++ b/src/HOL/Data_Structures/Tree234_Map.thy Sat Dec 05 16:33:20 2015 +0100
@@ -113,7 +113,8 @@
subsection "Functional correctness"
-lemma lookup: "sorted1(inorder t) \<Longrightarrow> lookup t x = map_of (inorder t) x"
+lemma lookup_map_of:
+ "sorted1(inorder t) \<Longrightarrow> lookup t x = map_of (inorder t) x"
by (induction t) (auto simp: map_of_simps split: option.split)
@@ -163,11 +164,11 @@
subsection \<open>Overall Correctness\<close>
-interpretation T234_Map: Map_by_Ordered
+interpretation Map_by_Ordered
where empty = Leaf and lookup = lookup and update = update and delete = delete
and inorder = inorder and inv = bal
proof (standard, goal_cases)
- case 2 thus ?case by(simp add: lookup)
+ case 2 thus ?case by(simp add: lookup_map_of)
next
case 3 thus ?case by(simp add: inorder_update)
next
--- a/src/HOL/Data_Structures/Tree23_Map.thy Sat Dec 05 16:13:28 2015 +0100
+++ b/src/HOL/Data_Structures/Tree23_Map.thy Sat Dec 05 16:33:20 2015 +0100
@@ -72,7 +72,8 @@
subsection \<open>Functional Correctness\<close>
-lemma lookup: "sorted1(inorder t) \<Longrightarrow> lookup t x = map_of (inorder t) x"
+lemma lookup_map_of:
+ "sorted1(inorder t) \<Longrightarrow> lookup t x = map_of (inorder t) x"
by (induction t) (auto simp: map_of_simps split: option.split)
@@ -118,11 +119,11 @@
subsection \<open>Overall Correctness\<close>
-interpretation T23_Map: Map_by_Ordered
+interpretation Map_by_Ordered
where empty = Leaf and lookup = lookup and update = update and delete = delete
and inorder = inorder and inv = bal
proof (standard, goal_cases)
- case 2 thus ?case by(simp add: lookup)
+ case 2 thus ?case by(simp add: lookup_map_of)
next
case 3 thus ?case by(simp add: inorder_update)
next
--- a/src/HOL/Data_Structures/Tree_Map.thy Sat Dec 05 16:13:28 2015 +0100
+++ b/src/HOL/Data_Structures/Tree_Map.thy Sat Dec 05 16:33:20 2015 +0100
@@ -30,7 +30,7 @@
subsection "Functional Correctness Proofs"
-lemma lookup_eq:
+lemma lookup_map_of:
"sorted1(inorder t) \<Longrightarrow> lookup t x = map_of (inorder t) x"
by (induction t) (auto simp: map_of_simps split: option.split)
@@ -48,7 +48,7 @@
proof (standard, goal_cases)
case 1 show ?case by simp
next
- case 2 thus ?case by(simp add: lookup_eq)
+ case 2 thus ?case by(simp add: lookup_map_of)
next
case 3 thus ?case by(simp add: inorder_update)
next