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

* lib/date/format.rb: suppressed a warning.

Browse source 
* lib/irb/ruby-lex.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-08-16 12:32:35 +00:00
parent 066b30245b
commit 5e4f23d600
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Aug 16 21:31:21 2009 NARUSE, Yui <naruse@ruby-lang.org>
* lib/date/format.rb: suppressed a warning.
* lib/irb/ruby-lex.rb: ditto.
Sun Aug 16 15:25:26 2009 NARUSE, Yui <naruse@ruby-lang.org>
* lib/csv.rb: Change magic comment to US-ASCII in order to

14
lib/date/format.rb
View file

@ -544,8 +544,8 @@ class Date
e._cent ||= if val >= 69 then 19 else 20 end
when 'Z', /\A:{0,3}z/
return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
|[[:alpha:].\s]+(?:standard|daylight)\s+time\b
|[[:alpha:]]+(?:\s+dst)?\b
|[a-z.\s]+(?:standard|daylight)\s+time\b
|[a-z]+(?:\s+dst)?\b
)/ix, '')
val = $1
e.zone = val
@ -560,8 +560,8 @@ class Date
end
else
case c
when /\A[\s\v]/
str.sub!(/\A[\s\v]+/, '')
when /\A\s/
str.sub!(/\A\s+/, '')
else
return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
end
@ -703,9 +703,9 @@ class Date
(
(?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
|
[[:alpha:].\s]+(?:standard|daylight)\stime\b
[a-z.\s]+(?:standard|daylight)\stime\b
|
[[:alpha:]]+(?:\sdst)?\b
[a-z]+(?:\sdst)?\b
)
)?
/ix,
@ -1034,7 +1034,7 @@ class Date
e._comp = comp
str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
str.gsub!(/[^-+',.\/:@0-9a-zA-Z\[\]]+/, ' ')
_parse_time(str, e) # || _parse_beat(str, e)
_parse_day(str, e)

4
lib/irb/ruby-lex.rb
View file

@ -407,7 +407,7 @@ class RubyLex
if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
(@lex_state != EXPR_ARG || @space_seen)
c = peek(0)
if /\S/ =~ c && (/["'`]/ =~ c || /[\w_]/ =~ c || c == "-")
if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-")
tk = identify_here_document
end
end
@ -728,7 +728,7 @@ class RubyLex
printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
if peek(0) =~ /[0-9]/
t = identify_number
elsif peek(0) =~ /[\w_]/
elsif peek(0) =~ /\w/
t = identify_identifier
end
printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?