Changed PropVal to map between NONE and Nan for asDouble() and toJSON()

mppmu · Apr 24, 2015 · 7b434cb · 7b434cb
1 parent 87be07b
commit 7b434cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Props.cxx b/src/Props.cxx
@@ -316,8 +316,11 @@ void PropVal::substVars(const Props &varValues, bool useEnvVars, bool ignoreMiss
 
 
 void PropVal::toJSON(std::ostream &out, Real x) {
-	out.precision(16);
-	out << x;
+	if (x != x) toJSON(out, nullptr); // NaN
+	else {
+		out.precision(16);
+		out << x;
+	}
 }
 
 

diff --git a/src/Props.h b/src/Props.h
@@ -25,6 +25,7 @@
 #include <algorithm>
 #include <functional>
 #include <iosfwd>
+#include <limits>
 #include <cassert>
 
 #include "Name.h"
@@ -381,6 +382,8 @@ class PropVal final: public virtual Printable {
 
 	double asDouble() const {
 		switch (m_type) {
+			case Type::NONE:
+				return std::numeric_limits<double>::quiet_NaN();
 			case Type::INTEGER:
 				return m_content.i;
 			case Type::REAL: