Haskell now living in the RealWorld

--- a/src/HOL/Library/Array.thy	Tue Jul 29 14:07:23 2008 +0200
+++ b/src/HOL/Library/Array.thy	Tue Jul 29 14:20:22 2008 +0200
@@ -198,7 +198,7 @@
 
 subsubsection {* Haskell *}
 
-code_type array (Haskell "STArray '_s _")
+code_type array (Haskell "STArray/ RealWorld/ _")
 code_const Array (Haskell "error/ \"bare Array\"")
 code_const Array.new' (Haskell "newArray/ (0,/ _)")
 code_const Array.of_list' (Haskell "newListArray/ (0,/ _)")

--- a/src/HOL/Library/Heap_Monad.thy	Tue Jul 29 14:07:23 2008 +0200
+++ b/src/HOL/Library/Heap_Monad.thy	Tue Jul 29 14:20:22 2008 +0200
@@ -169,14 +169,6 @@
 in [(@{const_syntax "run"}, tr')] end;
 *}
 
-subsubsection {* Plain evaluation *}
-
-definition
-  evaluate :: "'a Heap \<Rightarrow> 'a"
-where
-  [code del]: "evaluate f = (case execute f Heap.empty
-    of (Inl x, _) \<Rightarrow> x)"
-
 
 subsection {* Monad properties *}
 
@@ -330,6 +322,7 @@
 import qualified Data.STRef;
 import qualified Data.Array.ST;
 
+type RealWorld = Control.Monad.ST.RealWorld;
 type ST s a = Control.Monad.ST.ST s a;
 type STRef s a = Data.STRef.STRef s a;
 type STArray s a = Data.Array.ST.STArray s Int a;
@@ -356,16 +349,15 @@
 writeArray :: STArray s a -> Int -> a -> ST s ();
 writeArray = Data.Array.ST.writeArray;*}
 
-code_reserved Haskell ST STRef Array
+code_reserved Haskell RealWorld ST STRef Array
   runST
   newSTRef reasSTRef writeSTRef
   newArray newListArray lengthArray readArray writeArray
 
 text {* Monad *}
 
-code_type Heap (Haskell "ST '_s _")
-code_const Heap (Haskell "error \"bare Heap\")")
-code_const evaluate (Haskell "runST")
+code_type Heap (Haskell "ST/ RealWorld/ _")
+code_const Heap (Haskell "error/ \"bare Heap\"")
 code_monad run "op \<guillemotright>=" Haskell
 code_const return (Haskell "return")
 code_const "Heap_Monad.Fail" (Haskell "_")

--- a/src/HOL/Library/Ref.thy	Tue Jul 29 14:07:23 2008 +0200
+++ b/src/HOL/Library/Ref.thy	Tue Jul 29 14:20:22 2008 +0200
@@ -82,7 +82,7 @@
 
 subsubsection {* Haskell *}
 
-code_type ref (Haskell "STRef '_s _")
+code_type ref (Haskell "STRef/ RealWorld/ _")
 code_const Ref (Haskell "error/ \"bare Ref\"")
 code_const Ref.new (Haskell "newSTRef")
 code_const Ref.lookup (Haskell "readSTRef")