From f19bfe538a69d78a99d1a608d030774182a09fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 28 Jun 2024 10:25:39 +0200
Subject: [PATCH] EFUNs: Make mk{multiset,mapping}() useable in constant
expressions again.
This reverts most of 8f998d6e70b319d34f1f824573fdb67a0459c71c.
---
src/builtin.cmod | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/builtin.cmod b/src/builtin.cmod
index 8669b0b5a1..a5d8b5c699 100644
--- a/src/builtin.cmod
+++ b/src/builtin.cmod
@@ -1023,7 +1023,7 @@ PIKEFUN array column(array data, mixed index)
PMOD_EXPORT
PIKEFUN multiset(1) mkmultiset(array(1=mixed) a)
efun;
- optflags OPT_TRY_OPTIMIZE|OPT_EXTERNAL_DEPEND;
+ optflags OPT_TRY_OPTIMIZE;
{
RETURN mkmultiset(a);
}
@@ -1333,7 +1333,7 @@ PIKEFUN string ctime(longest timestamp)
PMOD_EXPORT
PIKEFUN mapping(1:2) mkmapping(array(1=mixed) ind, array(2=mixed) val)
efun;
- optflags OPT_TRY_OPTIMIZE|OPT_EXTERNAL_DEPEND;
+ optflags OPT_TRY_OPTIMIZE;
{
if(ind->size != val->size)
bad_arg_error("mkmapping", args, 2, "array", Pike_sp+1-args,
--
GitLab