remove Symbol::empty

the only use of this function is to determine whether a lambda has a non-set
formal, but this use is arguably better served by Symbol::set and using a
non-Symbol instead of an empty symbol in the parser when no such formal is present.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index a2def65a6..bf01935a9 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -144,9 +144,9 @@ void ExprLambda::show(std::ostream & str) const
             str << "...";
         }
         str << " }";
-        if (!arg.empty()) str << " @ ";
+        if (arg.set()) str << " @ ";
     }
-    if (!arg.empty()) str << arg;
+    if (arg.set()) str << arg;
     str << ": " << *body << ")";
 }
 
@@ -364,11 +364,11 @@ void ExprLambda::bindVars(const StaticEnv & env)
     StaticEnv newEnv(
         false, &env,
         (hasFormals() ? formals->formals.size() : 0) +
-        (arg.empty() ? 0 : 1));
+        (!arg.set() ? 0 : 1));
 
     Displacement displ = 0;
 
-    if (!arg.empty()) newEnv.vars.emplace_back(arg, displ++);
+    if (arg.set()) newEnv.vars.emplace_back(arg, displ++);
 
     if (hasFormals()) {
         for (auto & i : formals->formals)