diff -u rrb.old/node.rb rrb/node.rb --- rrb.old/node.rb Sat May 8 21:31:37 2004 +++ rrb/node.rb Fri Oct 14 14:45:43 2005 @@ -476,7 +476,7 @@ when /\A([^#.]*).([^#.]+)\Z/ ClassMethod.new( Namespace.new( $1 ), $2 ) else - raise Error, "#{str} is invalid as method name" + raise RRBError, "#{str} is invalid as method name" end end diff -u rrb.old/script.rb rrb/script.rb --- rrb.old/script.rb Fri Oct 14 21:02:13 2005 +++ rrb/script.rb Fri Oct 14 21:02:28 2005 @@ -80,7 +80,7 @@ return DumpedInfo.get_dumped_info( io ) end if $?/256 != 0 then - raise SDL::Error, "fail to run ruby internally" + raise RRBError, "fail to run ruby internally" end ensure FileUtils.rm_r work_dir_path diff -u rrb.old/vim_interface.rb rrb/vim_interface.rb --- rrb.old/vim_interface.rb Tue Jul 19 03:36:46 2005 +++ rrb/vim_interface.rb Fri Oct 14 20:46:47 2005 @@ -33,7 +33,7 @@ end def rename_var(new_var) - path = VIM::Buffer.current.name + path = VIM::Buffer.current.name.tr('\\', '/') lineno, col = VIM::Window.current.cursor old_var = VimInterface.search_id(VIM::Buffer.current[lineno], col) @@ -86,21 +86,21 @@ return end - VimInterface.refactor(type, args) + VimInterface.refactor(script, type, args) end def extract_method(new_method, line1, line2) - path = VIM::Buffer.current.name + path = VIM::Buffer.current.name.tr('\\', '/') files = Dir.glob(File.dirname(path) + '/*.rb') script = RRB::Script.new_from_filenames(*files) args = [path, new_method, line1, line2] - VimInterface.refactor("extract_method", args) + VimInterface.refactor(script, "extract_method", args) VimInterface.set_msg("Extract method: #{new_method}") end def rename_method_all(method) - path = VIM::Buffer.current.name + path = VIM::Buffer.current.name.tr('\\', '/') lineno, col = VIM::Window.current.cursor old_method = VimInterface.search_id(VIM::Buffer.current[lineno], col)