From 3d0c93a90750e4cb01947c14c462f1b96c361d3c Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 13 Feb 2006 09:07:57 +0000 Subject: * eval.c (copy_node_scope): remove duplicated semicolons at end. a patch from KIMURA Koichi . [ruby-dev:28332] * eval.c (VIS_MODE): remove unnecessary argument. [ruby-dev:28332] * parse.y (parser_parse_string): mention "regexp" in a error message. a patch from Mauricio Fernandez [ruby-core:07340] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ eval.c | 7 +++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c63a18d48..19ca56bf17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Feb 13 18:01:52 2006 Yukihiro Matsumoto + + * eval.c (copy_node_scope): remove duplicated semicolons at end. + a patch from KIMURA Koichi . + [ruby-dev:28332] + + * eval.c (VIS_MODE): remove unnecessary argument. + [ruby-dev:28332] + Mon Feb 13 13:49:48 2006 Yukihiro Matsumoto * parse.y (parser_parse_string): mention "regexp" in a error diff --git a/eval.c b/eval.c index b64ae6f7e1..ccb177a9e9 100644 --- a/eval.c +++ b/eval.c @@ -256,7 +256,7 @@ static int vis_mode; #define VIS_MASK 7 #define VIS_SET(f) (vis_mode=(f)) #define VIS_TEST(f) (vis_mode&(f)) -#define VIS_MODE(f) (vis_mode) +#define VIS_MODE() (vis_mode) NODE* ruby_current_node; int ruby_safe_level = 0; @@ -2102,7 +2102,7 @@ rb_mod_alias_method(VALUE mod, VALUE newname, VALUE oldname) static NODE* copy_node_scope(NODE *node, NODE *rval) { - NODE *cref = NEW_NODE(NODE_CREF,rval->nd_clss,0,rval->nd_next);; + NODE *cref = NEW_NODE(NODE_CREF,rval->nd_clss,0,rval->nd_next); NODE *copy = NEW_NODE(NODE_SCOPE,0,cref,node->nd_next); if (node->nd_tbl) { @@ -5716,7 +5716,7 @@ formal_assign(VALUE recv, NODE *node, int argc, const VALUE *argv, VALUE *local_ ruby_frame->self = recv;\ ruby_frame->argc = argc;\ ruby_frame->block = block;\ - ruby_frame->flags = ((flags & NOEX_RECV) ? FRAME_FUNC : 0) | 0; + ruby_frame->flags = (flags & NOEX_RECV) ? FRAME_FUNC : 0; static VALUE rb_call0(VALUE klass, VALUE recv, ID id, ID oid, @@ -5726,7 +5726,6 @@ rb_call0(VALUE klass, VALUE recv, ID id, ID oid, { NODE *b2; /* OK */ volatile VALUE result = Qnil; - int dmeth = DMETHOD_P(); static int tick; volatile VALUE args; volatile int safe = -1; -- cgit v1.2.3