Merge branch 'master' of github.com:mruby/mruby

2 files changed, 20 insertions, 7 deletions

diff --git a/mrblib/numeric.rb b/mrblib/numeric.rb
index ee5bdcb56..08600b0bf 100644
--- a/mrblib/numeric.rb
+++ b/mrblib/numeric.rb
@@ -1,8 +1,14 @@
-#
-#  Integer
-#
+##
+# Integer
+#  
+# ISO 15.2.8
 class Integer
-  # 15.2.8.3.15
+
+  ##
+  # Calls the given block once for each Integer
+  # from +self+ downto +num+.
+  #
+  # ISO 15.2.8.3.15
   def downto(num, &block)
     raise TypeError, "expected Integer" unless num.kind_of? Integer
     i = self
@@ -13,7 +19,10 @@ class Integer
     self
   end
 
-  # 15.2.8.3.22
+  ##
+  # Calls the given block +self+ times.
+  #
+  # ISO 15.2.8.3.22
   def times(&block)
     i = 0
     while(i < self)
@@ -23,7 +32,11 @@ class Integer
     self
   end
 
-  # 15.2.8.3.27
+  ##
+  # Calls the given block once for each Integer
+  # from +self+ upto +num+.
+  #
+  # ISO 15.2.8.3.27
   def upto(num, &block)
     raise TypeError, "expected Integer" unless num.kind_of? Integer
     i = self
diff --git a/src/vm.c b/src/vm.c
index 48a329a7d..9915200de 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -299,7 +299,7 @@ localjump_error(mrb_state *mrb, const char *kind)
 
 #define SET_SYM_VALUE(r,v) {\
   (r).tt = MRB_TT_SYMBOL;\
-  (r).value.i = (v);\
+  (r).value.sym = (v);\
 }
 
 #define SET_OBJ_VALUE(r,v) {\