From 6a125e65d0f2dac90cdc69f16be0a4bd888c7a2f Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 15 Jul 2024 19:33:56 +0200
Subject: [PATCH] Revert "Doc comments: use std::unordered_map"

hash<SourcePath> isn't implemented yet, and I can't cherry-pick
a bug-free commit yet.

This reverts commit 95529f31e3bbda99111c5ce98a33484dc6e7a462.
---
 src/libexpr/eval.hh         | 4 ++--
 src/libexpr/parser-state.hh | 2 +-
 src/libexpr/parser.y        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index d9a3e80bc..3918fb092 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -130,7 +130,7 @@ struct Constant
     typedef std::map<std::string, Value *> ValMap;
 #endif
 
-typedef std::unordered_map<PosIdx, DocComment> DocCommentMap;
+typedef std::map<PosIdx, DocComment> DocCommentMap;
 
 struct Env
 {
@@ -335,7 +335,7 @@ private:
      * Associate source positions of certain AST nodes with their preceding doc comment, if they have one.
      * Grouped by file.
      */
-    std::unordered_map<SourcePath, DocCommentMap> positionToDocComment;
+    std::map<SourcePath, DocCommentMap> positionToDocComment;
 
     LookupPath lookupPath;
 
diff --git a/src/libexpr/parser-state.hh b/src/libexpr/parser-state.hh
index 5a7bcb717..983a17a2e 100644
--- a/src/libexpr/parser-state.hh
+++ b/src/libexpr/parser-state.hh
@@ -64,7 +64,7 @@ struct LexerState
     /**
      * @brief Maps some positions to a DocComment, where the comment is relevant to the location.
      */
-    std::unordered_map<PosIdx, DocComment> & positionToDocComment;
+    std::map<PosIdx, DocComment> & positionToDocComment;
 
     PosTable & positions;
     PosTable::Origin origin;
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 8ea176b24..452d265bc 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -48,7 +48,7 @@
 
 namespace nix {
 
-typedef std::unordered_map<PosIdx, DocComment> DocCommentMap;
+typedef std::map<PosIdx, DocComment> DocCommentMap;
 
 Expr * parseExprFromBuf(
     char * text,