Merge pull request #1212 from agarny/issue1211

Analyser: improve the reporting of unit-related issues with the pow() function

src/debug.cpp

@@ -610,7 +610,7 @@ std::string doPrintAstAsTree(const AnalyserEquationAstPtr &ast)
 }
 
 std::string doPrintAstAsTree(const AnalyserEquationAstPtr &ast,
-                AnalyserEquationAstTrunk *prevTrunk, bool isLeft)
+                             AnalyserEquationAstTrunk *prevTrunk, bool isLeft)
 {
     if (ast == nullptr) {
         return {};

src/debug.h

@@ -95,7 +95,8 @@ struct Debug
 
 void printAnalyserModelEquations(const AnalyserModelPtr &model);
 void printAnalyserModelVariables(const AnalyserModelPtr &model);
-void printAst(const AnalyserEquationAstPtr &ast);
+void printAstAsTree(const AnalyserEquationAstPtr &ast);
+void printAstAsCode(const AnalyserEquationAstPtr &ast);
 void printComponentMap(const ComponentMap &map);
 void printConnectionMap(const ConnectionMap &map);
 void printEquivalenceMap(const EquivalenceMap &map);

src/generator.cpp

@@ -879,7 +879,7 @@ std::string Generator::GeneratorImpl::generateMethodBodyCode(const std::string &
                methodBody;
 }
 
-std::string Generator::GeneratorImpl::generateDoubleCode(const std::string &value) const
+std::string generateDoubleCode(const std::string &value)
 {
     if (value.find('.') != std::string::npos) {
         return value;

src/generator_p.h

@@ -24,6 +24,8 @@ limitations under the License.
 
 namespace libcellml {
 
+std::string generateDoubleCode(const std::string &value);
+
 /**
  * @brief The Generator::GeneratorImpl struct.
  *
@@ -109,7 +111,6 @@ struct Generator::GeneratorImpl
 
     std::string generateMethodBodyCode(const std::string &methodBody) const;
 
-    std::string generateDoubleCode(const std::string &value) const;
     std::string generateDoubleOrConstantVariableNameCode(const VariablePtr &variable) const;
     std::string generateVariableNameCode(const VariablePtr &variable,
                                          bool state = true) const;

src/utilities.cpp

@@ -115,6 +115,11 @@ Strings split(const std::string &content, const std::string &delimiter)
 
 std::string convertToString(double value, bool fullPrecision)
 {
+    if (std::isnan(value)) {
+        // Always return "nan" whether we are dealing with +NAN or -NAN. This is to ensure that
+        // the string representation of a NAN is consistent across compilers.
+        return "nan";
+    }
     std::ostringstream strs;
     if (fullPrecision) {
         strs << std::setprecision(std::numeric_limits<double>::digits10) << value;