1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Clarification of what '*' matches. Patch by John Wells <john.wells at greatworx.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2010-06-04 21:22:47 +00:00
parent c052958912
commit 79aac05474
4 changed files with 9 additions and 7 deletions

View file

@ -1,3 +1,8 @@
Sat Jun 5 06:20:57 2010 Eric Hodel <drbrain@segment7.net>
* dir.c: Clarification of what '*' matches. Patch by John Wells
<john.wells at greatworx.com>
Fri Jun 4 10:46:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jun 4 10:46:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/cfunc.c (rb_dlcfunc_inspect): should taint the result. * ext/dl/cfunc.c (rb_dlcfunc_inspect): should taint the result.

5
dir.c
View file

@ -1741,7 +1741,10 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
* <code>\*c\*</code> will match all files that * <code>\*c\*</code> will match all files that
* have <code>c</code> in them (including at * have <code>c</code> in them (including at
* the beginning or end). Equivalent to * the beginning or end). Equivalent to
* <code>/ .* /x</code> in regexp. * <code>/ .* /x</code> in regexp. Note, this
* will not match Unix-like hidden files (dotfiles).
* In order to include those in the match results,
* you must use something like "{*,.*}".
* <code>**</code>:: Matches directories recursively. * <code>**</code>:: Matches directories recursively.
* <code>?</code>:: Matches any one character. Equivalent to * <code>?</code>:: Matches any one character. Equivalent to
* <code>/.{1}/</code> in regexp. * <code>/.{1}/</code> in regexp.

View file

@ -17,11 +17,6 @@ module RubyToken
EXPR_DOT = :EXPR_DOT EXPR_DOT = :EXPR_DOT
EXPR_CLASS = :EXPR_CLASS EXPR_CLASS = :EXPR_CLASS
# for ruby 1.4X
if !defined?(Symbol)
Symbol = Integer
end
class Token class Token
def initialize(seek, line_no, char_no) def initialize(seek, line_no, char_no)
@seek = seek @seek = seek

View file

@ -1914,7 +1914,6 @@ rb_num2ull(VALUE val)
* *
*/ */
/* /*
* call-seq: * call-seq:
* int.to_i -> integer * int.to_i -> integer