mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* parse.y (yylex): __END__ should not be effective within
string literals. * parse.y (here_document): should be aware of __END__ within here documents. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9020b60483
commit
05b4ec8683
4 changed files with 23 additions and 9 deletions
|
|
@ -95,8 +95,7 @@ class PStore
|
|||
file.flock(read_only ? File::LOCK_SH : File::LOCK_EX)
|
||||
if read_only
|
||||
@table = Marshal::load(file)
|
||||
elsif orig
|
||||
content = file.read
|
||||
elsif orig and (content = file.read) != nil
|
||||
@table = Marshal::load(content)
|
||||
size = content.size
|
||||
md5 = Digest::MD5.digest(content)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue