1.1 --- a/src/HOL/Nominal/nominal_primrec.ML Fri Dec 05 20:38:40 2008 +0100
1.2 +++ b/src/HOL/Nominal/nominal_primrec.ML Sat Dec 06 08:45:38 2008 +0100
1.3 @@ -230,7 +230,7 @@
1.4 fun gen_primrec_i note def alt_name invs fctxt eqns_atts thy =
1.5 let
1.6 val (raw_eqns, atts) = split_list eqns_atts;
1.7 - val eqns = map (apfst Name.name_of) raw_eqns;
1.8 + val eqns = map (apfst Binding.base_name) raw_eqns;
1.9 val dt_info = NominalPackage.get_nominal_datatypes thy;
1.10 val rec_eqns = fold_rev (process_eqn thy o snd) eqns [];
1.11 val lsrs :: lsrss = maps (fn (_, (_, _, eqns)) =>
2.1 --- a/src/HOL/ROOT.ML Fri Dec 05 20:38:40 2008 +0100
2.2 +++ b/src/HOL/ROOT.ML Sat Dec 06 08:45:38 2008 +0100
2.3 @@ -3,7 +3,7 @@
2.4 Classical Higher-order Logic -- batteries included.
2.5 *)
2.6
2.7 -use_thy "Complex/Complex_Main";
2.8 +use_thy "Complex_Main";
2.9
2.10 val HOL_proofs = ! Proofterm.proofs;
2.11
3.1 --- a/src/HOL/Tools/function_package/fundef_common.ML Fri Dec 05 20:38:40 2008 +0100
3.2 +++ b/src/HOL/Tools/function_package/fundef_common.ML Sat Dec 06 08:45:38 2008 +0100
3.3 @@ -82,7 +82,7 @@
3.4 psimps, pinducts, termination, defname}) phi =
3.5 let
3.6 val term = Morphism.term phi val thm = Morphism.thm phi val fact = Morphism.fact phi
3.7 - val name = Name.name_of o Morphism.binding phi o Binding.name
3.8 + val name = Binding.base_name o Morphism.binding phi o Binding.name
3.9 in
3.10 FundefCtxData { add_simps = add_simps, case_names = case_names,
3.11 fs = map term fs, R = term R, psimps = fact psimps,
4.1 --- a/src/HOL/Tools/function_package/fundef_package.ML Fri Dec 05 20:38:40 2008 +0100
4.2 +++ b/src/HOL/Tools/function_package/fundef_package.ML Sat Dec 06 08:45:38 2008 +0100
4.3 @@ -96,8 +96,8 @@
4.4 fun gen_add_fundef is_external prep fixspec eqnss config flags lthy =
4.5 let
4.6 val ((fixes0, spec0), ctxt') = prep fixspec (map (fn (n_a, eq) => [(n_a, [eq])]) eqnss) lthy
4.7 - val fixes = map (apfst (apfst Name.name_of)) fixes0;
4.8 - val spec = map (apfst (apfst Name.name_of)) spec0;
4.9 + val fixes = map (apfst (apfst Binding.base_name)) fixes0;
4.10 + val spec = map (apfst (apfst Binding.base_name)) spec0;
4.11 val (eqs, post, sort_cont, cnames) = FundefCommon.get_preproc lthy config flags ctxt' fixes spec
4.12
4.13 val defname = mk_defname fixes
5.1 --- a/src/HOL/Tools/inductive_package.ML Fri Dec 05 20:38:40 2008 +0100
5.2 +++ b/src/HOL/Tools/inductive_package.ML Sat Dec 06 08:45:38 2008 +0100
5.3 @@ -260,7 +260,7 @@
5.4
5.5 fun check_rule ctxt cs params ((binding, att), rule) =
5.6 let
5.7 - val name = Name.name_of binding;
5.8 + val err_name = Binding.display binding;
5.9 val params' = Term.variant_frees rule (Logic.strip_params rule);
5.10 val frees = rev (map Free params');
5.11 val concl = subst_bounds (frees, Logic.strip_assums_concl rule);
5.12 @@ -278,7 +278,7 @@
5.13
5.14 fun check_prem' prem t =
5.15 if head_of t mem cs then
5.16 - check_ind (err_in_prem ctxt name rule prem) t
5.17 + check_ind (err_in_prem ctxt err_name rule prem) t
5.18 else (case t of
5.19 Abs (_, _, t) => check_prem' prem t
5.20 | t $ u => (check_prem' prem t; check_prem' prem u)
5.21 @@ -286,15 +286,15 @@
5.22
5.23 fun check_prem (prem, aprem) =
5.24 if can HOLogic.dest_Trueprop aprem then check_prem' prem prem
5.25 - else err_in_prem ctxt name rule prem "Non-atomic premise";
5.26 + else err_in_prem ctxt err_name rule prem "Non-atomic premise";
5.27 in
5.28 (case concl of
5.29 Const ("Trueprop", _) $ t =>
5.30 if head_of t mem cs then
5.31 - (check_ind (err_in_rule ctxt name rule') t;
5.32 + (check_ind (err_in_rule ctxt err_name rule') t;
5.33 List.app check_prem (prems ~~ aprems))
5.34 - else err_in_rule ctxt name rule' bad_concl
5.35 - | _ => err_in_rule ctxt name rule' bad_concl);
5.36 + else err_in_rule ctxt err_name rule' bad_concl
5.37 + | _ => err_in_rule ctxt err_name rule' bad_concl);
5.38 ((binding, att), arule)
5.39 end;
5.40
5.41 @@ -638,7 +638,7 @@
5.42
5.43 val rec_name =
5.44 if Binding.is_empty alt_name then
5.45 - Binding.name (space_implode "_" (map (Name.name_of o fst) cnames_syn))
5.46 + Binding.name (space_implode "_" (map (Binding.base_name o fst) cnames_syn))
5.47 else alt_name;
5.48
5.49 val ((rec_const, (_, fp_def)), ctxt') = ctxt |>
5.50 @@ -671,9 +671,9 @@
5.51 fun declare_rules kind rec_binding coind no_ind cnames intrs intr_bindings intr_atts
5.52 elims raw_induct ctxt =
5.53 let
5.54 - val rec_name = Name.name_of rec_binding;
5.55 + val rec_name = Binding.base_name rec_binding;
5.56 val rec_qualified = Binding.qualify rec_name;
5.57 - val intr_names = map Name.name_of intr_bindings;
5.58 + val intr_names = map Binding.base_name intr_bindings;
5.59 val ind_case_names = RuleCases.case_names intr_names;
5.60 val induct =
5.61 if coind then
5.62 @@ -730,11 +730,11 @@
5.63 cs intros monos params cnames_syn ctxt =
5.64 let
5.65 val _ = null cnames_syn andalso error "No inductive predicates given";
5.66 - val names = map (Name.name_of o fst) cnames_syn;
5.67 + val names = map (Binding.base_name o fst) cnames_syn;
5.68 val _ = message (quiet_mode andalso not verbose)
5.69 ("Proofs for " ^ coind_prefix coind ^ "inductive predicate(s) " ^ commas_quote names);
5.70
5.71 - val cnames = map (Sign.full_bname (ProofContext.theory_of ctxt) o Name.name_of o #1) cnames_syn; (* FIXME *)
5.72 + val cnames = map (Sign.full_name (ProofContext.theory_of ctxt) o #1) cnames_syn; (* FIXME *)
5.73 val ((intr_names, intr_atts), intr_ts) =
5.74 apfst split_list (split_list (map (check_rule ctxt cs params) intros));
5.75
5.76 @@ -745,7 +745,7 @@
5.77 val (intrs, unfold) = prove_intrs quiet_mode coind mono fp_def (length bs + length xs)
5.78 params intr_ts rec_preds_defs ctxt1;
5.79 val elims = if no_elim then [] else
5.80 - prove_elims quiet_mode cs params intr_ts (map Name.name_of intr_names)
5.81 + prove_elims quiet_mode cs params intr_ts (map Binding.base_name intr_names)
5.82 unfold rec_preds_defs ctxt1;
5.83 val raw_induct = zero_var_indexes
5.84 (if no_ind then Drule.asm_rl else
5.85 @@ -789,16 +789,16 @@
5.86
5.87 (* abbrevs *)
5.88
5.89 - val (_, ctxt1) = Variable.add_fixes (map (Name.name_of o fst o fst) cnames_syn) lthy;
5.90 + val (_, ctxt1) = Variable.add_fixes (map (Binding.base_name o fst o fst) cnames_syn) lthy;
5.91
5.92 fun get_abbrev ((name, atts), t) =
5.93 if can (Logic.strip_assums_concl #> Logic.dest_equals) t then
5.94 let
5.95 - val _ = Name.name_of name = "" andalso null atts orelse
5.96 + val _ = Binding.is_empty name andalso null atts orelse
5.97 error "Abbreviations may not have names or attributes";
5.98 val ((x, T), rhs) = LocalDefs.abs_def (snd (LocalDefs.cert_def ctxt1 t));
5.99 val var =
5.100 - (case find_first (fn ((c, _), _) => Name.name_of c = x) cnames_syn of
5.101 + (case find_first (fn ((c, _), _) => Binding.base_name c = x) cnames_syn of
5.102 NONE => error ("Undeclared head of abbreviation " ^ quote x)
5.103 | SOME ((b, T'), mx) =>
5.104 if T <> T' then error ("Bad type specification for abbreviation " ^ quote x)
5.105 @@ -807,17 +807,17 @@
5.106 else NONE;
5.107
5.108 val abbrevs = map_filter get_abbrev spec;
5.109 - val bs = map (Name.name_of o fst o fst) abbrevs;
5.110 + val bs = map (Binding.base_name o fst o fst) abbrevs;
5.111
5.112
5.113 (* predicates *)
5.114
5.115 val pre_intros = filter_out (is_some o get_abbrev) spec;
5.116 - val cnames_syn' = filter_out (member (op =) bs o Name.name_of o fst o fst) cnames_syn;
5.117 - val cs = map (Free o apfst Name.name_of o fst) cnames_syn';
5.118 + val cnames_syn' = filter_out (member (op =) bs o Binding.base_name o fst o fst) cnames_syn;
5.119 + val cs = map (Free o apfst Binding.base_name o fst) cnames_syn';
5.120 val ps = map Free pnames;
5.121
5.122 - val (_, ctxt2) = lthy |> Variable.add_fixes (map (Name.name_of o fst o fst) cnames_syn');
5.123 + val (_, ctxt2) = lthy |> Variable.add_fixes (map (Binding.base_name o fst o fst) cnames_syn');
5.124 val _ = map (fn abbr => LocalDefs.fixed_abbrev abbr ctxt2) abbrevs;
5.125 val ctxt3 = ctxt2 |> fold (snd oo LocalDefs.fixed_abbrev) abbrevs;
5.126 val expand = Assumption.export_term ctxt3 lthy #> ProofContext.cert_term lthy;
5.127 @@ -849,7 +849,7 @@
5.128 in
5.129 lthy
5.130 |> LocalTheory.set_group (serial_string ())
5.131 - |> gen_add_inductive_i mk_def flags cs (map (apfst Name.name_of o fst) ps) intrs monos
5.132 + |> gen_add_inductive_i mk_def flags cs (map (apfst Binding.base_name o fst) ps) intrs monos
5.133 end;
5.134
5.135 val add_inductive_i = gen_add_inductive_i add_ind_def;
5.136 @@ -857,7 +857,7 @@
5.137
5.138 fun add_inductive_global group flags cnames_syn pnames pre_intros monos thy =
5.139 let
5.140 - val name = Sign.full_bname thy (Name.name_of (fst (fst (hd cnames_syn))));
5.141 + val name = Sign.full_name thy (fst (fst (hd cnames_syn)));
5.142 val ctxt' = thy
5.143 |> TheoryTarget.init NONE
5.144 |> LocalTheory.set_group group
5.145 @@ -945,11 +945,11 @@
5.146 fun flatten_specification specs = specs |> maps
5.147 (fn (a, (concl, [])) => concl |> map
5.148 (fn ((b, atts), [B]) =>
5.149 - if Name.name_of a = "" then ((b, atts), B)
5.150 - else if Name.name_of b = "" then ((a, atts), B)
5.151 + if Binding.is_empty a then ((b, atts), B)
5.152 + else if Binding.is_empty b then ((a, atts), B)
5.153 else error "Illegal nested case names"
5.154 | ((b, _), _) => error "Illegal simultaneous specification")
5.155 - | (a, _) => error ("Illegal local specification parameters for " ^ quote (Name.name_of a)));
5.156 + | (a, _) => error ("Illegal local specification parameters for " ^ quote (Binding.base_name a)));
5.157
5.158 fun gen_ind_decl mk_def coind =
5.159 P.fixes -- P.for_fixes --
6.1 --- a/src/HOL/Tools/inductive_set_package.ML Fri Dec 05 20:38:40 2008 +0100
6.2 +++ b/src/HOL/Tools/inductive_set_package.ML Sat Dec 06 08:45:38 2008 +0100
6.3 @@ -499,9 +499,9 @@
6.4 (* convert theorems to set notation *)
6.5 val rec_name =
6.6 if Binding.is_empty alt_name then
6.7 - Binding.name (space_implode "_" (map (Name.name_of o fst) cnames_syn))
6.8 + Binding.name (space_implode "_" (map (Binding.base_name o fst) cnames_syn))
6.9 else alt_name;
6.10 - val cnames = map (Sign.full_bname (ProofContext.theory_of ctxt3) o Name.name_of o #1) cnames_syn; (* FIXME *)
6.11 + val cnames = map (Sign.full_name (ProofContext.theory_of ctxt3) o #1) cnames_syn; (* FIXME *)
6.12 val (intr_names, intr_atts) = split_list (map fst intros);
6.13 val raw_induct' = to_set [] (Context.Proof ctxt3) raw_induct;
6.14 val (intrs', elims', induct, ctxt4) =
7.1 --- a/src/HOL/Tools/primrec_package.ML Fri Dec 05 20:38:40 2008 +0100
7.2 +++ b/src/HOL/Tools/primrec_package.ML Sat Dec 06 08:45:38 2008 +0100
7.3 @@ -194,7 +194,7 @@
7.4 val def_name = Thm.def_name (Sign.base_name fname);
7.5 val rhs = singleton (Syntax.check_terms ctxt) raw_rhs;
7.6 val SOME var = get_first (fn ((b, _), mx) =>
7.7 - if Name.name_of b = fname then SOME (b, mx) else NONE) fixes;
7.8 + if Binding.base_name b = fname then SOME (b, mx) else NONE) fixes;
7.9 in (var, ((Binding.name def_name, []), rhs)) end;
7.10
7.11
7.12 @@ -231,7 +231,7 @@
7.13 let
7.14 val (fixes, spec) = prepare_spec prep_spec lthy raw_fixes raw_spec;
7.15 val eqns = fold_rev (process_eqn (fn v => Variable.is_fixed lthy v
7.16 - orelse exists (fn ((w, _), _) => v = Name.name_of w) fixes) o snd) spec [];
7.17 + orelse exists (fn ((w, _), _) => v = Binding.base_name w) fixes) o snd) spec [];
7.18 val tnames = distinct (op =) (map (#1 o snd) eqns);
7.19 val dts = find_dts (DatatypePackage.get_datatypes (ProofContext.theory_of lthy)) tnames tnames;
7.20 val main_fns = map (fn (tname, {index, ...}) =>
7.21 @@ -298,7 +298,7 @@
7.22 P.name >> pair false) --| P.$$$ ")")) (false, "");
7.23
7.24 val old_primrec_decl =
7.25 - opt_unchecked_name -- Scan.repeat1 ((SpecParse.opt_thm_name ":" >> apfst Name.name_of) -- P.prop);
7.26 + opt_unchecked_name -- Scan.repeat1 ((SpecParse.opt_thm_name ":" >> apfst Binding.base_name) -- P.prop);
7.27
7.28 fun pipe_error t = P.!!! (Scan.fail_with (K
7.29 (cat_lines ["Equations must be separated by " ^ quote "|", quote t])));
8.1 --- a/src/HOL/Tools/recdef_package.ML Fri Dec 05 20:38:40 2008 +0100
8.2 +++ b/src/HOL/Tools/recdef_package.ML Sat Dec 06 08:45:38 2008 +0100
8.3 @@ -299,7 +299,7 @@
8.4
8.5 val recdef_decl =
8.6 Scan.optional (P.$$$ "(" -- P.!!! (P.$$$ "permissive" -- P.$$$ ")") >> K false) true --
8.7 - P.name -- P.term -- Scan.repeat1 ((SpecParse.opt_thm_name ":" >> apfst Name.name_of) -- P.prop)
8.8 + P.name -- P.term -- Scan.repeat1 ((SpecParse.opt_thm_name ":" >> apfst Binding.base_name) -- P.prop)
8.9 -- Scan.option hints
8.10 >> (fn ((((p, f), R), eqs), src) => #1 o add_recdef p f R (map P.triple_swap eqs) src);
8.11
8.12 @@ -320,7 +320,7 @@
8.13 val _ =
8.14 OuterSyntax.local_theory_to_proof' "recdef_tc" "recommence proof of termination condition (TFL)"
8.15 K.thy_goal
8.16 - ((SpecParse.opt_thm_name ":" >> apfst Name.name_of) -- P.xname --
8.17 + ((SpecParse.opt_thm_name ":" >> apfst Binding.base_name) -- P.xname --
8.18 Scan.option (P.$$$ "(" |-- P.nat --| P.$$$ ")")
8.19 >> (fn ((thm_name, name), i) => recdef_tc thm_name name i));
8.20
9.1 --- a/src/HOL/Tools/record_package.ML Fri Dec 05 20:38:40 2008 +0100
9.2 +++ b/src/HOL/Tools/record_package.ML Sat Dec 06 08:45:38 2008 +0100
9.3 @@ -346,19 +346,14 @@
9.4 val get_updates = Symtab.lookup o #updates o get_sel_upd;
9.5 fun get_simpset thy = Simplifier.theory_context thy (#simpset (get_sel_upd thy));
9.6
9.7 -fun put_sel_upd names simps thy =
9.8 - let
9.9 - val sels = map (rpair ()) names;
9.10 - val upds = map (suffix updateN) names ~~ names;
9.11 -
9.12 - val {records, sel_upd = {selectors, updates, simpset},
9.13 - equalities, extinjects, extsplit, splits, extfields,fieldext} = RecordsData.get thy;
9.14 - val data = make_record_data records
9.15 - {selectors = Symtab.extend (selectors, sels),
9.16 - updates = Symtab.extend (updates, upds),
9.17 - simpset = Simplifier.addsimps (simpset, simps)}
9.18 - equalities extinjects extsplit splits extfields fieldext;
9.19 - in RecordsData.put data thy end;
9.20 +fun put_sel_upd names simps = RecordsData.map (fn {records,
9.21 + sel_upd = {selectors, updates, simpset},
9.22 + equalities, extinjects, extsplit, splits, extfields, fieldext} =>
9.23 + make_record_data records
9.24 + {selectors = fold (fn name => Symtab.update (name, ())) names selectors,
9.25 + updates = fold (fn name => Symtab.update ((suffix updateN) name, name)) names updates,
9.26 + simpset = Simplifier.addsimps (simpset, simps)}
9.27 + equalities extinjects extsplit splits extfields fieldext);
9.28
9.29
9.30 (* access 'equalities' *)
10.1 --- a/src/HOL/Tools/refute.ML Fri Dec 05 20:38:40 2008 +0100
10.2 +++ b/src/HOL/Tools/refute.ML Sat Dec 06 08:45:38 2008 +0100
10.3 @@ -313,18 +313,10 @@
10.4
10.5 (* (string * string) -> theory -> theory *)
10.6
10.7 - fun set_default_param (name, value) thy =
10.8 - let
10.9 - val {interpreters, printers, parameters} = RefuteData.get thy
10.10 - in
10.11 - RefuteData.put (case Symtab.lookup parameters name of
10.12 - NONE =>
10.13 + fun set_default_param (name, value) = RefuteData.map
10.14 + (fn {interpreters, printers, parameters} =>
10.15 {interpreters = interpreters, printers = printers,
10.16 - parameters = Symtab.extend (parameters, [(name, value)])}
10.17 - | SOME _ =>
10.18 - {interpreters = interpreters, printers = printers,
10.19 - parameters = Symtab.update (name, value) parameters}) thy
10.20 - end;
10.21 + parameters = Symtab.update (name, value) parameters});
10.22
10.23 (* ------------------------------------------------------------------------- *)
10.24 (* get_default_param: retrieves the value associated with 'name' from *)
11.1 --- a/src/HOL/Tools/specification_package.ML Fri Dec 05 20:38:40 2008 +0100
11.2 +++ b/src/HOL/Tools/specification_package.ML Sat Dec 06 08:45:38 2008 +0100
11.3 @@ -233,7 +233,7 @@
11.4
11.5 val specification_decl =
11.6 P.$$$ "(" |-- Scan.repeat1 (opt_name -- P.term -- opt_overloaded) --| P.$$$ ")" --
11.7 - Scan.repeat1 ((SpecParse.opt_thm_name ":" >> apfst Name.name_of) -- P.prop)
11.8 + Scan.repeat1 ((SpecParse.opt_thm_name ":" >> apfst Binding.base_name) -- P.prop)
11.9
11.10 val _ =
11.11 OuterSyntax.command "specification" "define constants by specification" K.thy_goal
11.12 @@ -244,7 +244,7 @@
11.13 val ax_specification_decl =
11.14 P.name --
11.15 (P.$$$ "(" |-- Scan.repeat1 (opt_name -- P.term -- opt_overloaded) --| P.$$$ ")" --
11.16 - Scan.repeat1 ((SpecParse.opt_thm_name ":" >> apfst Name.name_of) -- P.prop))
11.17 + Scan.repeat1 ((SpecParse.opt_thm_name ":" >> apfst Binding.base_name) -- P.prop))
11.18
11.19 val _ =
11.20 OuterSyntax.command "ax_specification" "define constants by specification" K.thy_goal
12.1 --- a/src/HOLCF/Tools/fixrec_package.ML Fri Dec 05 20:38:40 2008 +0100
12.2 +++ b/src/HOLCF/Tools/fixrec_package.ML Sat Dec 06 08:45:38 2008 +0100
12.3 @@ -226,7 +226,7 @@
12.4 val lengths = map length blocks;
12.5
12.6 val ((bindings, srcss), strings) = apfst split_list (split_list eqns);
12.7 - val names = map Name.name_of bindings;
12.8 + val names = map Binding.base_name bindings;
12.9 val atts = map (map (prep_attrib thy)) srcss;
12.10 val eqn_ts = map (prep_prop thy) strings;
12.11 val rec_ts = map (fn eq => chead_of (fst (dest_eqs (Logic.strip_imp_concl eq)))
12.12 @@ -278,7 +278,7 @@
12.13 val ts = map (prep_term thy) strings;
12.14 val simps = map (fix_pat thy) ts;
12.15 in
12.16 - (snd o PureThy.add_thmss [((Name.name_of name, simps), atts)]) thy
12.17 + (snd o PureThy.add_thmss [((Binding.base_name name, simps), atts)]) thy
12.18 end;
12.19
12.20 val add_fixpat = gen_add_fixpat Syntax.read_term_global Attrib.attribute;
13.1 --- a/src/Pure/General/binding.ML Fri Dec 05 20:38:40 2008 +0100
13.2 +++ b/src/Pure/General/binding.ML Sat Dec 06 08:45:38 2008 +0100
13.3 @@ -23,6 +23,7 @@
13.4 val add_prefix: bool -> string -> T -> T
13.5 val map_prefix: ((string * bool) list -> T -> T) -> T -> T
13.6 val is_empty: T -> bool
13.7 + val base_name: T -> string
13.8 val pos_of: T -> Position.T
13.9 val dest: T -> (string * bool) list * string
13.10 val display: T -> string
13.11 @@ -56,7 +57,7 @@
13.12 else path ^ "." ^ name;
13.13
13.14 val qualify = map_base o qualify_base;
13.15 - (*FIXME should all operations on bare names moved here from name_space.ML ?*)
13.16 + (*FIXME should all operations on bare names move here from name_space.ML ?*)
13.17
13.18 fun add_prefix sticky prfx b = if prfx = "" then error "empty name prefix"
13.19 else (map_binding o apfst) (cons (prfx, sticky)) b;
13.20 @@ -65,6 +66,7 @@
13.21 f prefix (name_pos (name, pos));
13.22
13.23 fun is_empty (Binding ((_, name), _)) = name = "";
13.24 +fun base_name (Binding ((_, name), _)) = name;
13.25 fun pos_of (Binding (_, pos)) = pos;
13.26 fun dest (Binding (prefix_name, _)) = prefix_name;
13.27
14.1 --- a/src/Pure/General/name_space.ML Fri Dec 05 20:38:40 2008 +0100
14.2 +++ b/src/Pure/General/name_space.ML Sat Dec 06 08:45:38 2008 +0100
14.3 @@ -48,7 +48,6 @@
14.4 -> 'a table * 'a table -> 'a table
14.5 val dest_table: 'a table -> (string * 'a) list
14.6 val extern_table: 'a table -> (xstring * 'a) list
14.7 - val extend_table: naming -> (bstring * 'a) list -> 'a table -> 'a table
14.8 end;
14.9
14.10 structure NameSpace: NAME_SPACE =
14.11 @@ -303,10 +302,6 @@
14.12 val (name, space') = declare naming b space;
14.13 in (name, (space', Symtab.update_new (name, x) tab)) end;
14.14
14.15 -fun extend_table naming bentries (space, tab) =
14.16 - let val entries = map (apfst (full_internal naming)) bentries
14.17 - in (fold (declare_internal naming o #1) entries space, Symtab.extend (tab, entries)) end;
14.18 -
14.19 fun merge_tables eq ((space1, tab1), (space2, tab2)) =
14.20 (merge (space1, space2), Symtab.merge eq (tab1, tab2));
14.21
15.1 --- a/src/Pure/General/table.ML Fri Dec 05 20:38:40 2008 +0100
15.2 +++ b/src/Pure/General/table.ML Sat Dec 06 08:45:38 2008 +0100
15.3 @@ -41,7 +41,6 @@
15.4 val map_entry: key -> ('a -> 'a) -> 'a table -> 'a table
15.5 val map_default: (key * 'a) -> ('a -> 'a) -> 'a table -> 'a table
15.6 val make: (key * 'a) list -> 'a table (*exception DUP*)
15.7 - val extend: 'a table * (key * 'a) list -> 'a table (*exception DUP*)
15.8 val join: (key -> 'a * 'a -> 'a) (*exception DUP/SAME*) ->
15.9 'a table * 'a table -> 'a table (*exception DUP*)
15.10 val merge: ('a * 'a -> bool) -> 'a table * 'a table -> 'a table (*exception DUP*)
15.11 @@ -364,9 +363,7 @@
15.12
15.13 (* simultaneous modifications *)
15.14
15.15 -fun extend (table, args) = fold update_new args table;
15.16 -
15.17 -fun make entries = extend (empty, entries);
15.18 +fun make entries = fold update_new entries empty;
15.19
15.20 fun join f (table1, table2) =
15.21 let fun add (key, y) tab = modify key (fn NONE => y | SOME x => f key (x, y)) tab;
16.1 --- a/src/Pure/Isar/attrib.ML Fri Dec 05 20:38:40 2008 +0100
16.2 +++ b/src/Pure/Isar/attrib.ML Sat Dec 06 08:45:38 2008 +0100
16.3 @@ -146,8 +146,8 @@
16.4 fun add_attributes raw_attrs thy =
16.5 let
16.6 val new_attrs =
16.7 - raw_attrs |> map (fn (name, att, comment) => (name, ((att, comment), stamp ())));
16.8 - fun add attrs = NameSpace.extend_table (Sign.naming_of thy) new_attrs attrs
16.9 + raw_attrs |> map (fn (name, att, comment) => (Binding.name name, ((att, comment), stamp ())));
16.10 + fun add attrs = fold (snd oo NameSpace.bind (Sign.naming_of thy)) new_attrs attrs
16.11 handle Symtab.DUP dup => error ("Duplicate declaration of attributes " ^ quote dup);
16.12 in Attributes.map add thy end;
16.13
17.1 --- a/src/Pure/Isar/class.ML Fri Dec 05 20:38:40 2008 +0100
17.2 +++ b/src/Pure/Isar/class.ML Sat Dec 06 08:45:38 2008 +0100
17.3 @@ -545,7 +545,7 @@
17.4 val constrain = Element.Constrains ((map o apsnd o map_atyps)
17.5 (K (TFree (Name.aT, base_sort))) supparams);
17.6 fun fork_syn (Element.Fixes xs) =
17.7 - fold_map (fn (c, ty, syn) => cons (Name.name_of c, syn) #> pair (c, ty, NoSyn)) xs
17.8 + fold_map (fn (c, ty, syn) => cons (Binding.base_name c, syn) #> pair (c, ty, NoSyn)) xs
17.9 #>> Element.Fixes
17.10 | fork_syn x = pair x;
17.11 fun fork_syntax elems =
18.1 --- a/src/Pure/Isar/constdefs.ML Fri Dec 05 20:38:40 2008 +0100
18.2 +++ b/src/Pure/Isar/constdefs.ML Sat Dec 06 08:45:38 2008 +0100
18.3 @@ -38,7 +38,7 @@
18.4 val prop = prep_prop var_ctxt raw_prop;
18.5 val (c, T) = #1 (LocalDefs.cert_def thy_ctxt (Logic.strip_imp_concl prop));
18.6 val _ =
18.7 - (case Option.map Name.name_of d of
18.8 + (case Option.map Binding.base_name d of
18.9 NONE => ()
18.10 | SOME c' =>
18.11 if c <> c' then
18.12 @@ -46,7 +46,7 @@
18.13 else ());
18.14
18.15 val def = Term.subst_atomic [(Free (c, T), Const (Sign.full_bname thy c, T))] prop;
18.16 - val name = Thm.def_name_optional c (Name.name_of raw_name);
18.17 + val name = Thm.def_name_optional c (Binding.base_name raw_name);
18.18 val atts = map (prep_att thy) raw_atts;
18.19
18.20 val thy' =
19.1 --- a/src/Pure/Isar/element.ML Fri Dec 05 20:38:40 2008 +0100
19.2 +++ b/src/Pure/Isar/element.ML Sat Dec 06 08:45:38 2008 +0100
19.3 @@ -113,7 +113,7 @@
19.4 fn Fixes fixes => Fixes (fixes |> map (fn (x, T, mx) =>
19.5 let val (x', mx') = var (x, mx) in (x', Option.map typ T, mx') end))
19.6 | Constrains xs => Constrains (xs |> map (fn (x, T) =>
19.7 - let val x' = Name.name_of (#1 (var (Binding.name x, NoSyn))) in (x', typ T) end))
19.8 + let val x' = Binding.base_name (#1 (var (Binding.name x, NoSyn))) in (x', typ T) end))
19.9 | Assumes asms => Assumes (asms |> map (fn ((a, atts), propps) =>
19.10 ((binding a, map attrib atts), propps |> map (fn (t, ps) => (term t, map term ps)))))
19.11 | Defines defs => Defines (defs |> map (fn ((a, atts), (t, ps)) =>
19.12 @@ -136,7 +136,7 @@
19.13 (* logical content *)
19.14
19.15 fun params_of (Fixes fixes) = fixes |> map
19.16 - (fn (x, SOME T, _) => (Name.name_of x, T)
19.17 + (fn (x, SOME T, _) => (Binding.base_name x, T)
19.18 | (x, _, _) => raise TERM ("Untyped context element parameter " ^ quote (Binding.display x), []))
19.19 | params_of _ = [];
19.20
19.21 @@ -182,8 +182,8 @@
19.22 Pretty.block (Pretty.breaks (prt_name_atts a ":" @ prt_terms (map fst ts)));
19.23
19.24 fun prt_var (x, SOME T) = Pretty.block
19.25 - [Pretty.str (Name.name_of x ^ " ::"), Pretty.brk 1, prt_typ T]
19.26 - | prt_var (x, NONE) = Pretty.str (Name.name_of x);
19.27 + [Pretty.str (Binding.base_name x ^ " ::"), Pretty.brk 1, prt_typ T]
19.28 + | prt_var (x, NONE) = Pretty.str (Binding.base_name x);
19.29 val prt_vars = separate (Pretty.keyword "and") o map prt_var;
19.30
19.31 fun prt_obtain (_, ([], ts)) = Pretty.block (Pretty.breaks (prt_terms ts))
19.32 @@ -207,9 +207,9 @@
19.33 fun prt_mixfix NoSyn = []
19.34 | prt_mixfix mx = [Pretty.brk 2, Syntax.pretty_mixfix mx];
19.35
19.36 - fun prt_fix (x, SOME T, mx) = Pretty.block (Pretty.str (Name.name_of x ^ " ::") ::
19.37 + fun prt_fix (x, SOME T, mx) = Pretty.block (Pretty.str (Binding.base_name x ^ " ::") ::
19.38 Pretty.brk 1 :: prt_typ T :: Pretty.brk 1 :: prt_mixfix mx)
19.39 - | prt_fix (x, NONE, mx) = Pretty.block (Pretty.str (Name.name_of x) ::
19.40 + | prt_fix (x, NONE, mx) = Pretty.block (Pretty.str (Binding.base_name x) ::
19.41 Pretty.brk 1 :: prt_mixfix mx);
19.42 fun prt_constrain (x, T) = prt_fix (Binding.name x, SOME T, NoSyn);
19.43
19.44 @@ -395,7 +395,7 @@
19.45
19.46 fun rename_var ren (b, mx) =
19.47 let
19.48 - val x = Name.name_of b;
19.49 + val x = Binding.base_name b;
19.50 val (x', mx') = rename_var_name ren (x, mx);
19.51 in (Binding.name x', mx') end;
19.52
20.1 --- a/src/Pure/Isar/expression.ML Fri Dec 05 20:38:40 2008 +0100
20.2 +++ b/src/Pure/Isar/expression.ML Sat Dec 06 08:45:38 2008 +0100
20.3 @@ -134,8 +134,8 @@
20.4 if null dups then () else error (message ^ commas dups)
20.5 end;
20.6
20.7 - fun match_bind (n, b) = (n = Name.name_of b);
20.8 - fun bind_eq (b1, b2) = (Name.name_of b1 = Name.name_of b2);
20.9 + fun match_bind (n, b) = (n = Binding.base_name b);
20.10 + fun bind_eq (b1, b2) = (Binding.base_name b1 = Binding.base_name b2);
20.11 (* FIXME: cannot compare bindings for equality. *)
20.12
20.13 fun params_loc loc =
20.14 @@ -177,8 +177,8 @@
20.15
20.16 val (implicit, expr') = params_expr expr;
20.17
20.18 - val implicit' = map (#1 #> Name.name_of) implicit;
20.19 - val fixed' = map (#1 #> Name.name_of) fixed;
20.20 + val implicit' = map (#1 #> Binding.base_name) implicit;
20.21 + val fixed' = map (#1 #> Binding.base_name) fixed;
20.22 val _ = reject_dups "Duplicate fixed parameter(s): " fixed';
20.23 val implicit'' = if strict then []
20.24 else let val _ = reject_dups
20.25 @@ -385,7 +385,7 @@
20.26 end;
20.27
20.28 fun finish_primitive parms _ (Fixes fixes) = Fixes (map (fn (binding, _, mx) =>
20.29 - let val x = Name.name_of binding
20.30 + let val x = Binding.base_name binding
20.31 in (binding, AList.lookup (op =) parms x, mx) end) fixes)
20.32 | finish_primitive _ _ (Constrains _) = Constrains []
20.33 | finish_primitive _ close (Assumes asms) = close (Assumes asms)
20.34 @@ -396,7 +396,7 @@
20.35 let
20.36 val thy = ProofContext.theory_of ctxt;
20.37 val (parm_names, parm_types) = NewLocale.params_of thy loc |>
20.38 - map (fn (b, SOME T, _) => (Name.name_of b, T)) |> split_list;
20.39 + map (fn (b, SOME T, _) => (Binding.base_name b, T)) |> split_list;
20.40 val (asm, defs) = NewLocale.specification_of thy loc;
20.41 val (morph, _) = inst_morph (parm_names, parm_types) (prfx, inst) ctxt;
20.42 val asm' = Option.map (Morphism.term morph) asm;
20.43 @@ -440,7 +440,7 @@
20.44 fun prep_inst (loc, (prfx, inst)) (i, insts, ctxt) =
20.45 let
20.46 val (parm_names, parm_types) = NewLocale.params_of thy loc |>
20.47 - map (fn (b, SOME T, _) => (Name.name_of b, T)) |> split_list;
20.48 + map (fn (b, SOME T, _) => (Binding.base_name b, T)) |> split_list;
20.49 val inst' = parse_inst parm_names inst ctxt;
20.50 val parm_types' = map (TypeInfer.paramify_vars o
20.51 Term.map_type_tvar (fn ((x, _), S) => TVar ((x, i), S)) o Logic.varifyT) parm_types;
20.52 @@ -473,7 +473,7 @@
20.53 val (insts, elems, concl, ctxt) = prep_concl raw_concl (insts', elems'', ctxt'');
20.54
20.55 (* Retrieve parameter types *)
20.56 - val xs = fold (fn Fixes fixes => (fn ps => ps @ map (Name.name_of o #1) fixes) |
20.57 + val xs = fold (fn Fixes fixes => (fn ps => ps @ map (Binding.base_name o #1) fixes) |
20.58 _ => fn ps => ps) (Fixes fors :: elems) [];
20.59 val (Ts, ctxt') = fold_map ProofContext.inferred_param xs ctxt;
20.60 val parms = xs ~~ Ts; (* params from expression and elements *)
21.1 --- a/src/Pure/Isar/isar_cmd.ML Fri Dec 05 20:38:40 2008 +0100
21.2 +++ b/src/Pure/Isar/isar_cmd.ML Sat Dec 06 08:45:38 2008 +0100
21.3 @@ -167,7 +167,7 @@
21.4 (* axioms *)
21.5
21.6 fun add_axms f args thy =
21.7 - f (map (fn ((b, ax), srcs) => ((Name.name_of b, ax), map (Attrib.attribute thy) srcs)) args) thy;
21.8 + f (map (fn ((b, ax), srcs) => ((Binding.base_name b, ax), map (Attrib.attribute thy) srcs)) args) thy;
21.9
21.10 val add_axioms = add_axms (snd oo PureThy.add_axioms_cmd);
21.11
22.1 --- a/src/Pure/Isar/isar_syn.ML Fri Dec 05 20:38:40 2008 +0100
22.2 +++ b/src/Pure/Isar/isar_syn.ML Sat Dec 06 08:45:38 2008 +0100
22.3 @@ -413,7 +413,7 @@
22.4 opt_prefix -- SpecParse.locale_expr -- SpecParse.locale_insts
22.5 >> (fn ((name, expr), insts) => Toplevel.print o
22.6 Toplevel.theory_to_proof
22.7 - (Locale.interpretation_cmd (Name.name_of name) expr insts)));
22.8 + (Locale.interpretation_cmd (Binding.base_name name) expr insts)));
22.9
22.10 val _ =
22.11 OuterSyntax.command "interpret"
22.12 @@ -422,7 +422,7 @@
22.13 (opt_prefix -- SpecParse.locale_expr -- SpecParse.locale_insts
22.14 >> (fn ((name, expr), insts) => Toplevel.print o
22.15 Toplevel.proof'
22.16 - (fn int => Locale.interpret_cmd (Name.name_of name) expr insts int)));
22.17 + (fn int => Locale.interpret_cmd (Binding.base_name name) expr insts int)));
22.18
22.19
22.20 (* classes *)
23.1 --- a/src/Pure/Isar/local_defs.ML Fri Dec 05 20:38:40 2008 +0100
23.2 +++ b/src/Pure/Isar/local_defs.ML Sat Dec 06 08:45:38 2008 +0100
23.3 @@ -91,7 +91,7 @@
23.4 let
23.5 val ((bvars, mxs), specs) = defs |> split_list |>> split_list;
23.6 val ((bfacts, atts), rhss) = specs |> split_list |>> split_list;
23.7 - val xs = map Name.name_of bvars;
23.8 + val xs = map Binding.base_name bvars;
23.9 val names = map2 (Binding.map_base o Thm.def_name_optional) xs bfacts;
23.10 val eqs = mk_def ctxt (xs ~~ rhss);
23.11 val lhss = map (fst o Logic.dest_equals) eqs;
24.1 --- a/src/Pure/Isar/locale.ML Fri Dec 05 20:38:40 2008 +0100
24.2 +++ b/src/Pure/Isar/locale.ML Sat Dec 06 08:45:38 2008 +0100
24.3 @@ -646,7 +646,7 @@
24.4 | unify _ env = env;
24.5 val (unifier, _) = fold unify (Ts' ~~ Us') (Vartab.empty, maxidx'');
24.6 val Vs = map (Option.map (Envir.norm_type unifier)) Us';
24.7 - val unifier' = Vartab.extend (unifier, frozen_tvars ctxt (map_filter I Vs));
24.8 + val unifier' = fold Vartab.update_new (frozen_tvars ctxt (map_filter I Vs)) unifier;
24.9 in map (Option.map (Envir.norm_type unifier')) Vs end;
24.10
24.11 fun params_of elemss =
24.12 @@ -711,7 +711,7 @@
24.13 (Vartab.empty, maxidx);
24.14
24.15 val parms' = map (apsnd (Envir.norm_type unifier)) (distinct (eq_fst (op =)) parms);
24.16 - val unifier' = Vartab.extend (unifier, frozen_tvars ctxt (map #2 parms'));
24.17 + val unifier' = fold Vartab.update_new (frozen_tvars ctxt (map #2 parms')) unifier;
24.18
24.19 fun inst_parms (i, ps) =
24.20 List.foldr Term.add_typ_tfrees [] (map_filter snd ps)
24.21 @@ -1100,15 +1100,15 @@
24.22 *)
24.23
24.24 fun flatten (ctxt, _) ((ids, syn), Elem (Fixes fixes)) = let
24.25 - val ids' = ids @ [(("", map (Name.name_of o #1) fixes), ([], Assumed []))]
24.26 + val ids' = ids @ [(("", map (Binding.base_name o #1) fixes), ([], Assumed []))]
24.27 in
24.28 ((ids',
24.29 merge_syntax ctxt ids'
24.30 - (syn, Symtab.make (map (fn fx => (Name.name_of (#1 fx), #3 fx)) fixes))
24.31 + (syn, Symtab.make (map (fn fx => (Binding.base_name (#1 fx), #3 fx)) fixes))
24.32 handle Symtab.DUP x => err_in_locale ctxt
24.33 ("Conflicting syntax for parameter: " ^ quote x)
24.34 (map #1 ids')),
24.35 - [((("", map (rpair NONE o Name.name_of o #1) fixes), Assumed []), Ext (Fixes fixes))])
24.36 + [((("", map (rpair NONE o Binding.base_name o #1) fixes), Assumed []), Ext (Fixes fixes))])
24.37 end
24.38 | flatten _ ((ids, syn), Elem elem) =
24.39 ((ids @ [(("", []), ([], Assumed []))], syn), [((("", []), Assumed []), Ext elem)])
24.40 @@ -1252,7 +1252,7 @@
24.41
24.42
24.43 fun finish_ext_elem parms _ (Fixes fixes, _) = Fixes (map (fn (b, _, mx) =>
24.44 - let val x = Name.name_of b
24.45 + let val x = Binding.base_name b
24.46 in (b, AList.lookup (op =) parms x, mx) end) fixes)
24.47 | finish_ext_elem parms _ (Constrains _, _) = Constrains []
24.48 | finish_ext_elem _ close (Assumes asms, propp) =
25.1 --- a/src/Pure/Isar/method.ML Fri Dec 05 20:38:40 2008 +0100
25.2 +++ b/src/Pure/Isar/method.ML Sat Dec 06 08:45:38 2008 +0100
25.3 @@ -448,9 +448,9 @@
25.4 fun add_methods raw_meths thy =
25.5 let
25.6 val new_meths = raw_meths |> map (fn (name, f, comment) =>
25.7 - (name, ((f, comment), stamp ())));
25.8 + (Binding.name name, ((f, comment), stamp ())));
25.9
25.10 - fun add meths = NameSpace.extend_table (Sign.naming_of thy) new_meths meths
25.11 + fun add meths = fold (snd oo NameSpace.bind (Sign.naming_of thy)) new_meths meths
25.12 handle Symtab.DUP dup => error ("Duplicate declaration of method " ^ quote dup);
25.13 in Methods.map add thy end;
25.14
26.1 --- a/src/Pure/Isar/new_locale.ML Fri Dec 05 20:38:40 2008 +0100
26.2 +++ b/src/Pure/Isar/new_locale.ML Sat Dec 06 08:45:38 2008 +0100
26.3 @@ -175,7 +175,7 @@
26.4
26.5 fun instance_of thy name morph =
26.6 params_of thy name |>
26.7 - map ((fn (b, T, _) => Free (Name.name_of b, the T)) #> Morphism.term morph);
26.8 + map ((fn (b, T, _) => Free (Binding.base_name b, the T)) #> Morphism.term morph);
26.9
26.10 fun specification_of thy name =
26.11 let
27.1 --- a/src/Pure/Isar/obtain.ML Fri Dec 05 20:38:40 2008 +0100
27.2 +++ b/src/Pure/Isar/obtain.ML Sat Dec 06 08:45:38 2008 +0100
27.3 @@ -122,7 +122,7 @@
27.4 (*obtain vars*)
27.5 val (vars, vars_ctxt) = prep_vars raw_vars ctxt;
27.6 val (_, fix_ctxt) = vars_ctxt |> ProofContext.add_fixes_i vars;
27.7 - val xs = map (Name.name_of o #1) vars;
27.8 + val xs = map (Binding.base_name o #1) vars;
27.9
27.10 (*obtain asms*)
27.11 val (asms_ctxt, proppss) = prep_propp (fix_ctxt, map snd raw_asms);
27.12 @@ -261,7 +261,7 @@
27.13
27.14 fun inferred_type (binding, _, mx) ctxt =
27.15 let
27.16 - val x = Name.name_of binding;
27.17 + val x = Binding.base_name binding;
27.18 val (T, ctxt') = ProofContext.inferred_param x ctxt
27.19 in ((x, T, mx), ctxt') end;
27.20
28.1 --- a/src/Pure/Isar/proof_context.ML Fri Dec 05 20:38:40 2008 +0100
28.2 +++ b/src/Pure/Isar/proof_context.ML Sat Dec 06 08:45:38 2008 +0100
28.3 @@ -1012,7 +1012,7 @@
28.4 fun prep_vars prep_typ internal =
28.5 fold_map (fn (raw_b, raw_T, raw_mx) => fn ctxt =>
28.6 let
28.7 - val raw_x = Name.name_of raw_b;
28.8 + val raw_x = Binding.base_name raw_b;
28.9 val (x, mx) = Syntax.const_mixfix raw_x raw_mx;
28.10 val _ = Syntax.is_identifier (no_skolem internal x) orelse
28.11 error ("Illegal variable name: " ^ quote x);
28.12 @@ -1122,7 +1122,7 @@
28.13 fun gen_fixes prep raw_vars ctxt =
28.14 let
28.15 val (vars, _) = prep raw_vars ctxt;
28.16 - val (xs', ctxt') = Variable.add_fixes (map (Name.name_of o #1) vars) ctxt;
28.17 + val (xs', ctxt') = Variable.add_fixes (map (Binding.base_name o #1) vars) ctxt;
28.18 val ctxt'' =
28.19 ctxt'
28.20 |> fold_map declare_var (map2 (fn x' => fn (_, T, mx) => (x', T, mx)) xs' vars)
29.1 --- a/src/Pure/Isar/specification.ML Fri Dec 05 20:38:40 2008 +0100
29.2 +++ b/src/Pure/Isar/specification.ML Sat Dec 06 08:45:38 2008 +0100
29.3 @@ -153,7 +153,7 @@
29.4 fun gen_axioms do_print prep raw_vars raw_specs thy =
29.5 let
29.6 val ((vars, specs), _) = prep raw_vars [raw_specs] (ProofContext.init thy);
29.7 - val xs = map (fn ((b, T), _) => (Name.name_of b, T)) vars;
29.8 + val xs = map (fn ((b, T), _) => (Binding.base_name b, T)) vars;
29.9
29.10 (*consts*)
29.11 val (consts, consts_thy) = thy |> fold_map (Theory.specify_const []) vars;
29.12 @@ -161,7 +161,7 @@
29.13
29.14 (*axioms*)
29.15 val (axioms, axioms_thy) = consts_thy |> fold_map (fn ((b, atts), props) =>
29.16 - fold_map Thm.add_axiom (PureThy.name_multi (Name.name_of b) (map subst props))
29.17 + fold_map Thm.add_axiom (PureThy.name_multi (Binding.base_name b) (map subst props))
29.18 #>> (fn ths => ((b, atts), [(map Drule.standard' ths, [])]))) specs;
29.19 val (facts, thy') = axioms_thy |> PureThy.note_thmss Thm.axiomK
29.20 (Attrib.map_facts (Attrib.attribute_i axioms_thy) axioms);
29.21 @@ -187,7 +187,7 @@
29.22 [] => (Binding.name x, NoSyn)
29.23 | [((b, _), mx)] =>
29.24 let
29.25 - val y = Name.name_of b;
29.26 + val y = Binding.base_name b;
29.27 val _ = x = y orelse
29.28 error ("Head of definition " ^ quote x ^ " differs from declaration " ^ quote y ^
29.29 Position.str_of (Binding.pos_of b));
29.30 @@ -220,7 +220,7 @@
29.31 [] => (Binding.name x, NoSyn)
29.32 | [((b, _), mx)] =>
29.33 let
29.34 - val y = Name.name_of b;
29.35 + val y = Binding.base_name b;
29.36 val _ = x = y orelse
29.37 error ("Head of abbreviation " ^ quote x ^ " differs from declaration " ^ quote y ^
29.38 Position.str_of (Binding.pos_of b));
29.39 @@ -281,11 +281,11 @@
29.40 | Element.Obtains obtains =>
29.41 let
29.42 val case_names = obtains |> map_index (fn (i, (b, _)) =>
29.43 - let val name = Name.name_of b
29.44 + let val name = Binding.base_name b
29.45 in if name = "" then string_of_int (i + 1) else name end);
29.46 val constraints = obtains |> map (fn (_, (vars, _)) =>
29.47 Element.Constrains
29.48 - (vars |> map_filter (fn (x, SOME T) => SOME (Name.name_of x, T) | _ => NONE)));
29.49 + (vars |> map_filter (fn (x, SOME T) => SOME (Binding.base_name x, T) | _ => NONE)));
29.50
29.51 val raw_propp = obtains |> map (fn (_, (_, props)) => map (rpair []) props);
29.52 val (propp, elems_ctxt) = prep_stmt (elems @ constraints) raw_propp ctxt;
29.53 @@ -295,7 +295,7 @@
29.54 fun assume_case ((name, (vars, _)), asms) ctxt' =
29.55 let
29.56 val bs = map fst vars;
29.57 - val xs = map Name.name_of bs;
29.58 + val xs = map Binding.base_name bs;
29.59 val props = map fst asms;
29.60 val (Ts, _) = ctxt'
29.61 |> fold Variable.declare_term props
30.1 --- a/src/Pure/Isar/theory_target.ML Fri Dec 05 20:38:40 2008 +0100
30.2 +++ b/src/Pure/Isar/theory_target.ML Sat Dec 06 08:45:38 2008 +0100
30.3 @@ -200,7 +200,7 @@
30.4 val similar_body = Type.similar_types (rhs, rhs');
30.5 (* FIXME workaround based on educated guess *)
30.6 val (prefix', _) = Binding.dest b';
30.7 - val class_global = Name.name_of b = Name.name_of b'
30.8 + val class_global = Binding.base_name b = Binding.base_name b'
30.9 andalso not (null prefix')
30.10 andalso (fst o snd o split_last) prefix' = Class.class_prefix target;
30.11 in
30.12 @@ -219,7 +219,7 @@
30.13
30.14 fun declare_const (ta as Target {target, is_locale, is_class, ...}) depends ((b, T), mx) lthy =
30.15 let
30.16 - val c = Name.name_of b;
30.17 + val c = Binding.base_name b;
30.18 val tags = LocalTheory.group_position_of lthy;
30.19 val xs = filter depends (#1 (ProofContext.inferred_fixes (LocalTheory.target_of lthy)));
30.20 val U = map #2 xs ---> T;
30.21 @@ -252,7 +252,7 @@
30.22
30.23 fun abbrev (ta as Target {target, is_locale, is_class, ...}) prmode ((b, mx), t) lthy =
30.24 let
30.25 - val c = Name.name_of b;
30.26 + val c = Binding.base_name b;
30.27 val tags = LocalTheory.group_position_of lthy;
30.28 val thy_ctxt = ProofContext.init (ProofContext.theory_of lthy);
30.29 val target_ctxt = LocalTheory.target_of lthy;
30.30 @@ -289,7 +289,7 @@
30.31 val thy = ProofContext.theory_of lthy;
30.32 val thy_ctxt = ProofContext.init thy;
30.33
30.34 - val c = Name.name_of b;
30.35 + val c = Binding.base_name b;
30.36 val name' = Binding.map_base (Thm.def_name_optional c) name;
30.37 val (rhs', rhs_conv) =
30.38 LocalDefs.export_cterm lthy thy_ctxt (Thm.cterm_of thy rhs) |>> Thm.term_of;
30.39 @@ -310,7 +310,7 @@
30.40 then (fn name => fn eq => Thm.add_def false false (name, Logic.mk_equals eq))
30.41 else (fn name => fn (Const (c, _), rhs) => AxClass.define_overloaded name (c, rhs)));
30.42 val (global_def, lthy3) = lthy2
30.43 - |> LocalTheory.theory_result (define_const (Name.name_of name') (lhs', rhs'));
30.44 + |> LocalTheory.theory_result (define_const (Binding.base_name name') (lhs', rhs'));
30.45 val def = LocalDefs.trans_terms lthy3
30.46 [(*c == global.c xs*) local_def,
30.47 (*global.c xs == rhs'*) global_def,
31.1 --- a/src/Pure/Syntax/syntax.ML Fri Dec 05 20:38:40 2008 +0100
31.2 +++ b/src/Pure/Syntax/syntax.ML Sat Dec 06 08:45:38 2008 +0100
31.3 @@ -173,7 +173,7 @@
31.4
31.5 fun remove_trtab trfuns = fold (Symtab.remove SynExt.eq_trfun) trfuns;
31.6
31.7 -fun update_trtab name trfuns tab = Symtab.extend (remove_trtab trfuns tab, trfuns)
31.8 +fun update_trtab name trfuns tab = fold Symtab.update_new trfuns (remove_trtab trfuns tab)
31.9 handle Symtab.DUP c => err_dup_trfun name c;
31.10
31.11 fun merge_trtabs name tab1 tab2 = Symtab.merge SynExt.eq_trfun (tab1, tab2)
32.1 --- a/src/Pure/Tools/invoke.ML Fri Dec 05 20:38:40 2008 +0100
32.2 +++ b/src/Pure/Tools/invoke.ML Sat Dec 06 08:45:38 2008 +0100
32.3 @@ -120,7 +120,7 @@
32.4 (K.tag_proof K.prf_goal)
32.5 (SpecParse.opt_thm_name ":" -- SpecParse.locale_expr -- SpecParse.locale_insts -- P.for_fixes
32.6 >> (fn ((((name, atts), expr), (insts, _)), fixes) =>
32.7 - Toplevel.print o Toplevel.proof' (invoke (Name.name_of name, atts) expr insts fixes)));
32.8 + Toplevel.print o Toplevel.proof' (invoke (Binding.base_name name, atts) expr insts fixes)));
32.9
32.10 end;
32.11
33.1 --- a/src/Pure/name.ML Fri Dec 05 20:38:40 2008 +0100
33.2 +++ b/src/Pure/name.ML Sat Dec 06 08:45:38 2008 +0100
33.3 @@ -27,8 +27,6 @@
33.4 val variants: string list -> context -> string list * context
33.5 val variant_list: string list -> string list -> string list
33.6 val variant: string list -> string -> string
33.7 -
33.8 - val name_of: Binding.T -> string (*FIMXE legacy*)
33.9 end;
33.10
33.11 structure Name: NAME =
33.12 @@ -140,9 +138,4 @@
33.13 fun variant_list used names = #1 (make_context used |> variants names);
33.14 fun variant used = singleton (variant_list used);
33.15
33.16 -
33.17 -(** generic name bindings -- legacy **)
33.18 -
33.19 -val name_of = snd o Binding.dest;
33.20 -
33.21 end;
34.1 --- a/src/Pure/sign.ML Fri Dec 05 20:38:40 2008 +0100
34.2 +++ b/src/Pure/sign.ML Sat Dec 06 08:45:38 2008 +0100
34.3 @@ -508,10 +508,10 @@
34.4 val prepT = Type.no_tvars o Term.no_dummyT o certify_typ thy o parse_typ ctxt;
34.5 fun prep (raw_b, raw_T, raw_mx) =
34.6 let
34.7 - val (mx_name, mx) = Syntax.const_mixfix (Name.name_of raw_b) raw_mx;
34.8 + val (mx_name, mx) = Syntax.const_mixfix (Binding.base_name raw_b) raw_mx;
34.9 val b = Binding.map_base (K mx_name) raw_b;
34.10 val c = full_name thy b;
34.11 - val c_syn = if authentic then Syntax.constN ^ c else Name.name_of b;
34.12 + val c_syn = if authentic then Syntax.constN ^ c else Binding.base_name b;
34.13 val T = (prepT raw_T handle TYPE (msg, _, _) => error msg) handle ERROR msg =>
34.14 cat_error msg ("in declaration of constant " ^ quote (Binding.display b));
34.15 val T' = Logic.varifyT T;
35.1 --- a/src/Pure/theory.ML Fri Dec 05 20:38:40 2008 +0100
35.2 +++ b/src/Pure/theory.ML Sat Dec 06 08:45:38 2008 +0100
35.3 @@ -178,8 +178,8 @@
35.4
35.5 fun gen_add_axioms prep_axm raw_axms thy = thy |> map_axioms (fn axioms =>
35.6 let
35.7 - val axms = map (apsnd Logic.varify o prep_axm thy) raw_axms;
35.8 - val axioms' = NameSpace.extend_table (Sign.naming_of thy) axms axioms
35.9 + val axms = map (apfst Binding.name o apsnd Logic.varify o prep_axm thy) raw_axms;
35.10 + val axioms' = fold (snd oo NameSpace.bind (Sign.naming_of thy)) axms axioms
35.11 handle Symtab.DUP dup => err_dup_axm dup;
35.12 in axioms' end);
35.13
36.1 --- a/src/ZF/Tools/inductive_package.ML Fri Dec 05 20:38:40 2008 +0100
36.2 +++ b/src/ZF/Tools/inductive_package.ML Sat Dec 06 08:45:38 2008 +0100
36.3 @@ -67,7 +67,7 @@
36.4 val _ = Theory.requires thy "Inductive_ZF" "(co)inductive definitions";
36.5 val ctxt = ProofContext.init thy;
36.6
36.7 - val intr_specs = map (apfst (apfst Name.name_of)) raw_intr_specs;
36.8 + val intr_specs = map (apfst (apfst Binding.base_name)) raw_intr_specs;
36.9 val (intr_names, intr_tms) = split_list (map fst intr_specs);
36.10 val case_names = RuleCases.case_names intr_names;
36.11
37.1 --- a/src/ZF/Tools/primrec_package.ML Fri Dec 05 20:38:40 2008 +0100
37.2 +++ b/src/ZF/Tools/primrec_package.ML Sat Dec 06 08:45:38 2008 +0100
37.3 @@ -180,7 +180,7 @@
37.4
37.5 val (eqn_thms', thy2) =
37.6 thy1
37.7 - |> PureThy.add_thms ((map Name.name_of eqn_names ~~ eqn_thms) ~~ eqn_atts);
37.8 + |> PureThy.add_thms ((map Binding.base_name eqn_names ~~ eqn_thms) ~~ eqn_atts);
37.9 val (_, thy3) =
37.10 thy2
37.11 |> PureThy.add_thmss [(("simps", eqn_thms'), [Simplifier.simp_add])]