From d584dd5b99f4c1e32477db2dfb791d52b0139df1 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Sat, 4 Dec 2021 07:42:58 +0100
Subject: [PATCH] fixes #19015 [backport:1.6] (#19204)

---
 changelog.md           | 3 +++
 compiler/options.nim   | 3 ++-
 compiler/sigmatch.nim  | 3 ++-
 tests/misc/trfc405.nim | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 258cf73e46..a8f1920e97 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,9 @@
   or define your own `Math.trunc` polyfill using the [`emit` pragma](https://nim-lang.org/docs/manual.html#implementation-specific-pragmas-emit-pragma). Nim uses
   `Math.trunc` for the division and modulo operators for integers.
 
+- Optional parameters in combination with `: body` syntax (RFC #405) are now opt-in via
+  `experimental:flexibleOptionalParams`.
+
 ## Standard library additions and changes
 
 - `macros.parseExpr` and `macros.parseStmt` now accept an optional
diff --git a/compiler/options.nim b/compiler/options.nim
index d8e5057f9a..383b6fa2ac 100644
--- a/compiler/options.nim
+++ b/compiler/options.nim
@@ -207,7 +207,8 @@ type
     strictNotNil,
     overloadableEnums,
     strictEffects,
-    unicodeOperators
+    unicodeOperators,
+    flexibleOptionalParams
 
   LegacyFeature* = enum
     allowSemcheckedAstModification,
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index 6bc6eefe0e..93be92676a 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -2461,7 +2461,8 @@ proc matchesAux(c: PContext, n, nOrig: PNode, m: var TCandidate, marker: var Int
         if m.callee.n[f].kind != nkSym:
           internalError(c.config, n[a].info, "matches")
           noMatch()
-        if a >= firstArgBlock: f = max(f, m.callee.n.len - (n.len - a))
+        if flexibleOptionalParams in c.features and a >= firstArgBlock:
+          f = max(f, m.callee.n.len - (n.len - a))
         formal = m.callee.n[f].sym
         m.firstMismatch.kind = kTypeMismatch
         if containsOrIncl(marker, formal.position) and container.isNil:
diff --git a/tests/misc/trfc405.nim b/tests/misc/trfc405.nim
index adc39b1df4..8c967eb773 100644
--- a/tests/misc/trfc405.nim
+++ b/tests/misc/trfc405.nim
@@ -1,3 +1,6 @@
+
+{.experimental: "flexibleOptionalParams".}
+
 # https://github.com/nim-lang/RFCs/issues/405
 
 template main =