yugui	2009-02-22 21:49:21 +0900 (Sun, 22 Feb 2009)

  New Revision: 22533

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22533

  Log:
    merges r22259 from trunk into ruby_1_9_1.
    * compile.c (hide_obj): OBJ_FREEZE() is not an expression.  a patch
      from nagachika <nagachika00 AT gmail.com> at [ruby-dev:37977].
    * compile.c (insn_set_sc_state): fixed typoe.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/compile.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22532)
+++ ruby_1_9_1/ChangeLog	(revision 22533)
@@ -1,3 +1,10 @@
+Thu Feb 12 22:51:18 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* compile.c (hide_obj): OBJ_FREEZE() is not an expression.  a patch
+	  from nagachika <nagachika00 AT gmail.com> at [ruby-dev:37977].
+
+	* compile.c (insn_set_sc_state): fixed typoe.
+
 Thu Feb 12 19:42:33 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (compile_array_, defined_expr, iseq_compile_each): hide
Index: ruby_1_9_1/compile.c
===================================================================
--- ruby_1_9_1/compile.c	(revision 22532)
+++ ruby_1_9_1/compile.c	(revision 22533)
@@ -295,7 +295,7 @@
 #define INIT_ANCHOR(name) \
   (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
 
-#define hide_obj(obj) (void)(OBJ_FREEZE(obj), RBASIC(obj)->klass = 0)
+#define hide_obj(obj) do {OBJ_FREEZE(obj); RBASIC(obj)->klass = 0;} while (0)
 
 #include "optinsn.inc"
 #if OPT_INSTRUCTIONS_UNIFICATION
@@ -1978,7 +1978,7 @@
 		dump_disasm_list((LINK_ELEMENT *)iobj);
 		dump_disasm_list((LINK_ELEMENT *)lobj);
 		printf("\n-- %d, %d\n", lobj->sc_state, nstate);
-		rb_compile_error(RSTRING_PTR(iseq->filename), iobj->lineno,
+		rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
 				 "insn_set_sc_state error\n");
 		return 0;
 	    }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/