diff options
| author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-10 09:07:52 +0000 |
|---|---|---|
| committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-10 09:07:52 +0000 |
| commit | 62b368dc4ae950b8218097cafc9fc4591e1093de (patch) | |
| tree | eabf7f1fc1890b84d5abd5fd8bc20d1130ec912c | |
| parent | ba18b0c6cbcfd9afed3684cf667a9503d65d5ca1 (diff) | |
* lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/erb.rb | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Wed Dec 10 18:07:25 2003 Minero Aoki <aamine@loveruby.net> + + * lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208] + Wed Dec 10 17:54:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/stringio/stringio.c (strio_read): do not set EOF flag when diff --git a/lib/erb.rb b/lib/erb.rb index 1b712c92c2..4e3aaf4a86 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -387,8 +387,10 @@ class ERB compiler = ERB::Compiler.new(trim_mode) set_eoutvar(compiler, eoutvar) @src = compiler.compile(str) + @filename = nil end - attr :src + attr_reader :src + attr_accessor :filename def set_eoutvar(compiler, eoutvar = '_erbout') compiler.put_cmd = "#{eoutvar}.concat" @@ -416,7 +418,7 @@ class ERB } return th.value else - return eval(@src, b) + return eval(@src, b, (@filename || '(erb)'), 1) end end |