* time.c (time_mdump): dump timezone string to private instance variable

  on marshaling.

* time.c (time_mload): load timezone string from private instance
  variable named 'zone'.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 33 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d2bf9669b..407aaa6d17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Dec  7 09:47:35 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (time_mdump): dump timezone string to private instance variable
+	  on marshaling.
+
+	* time.c (time_mload): load timezone string from private instance
+	  variable named 'zone'.
+
 Fri Dec  7 01:15:07 2012  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* ext/fiddle/lib/fiddle/function.rb (Fiddle::Function#name): new
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 094a5af68a..c4ffccedad 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -290,6 +290,21 @@ class TestTime < Test::Unit::TestCase
     assert_equal(29700, t2.utc_offset, bug)
   end
 
+  def test_marshal_zone
+    orig_zone = ENV['TZ']
+
+    t = Time.utc(2013, 2, 24)
+    assert_equal('UTC', t.zone)
+    assert_equal('UTC', Marshal.load(Marshal.dump(t)).zone)
+
+    ENV['TZ'] = 'Asia/Tokyo'
+    t = Time.local(2013, 2, 24)
+    assert_equal('JST', Time.local(2013, 2, 24).zone)
+    assert_equal('JST', Marshal.load(Marshal.dump(t)).zone)
+  ensure
+    ENV['TZ'] = orig_zone
+  end
+
   def test_marshal_to_s
     t1 = Time.new(2011,11,8, 0,42,25, 9*3600)
     t2 = Time.at(Marshal.load(Marshal.dump(t1)))
diff --git a/time.c b/time.c
index 846ff3db16..c8aedd88ce 100644
--- a/time.c
+++ b/time.c
@@ -29,7 +29,7 @@
 
 #include "timev.h"
 
-static ID id_divmod, id_mul, id_submicro, id_nano_num, id_nano_den, id_offset;
+static ID id_divmod, id_mul, id_submicro, id_nano_num, id_nano_den, id_offset, id_zone;
 static ID id_eq, id_ne, id_quo, id_div, id_cmp, id_lshift;
 
 #define NDIV(x,y) (-(-((x)+1)/(y))-1)
@@ -4707,6 +4707,9 @@ time_mdump(VALUE time)
 	    off = rb_Integer(div);
 	rb_ivar_set(str, id_offset, off);
     }
+    if (tobj->vtm.zone) {
+	rb_ivar_set(str, id_zone, rb_locale_str_new_cstr(tobj->vtm.zone));
+    }
     return str;
 }
 
@@ -4734,7 +4737,7 @@ time_mload(VALUE time, VALUE str)
     struct vtm vtm;
     int i, gmt;
     long nsec;
-    VALUE submicro, nano_num, nano_den, offset;
+    VALUE submicro, nano_num, nano_den, offset, zone;
     wideval_t timew;
     st_data_t data;
 
@@ -4752,6 +4755,7 @@ time_mload(VALUE time, VALUE str)
     get_attr(nano_den, {});
     get_attr(submicro, {});
     get_attr(offset, validate_utc_offset(offset));
+    get_attr(zone, {});
 #undef get_attr
 
     rb_copy_generic_ivar(time, str);
@@ -4835,6 +4839,9 @@ end_submicro: ;
 	time_set_utc_offset(time, offset);
 	time_fixoff(time);
     }
+    if (!NIL_P(zone)) {
+	tobj->vtm.zone = StringValueCStr(zone);
+    }
 
     return time;
 }
@@ -4955,6 +4962,7 @@ Init_Time(void)
     id_nano_num = rb_intern("nano_num");
     id_nano_den = rb_intern("nano_den");
     id_offset = rb_intern("offset");
+    id_zone = rb_intern("zone");
 
     rb_cTime = rb_define_class("Time", rb_cObject);
     rb_include_module(rb_cTime, rb_mComparable);