[Rubyeclipse-commit] org.rubypeople.rdt.launching/ruby eclipseDebug.rb,1.17,1.18

[Markus B. <mba...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/ruby
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7903/ruby

Modified Files:
	eclipseDebug.rb 
Log Message:
variable renders object id as positive/negative hex number. fixes problem with negative ID.

Index: eclipseDebug.rb
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/ruby/eclipseDebug.rb,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** eclipseDebug.rb	13 Oct 2005 19:43:30 -0000	1.17
--- eclipseDebug.rb	16 Jan 2006 21:09:20 -0000	1.18
***************
*** 73,77 ****
        end	  
  	end
!     out("<variable name=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%s\"/>", CGI.escapeHTML(name), kind, CGI.escapeHTML(valueString), value.class(), hasChildren, value.respond_to?(:object_id) ? value.object_id : value.id)
    end
  
--- 73,77 ----
        end	  
  	end
!     out("<variable name=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\"/>", CGI.escapeHTML(name), kind, CGI.escapeHTML(valueString), value.class(), hasChildren, value.respond_to?(:object_id) ? value.object_id : value.id)
    end
  
***************
*** 396,400 ****
          end		
  
!       when /^\s*i(?:nstance)?\s*(\d+)?\s+(\d+)?/        
          new_binding = getBinding($1)
          if new_binding then
--- 396,400 ----
          end		
  
!       when /^\s*i(?:nstance)?\s*(\d+)?\s+((?:[\\+-]0x)?[\dabcdef]+)?/        
          new_binding = getBinding($1)
          if new_binding then
***************
*** 404,408 ****
            @printer.printXml("<variables>")
            if $2 then
!             obj = ObjectSpace._id2ref($2.to_i)
              if (!obj) then
                @printer.debug("unknown object id : %s", $2)
--- 404,408 ----
            @printer.printXml("<variables>")
            if $2 then
!             obj = ObjectSpace._id2ref($2.hex)
              if (!obj) then
                @printer.debug("unknown object id : %s", $2)