Skip to content
Snippets Groups Projects
Commit c084264e authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Indexing of a joinnode can return a program too.

Rev: lib/master.pike.in:1.97
parent d032417b
No related branches found
No related tags found
No related merge requests found
/* -*- Pike -*- /* -*- Pike -*-
* *
* $Id: master.pike.in,v 1.96 2000/01/27 23:07:27 hubbe Exp $ * $Id: master.pike.in,v 1.97 2000/02/04 11:27:21 grubba Exp $
* *
* Master-file for Pike. * Master-file for Pike.
* *
...@@ -650,7 +650,7 @@ class joinnode ...@@ -650,7 +650,7 @@ class joinnode
joined_modules = _joined_modules; joined_modules = _joined_modules;
} }
static object|mapping ind(string index) static object|mapping|program ind(string index)
{ {
array(mixed) res = ({}); array(mixed) res = ({});
foreach(joined_modules, object|mapping o) foreach(joined_modules, object|mapping o)
...@@ -678,9 +678,9 @@ class joinnode ...@@ -678,9 +678,9 @@ class joinnode
return UNDEFINED; return UNDEFINED;
} }
object|mapping `[](string index) object|mapping|program `[](string index)
{ {
object|mapping ret; object|mapping|program ret;
if (!zero_type(ret = cache[index])) { if (!zero_type(ret = cache[index])) {
if (ret != ZERO_TYPE) { if (ret != ZERO_TYPE) {
return ret; return ret;
...@@ -705,7 +705,7 @@ class joinnode ...@@ -705,7 +705,7 @@ class joinnode
if (_cache_full) { if (_cache_full) {
return; return;
} }
foreach(joined_modules, object|mapping o) { foreach(joined_modules, object|mapping|program o) {
foreach(indices(o), string index) { foreach(indices(o), string index) {
if (zero_type(cache[index])) { if (zero_type(cache[index])) {
`[](index); `[](index);
...@@ -1101,7 +1101,7 @@ string trim_file_name(string s) ...@@ -1101,7 +1101,7 @@ string trim_file_name(string s)
} }
/* /*
* This function is called whenever a compiling error occurs, * This function is called whenever a compiling error occurs.
* Nothing strange about it. * Nothing strange about it.
* Note that previous_object cannot be trusted in ths function, because * Note that previous_object cannot be trusted in ths function, because
* the compiler calls this function. * the compiler calls this function.
...@@ -1131,7 +1131,7 @@ void compile_error(string file,int line,string err) ...@@ -1131,7 +1131,7 @@ void compile_error(string file,int line,string err)
} }
/* /*
* This function is called whenever a compiling error occurs, * This function is called whenever a compiling warning occurs.
* Nothing strange about it. * Nothing strange about it.
* Note that previous_object cannot be trusted in ths function, because * Note that previous_object cannot be trusted in ths function, because
* the compiler calls this function. * the compiler calls this function.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment