aboutsummaryrefslogtreecommitdiff
path: root/libphobos
diff options
context:
space:
mode:
Diffstat (limited to 'libphobos')
-rw-r--r--libphobos/ChangeLog21
-rw-r--r--libphobos/libdruntime/MERGE2
-rw-r--r--libphobos/libdruntime/Makefile.am2
-rw-r--r--libphobos/libdruntime/Makefile.in6
-rw-r--r--libphobos/libdruntime/core/stdcpp/xutility.d1
-rw-r--r--libphobos/libdruntime/rt/invariant_.d (renamed from libphobos/libdruntime/rt/invariant.d)9
-rw-r--r--libphobos/src/MERGE2
-rw-r--r--libphobos/src/std/experimental/allocator/building_blocks/allocator_list.d18
-rw-r--r--libphobos/src/std/experimental/allocator/common.d3
-rw-r--r--libphobos/src/std/format/spec.d35
-rw-r--r--libphobos/src/std/format/write.d23
-rw-r--r--libphobos/src/std/numeric.d2
12 files changed, 93 insertions, 31 deletions
diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index d2308d9..e04bedd 100644
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,24 @@
+2025-03-31 Iain Buclaw <ibuclaw@gdcproject.org>
+
+ * libdruntime/MERGE: Merge upstream druntime c6863be720.
+ * src/MERGE: Merge upstream phobos 60034b56e.
+
+2025-03-22 Iain Buclaw <ibuclaw@gdcproject.org>
+
+ * libdruntime/MERGE: Merge upstream druntime 94950cae58.
+
+2025-03-22 Iain Buclaw <ibuclaw@gdcproject.org>
+
+ * libdruntime/Makefile.am (DRUNTIME_DSOURCES): Rename rt/invariant.d
+ to rt/invariant_.d.
+ * libdruntime/Makefile.in: Regenerate.
+ * libdruntime/rt/invariant.d: Move to...
+ * libdruntime/rt/invariant_.d: ...here.
+
+2025-03-22 Iain Buclaw <ibuclaw@gdcproject.org>
+
+ * src/MERGE: Merge upstream phobos d4c9efef1.
+
2025-03-18 Iain Buclaw <ibuclaw@gdcproject.org>
* src/MERGE: Merge upstream phobos 79cbde1ab.
diff --git a/libphobos/libdruntime/MERGE b/libphobos/libdruntime/MERGE
index 18c9d11..00c8518 100644
--- a/libphobos/libdruntime/MERGE
+++ b/libphobos/libdruntime/MERGE
@@ -1,4 +1,4 @@
-d2ee11364c25ca8865eb0acb9596a6147532ef41
+c6863be7206eef3c393726363a480baf0a0c6530
The first line of this file holds the git revision number of the last
merge done from the dlang/dmd repository.
diff --git a/libphobos/libdruntime/Makefile.am b/libphobos/libdruntime/Makefile.am
index 595e3f9..252c6a3 100644
--- a/libphobos/libdruntime/Makefile.am
+++ b/libphobos/libdruntime/Makefile.am
@@ -222,7 +222,7 @@ DRUNTIME_DSOURCES = core/atomic.d core/attribute.d core/bitop.d \
gcc/unwind/generic.d gcc/unwind/package.d gcc/unwind/pe.d object.d \
rt/aApply.d rt/aApplyR.d rt/aaA.d rt/adi.d rt/arraycat.d rt/cast_.d \
rt/config.d rt/critical_.d rt/deh.d rt/dmain2.d rt/ehalloc.d \
- rt/invariant.d rt/lifetime.d rt/memory.d rt/minfo.d rt/monitor_.d \
+ rt/invariant_.d rt/lifetime.d rt/memory.d rt/minfo.d rt/monitor_.d \
rt/profilegc.d rt/sections.d rt/tlsgc.d rt/util/typeinfo.d \
rt/util/utility.d
diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in
index 4832fd1..52b0c37 100644
--- a/libphobos/libdruntime/Makefile.in
+++ b/libphobos/libdruntime/Makefile.in
@@ -248,7 +248,7 @@ am__objects_1 = core/atomic.lo core/attribute.lo core/bitop.lo \
gcc/unwind/generic.lo gcc/unwind/package.lo gcc/unwind/pe.lo \
object.lo rt/aApply.lo rt/aApplyR.lo rt/aaA.lo rt/adi.lo \
rt/arraycat.lo rt/cast_.lo rt/config.lo rt/critical_.lo \
- rt/deh.lo rt/dmain2.lo rt/ehalloc.lo rt/invariant.lo \
+ rt/deh.lo rt/dmain2.lo rt/ehalloc.lo rt/invariant_.lo \
rt/lifetime.lo rt/memory.lo rt/minfo.lo rt/monitor_.lo \
rt/profilegc.lo rt/sections.lo rt/tlsgc.lo rt/util/typeinfo.lo \
rt/util/utility.lo
@@ -903,7 +903,7 @@ DRUNTIME_DSOURCES = core/atomic.d core/attribute.d core/bitop.d \
gcc/unwind/generic.d gcc/unwind/package.d gcc/unwind/pe.d object.d \
rt/aApply.d rt/aApplyR.d rt/aaA.d rt/adi.d rt/arraycat.d rt/cast_.d \
rt/config.d rt/critical_.d rt/deh.d rt/dmain2.d rt/ehalloc.d \
- rt/invariant.d rt/lifetime.d rt/memory.d rt/minfo.d rt/monitor_.d \
+ rt/invariant_.d rt/lifetime.d rt/memory.d rt/minfo.d rt/monitor_.d \
rt/profilegc.d rt/sections.d rt/tlsgc.d rt/util/typeinfo.d \
rt/util/utility.d
@@ -1413,7 +1413,7 @@ rt/critical_.lo: rt/$(am__dirstamp)
rt/deh.lo: rt/$(am__dirstamp)
rt/dmain2.lo: rt/$(am__dirstamp)
rt/ehalloc.lo: rt/$(am__dirstamp)
-rt/invariant.lo: rt/$(am__dirstamp)
+rt/invariant_.lo: rt/$(am__dirstamp)
rt/lifetime.lo: rt/$(am__dirstamp)
rt/memory.lo: rt/$(am__dirstamp)
rt/minfo.lo: rt/$(am__dirstamp)
diff --git a/libphobos/libdruntime/core/stdcpp/xutility.d b/libphobos/libdruntime/core/stdcpp/xutility.d
index 5e2e711..f93df68 100644
--- a/libphobos/libdruntime/core/stdcpp/xutility.d
+++ b/libphobos/libdruntime/core/stdcpp/xutility.d
@@ -35,6 +35,7 @@ enum CppStdRevision : uint
cpp14 = 201402,
cpp17 = 201703,
cpp20 = 202002,
+ cpp23 = 202302,
}
/**
diff --git a/libphobos/libdruntime/rt/invariant.d b/libphobos/libdruntime/rt/invariant_.d
index e536196..2a64dc8 100644
--- a/libphobos/libdruntime/rt/invariant.d
+++ b/libphobos/libdruntime/rt/invariant_.d
@@ -4,15 +4,10 @@
* Copyright: Copyright Digital Mars 2007 - 2010.
* License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
* Authors: Walter Bright
- * Source: $(DRUNTIMESRC rt/_invariant.d)
- */
-
-/* Copyright Digital Mars 2007 - 2010.
- * Distributed under the Boost Software License, Version 1.0.
- * (See accompanying file LICENSE or copy at
- * http://www.boost.org/LICENSE_1_0.txt)
+ * Source: $(DRUNTIMESRC rt/_invariant_.d)
*/
+module rt.invariant_;
/**
*
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE
index a4888fc..3dfe008 100644
--- a/libphobos/src/MERGE
+++ b/libphobos/src/MERGE
@@ -1,4 +1,4 @@
-79cbde1ab69bae9372f310d663edfc43166095e3
+60034b56e2a036a66fa78cbc0ec0290956423684
The first line of this file holds the git revision number of the last
merge done from the dlang/phobos repository.
diff --git a/libphobos/src/std/experimental/allocator/building_blocks/allocator_list.d b/libphobos/src/std/experimental/allocator/building_blocks/allocator_list.d
index c6d5fca..9d30b5e 100644
--- a/libphobos/src/std/experimental/allocator/building_blocks/allocator_list.d
+++ b/libphobos/src/std/experimental/allocator/building_blocks/allocator_list.d
@@ -1140,7 +1140,6 @@ template SharedAllocatorList(alias factoryFunction,
import std.algorithm.comparison : max;
import std.typecons : Ternary;
- enum pageSize = 4096;
enum numPages = 2;
static void testrw(void[] b)
@@ -1269,8 +1268,6 @@ template SharedAllocatorList(alias factoryFunction,
import std.algorithm.comparison : max;
import std.typecons : Ternary;
- enum pageSize = 4096;
-
static void testrw(void[] b)
{
ubyte* buf = cast(ubyte*) b.ptr;
@@ -1283,17 +1280,17 @@ template SharedAllocatorList(alias factoryFunction,
enum numPages = 5;
AllocatorList!((n) => AscendingPageAllocator(max(n, numPages * pageSize)), NullAllocator) a;
- auto b = a.alignedAllocate(1, pageSize * 2);
+ auto b = a.alignedAllocate(1, cast(uint) (pageSize * 2));
assert(b.length == 1);
- assert(a.expand(b, 4095));
- assert(b.ptr.alignedAt(2 * 4096));
- assert(b.length == 4096);
+ assert(a.expand(b, pageSize - 1));
+ assert(b.ptr.alignedAt(cast(uint) (pageSize * 2)));
+ assert(b.length == pageSize);
- b = a.allocate(4096);
- assert(b.length == 4096);
+ b = a.allocate(pageSize);
+ assert(b.length == pageSize);
assert(a.allocators.length == 1);
- assert(a.allocate(4096 * 5).length == 4096 * 5);
+ assert(a.allocate(pageSize * 5).length == pageSize * 5);
assert(a.allocators.length == 2);
assert(a.deallocateAll());
@@ -1339,7 +1336,6 @@ template SharedAllocatorList(alias factoryFunction,
import std.algorithm.comparison : max;
enum numThreads = 100;
- enum pageSize = 4096;
enum numPages = 10;
SharedAllocatorList!((n) => SharedAscendingPageAllocator(max(n, pageSize * numPages)), Mallocator) a;
diff --git a/libphobos/src/std/experimental/allocator/common.d b/libphobos/src/std/experimental/allocator/common.d
index b06fb62..2451572 100644
--- a/libphobos/src/std/experimental/allocator/common.d
+++ b/libphobos/src/std/experimental/allocator/common.d
@@ -63,7 +63,8 @@ unittest
class C2 { char c; }
static assert(stateSize!C2 == 4 * size_t.sizeof);
static class C3 { char c; }
- static assert(stateSize!C3 == 2 * size_t.sizeof + char.sizeof);
+ // Uncomment test after dmd issue closed https://github.com/dlang/dmd/issues/21065
+ //static assert(stateSize!C3 == 3 * size_t.sizeof);
}
/**
diff --git a/libphobos/src/std/format/spec.d b/libphobos/src/std/format/spec.d
index e5564c9..b828bb6 100644
--- a/libphobos/src/std/format/spec.d
+++ b/libphobos/src/std/format/spec.d
@@ -127,14 +127,16 @@ if (is(Unqual!Char == Char))
Counting starts with `1`. Set to `0` if not used. Default: `0`.
*/
- ubyte indexStart;
+ ushort indexStart;
/**
Index of the last argument for positional parameter ranges.
Counting starts with `1`. Set to `0` if not used. Default: `0`.
+
+ The maximum value of this field is used as a sentinel to indicate the arguments' length.
*/
- ubyte indexEnd;
+ ushort indexEnd;
version (StdDdoc)
{
@@ -296,6 +298,8 @@ if (is(Unqual!Char == Char))
}
width = 0;
+ indexStart = 0;
+ indexEnd = 0;
precision = UNSPECIFIED;
nested = null;
// Parse the spec (we assume we're past '%' already)
@@ -834,6 +838,33 @@ if (is(Unqual!Char == Char))
== "$ expected after '*10' in format string");
}
+// https://github.com/dlang/phobos/issues/10713
+@safe pure unittest
+{
+ import std.array : appender;
+ auto f = FormatSpec!char("%3$d%d");
+
+ auto w = appender!(char[])();
+ f.writeUpToNextSpec(w);
+ assert(f.indexStart == 3);
+
+ f.writeUpToNextSpec(w);
+ assert(w.data.length == 0);
+ assert(f.indexStart == 0);
+}
+
+// https://github.com/dlang/phobos/issues/10699
+@safe pure unittest
+{
+ import std.array : appender;
+ auto f = FormatSpec!char("%1:$d");
+ auto w = appender!(char[])();
+
+ f.writeUpToNextSpec(w);
+ assert(f.indexStart == 1);
+ assert(f.indexEnd == ushort.max);
+}
+
/**
Helper function that returns a `FormatSpec` for a single format specifier.
diff --git a/libphobos/src/std/format/write.d b/libphobos/src/std/format/write.d
index 078fa78..d704c14 100644
--- a/libphobos/src/std/format/write.d
+++ b/libphobos/src/std/format/write.d
@@ -648,9 +648,16 @@ uint formattedWrite(Writer, Char, Args...)(auto ref Writer w, const scope Char[]
break SWITCH;
}
default:
- throw new FormatException(
- text("Positional specifier %", spec.indexStart, '$', spec.spec,
- " index exceeds ", Args.length));
+ if (spec.indexEnd == spec.indexEnd.max)
+ break;
+ else if (spec.indexEnd == spec.indexStart)
+ throw new FormatException(
+ text("Positional specifier %", spec.indexStart, '$', spec.spec,
+ " index exceeds ", Args.length));
+ else
+ throw new FormatException(
+ text("Positional specifier %", spec.indexStart, ":", spec.indexEnd, '$', spec.spec,
+ " index exceeds ", Args.length));
}
}
return currentArg;
@@ -1199,6 +1206,16 @@ if (isSomeString!(typeof(fmt)))
formattedWrite(stream, "%s", aa);
}
+// https://github.com/dlang/phobos/issues/10699
+@safe pure unittest
+{
+ import std.array : appender;
+ auto w = appender!(char[])();
+
+ formattedWrite(w, "%1:$d", 1, 2, 3);
+ assert(w.data == "123");
+}
+
/**
Formats a value of any type according to a format specifier and
writes the result to an output range.
diff --git a/libphobos/src/std/numeric.d b/libphobos/src/std/numeric.d
index 9966b1c..918984f 100644
--- a/libphobos/src/std/numeric.d
+++ b/libphobos/src/std/numeric.d
@@ -37,7 +37,7 @@ public enum CustomFloatFlags
* Store values in normalized form by default. The actual precision of the
* significand is extended by 1 bit by assuming an implicit leading bit of 1
* instead of 0. i.e. `1.nnnn` instead of `0.nnnn`.
- * True for all $(LINK2 https://en.wikipedia.org/wiki/IEEE_floating_point, IEE754) types
+ * True for all $(LINK2 https://en.wikipedia.org/wiki/IEEE_floating_point, IEEE754) types
*/
storeNormalized = 2,
generated by cgit v1.1 at 2025-04-05 07:38:56 +0000