# HG changeset patch
# User ballarin
# Date 1228768430 -3600
# Node ID 54d3a31ca0f600fed81dfe50b9c2401c3df20c3d
# Parent  ce100fbc3c8ec7604bf19dcd74feee6bf283276a
Default names for definitions.

diff -r ce100fbc3c8e -r 54d3a31ca0f6 src/FOL/ex/NewLocaleTest.thy
--- a/src/FOL/ex/NewLocaleTest.thy	Mon Dec 08 18:44:24 2008 +0100
+++ b/src/FOL/ex/NewLocaleTest.thy	Mon Dec 08 21:33:50 2008 +0100
@@ -121,7 +121,7 @@
     and lnot ("-- _" [60] 60)
   assumes assoc: "(x && y) && z = x && (y && z)"
     and notnot: "-- (-- x) = x"
-  defines lor_def: (* FIXME *) "x || y == --(-- x && -- y)"
+  defines "x || y == --(-- x && -- y)"
 begin
 
 lemma "x || y = --(-- x && --y)"
diff -r ce100fbc3c8e -r 54d3a31ca0f6 src/Pure/Isar/expression.ML
--- a/src/Pure/Isar/expression.ML	Mon Dec 08 18:44:24 2008 +0100
+++ b/src/Pure/Isar/expression.ML	Mon Dec 08 21:33:50 2008 +0100
@@ -378,8 +378,11 @@
         (case elem of
           Assumes asms => Assumes (asms |> map (fn (a, propps) =>
             (a, map (fn (t, ps) => (close_frees t, no_binds ps)) propps)))
-        | Defines defs => Defines (defs |> map (fn (a, (t, ps)) =>
-            (a, (#2 (LocalDefs.cert_def ctxt (close_frees t)), no_binds ps))))
+        | Defines defs => Defines (defs |> map (fn ((name, atts), (t, ps)) =>
+            let val ((c, _), t') = LocalDefs.cert_def ctxt (close_frees t)
+            in
+              ((Binding.map_base (Thm.def_name_optional c) name, atts), (t', no_binds ps))
+            end))
         | e => e)
       end;