0
@@ -64,8 +64,8 @@ module Benchmark
0
           print "%#{@group_max}s" % name
0
           
0
           # Actually run the benchmarks
0
-          procs.each_with_index do |proc, i|
0
-            head = @columns[@columns.order[i]]
0
+          procs.each_with_index do |(column, proc), i|
0
+            head = @columns[column]
0
             bench = Benchmark.measure { @times.times(&proc)}
0
             print (" %#{head.size >= 5 ? head.size : 5}.2f |" % bench.real)
0
           end
0
@@ -98,7 +98,7 @@ module Benchmark
0
     def report(str, &blk)
0
       @groups ||= Dictionary.new {|h,k| h[k] = Dictionary.new}
0
       if !@columns || @columns.size == 1
0
-        @groups[@current_group || ""][str] = [blk]
0
+        @groups[@current_group || ""][str] = {(@columns && @columns.order[0]) || :results => blk}
0
       else
0
         report = GroupReport.new(@columns.keys)
0
         report.instance_eval(&blk)
0
@@ -120,12 +120,12 @@ module Benchmark
0
       cols.each do |col|
0
         new_self.class_eval <<-RUBY
0
           def #{col}(&blk)
0
-            @runs ||= []
0
-            @runs << blk
0
+            @runs ||= {}
0
+            @runs[#{col.to_sym.inspect}] = blk
0
           end
0
         RUBY
0
       end
0
     end
0
   end
0
   
0
-end
0
\ No newline at end of file
0
+end