lib/ruby-debug/commands/breakpoints.rb in ruby-debug-0.5.2-mswin32 vs lib/ruby-debug/commands/breakpoints.rb in ruby-debug-0.5.3

@@ -44,12 +44,12 @@
         pos = pos.to_i
       else
         pos = pos.intern.id2name
       end
       
-      Debugger.add_breakpoint file, pos, expr
-      print "Set breakpoint %d at %s:%s\n", Debugger.breakpoints.size, file, pos.to_s
+      b = Debugger.add_breakpoint file, pos, expr
+      print "Set breakpoint %d at %s:%s\n", b.id, file, pos.to_s
     end
 
     class << self
       def help_command
         'break'
@@ -72,15 +72,15 @@
     end
 
     def execute
       unless Debugger.breakpoints.empty?
         print "Breakpoints:\n"
-        Debugger.breakpoints.each_with_index do |b, n|
+        Debugger.breakpoints.sort_by{|b| b.id }.each do |b|
           if b.expr.nil?
-            print "  %d %s:%s\n", n+1, b.source, b.pos
+            print "  %d %s:%s\n", b.id, b.source, b.pos
           else
-            print "  %d %s:%s if %s\n", n+1, b.source, b.pos, b.expr
+            print "  %d %s:%s if %s\n", b.id, b.source, b.pos, b.expr
           end
         end
         print "\n"
       else
         print "No breakpoints\n"
@@ -113,10 +113,10 @@
         if confirm("Clear all breakpoints? (y/n) ")
           Debugger.breakpoints.clear
         end
       else
         pos = pos.to_i
-        unless Debugger.breakpoints.delete_at(pos-1)
+        unless Debugger.remove_breakpoint(pos)
           print "Breakpoint %d is not defined\n", pos
         end
       end
     end
 
\ No newline at end of file