[前][次][番号順一覧][スレッド一覧]

ruby-changes:22760

From: naruse <ko1@a...>
Date: Sat, 25 Feb 2012 17:09:06 +0900 (JST)
Subject: [ruby-changes:22760] naruse:r34809 (trunk): * lib/fileutils.rb: use chomp(?/) instead of sub to optimize and avoid

naruse	2012-02-25 17:08:55 +0900 (Sat, 25 Feb 2012)

  New Revision: 34809

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34809

  Log:
    * lib/fileutils.rb: use chomp(?/) instead of sub to optimize and avoid
      to regexping invalid string.

  Modified files:
    trunk/ChangeLog
    trunk/lib/fileutils.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34808)
+++ ChangeLog	(revision 34809)
@@ -1,3 +1,8 @@
+Sat Feb 25 17:07:15 2012  NARUSE, Yui  <naruse@r...>
+
+	* lib/fileutils.rb: use chomp(?/) instead of sub to optimize and avoid
+	  to regexping invalid string.
+
 Sat Feb 25 16:18:24 2012  NARUSE, Yui  <naruse@r...>
 
 	* complex.c (nucomp_marshal_load): raise error on invalid data.
Index: lib/fileutils.rb
===================================================================
--- lib/fileutils.rb	(revision 34808)
+++ lib/fileutils.rb	(revision 34809)
@@ -281,7 +281,7 @@
     fu_output_message "mkdir -p #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}" if options[:verbose]
     return *list if options[:noop]
 
-    list.map {|path| path.sub(%r</\z>, '') }.each do |path|
+    list.map {|path| path.chomp(?/) }.each do |path|
       # optimize for the most common case
       begin
         fu_mkdir path, options[:mode]
@@ -317,7 +317,7 @@
 private
 
   def fu_mkdir(path, mode)   #:nodoc:
-    path = path.sub(%r</\z>, '')
+    path = path.chomp(?/)
     if mode
       Dir.mkdir path, mode
       File.chmod mode, path
@@ -346,7 +346,7 @@
     return if options[:noop]
     list.each do |dir|
       begin
-        Dir.rmdir(dir = dir.sub(%r</\z>, ''))
+        Dir.rmdir(dir = dir.chomp(?/))
         if parents
           until (parent = File.dirname(dir)) == '.' or parent == dir
             Dir.rmdir(dir)
@@ -1465,7 +1465,7 @@
 
     def remove_dir1
       platform_support {
-        Dir.rmdir path().sub(%r</\z>, '')
+        Dir.rmdir path().chomp(?/)
       }
     end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]