knu	2012-11-30 13:01:07 +0900 (Fri, 30 Nov 2012)

  New Revision: 38028

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

  Log:
    Stop using a regexp that causes a false warning.
    
    * lib/abbrev.rb (Abbrev#abbrev): Stop using a regexp that causes a
      false warning. [Bug #7471]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38027)
+++ ChangeLog	(revision 38028)
@@ -4,6 +4,9 @@
 	  should only match the beginning of each word, not the beginning
 	  of every line in it.
 
+	* lib/abbrev.rb (Abbrev#abbrev): Stop using a regexp that causes a
+	  false warning. [Bug #7471]
+
 Fri Nov 30 12:30:55 2012  Akinori MUSHA  <knu@i...>
 
 	* test/test_abbrev.rb: Add tests for lib/abbrev.rb.
Index: lib/abbrev.rb
===================================================================
--- lib/abbrev.rb	(revision 38027)
+++ lib/abbrev.rb	(revision 38028)
@@ -73,9 +73,9 @@
     end
 
     words.each do |word|
-      next if (abbrev = word).empty?
-      while (len = abbrev.rindex(/[\w\W]\z/)) > 0
-        abbrev = word[0,len]
+      next if word.empty?
+      word.size.downto(1) { |len|
+        abbrev = word[0...len]
 
         next if pattern && pattern !~ abbrev
 
@@ -87,7 +87,7 @@
         else
           break
         end
-      end
+      }
     end
 
     words.each do |word|

Property changes on: lib/abbrev.rb
___________________________________________________________________
Added: svn:executable
   + *


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