src/HOL/Tools/Function/scnp_reconstruct.ML

           fold_product add_edge (0 upto arity p - 1) (0 upto arity q - 1) []
       in
         G (p, q, edges)
       end
   in
-    GP (map arity (0 upto n - 1), map mk_graph cs)
+    GP (map_range arity n, map mk_graph cs)
   end
 
 (* General reduction pair application *)
 fun rem_inv_img ctxt =
   let

   | print_cell (NONE) = "?"
 
 fun print_error ctxt D = CALLS (fn (cs, i) =>
   let
     val np = get_num_points D
-    val ms = map (get_measures D) (0 upto np - 1)
-    val tys = map (get_types D) (0 upto np - 1)
+    val ms = map_range (get_measures D) np
+    val tys = map_range (get_types D) np
     fun index xs = (1 upto length xs) ~~ xs
     fun outp s t f xs = map (fn (x, y) => s ^ Int.toString x ^ t ^ f y ^ "\n") xs
     val ims = index (map index ms)
     val _ = tracing (implode (outp "fn #" ":\n" (implode o outp "\tmeasure #" ": " (Syntax.string_of_term ctxt)) ims))
     fun print_call (k, c) =