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

(ERB::Compiler): add instance variable @insert_cmd to change <%='s behavior.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
seki 2006-01-10 15:21:45 +00:00
parent 3428af761c
commit b468b45f7a
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jan 11 00:12:29 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
change <%='s behavior.
Tue Jan 10 19:42:33 2006 Tanaka Akira <akr@m17n.org> Tue Jan 10 19:42:33 2006 Tanaka Akira <akr@m17n.org>
* gc.c (garbage_collect): mark ruby_current_node. * gc.c (garbage_collect): mark ruby_current_node.

8
lib/erb.rb
View file

@ -558,7 +558,7 @@ class ERB
out.push(content) out.push(content)
end end
when '<%=' when '<%='
out.push("#{@put_cmd}((#{content}).to_s)") out.push("#{@insert_cmd}((#{content}).to_s)")
when '<%#' when '<%#'
# out.push("# #{content.dump}") # out.push("# #{content.dump}")
end end
@ -607,11 +607,12 @@ class ERB
def initialize(trim_mode) def initialize(trim_mode)
@percent, @trim_mode = prepare_trim_mode(trim_mode) @percent, @trim_mode = prepare_trim_mode(trim_mode)
@put_cmd = 'print' @put_cmd = 'print'
@insert_cmd = @put_cmd
@pre_cmd = [] @pre_cmd = []
@post_cmd = [] @post_cmd = []
end end
attr_reader :percent, :trim_mode attr_reader :percent, :trim_mode
attr_accessor :put_cmd, :pre_cmd, :post_cmd attr_accessor :put_cmd, :insert_cmd, :pre_cmd, :post_cmd
end end
end end
@ -705,6 +706,7 @@ class ERB
# #
def set_eoutvar(compiler, eoutvar = '_erbout') def set_eoutvar(compiler, eoutvar = '_erbout')
compiler.put_cmd = "#{eoutvar}.concat" compiler.put_cmd = "#{eoutvar}.concat"
compiler.insert_cmd = "#{eoutvar}.concat"
cmd = [] cmd = []
cmd.push "#{eoutvar} = ''" cmd.push "#{eoutvar} = ''"
@ -822,5 +824,3 @@ class ERB
module_function :def_erb_method module_function :def_erb_method
end end
end end