From fb0ef6ca6bfea368e594e9ae2714858030f66bc6 Mon Sep 17 00:00:00 2001
From: "Commentator2.0" <commentator2.0@crystal-cavern.systems>
Date: Tue, 8 Apr 2025 10:21:53 +0200
Subject: [PATCH] Made parser warnings use Error info

no other warn calls were found, which have position information

Change-Id: If9773b86a756e5b2e4096d3f6b3a5114bfed5bee
---
 lix/libexpr/parser/parser-impl1.inc.cc        | 15 ++++----
 lix/libexpr/parser/state.hh                   | 35 +++++++++----------
 tests/functional/lang/parse-fail-crlf.err.exp |  7 +++-
 ...arse-okay-rec-set-override-warning.err.exp | 14 ++++++--
 4 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/lix/libexpr/parser/parser-impl1.inc.cc b/lix/libexpr/parser/parser-impl1.inc.cc
index 62f12e34e..f4f9d3ff3 100644
--- a/lix/libexpr/parser/parser-impl1.inc.cc
+++ b/lix/libexpr/parser/parser-impl1.inc.cc
@@ -755,12 +755,15 @@ template<> struct BuildAST<grammar::v1::expr::ancient_let> : change_head<Binding
         // Added 2024-09-18. Turn into an error at some point in the future.
         // See the documentation on deprecated features for more details.
         if (!ps.featureSettings.isEnabled(Dep::AncientLet))
-            warn(
-                "%s found at %s. This feature is deprecated and will be removed in the future. Use %s to silence this warning.",
-                "let {",
-                ps.positions[ps.at(in)],
-                "--extra-deprecated-features ancient-let"
-            );
+            //FIXME: why aren't there any tests for this?
+            logWarning({
+                .msg = HintFmt(
+                    "%s is deprecated and will be removed in the future. Use %s to silence this warning.",
+                    "let {",
+                    "--extra-deprecated-features ancient-let"
+                    ),
+                .pos = ps.positions[ps.at(in)]
+            });
 
         auto pos = ps.at(in);
         b.set.pos = pos;
diff --git a/lix/libexpr/parser/state.hh b/lix/libexpr/parser/state.hh
index 6153fcddf..af3de1222 100644
--- a/lix/libexpr/parser/state.hh
+++ b/lix/libexpr/parser/state.hh
@@ -85,35 +85,34 @@ inline void State::dupAttr(Symbol attr, const PosIdx pos, const PosIdx prevPos)
 inline void State::overridesFound(const PosIdx pos) {
     // Added 2024-09-18. Turn into an error at some point in the future.
     // See the documentation on deprecated features for more details.
-    warn(
-        "%s found at %s. This feature is deprecated and will be removed in the future. Use %s to silence this warning.",
-        "__overrides",
-        positions[pos],
-        "--extra-deprecated-features rec-set-overrides"
-    );
+    logWarning({
+        .msg = HintFmt(
+            "%s attributes are deprecated and will be removed in the future. Use %s to silence this warning.",
+            "__overrides",
+             "--extra-deprecated-features rec-set-overrides"
+            ),
+        .pos = positions[pos],
+    });
 }
 
 // Added 2025-02-05. This is unlikely to ever occur in the wild, given how broken it is
 inline void State::badLineEndingFound(const PosIdx pos, bool warnOnly)
 {
+    ErrorInfo ei = {
+        .msg = HintFmt(
+            "CR (`\\r`) and CRLF (`\\r\\n`) line endings are not supported. Please inspect the file and normalize it to use LF (`\\n`) line endings instead. Use %s to silence this warning.",
+            "--extra-deprecated-features cr-line-endings"
+        ),
+        .pos = positions[pos],
+    };
     // Within strings we should throw because it is a correctness issue, outside of
     // strings it only harmlessly fucks up line numbers in error messages so warning is sufficient.
     if (warnOnly) {
         if (!hasWarnedAboutBadLineEndings)
-            warn(
-                "CR (`\\r`) and CRLF (`\\r\\n`) line endings found at %s. Please inspect the file and normalize it to use LF (`\\n`) line endings instead. Use %s to silence this warning.",
-                positions[pos],
-                "--extra-deprecated-features cr-line-endings"
-            );
+            logWarning(ei);
         hasWarnedAboutBadLineEndings = true;
     } else
-        throw ParseError({
-            .msg = HintFmt(
-                "CR (`\\r`) and CRLF (`\\r\\n`) line endings are not supported. Please inspect the file and normalize it to use LF (`\\n`) line endings instead. Use %s to silence this warning.",
-                "--extra-deprecated-features cr-line-endings"
-            ),
-            .pos = positions[pos],
-        });
+        throw ParseError(ei);
 }
 // Added 2025-02-05.
 inline void State::nulFound(const PosIdx pos)
diff --git a/tests/functional/lang/parse-fail-crlf.err.exp b/tests/functional/lang/parse-fail-crlf.err.exp
index 62fa54fa7..cf6c36c94 100644
--- a/tests/functional/lang/parse-fail-crlf.err.exp
+++ b/tests/functional/lang/parse-fail-crlf.err.exp
@@ -1,4 +1,9 @@
-warning: CR (`\r`) and CRLF (`\r\n`) line endings found at «stdin»:7:21. Please inspect the file and normalize it to use LF (`\n`) line endings instead. Use --extra-deprecated-features cr-line-endings to silence this warning.
+warning: CR (`\r`) and CRLF (`\r\n`) line endings are not supported. Please inspect the file and normalize it to use LF (`\n`) line endings instead. Use --extra-deprecated-features cr-line-endings to silence this warning.
+         at «stdin»:7:21:
+              6|   x =
+              7|   # Dit is een test.
+               |                     ^
+              8| y;
 error: CR (`\r`) and CRLF (`\r\n`) line endings are not supported. Please inspect the file and normalize it to use LF (`\n`) line endings instead. Use --extra-deprecated-features cr-line-endings to silence this warning.
        at «stdin»:14:15:
            13|   # translated to LF.
diff --git a/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp b/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp
index 88d6e798b..9fc07b6b5 100644
--- a/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp
+++ b/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp
@@ -1,2 +1,12 @@
-warning: __overrides found at «stdin»:3:16. This feature is deprecated and will be removed in the future. Use --extra-deprecated-features rec-set-overrides to silence this warning.
-warning: __overrides found at «stdin»:4:8. This feature is deprecated and will be removed in the future. Use --extra-deprecated-features rec-set-overrides to silence this warning.
+warning: __overrides attributes are deprecated and will be removed in the future. Use --extra-deprecated-features rec-set-overrides to silence this warning.
+         at «stdin»:3:16:
+              2|         # Should warn
+              3|  { a = rec {}; a.__overrides = {}; }
+               |                ^
+              4|  rec { __overrides = {}; }
+warning: __overrides attributes are deprecated and will be removed in the future. Use --extra-deprecated-features rec-set-overrides to silence this warning.
+         at «stdin»:4:8:
+              3|  { a = rec {}; a.__overrides = {}; }
+              4|    rec { __overrides = {}; }
+               |        ^
+              5|    # Should not warn: Not recursive