From b7a586beae1027ea0c82411637920a5032d1dedf Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Thu, 25 Aug 2022 19:04:50 +0200
Subject: d: Merge upstream dmd 817610b16d, phobos b578dfad9

D front-end changes:

    - Import latest bug fixes to mainline.

Phobos changes:

    - Import latest bug fixes to mainline.
    - std.logger module has been moved out of experimental.
    - Removed std.experimental.typecons module.

gcc/d/ChangeLog:

	* dmd/MERGE: Merge upstream dmd 817610b16d.
	* d-ctfloat.cc (CTFloat::parse): Update for new front-end interface.
	* d-lang.cc (d_parse_file): Likewise.
	* expr.cc (ExprVisitor::visit (AssignExp *)): Remove handling of array
	assignments to non-trivial static and dynamic arrays.
	* runtime.def (ARRAYASSIGN): Remove.
	(ARRAYASSIGN_L): Remove.
	(ARRAYASSIGN_R): Remove.

libphobos/ChangeLog:

	* libdruntime/MERGE: Merge upstream druntime 817610b16d.
	* libdruntime/Makefile.am (DRUNTIME_DSOURCES): Add
	core/internal/array/arrayassign.d.
	* libdruntime/Makefile.in: Regenerate.
	* src/MERGE: Merge upstream phobos b578dfad9.
	* src/Makefile.am (PHOBOS_DSOURCES): Remove
	std/experimental/typecons.d. Add std/logger package.
	* src/Makefile.in: Regenerate.
---
 libphobos/src/std/regex/package.d | 54 +++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 19 deletions(-)

(limited to 'libphobos/src/std/regex')

diff --git a/libphobos/src/std/regex/package.d b/libphobos/src/std/regex/package.d
index e24abc5..1562d79 100644
--- a/libphobos/src/std/regex/package.d
+++ b/libphobos/src/std/regex/package.d
@@ -43,11 +43,16 @@ $(TR $(TD Objects) $(TD
 ))
 
   $(SECTION Synopsis)
-  ---
-  import std.regex;
-  import std.stdio;
-  void main()
-  {
+
+  Create a regex at runtime:
+  $(RUNNABLE_EXAMPLE
+  $(RUNNABLE_EXAMPLE_STDIN
+They met on 24/01/1970.
+7/8/99 wasn't as hot as 7/8/2022.
+)
+      ---
+      import std.regex;
+      import std.stdio;
       // Print out all possible dd/mm/yy(yy) dates found in user input.
       auto r = regex(r"\b[0-9][0-9]?/[0-9][0-9]?/[0-9][0-9](?:[0-9][0-9])?\b");
       foreach (line; stdin.byLine)
@@ -57,19 +62,24 @@ $(TR $(TD Objects) $(TD
         foreach (c; matchAll(line, r))
             writeln(c.hit);
       }
-  }
-  ...
-
-  // Create a static regex at compile-time, which contains fast native code.
+      ---
+  )
+  Create a static regex at compile-time, which contains fast native code:
+  $(RUNNABLE_EXAMPLE
+  ---
+  import std.regex;
   auto ctr = ctRegex!(`^.*/([^/]+)/?$`);
 
   // It works just like a normal regex:
   auto c2 = matchFirst("foo/bar", ctr);   // First match found here, if any
   assert(!c2.empty);   // Be sure to check if there is a match before examining contents!
   assert(c2[1] == "bar");   // Captures is a range of submatches: 0 = full match.
-
-  ...
-  // multi-pattern regex
+  ---
+  )
+  Multi-pattern regex:
+  $(RUNNABLE_EXAMPLE
+  ---
+  import std.regex;
   auto multi = regex([`\d+,\d+`, `([a-z]+):(\d+)`]);
   auto m = "abc:43 12,34".matchAll(multi);
   assert(m.front.whichPattern == 2);
@@ -77,21 +87,27 @@ $(TR $(TD Objects) $(TD
   assert(m.front[2] == "43");
   m.popFront();
   assert(m.front.whichPattern == 1);
-  assert(m.front[1] == "12");
-  ...
-
+  assert(m.front[0] == "12,34");
+  ---
+  )
+  $(LREF Captures) and `opCast!bool`:
+  $(RUNNABLE_EXAMPLE
+  ---
+  import std.regex;
   // The result of `matchAll/matchFirst` is directly testable with `if/assert/while`,
   // e.g. test if a string consists of letters only:
   assert(matchFirst("LettersOnly", `^\p{L}+$`));
 
-  // And we can take advantage of the ability to define a variable in the $(LINK2 https://dlang.org/spec/statement.html#IfCondition `IfCondition`):
-  if (const auto captures = matchFirst("At l34st one digit, but maybe more...", `((\d)(\d*))`))
+  // And we can take advantage of the ability to define a variable in the IfCondition:
+  if (const captures = matchFirst("At l34st one digit, but maybe more...", `((\d)(\d*))`))
   {
       assert(captures[2] == "3");
       assert(captures[3] == "4");
       assert(captures[1] == "34");
   }
   ---
+  )
+  See_Also: $(LINK2 https://dlang.org/spec/statement.html#IfCondition, `IfCondition`).
 
   $(SECTION Syntax and general information)
   The general usage guideline is to keep regex complexity on the side of simplicity,
@@ -470,7 +486,7 @@ private struct CTRegexWrapper(Char)
     alias getRe this;
 }
 
-template ctRegexImpl(alias pattern, string flags=[])
+template ctRegexImpl(alias pattern, string flags="")
 {
     import std.regex.internal.backtracking, std.regex.internal.parser;
     static immutable r = cast(immutable) regex(pattern, flags);
@@ -518,7 +534,7 @@ template ctRegexImpl(alias pattern, string flags=[])
     pattern = Regular expression
     flags = The _attributes (g, i, m, s and x accepted)
 +/
-public enum ctRegex(alias pattern, alias flags=[]) = ctRegexImpl!(pattern, flags).wrapper;
+public enum ctRegex(alias pattern, string flags="") = ctRegexImpl!(pattern, flags).wrapper;
 
 enum isRegexFor(RegEx, R) = is(immutable RegEx == immutable Regex!(BasicElementOf!R))
      || is(RegEx : const(Regex!(BasicElementOf!R)))
-- 
cgit v1.1