Fix constructor bug and add inline function for core determination

ratioSolver · Mar 27, 2024 · 3a6f34d · 3a6f34d
1 parent 33201e4
commit 3a6f34d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/extern/utils b/extern/utils
diff --git a/include/core.hpp b/include/core.hpp
@@ -381,6 +381,8 @@ namespace riddle
 
   [[nodiscard]] type &determine_type(const std::vector<std::shared_ptr<item>> &xprs);
 
+  inline bool is_core(const scope &scp) noexcept { return &scp == &scp.get_core(); }
+
   class unsolvable_exception : public std::exception
   {
     const char *what() const noexcept override { return "the problem is unsolvable.."; }

diff --git a/src/constructor.cpp b/src/constructor.cpp
@@ -82,7 +82,7 @@ namespace riddle
                 {
                 case 0:
                     if (auto c_tp = dynamic_cast<component_type *>(&f->get_type()))
-                        instance->items.emplace(f_name, f->get_type().new_instance());
+                        instance->items.emplace(f_name, c_tp->new_instance());
                     else
                         instance->items.emplace(f_name, f->get_type().new_instance());
                     break;
@@ -100,6 +100,7 @@ namespace riddle
                                 throw std::runtime_error("Cannot find constructor for class " + f->get_type().get_name());
                         }
                     }
+                    break;
                 default:
                 {
                     std::vector<std::reference_wrapper<const type>> arg_types;