summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-15 07:20:07 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-15 07:20:07 +0000
commitec7a964dca57821d2d7a36f168c2355a46a76ca2 (patch)
tree3472cfcb33fdfec2dff808add0a1775f34334960
parent365fae4dd9849e21c1494016bbd18f01d1b015df (diff)
* lib/erb.rb: Render erb with array buffer for function call optimization.
[fix GH-1143] * lib/rdoc/erb_partial.rb: ditto. * template/verconf.h.tmpl: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/erb.rb10
-rw-r--r--lib/rdoc/erb_partial.rb2
-rw-r--r--template/verconf.h.tmpl4
4 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 56c3a62..7e01847 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 15 16:19:26 2015 Takashi Kokubun <takashikkbn@gmail.com>
+
+ * lib/erb.rb: Render erb with array buffer for function call optimization.
+ [fix GH-1143]
+ * lib/rdoc/erb_partial.rb: ditto.
+ * template/verconf.h.tmpl: ditto.
+
Tue Dec 15 13:50:05 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_oct): [DOC] mention radix indicators.
diff --git a/lib/erb.rb b/lib/erb.rb
index b099c82..7b328bf 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -589,7 +589,7 @@ class ERB
end
def add_insert_cmd(out, content)
- out.push("#{@insert_cmd}((#{content}).to_s)")
+ out.push("#{@insert_cmd}((#{content}))")
end
# Compiles an ERB template into Ruby code. Returns an array of the code
@@ -834,10 +834,10 @@ class ERB
# requires the setup of an ERB _compiler_ object.
#
def set_eoutvar(compiler, eoutvar = '_erbout')
- compiler.put_cmd = "#{eoutvar}.concat"
- compiler.insert_cmd = "#{eoutvar}.concat"
- compiler.pre_cmd = ["#{eoutvar} = ''"]
- compiler.post_cmd = ["#{eoutvar}.force_encoding(__ENCODING__)"]
+ compiler.put_cmd = "#{eoutvar}.push"
+ compiler.insert_cmd = "#{eoutvar}.push"
+ compiler.pre_cmd = ["#{eoutvar} = []"]
+ compiler.post_cmd = ["#{eoutvar}.join.force_encoding(__ENCODING__)"]
end
# Generate results and print them. (see ERB#result)
diff --git a/lib/rdoc/erb_partial.rb b/lib/rdoc/erb_partial.rb
index 910d1e0..8359258 100644
--- a/lib/rdoc/erb_partial.rb
+++ b/lib/rdoc/erb_partial.rb
@@ -11,7 +11,7 @@ class RDoc::ERBPartial < ERB
def set_eoutvar compiler, eoutvar = '_erbout'
super
- compiler.pre_cmd = ["#{eoutvar} ||= ''"]
+ compiler.pre_cmd = ["#{eoutvar} ||= []"]
end
end
diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl
index 9325aee..9e09b77 100644
--- a/template/verconf.h.tmpl
+++ b/template/verconf.h.tmpl
@@ -52,7 +52,7 @@
% R["exec_prefix"] = '"RUBY_EXEC_PREFIX"'
% R["prefix"] = '"RUBY_EXEC_PREFIX"'
% exec_prefix_pat = /\A"#{Regexp.quote(rbconfig::CONFIG['exec_prefix'])}(?=\/|\z)/
-% _erbout.gsub!(/^(#define\s+(\S+)\s+)(.*)/) {
+% _erbout = [_erbout.join.gsub!(/^(#define\s+(\S+)\s+)(.*)/) {
% pre, name, repl = $1, $2, $3
% pat = %["#{name}"]
% c = C.merge(R.reject {|key, value| key == name or value.include?(pat)})
@@ -60,4 +60,4 @@
% repl.gsub!(/^""(?!$)|(.)""$/, '\1')
% repl.sub!(exec_prefix_pat, 'RUBY_EXEC_PREFIX"')
% pre + repl
-% }
+% }]