# HG changeset patch
# User haftmann
# Date 1187032961 -7200
# Node ID 4eb5bc6af0087c9ecb30b5179d3b441b9d3d9471
# Parent  ae3eb1766e567c16399b7e9d595a2ac820ba0dcf
simplified

diff -r ae3eb1766e56 -r 4eb5bc6af008 src/Tools/code/code_thingol.ML
--- a/src/Tools/code/code_thingol.ML	Mon Aug 13 21:22:40 2007 +0200
+++ b/src/Tools/code/code_thingol.ML	Mon Aug 13 21:22:41 2007 +0200
@@ -78,11 +78,8 @@
   val is_cons: code -> string -> bool;
   val add_eval_def: string (*bind name*) * iterm -> code -> code;
 
-  val ensure_def: (string -> string) -> (transact -> def * code) -> string
+  val ensure_def: (string -> string) -> (transact -> def * transact) -> string
     -> string -> transact -> transact;
-  val succeed: 'a -> transact -> 'a * code;
-  val fail: string -> transact -> 'a * code;
-  val message: string -> (transact -> 'a) -> transact -> 'a;
   val start_transact: (transact -> 'a * transact) -> code -> 'a * code;
 end;
 
@@ -251,7 +248,6 @@
 
 type code = def Graph.T;
 type transact = Graph.key option * code;
-exception FAIL of string list;
 
 
 (* abstract code *)
@@ -385,12 +381,11 @@
       | add_dp (SOME dep) = add_dep (dep, name);
     fun prep_def def code =
       (check_prep_def code def, code);
-    fun invoke_generator name defgen code =
-      defgen (SOME name, code) handle FAIL msgs => raise FAIL (msg' :: msgs);
     fun add_def false =
           ensure_bot name
           #> add_dp dep
-          #> invoke_generator name defgen
+          #> curry defgen (SOME name)
+          ##> snd
           #-> (fn def => prep_def def)
           #-> (fn def => add_def_incr (name, def)
           #> postprocess_def (name, def))
@@ -402,25 +397,10 @@
     |> pair dep
   end;
 
-fun succeed some (_, code) = (some, code);
-
-fun fail msg (_, code) = raise FAIL [msg];
-
-fun message msg f trns =
-  f trns handle FAIL msgs =>
-    raise FAIL (msg :: msgs);
-
 fun start_transact f code =
-  let
-    fun handle_fail f x =
-      (f x
-      handle FAIL msgs =>
-        (error o cat_lines) ("Code generation failed, while:" :: msgs))
-  in
-    (NONE, code)
-    |> handle_fail f
-    |-> (fn x => fn (_, code) => (x, code))
-  end;
+  (NONE, code)
+  |> f
+  |-> (fn x => fn (_, code) => (x, code));
 
 fun add_eval_def (name, t) code =
   code