* ext/psych/lib/psych/scalar_scanner.rb: Cache symbols while

tokenizing.  Thanks Kevin Menard!

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2012-10-22 21:24:50 +00:00
Родитель ca0cf16734
Коммит 6c6d4568e8
2 изменённых файлов: 9 добавлений и 2 удалений

Просмотреть файл

@ -1,3 +1,8 @@
Tue Oct 23 06:17:36 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb: Cache symbols while
tokenizing. Thanks Kevin Menard!
Tue Oct 23 06:15:40 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb: Updated the RegExp to catch

Просмотреть файл

@ -16,12 +16,14 @@ module Psych
# Create a new scanner
def initialize
@string_cache = {}
@symbol_cache = {}
end
# Tokenize +string+ returning the ruby object
def tokenize string
return nil if string.empty?
return string if @string_cache.key?(string)
return @symbol_cache[string] if @symbol_cache.key?(string)
case string
# Check for a String type, being careful not to get caught by hash keys, hex values, and
@ -67,9 +69,9 @@ module Psych
0.0 / 0.0
when /^:./
if string =~ /^:(["'])(.*)\1/
$2.sub(/^:/, '').to_sym
@symbol_cache[string] = $2.sub(/^:/, '').to_sym
else
string.sub(/^:/, '').to_sym
@symbol_cache[string] = string.sub(/^:/, '').to_sym
end
when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+$/
i = 0