pike.git/ lib/ master.pike.in

1998-10-17

1998-10-17 02:10:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 8b307eb1c5e83ad2c1037afed15e2ec081ad85e4 (36 lines) (+31/-5) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed a bug with the joinnodes.

Rev: lib/master.pike.in:1.34

1: - /* $Id: master.pike.in,v 1.33 1998/10/16 18:38:32 grubba Exp $ + /* $Id: master.pike.in,v 1.34 1998/10/17 02:10:00 grubba Exp $    *    * Master-file for Pike.    *
528:    foreach(joined_modules, object|mapping o) {    mixed ret;    if (!zero_type(ret = o[index])) { +  if (objectp(ret = o[index]) && +  (< joinnode, dirnode >)[object_program(ret)]) { +  // Only join directorynodes (or joinnodes).    res += ({ ret }); -  +  } else if (!sizeof(res)) { +  return(ret); +  } else { +  // Ignore +  werror(sprintf("Ignoring index %s: %t\n", index, ret)); +  continue;    }    } -  +  }    if (sizeof(res) > 1) {    return joinnode(res);    } else if (sizeof(res)) {
632:    {    string file=combine_path(path,identifier);    if(mixed ret=findmodule(file)) { +  if ((objectp(ret)) && +  (< joinnode, dirnode >)[object_program(ret)]) {    if (mixed new_ret = ret->_module_value) {    ret = new_ret;    }    tmp += ({ ret }); -  +  } else { +  if (mixed new_ret = ret->_module_value) { +  ret = new_ret;    } -  +  if (!sizeof(tmp)) { +  return ret; +  } else { +  // Ignore +  werror(sprintf("Ignoring file %O: %t for identifier %O\n", +  file, ret, identifier)); +  continue;    } -  +  } +  } +  }    if (sizeof(tmp)) {    if (sizeof(tmp) == 1) {    return(tmp[0]);