1.1 --- a/src/HOL/ex/NormalForm.thy	Tue Sep 23 18:11:43 2008 +0200
     1.2 +++ b/src/HOL/ex/NormalForm.thy	Tue Sep 23 18:11:44 2008 +0200
     1.3 @@ -91,8 +91,7 @@
     1.4  lemma "map (%x. case x of None \<Rightarrow> False | Some y \<Rightarrow> True) [None, Some ()] = [False, True]" by normalization
     1.5  
     1.6  lemma "last [a, b, c] = c" by normalization rule
     1.7 -lemma "last ([a, b, c] @ xs) = (if null xs then c else last xs)"
     1.8 -  by normalization rule
     1.9 +lemma "last ([a, b, c] @ xs) = last (c # xs)" by normalization rule
    1.10  
    1.11  lemma "(2::int) + 3 - 1 + (- k) * 2 = 4 + - k * 2" by normalization rule
    1.12  lemma "(-4::int) * 2 = -8" by normalization

     2.1 --- a/src/Tools/nbe.ML	Tue Sep 23 18:11:43 2008 +0200
     2.2 +++ b/src/Tools/nbe.ML	Tue Sep 23 18:11:44 2008 +0200
     2.3 @@ -18,7 +18,7 @@
     2.4      | Abs of (int * (Univ list -> Univ)) * Univ list;
     2.5    val apps: Univ -> Univ list -> Univ        (*explicit applications*)
     2.6    val abss: int -> (Univ list -> Univ) -> Univ
     2.7 -                                            (*abstractions as closures*)
     2.8 +                                             (*abstractions as closures*)
     2.9  
    2.10    val univs_ref: (unit -> Univ list -> Univ list) option ref
    2.11    val trace: bool ref
    2.12 @@ -90,6 +90,7 @@
    2.13  fun ml_cases t cs =
    2.14    "(case " ^ t ^ " of " ^ space_implode " | " (map (fn (p, t) => p ^ " => " ^ t) cs) ^ ")";
    2.15  fun ml_Let d e = "let\n" ^ d ^ " in " ^ e ^ " end";
    2.16 +fun ml_as v t = "(" ^ v ^ " as " ^ t ^ ")";
    2.17  
    2.18  fun ml_list es = "[" ^ commas es ^ "]";
    2.19  
    2.20 @@ -121,17 +122,21 @@
    2.21  
    2.22  val univs_cookie = (name_ref, univs_ref);
    2.23  
    2.24 -fun nbe_fun "" = "nbe_value"
    2.25 -  | nbe_fun c = "c_" ^ translate_string (fn "." => "_" | c => c) c;
    2.26 +fun nbe_fun 0 "" = "nbe_value"
    2.27 +  | nbe_fun i c = "c_" ^ translate_string (fn "." => "_" | c => c) c ^ "_" ^ string_of_int i;
    2.28  fun nbe_dict v n = "d_" ^ v ^ "_" ^ string_of_int n;
    2.29  fun nbe_bound v = "v_" ^ v;
    2.30 +fun nbe_default v = "w_" ^ v;
    2.31  
    2.32  (*note: these three are the "turning spots" where proper argument order is established!*)
    2.33  fun nbe_apps t [] = t
    2.34    | nbe_apps t ts = name_apps `$$` [t, ml_list (rev ts)];
    2.35 -fun nbe_apps_local c ts = nbe_fun c `$` ml_list (rev ts);
    2.36 -fun nbe_apps_constr idx ts =
    2.37 -  name_const `$` ("(" ^ string_of_int idx ^ ", " ^ ml_list (rev ts) ^ ")");
    2.38 +fun nbe_apps_local i c ts = nbe_fun i c `$` ml_list (rev ts);
    2.39 +fun nbe_apps_constr idx_of c ts =
    2.40 +  let
    2.41 +    val c' = if !trace then string_of_int (idx_of c) ^ " (*" ^ c ^ "*)"
    2.42 +      else string_of_int (idx_of c);
    2.43 +  in name_const `$` ("(" ^ c' ^ ", " ^ ml_list (rev ts) ^ ")") end;
    2.44  
    2.45  fun nbe_abss 0 f = f `$` ml_list []
    2.46    | nbe_abss n f = name_abss `$$` [string_of_int n, f];
    2.47 @@ -147,7 +152,7 @@
    2.48      fun prep_eqns (c, (vs, eqns)) =
    2.49        let
    2.50          val dicts = maps (fn (v, sort) => map_index (nbe_dict v o fst) sort) vs;
    2.51 -        val num_args = length dicts + (length o fst o hd) eqns;
    2.52 +        val num_args = length dicts + ((length o fst o hd) eqns);
    2.53        in (c, (num_args, (dicts, eqns))) end;
    2.54      val eqnss' = map prep_eqns eqnss;
    2.55  
    2.56 @@ -155,20 +160,20 @@
    2.57        let
    2.58          val ts' = (maps o map) assemble_idict dss @ ts;
    2.59        in case AList.lookup (op =) eqnss' c
    2.60 -       of SOME (n, _) => if n <= length ts'
    2.61 -            then let val (ts1, ts2) = chop n ts'
    2.62 -            in nbe_apps (nbe_apps_local c ts1) ts2
    2.63 -            end else nbe_apps (nbe_abss n (nbe_fun c)) ts'
    2.64 +       of SOME (num_args, _) => if num_args <= length ts'
    2.65 +            then let val (ts1, ts2) = chop num_args ts'
    2.66 +            in nbe_apps (nbe_apps_local 0 c ts1) ts2
    2.67 +            end else nbe_apps (nbe_abss num_args (nbe_fun 0 c)) ts'
    2.68          | NONE => if member (op =) deps c
    2.69 -            then nbe_apps (nbe_fun c) ts'
    2.70 -            else nbe_apps_constr (idx_of c) ts'
    2.71 +            then nbe_apps (nbe_fun 0 c) ts'
    2.72 +            else nbe_apps_constr idx_of c ts'
    2.73        end
    2.74      and assemble_idict (DictConst (inst, dss)) =
    2.75            assemble_constapp inst dss []
    2.76        | assemble_idict (DictVar (supers, (v, (n, _)))) =
    2.77            fold_rev (fn super => assemble_constapp super [] o single) supers (nbe_dict v n);
    2.78  
    2.79 -    fun assemble_iterm constapp =
    2.80 +    fun assemble_iterm match_cont constapp =
    2.81        let
    2.82          fun of_iterm t =
    2.83            let
    2.84 @@ -180,28 +185,38 @@
    2.85                nbe_apps (nbe_abss 1 (ml_abs (ml_list [nbe_bound v]) (of_iterm t))) ts
    2.86            | of_iapp (ICase (((t, _), cs), t0)) ts =
    2.87                nbe_apps (ml_cases (of_iterm t) (map (pairself of_iterm) cs
    2.88 -                @ [("_", of_iterm t0)])) ts
    2.89 +                @ [("_", case match_cont of SOME s => s | NONE => of_iterm t0)])) ts
    2.90        in of_iterm end;
    2.91  
    2.92 +    fun assemble_eqn c dicts default_args (i, (args, rhs)) =
    2.93 +      let
    2.94 +        val is_eval = (c = "");
    2.95 +        val default_rhs = nbe_apps_local (i+1) c (dicts @ default_args);
    2.96 +        val match_cont = if is_eval then NONE else SOME default_rhs;
    2.97 +        val assemble_arg = assemble_iterm NONE
    2.98 +          (fn c => fn _ => fn ts => nbe_apps_constr idx_of c ts);
    2.99 +        val assemble_rhs = assemble_iterm match_cont assemble_constapp;
   2.100 +        val eqns = if is_eval then
   2.101 +            [([ml_list (rev (dicts @ map assemble_arg args))], assemble_rhs rhs)]
   2.102 +          else
   2.103 +            [([ml_list (rev (dicts @ map2 ml_as default_args
   2.104 +                (map assemble_arg args)))], assemble_rhs rhs),
   2.105 +              ([ml_list (rev (dicts @ default_args))], default_rhs)]
   2.106 +      in (nbe_fun i c, eqns) end;
   2.107 +
   2.108      fun assemble_eqns (c, (num_args, (dicts, eqns))) =
   2.109        let
   2.110 -        val assemble_arg = assemble_iterm
   2.111 -          (fn c => fn _ => fn ts => nbe_apps_constr (idx_of c) ts);
   2.112 -        val assemble_rhs = assemble_iterm assemble_constapp;
   2.113 -        fun assemble_eqn (args, rhs) =
   2.114 -          ([ml_list (rev (dicts @ map assemble_arg args))], assemble_rhs rhs);
   2.115 -        val default_args = map nbe_bound (Name.invent_list [] "a" num_args);
   2.116 -        val default_eqn = if c = "" then NONE
   2.117 -          else SOME ([ml_list (rev default_args)],
   2.118 -            nbe_apps_constr (idx_of c) default_args);
   2.119 -      in
   2.120 -        ((nbe_fun c, map assemble_eqn eqns @ the_list default_eqn),
   2.121 -          nbe_abss num_args (nbe_fun c))
   2.122 -      end;
   2.123 +        val default_args = map nbe_default
   2.124 +          (Name.invent_list [] "a" (num_args - length dicts));
   2.125 +        val eqns' = map_index (assemble_eqn c dicts default_args) eqns
   2.126 +          @ (if c = "" then [] else [(nbe_fun (length eqns) c,
   2.127 +            [([ml_list (rev (dicts @ default_args))],
   2.128 +              nbe_apps_constr idx_of c (dicts @ default_args))])]);
   2.129 +      in (eqns', nbe_abss num_args (nbe_fun 0 c)) end;
   2.130  
   2.131      val (fun_vars, fun_vals) = map_split assemble_eqns eqnss';
   2.132 -    val deps_vars = ml_list (map nbe_fun deps);
   2.133 -  in ml_abs deps_vars (ml_Let (ml_fundefs fun_vars) (ml_list fun_vals)) end;
   2.134 +    val deps_vars = ml_list (map (nbe_fun 0) deps);
   2.135 +  in ml_abs deps_vars (ml_Let (ml_fundefs (flat fun_vars)) (ml_list fun_vals)) end;
   2.136  
   2.137  (* code compilation *)
   2.138  
   2.139 @@ -463,3 +478,4 @@
   2.140  end;
   2.141  
   2.142  end;
   2.143 + 
   2.144 \ No newline at end of file