From 3ff9aad22f3856ec592113b0c6157ebf888c4836 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Fri, 7 Feb 2014 12:18:55 +0900
Subject: move version info from gems to core; ref #576 #1684

---
 src/init.c  |  2 ++
 src/print.c | 20 ++++----------------
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/init.c b/src/init.c
index e97c72d68..c08c4b046 100644
--- a/src/init.c
+++ b/src/init.c
@@ -22,6 +22,7 @@ void mrb_init_numeric(mrb_state*);
 void mrb_init_range(mrb_state*);
 void mrb_init_gc(mrb_state*);
 void mrb_init_math(mrb_state*);
+void mrb_init_version(mrb_state*);
 void mrb_init_mrblib(mrb_state*);
 void mrb_init_mrbgems(mrb_state*);
 void mrb_final_mrbgems(mrb_state*);
@@ -47,6 +48,7 @@ mrb_init_core(mrb_state *mrb)
   mrb_init_numeric(mrb); DONE;
   mrb_init_range(mrb); DONE;
   mrb_init_gc(mrb); DONE;
+  mrb_init_version(mrb); DONE;
   mrb_init_mrblib(mrb); DONE;
 #ifndef DISABLE_GEMS
   mrb_init_mrbgems(mrb); DONE;
diff --git a/src/print.c b/src/print.c
index 94250ddce..9d59aa4ff 100644
--- a/src/print.c
+++ b/src/print.c
@@ -54,31 +54,19 @@ mrb_print_error(mrb_state *mrb)
 void
 mrb_show_version(mrb_state *mrb)
 {
-  static const char version_msg[] = "mruby - Embeddable Ruby  Copyright (c) 2010-2014 mruby developers\n";
   mrb_value msg;
 
-  if (mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION"))) {
-    msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION"));
-    msg = mrb_funcall(mrb, msg, "+", 1, mrb_str_new_lit(mrb, "\n"));
-  }
-  else {
-    msg = mrb_str_new_lit(mrb, version_msg);
-  }
+  msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION"));
   printstr(mrb, msg);
+  printstr(mrb, mrb_str_new_lit(mrb, "\n"));
 }
 
 void
 mrb_show_copyright(mrb_state *mrb)
 {
-  static const char copyright_msg[] = "mruby - Copyright (c) 2010-2014 mruby developers\n";
   mrb_value msg;
 
-  if (mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT"))) {
-    msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT"));
-    msg = mrb_funcall(mrb, msg, "+", 1, mrb_str_new_lit(mrb, "\n"));
-  }
-  else {
-    msg = mrb_str_new_lit(mrb, copyright_msg);
-  }
+  msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT"));
   printstr(mrb, msg);
+  printstr(mrb, mrb_str_new_lit(mrb, "\n"));
 }
-- 
cgit v1.2.3