From 85c1959240deef56928221fc29ceda9b03506e4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 12 Sep 2022 15:10:54 +0200
Subject: [PATCH] Remove some FIXMEs

---
 src/libexpr/eval.cc          | 4 ++--
 src/libexpr/parser.y         | 6 ------
 src/libexpr/primops.cc       | 1 -
 src/libexpr/tests/json.cc    | 4 +---
 src/libexpr/value-to-json.cc | 1 -
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index f3d2b79d3..8c2b680ec 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -532,12 +532,12 @@ EvalState::~EvalState()
 
 void EvalState::allowPath(const Path & path)
 {
-    rootFS->allowPath(CanonPath(path)); // FIXME
+    rootFS->allowPath(CanonPath(path));
 }
 
 void EvalState::allowPath(const StorePath & storePath)
 {
-    rootFS->allowPath(CanonPath(store->toRealPath(storePath))); // FIXME
+    rootFS->allowPath(CanonPath(store->toRealPath(storePath)));
 }
 
 void EvalState::allowAndSetStorePathString(const StorePath & storePath, Value & v)
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 5b868a4cf..f119e8661 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -509,11 +509,6 @@ string_parts_interpolated
 path_start
   : PATH {
     SourcePath path { data->basePath.accessor, CanonPath({$1.p, $1.l}, data->basePath.path) };
-    #if 0
-    /* add back in the trailing '/' to the first segment */
-    if ($1.p[$1.l-1] == '/' && $1.l > 1)
-      path.path += "/";
-    #endif
     $$ = new ExprPath(std::move(path));
   }
   | HPATH {
@@ -700,7 +695,6 @@ Expr * EvalState::parseExprFromFile(const SourcePath & path, std::shared_ptr<Sta
     auto buffer = path.readFile();
     // readFile hopefully have left some extra space for terminators
     buffer.append("\0\0", 2);
-    // FIXME: pass SourcePaths
     return parse(buffer.data(), buffer.size(), Pos::Origin(path), path.parent(), staticEnv);
 }
 
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 67efc986c..f0874f367 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -369,7 +369,6 @@ void prim_exec(EvalState & state, const PosIdx pos, Value * * args, Value & v)
     auto output = runProgram(program, true, commandArgs);
     Expr * parsed;
     try {
-        //auto base = state.positions[pos];
         parsed = state.parseExprFromString(std::move(output), state.rootPath("/"));
     } catch (Error & e) {
         e.addTrace(state.positions[pos], "While parsing the output from '%1%'", program);
diff --git a/src/libexpr/tests/json.cc b/src/libexpr/tests/json.cc
index 6741a0221..cfaa2f7d4 100644
--- a/src/libexpr/tests/json.cc
+++ b/src/libexpr/tests/json.cc
@@ -57,14 +57,12 @@ namespace nix {
         ASSERT_EQ(getJSONValue(v), "\"test\\\"\"");
     }
 
-    #if 0
     // The dummy store doesn't support writing files. Fails with this exception message:
     // C++ exception with description "error: operation 'addToStoreFromDump' is
     // not supported by store 'dummy'" thrown in the test body.
     TEST_F(JSONValueTest, DISABLED_Path) {
         Value v;
-        v.mkPath("test");
+        v.mkPath(state.rootPath("/test"));
         ASSERT_EQ(getJSONValue(v), "\"/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x\"");
     }
-    #endif
 } /* namespace nix */
diff --git a/src/libexpr/value-to-json.cc b/src/libexpr/value-to-json.cc
index 5769271c6..afe9c75fa 100644
--- a/src/libexpr/value-to-json.cc
+++ b/src/libexpr/value-to-json.cc
@@ -34,7 +34,6 @@ void printValueAsJSON(EvalState & state, bool strict,
 
         case nPath:
             if (copyToStore)
-                // FIXME: handle accessors
                 out.write(
                     state.store->printStorePath(
                         state.copyPathToStore(context, v.path())));