Skip to content
Snippets Groups Projects
Commit 3ad5d6f9 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Unnecessary to do object_program() when looking for the

is_resolv_foonode constants; `-> isn't overloaded.

Rev: lib/master.pike.in:1.119
parent 5dc4e237
No related branches found
No related tags found
No related merge requests found
/* -*- Pike -*- /* -*- Pike -*-
* *
* $Id: master.pike.in,v 1.118 2000/05/11 04:30:25 mast Exp $ * $Id: master.pike.in,v 1.119 2000/05/13 16:48:20 mast Exp $
* *
* Master-file for Pike. * Master-file for Pike.
* *
...@@ -729,8 +729,7 @@ class joinnode ...@@ -729,8 +729,7 @@ class joinnode
if (!zero_type(ret = o[index])) if (!zero_type(ret = o[index]))
{ {
if (objectp(ret = o[index]) && if (objectp(ret = o[index]) &&
(object_program(ret)->is_resolv_dirnode || (ret->is_resolv_dirnode || ret->is_resolv_joinnode))
object_program(ret)->is_resolv_joinnode))
{ {
// Only join directorynodes (or joinnodes). // Only join directorynodes (or joinnodes).
res += ({ ret }); res += ({ ret });
...@@ -848,8 +847,7 @@ mixed resolv_base(string identifier, string|void current_file) ...@@ -848,8 +847,7 @@ mixed resolv_base(string identifier, string|void current_file)
string file=combine_path(path,identifier); string file=combine_path(path,identifier);
if(mixed ret=findmodule(file)) { if(mixed ret=findmodule(file)) {
if ((objectp(ret)) && if ((objectp(ret)) &&
(object_program(ret)->is_resolv_dirnode || (ret->is_resolv_dirnode || ret->is_resolv_joinnode)) {
object_program(ret)->is_resolv_joinnode)) {
if (mixed new_ret = ret->_module_value) { if (mixed new_ret = ret->_module_value) {
ret = new_ret; ret = new_ret;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment