From c084264e2be68fa61e018d0a2675e0e4e1e54a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 4 Feb 2000 12:27:21 +0100
Subject: [PATCH] Indexing of a joinnode can return a program too.
Rev: lib/master.pike.in:1.97
---
lib/master.pike.in | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/master.pike.in b/lib/master.pike.in
index 06afc6b018..d8952eb704 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,6 +1,6 @@
/* -*- 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.
*
@@ -650,7 +650,7 @@ class joinnode
joined_modules = _joined_modules;
}
- static object|mapping ind(string index)
+ static object|mapping|program ind(string index)
{
array(mixed) res = ({});
foreach(joined_modules, object|mapping o)
@@ -678,9 +678,9 @@ class joinnode
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 (ret != ZERO_TYPE) {
return ret;
@@ -705,7 +705,7 @@ class joinnode
if (_cache_full) {
return;
}
- foreach(joined_modules, object|mapping o) {
+ foreach(joined_modules, object|mapping|program o) {
foreach(indices(o), string index) {
if (zero_type(cache[index])) {
`[](index);
@@ -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.
* Note that previous_object cannot be trusted in ths function, because
* the compiler calls this function.
@@ -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.
* Note that previous_object cannot be trusted in ths function, because
* the compiler calls this function.
--
GitLab