From 1e69d695a0d05670f8c59a13b52e405aeeaa7d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Wed, 18 Jun 2008 11:35:13 +0200 Subject: [PATCH] Strengthened the type for indices() some more- Rev: src/builtin_functions.c:1.672 --- src/builtin_functions.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/builtin_functions.c b/src/builtin_functions.c index ec40138320..7ade4b1ea0 100644 --- a/src/builtin_functions.c +++ b/src/builtin_functions.c @@ -2,7 +2,7 @@ || This file is part of Pike. For copyright information see COPYRIGHT. || Pike is distributed under GPL, LGPL and MPL. See the file COPYING || for more information. -|| $Id: builtin_functions.c,v 1.671 2008/06/16 21:46:35 mast Exp $ +|| $Id: builtin_functions.c,v 1.672 2008/06/18 09:35:13 grubba Exp $ */ #include "global.h" @@ -9133,10 +9133,12 @@ void init_builtin_efuns(void) /* function(string|array:int*)|function(mapping(1=mixed:mixed)|multiset(1=mixed):array(1))|function(object|program:string*) */ ADD_EFUN2("indices",f_indices, - tOr3(tFunc(tOr(tStr,tArray),tArr(tInt)), - tFunc(tOr(tMap(tSetvar(1,tMix),tMix),tSet(tSetvar(1,tMix))), - tArr(tVar(1))), - tFunc(tOr(tObj,tPrg(tObj)),tArr(tStr))), + tOr3(tFunc(tArray,tArr(tIntPos)), + tFunc(tOr3(tMap(tSetvar(1,tMix),tMix), + tSet(tSetvar(1,tMix)), + tNStr(tSetvar(1,tMix))), + tArr(tVar(1))), + tFunc(tOr(tObj,tPrg(tObj)),tArr(tStr))), OPT_TRY_OPTIMIZE,fix_indices_type,0); ADD_EFUN("undefinedp", f_undefinedp, tFunc(tMix,tInt01), OPT_TRY_OPTIMIZE); -- GitLab