merged
authorwenzelm
Fri, 23 Jan 2009 15:37:12 +0100
changeset 29621101c9093d56a
parent 29620 dc1257eaa4f2
parent 29619 82054da94a74
child 29625 a04710c3e096
merged
     1.1 --- a/doc-src/more_antiquote.ML	Fri Jan 23 09:06:14 2009 +0100
     1.2 +++ b/doc-src/more_antiquote.ML	Fri Jan 23 15:37:12 2009 +0100
     1.3 @@ -113,13 +113,13 @@
     1.4    val parse_const_terms = Scan.repeat1 Args.term
     1.5      >> (fn ts => fn thy => map (Code_Unit.check_const thy) ts);
     1.6    val parse_consts = Scan.lift (Args.parens (Args.$$$ "consts")) |-- parse_const_terms
     1.7 -    >> (fn mk_cs => fn thy => fn naming => map (the o Code_Thingol.lookup_const naming) (mk_cs thy));
     1.8 +    >> (fn mk_cs => fn thy => fn naming => map_filter (Code_Thingol.lookup_const naming) (mk_cs thy));
     1.9    val parse_types = Scan.lift (Args.parens (Args.$$$ "types") |-- Scan.repeat1 Args.name)
    1.10 -    >> (fn tycos => fn thy => fn naming => map (the o Code_Thingol.lookup_tyco naming o Sign.intern_type thy) tycos);
    1.11 +    >> (fn tycos => fn thy => fn naming => map_filter (Code_Thingol.lookup_tyco naming o Sign.intern_type thy) tycos);
    1.12    val parse_classes = Scan.lift (Args.parens (Args.$$$ "classes") |-- Scan.repeat1 Args.name)
    1.13 -    >> (fn classes => fn thy => fn naming => map (the o Code_Thingol.lookup_class naming o Sign.intern_class thy) classes);
    1.14 +    >> (fn classes => fn thy => fn naming => map_filter (Code_Thingol.lookup_class naming o Sign.intern_class thy) classes);
    1.15    val parse_instances = Scan.lift (Args.parens (Args.$$$ "instances") |-- Scan.repeat1 (Args.name --| Args.$$$ "::" -- Args.name))
    1.16 -    >> (fn insts => fn thy => fn naming => map (the o Code_Thingol.lookup_instance naming o apsnd (Sign.intern_type thy) o apfst (Sign.intern_class thy) o swap) insts);
    1.17 +    >> (fn insts => fn thy => fn naming => map_filter (Code_Thingol.lookup_instance naming o apsnd (Sign.intern_type thy) o apfst (Sign.intern_class thy) o swap) insts);
    1.18    val parse_names = parse_consts || parse_types || parse_classes || parse_instances; 
    1.19  
    1.20    fun code_stmts src ctxt ((mk_cs, mk_stmtss), target) =
     2.1 --- a/src/Pure/pure_setup.ML	Fri Jan 23 09:06:14 2009 +0100
     2.2 +++ b/src/Pure/pure_setup.ML	Fri Jan 23 15:37:12 2009 +0100
     2.3 @@ -33,7 +33,7 @@
     2.4    map (fn (x, y) => Pretty.str (x ^ "=" ^ y)) o Position.properties_of));
     2.5  install_pp (make_pp ["Thm", "thm"] ProofDisplay.pprint_thm);
     2.6  install_pp (make_pp ["Thm", "cterm"] ProofDisplay.pprint_cterm);
     2.7 -install_pp (make_pp ["Binding", "T"] (Pretty.pprint o Pretty.str o Binding.display));
     2.8 +install_pp (make_pp ["Binding", "binding"] (Pretty.pprint o Pretty.str o Binding.display));
     2.9  install_pp (make_pp ["Thm", "ctyp"] ProofDisplay.pprint_ctyp);
    2.10  install_pp (make_pp ["Context", "theory"] Context.pprint_thy);
    2.11  install_pp (make_pp ["Context", "theory_ref"] Context.pprint_thy_ref);