use isReservedKeyword in other print functions

NixOS · May 9, 2023 · 10f40db · 10f40db
1 parent 227bf5a
commit 10f40db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libexpr/print.cc b/src/libexpr/print.cc
@@ -45,7 +45,7 @@ std::ostream &
 printIdentifier(std::ostream & str, std::string_view s) {
     if (s.empty())
         str << "\"\"";
-    else if (s == "if") // FIXME: handle other keywords
+    else if (isReservedKeyword(s))
         str << '"' << s << '"';
     else {
         char c = s[0];
@@ -66,10 +66,10 @@ printIdentifier(std::ostream & str, std::string_view s) {
     return str;
 }
 
-// FIXME: keywords
 static bool isVarName(std::string_view s)
 {
     if (s.size() == 0) return false;
+    if (isReservedKeyword(s)) return false;
     char c = s[0];
     if ((c >= '0' && c <= '9') || c == '-' || c == '\'') return false;
     for (auto & i : s)