Make Value::type private

This is an implementation detail and shouldn't be used. Use normalType() and the various is<Type> functions instead
NixOS · Dec 12, 2020 · 527d65d · 527d65d
1 parent 71b6f4f
commit 527d65d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
@@ -68,7 +68,7 @@ RootValue allocRootValue(Value * v)
 }
 
 
-static void printValue(std::ostream & str, std::set<const Value *> & active, const Value & v)
+void printValue(std::ostream & str, std::set<const Value *> & active, const Value & v)
 {
     checkInterrupt();
 

diff --git a/src/libexpr/value.hh b/src/libexpr/value.hh
@@ -106,8 +106,14 @@ std::ostream & operator << (std::ostream & str, const ExternalValueBase & v);
 
 struct Value
 {
+private:
     ValueType type;
 
+friend std::string showType(const Value & v);
+friend void printValue(std::ostream & str, std::set<const Value *> & active, const Value & v);
+
+public:
+
     inline void setInt() { type = tInt; };
     inline void setBool() { type = tBool; };
     inline void setString() { type = tString; };