diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-12 13:51:19 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-12 13:51:19 +0000 |
commit | 5dd1a4c14e7d7a70afb8f3e1ebded95040d321ab (patch) | |
tree | b88bb3112eba0c463b94b85e4b053e6a35d3565c | |
parent | 7882b61a038257199a2b6776a9b9c2f77db693f8 (diff) | |
download | ruby-5dd1a4c14e7d7a70afb8f3e1ebded95040d321ab.tar.gz |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | compile.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu Feb 12 22:51:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 12:36:35 2009 Tanaka Akira <akr@fsij.org> * ext/socket/basicsocket.c (bsock_getpeereid): implemented for Solaris @@ -295,7 +295,7 @@ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); #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 @@ insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state) 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; } |