# HG changeset patch
# User haftmann
# Date 1223388445 -7200
# Node ID 376b9c083b0463b543184c36dac13568587a6ca8
# Parent  095fe24b48fdea21ca8ff403349d7da669c179da
tuned code setup

diff -r 095fe24b48fd -r 376b9c083b04 src/HOL/MicroJava/BV/BVExample.thy
--- a/src/HOL/MicroJava/BV/BVExample.thy	Tue Oct 07 16:07:24 2008 +0200
+++ b/src/HOL/MicroJava/BV/BVExample.thy	Tue Oct 07 16:07:25 2008 +0200
@@ -37,7 +37,7 @@
 subclass relation, method and field lookup are computed only once:
 *}
 lemma class_Object [simp]:
-  "class E Object = Some (arbitrary, [],[])"
+  "class E Object = Some (undefined, [],[])"
   by (simp add: class_def system_defs E_def)
 
 lemma class_NullPointer [simp]:
@@ -409,10 +409,9 @@
 
 section "Example for code generation: inferring method types"
 
-constdefs
-  test_kil :: "jvm_prog \<Rightarrow> cname \<Rightarrow> ty list \<Rightarrow> ty \<Rightarrow> nat \<Rightarrow> nat \<Rightarrow> 
-             exception_table \<Rightarrow> instr list \<Rightarrow> JVMType.state list"
-  "test_kil G C pTs rT mxs mxl et instr ==
+definition test_kil :: "jvm_prog \<Rightarrow> cname \<Rightarrow> ty list \<Rightarrow> ty \<Rightarrow> nat \<Rightarrow> nat \<Rightarrow> 
+             exception_table \<Rightarrow> instr list \<Rightarrow> JVMType.state list" where
+  "test_kil G C pTs rT mxs mxl et instr =
    (let first  = Some ([],(OK (Class C))#((map OK pTs))@(replicate mxl Err));
         start  = OK first#(replicate (size instr - 1) (OK None))
     in  kiljvm G mxs (1+size pTs+mxl) rT et instr start)"
@@ -433,23 +432,30 @@
   apply simp+
   done
 
-constdefs
-  some_elem :: "'a set \<Rightarrow> 'a"
-  "some_elem == (%S. SOME x. x : S)"
-
-lemma [code]:
-"iter f step ss w =
- while (%(ss,w). w \<noteq> {})
-       (%(ss,w). let p = some_elem w
-                 in propa f (step p (ss!p)) ss (w-{p}))
-       (ss,w)"
-  by (unfold iter_def some_elem_def, rule refl)
+definition some_elem :: "'a set \<Rightarrow> 'a" where
+  "some_elem = (%S. SOME x. x : S)"
 
 consts_code
   "some_elem" ("hd")
 
-code_const some_elem
-  (SML "hd")
+text {* This code setup is just a demonstration and \emph{not} sound! *}
+
+lemma False
+proof -
+  have "some_elem (set [False, True]) = False"
+    by evaluation
+  moreover have "some_elem (set [True, False]) = True"
+    by evaluation
+  ultimately show False
+    by (simp add: some_elem_def)
+qed
+
+lemma [code]:
+  "iter f step ss w = while (\<lambda>(ss, w). \<not> (is_empty w))
+    (\<lambda>(ss, w).
+        let p = some_elem w in propa f (step p (ss ! p)) ss (w - {p}))
+    (ss, w)"
+  unfolding iter_def is_empty_def some_elem_def ..
 
 lemma JVM_sup_unfold [code]:
  "JVMType.sup S m n = lift2 (Opt.sup
@@ -460,9 +466,7 @@
          Listn.sl_def upto_esl_def JType.esl_def Err.esl_def) 
   by simp
 
-lemmas [code] =
-  meta_eq_to_obj_eq [OF JType.sup_def [unfolded exec_lub_def]]
-  meta_eq_to_obj_eq [OF JVM_le_unfold]
+lemmas [code] = JType.sup_def [unfolded exec_lub_def] JVM_le_unfold
 
 lemmas [code ind] = rtranclp.rtrancl_refl converse_rtranclp_into_rtranclp
 
diff -r 095fe24b48fd -r 376b9c083b04 src/HOL/Real/RealDef.thy
--- a/src/HOL/Real/RealDef.thy	Tue Oct 07 16:07:24 2008 +0200
+++ b/src/HOL/Real/RealDef.thy	Tue Oct 07 16:07:25 2008 +0200
@@ -563,8 +563,8 @@
   real :: "'a => real"
 
 defs (overloaded)
-  real_of_nat_def [code inline]: "real == real_of_nat"
-  real_of_int_def [code inline]: "real == real_of_int"
+  real_of_nat_def [code unfold]: "real == real_of_nat"
+  real_of_int_def [code unfold]: "real == real_of_int"
 
 lemma real_eq_of_nat: "real = of_nat"
   unfolding real_of_nat_def ..
@@ -1157,6 +1157,4 @@
   | real_of_int i = (i, 1);
 *}
 
-declare real_of_int_of_nat_eq [symmetric, code]
-
 end