src/Tools/Code/code_printer.ML

 fun make_vars names = (fold (fn name => Symtab.update_new (name, name)) names Symtab.empty,
   Name.make_context names);
 
 fun intro_vars names (namemap, namectxt) =
   let
-    val (names', namectxt') = Name.variants names namectxt;
+    val (names', namectxt') = fold_map Name.variant names namectxt;
     val namemap' = fold2 (curry Symtab.update) names names' namemap;
   in (namemap', namectxt') end;
 
 fun lookup_var (namemap, _) name = case Symtab.lookup namemap name
  of SOME name' => name'

     fun fillup_param _ (_, SOME v) = v
       | fillup_param x (i, NONE) = x ^ string_of_int i;
     val fished1 = fold (map2 fish_param) lhss (replicate (length (hd lhss)) NONE);
     val x = singleton (Name.variant_list (map_filter I fished1)) "x";
     val fished2 = map_index (fillup_param x) fished1;
-    val (fished3, _) = Name.variants fished2 Name.context;
+    val (fished3, _) = fold_map Name.variant fished2 Name.context;
     val vars' = intro_vars fished3 vars;
   in map (lookup_var vars') fished3 end;
 
 fun intro_base_names no_syntax deresolve names = names 
   |> map_filter (fn name => if no_syntax name then