Smaller changes for MSVC compatibility. (#1355)

- These fixes come from #1354, and should not be controversial. - Generated sources are already split into dir, filename
BlueBrain · Jul 17, 2024 · 4f47074 · 4f47074
1 parent 8052b40
commit 4f47074
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/src/codegen/codegen_cpp_visitor.cpp b/src/codegen/codegen_cpp_visitor.cpp
@@ -1353,7 +1353,7 @@ void CodegenCppVisitor::setup(const Program& node) {
     info.mod_file = mod_filename;
 
     if (info.mod_suffix == "") {
-        info.mod_suffix = std::filesystem::path(mod_filename).stem();
+        info.mod_suffix = std::filesystem::path(mod_filename).stem().string();
     }
     info.rsuffix = info.point_process ? "" : "_" + info.mod_suffix;
 

diff --git a/src/language/code_generator.py b/src/language/code_generator.py
@@ -110,7 +110,7 @@ def jinja_template(self, path):
         Returns:
             A jinja template object
         """
-        name = str(path.relative_to(self.jinja_templates_dir))
+        name = str(path.relative_to(self.jinja_templates_dir).as_posix())
         return self.jinja_env.get_template(name)
 
     def _cmake_deps_task(self, tasks):

diff --git a/src/language/templates/code_generator.cmake b/src/language/templates/code_generator.cmake
@@ -5,19 +5,19 @@
 # cmake-format: off
 set(CODE_GENERATOR_JINJA_FILES
 {% for template in templates | sort %}
-    ${PROJECT_SOURCE_DIR}/src/language/templates/{{ template }}
+    ${PROJECT_SOURCE_DIR}/src/language/templates/{{ template.as_posix() }}
 {% endfor %}
 )
 
 set(CODE_GENERATOR_PY_FILES
 {% for file in py_files | sort %}
-    ${PROJECT_SOURCE_DIR}/src/language/{{ file }}
+    ${PROJECT_SOURCE_DIR}/src/language/{{ file.as_posix() }}
 {% endfor %}
 )
 
 set(CODE_GENERATOR_YAML_FILES
 {% for file in yaml_files | sort %}
-    ${PROJECT_SOURCE_DIR}/src/language/{{ file }}
+    ${PROJECT_SOURCE_DIR}/src/language/{{ file.as_posix() }}
 {% endfor %}
 )
 

diff --git a/src/parser/diffeq_context.cpp b/src/parser/diffeq_context.cpp
@@ -151,7 +151,7 @@ std::string DiffEqContext::get_non_cnexp_solution() const {
     std::string result;
     if (!deriv_invalid) {
         result = get_cvode_linear_diffeq();
-    } else if (deriv_invalid and eqn_invalid) {
+    } else if (deriv_invalid && eqn_invalid) {
         result = get_cvode_nonlinear_diffeq();
     } else {
         throw std::runtime_error("Error in differential equation solver with non-cnexp");

diff --git a/src/visitors/inline_visitor.hpp b/src/visitors/inline_visitor.hpp
@@ -14,6 +14,7 @@
 
 #include <map>
 #include <stack>
+#include <string>
 
 #include "symtab/decl.hpp"
 #include "visitors/ast_visitor.hpp"

diff --git a/src/visitors/local_var_rename_visitor.hpp b/src/visitors/local_var_rename_visitor.hpp
@@ -14,6 +14,7 @@
 
 #include <map>
 #include <stack>
+#include <string>
 
 #include "symtab/decl.hpp"
 #include "visitors/ast_visitor.hpp"

diff --git a/src/visitors/localize_visitor.hpp b/src/visitors/localize_visitor.hpp
@@ -13,6 +13,7 @@
  */
 
 #include <map>
+#include <string>
 
 #include "symtab/decl.hpp"
 #include "visitors/ast_visitor.hpp"

diff --git a/src/visitors/sympy_conductance_visitor.hpp b/src/visitors/sympy_conductance_visitor.hpp
@@ -14,6 +14,7 @@
 
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 
 #include "visitors/ast_visitor.hpp"