1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (is_defined): avoid unnecessary method invocations.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-07-31 04:40:11 +00:00
parent 45942bdbc6
commit 021b336535
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sat Jul 31 13:37:51 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (is_defined): avoid unnecessary method invocations.
Sat Jul 31 05:35:37 2004 why the lucky stiff <why@ruby-lang.org> Sat Jul 31 05:35:37 2004 why the lucky stiff <why@ruby-lang.org>
* lib/yaml/rubytypes.rb: exceptions were using an older * lib/yaml/rubytypes.rb: exceptions were using an older

20
eval.c
View File

@ -2159,7 +2159,7 @@ copy_node_scope(node, rval)
#define MATCH_DATA *rb_svar(node->nd_cnt) #define MATCH_DATA *rb_svar(node->nd_cnt)
static const char* is_defined _((VALUE, NODE*, char*)); static const char* is_defined _((VALUE, NODE*, char*, int));
static char* static char*
arg_defined(self, node, buf, type) arg_defined(self, node, buf, type)
@ -2176,13 +2176,13 @@ arg_defined(self, node, buf, type)
argc=node->nd_alen; argc=node->nd_alen;
if (argc > 0) { if (argc > 0) {
for (i=0;i<argc;i++) { for (i=0;i<argc;i++) {
if (!is_defined(self, node->nd_head, buf)) if (!is_defined(self, node->nd_head, buf, 0))
return 0; return 0;
node = node->nd_next; node = node->nd_next;
} }
} }
} }
else if (!is_defined(self, node, buf)) { else if (!is_defined(self, node, buf, 0)) {
return 0; return 0;
} }
return type; return type;
@ -2201,10 +2201,11 @@ search_iclass(self, klass)
} }
static const char* static const char*
is_defined(self, node, buf) is_defined(self, node, buf, noeval)
VALUE self; VALUE self;
NODE *node; /* OK */ NODE *node; /* OK */
char *buf; char *buf;
int noeval;
{ {
VALUE val; /* OK */ VALUE val; /* OK */
int state; int state;
@ -2239,7 +2240,8 @@ is_defined(self, node, buf)
val = self; val = self;
if (node->nd_recv == (NODE *)1) goto check_bound; if (node->nd_recv == (NODE *)1) goto check_bound;
case NODE_CALL: case NODE_CALL:
if (!is_defined(self, node->nd_recv, buf)) return 0; if (noeval) return ex;
if (!is_defined(self, node->nd_recv, buf, Qtrue)) return 0;
val = rb_eval(self, node->nd_recv); val = rb_eval(self, node->nd_recv);
check_bound: check_bound:
{ {
@ -2331,8 +2333,8 @@ is_defined(self, node, buf)
break; break;
case NODE_COLON2: case NODE_COLON2:
if (!is_defined(self, node->nd_recv, buf)) return 0; if (noeval) return ex;
val = rb_eval(self, node->nd_head); if (!is_defined(self, node->nd_recv, buf, Qtrue)) return 0;
switch (TYPE(val)) { switch (TYPE(val)) {
case T_CLASS: case T_CLASS:
case T_MODULE: case T_MODULE:
@ -3379,7 +3381,7 @@ rb_eval(self, n)
goto again; goto again;
case NODE_OP_ASGN_OR: case NODE_OP_ASGN_OR:
if ((node->nd_aid && !is_defined(self, node->nd_head, 0)) || if ((node->nd_aid && !is_defined(self, node->nd_head, 0, 0)) ||
!RTEST(result = rb_eval(self, node->nd_head))) { !RTEST(result = rb_eval(self, node->nd_head))) {
node = node->nd_value; node = node->nd_value;
goto again; goto again;
@ -3870,7 +3872,7 @@ rb_eval(self, n)
case NODE_DEFINED: case NODE_DEFINED:
{ {
char buf[20]; char buf[20];
const char *desc = is_defined(self, node->nd_head, buf); const char *desc = is_defined(self, node->nd_head, buf, 0);
if (desc) result = rb_str_new2(desc); if (desc) result = rb_str_new2(desc);
else result = Qnil; else result = Qnil;