aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--benchmark/bm_app_answer.rb12
2 files changed, 7 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index f1a51d7179..1769ad28dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 20 23:34:48 2013 Zachary Scott <e@zzak.io>
+
+ * benchmark/bm_app_answer.rb: removed duplicate code [Fixes GH-393]
+ https://github.com/ruby/ruby/pull/393
+
Fri Sep 20 23:24:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (btest, btest-ruby, test-knownbug): add $(RUN_OPTS) to
diff --git a/benchmark/bm_app_answer.rb b/benchmark/bm_app_answer.rb
index 3cd8a8fd37..e6763b3cca 100644
--- a/benchmark/bm_app_answer.rb
+++ b/benchmark/bm_app_answer.rb
@@ -1,15 +1,7 @@
-def ack(m, n)
- if m == 0 then
- n + 1
- elsif n == 0 then
- ack(m - 1, 1)
- else
- ack(m - 1, ack(m, n - 1))
- end
-end
+require_relative 'other-lang/ack'
def the_answer_to_life_the_universe_and_everything
(ack(3,7).to_s.split(//).inject(0){|s,x| s+x.to_i}.to_s + "2" ).to_i
end
-answer = the_answer_to_life_the_universe_and_everything
+answer = the_answer_to_life_the_universe_and_everything \ No newline at end of file