Update subproject commit in extern/riddle; modify determine_type call…

…s in solver.cpp to include context
ratioSolver · Nov 7, 2024 · f28b8c0 · f28b8c0
1 parent e7a71fd
commit f28b8c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/extern/riddle b/extern/riddle
diff --git a/src/solver.cpp b/src/solver.cpp
@@ -173,7 +173,7 @@ namespace ratio
         utils::lin sum;
         for (const auto &xpr : xprs)
             sum = sum + xpr->get_value();
-        auto &tp = determine_type(xprs);
+        auto &tp = determine_type(*this, xprs);
         if (&get_int_type() == &tp)
             return std::make_shared<riddle::arith_item>(get_int_type(), sum);
         assert(&get_real_type() == &tp);
@@ -186,7 +186,7 @@ namespace ratio
         utils::lin diff = xprs[0]->get_value();
         for (size_t i = 1; i < xprs.size(); i++)
             diff -= xprs[i]->get_value();
-        auto &tp = determine_type(xprs);
+        auto &tp = determine_type(*this, xprs);
         if (&get_int_type() == &tp)
             return std::make_shared<riddle::arith_item>(get_int_type(), diff);
         else if (&get_real_type() == &tp)
@@ -210,7 +210,7 @@ namespace ratio
                     assert(is_constant(*xpr) && arithmetic_value(*xpr).get_infinitesimal() == 0);
                     prod = prod * arithmetic_value(*xpr).get_rational();
                 }
-            auto &tp = determine_type(xprs);
+            auto &tp = determine_type(*this, xprs);
             if (&get_int_type() == &tp)
                 return std::make_shared<riddle::arith_item>(get_int_type(), prod);
             assert(&get_real_type() == &tp);
@@ -223,7 +223,7 @@ namespace ratio
             utils::rational prod = xprs[0]->get_type().get_scope().get_core().arithmetic_value(*xprs[0]).get_rational();
             for (size_t i = 1; i < xprs.size(); i++)
                 prod = prod * xprs[i]->get_type().get_scope().get_core().arithmetic_value(*xprs[i]).get_rational();
-            auto &tp = determine_type(xprs);
+            auto &tp = determine_type(*this, xprs);
             if (&get_int_type() == &tp)
                 return std::make_shared<riddle::arith_item>(get_int_type(), utils::lin(prod));
             assert(&get_real_type() == &tp);
@@ -241,7 +241,7 @@ namespace ratio
             assert(is_constant(*xprs[i]) && is_zero(arithmetic_value(*xprs[i]).get_infinitesimal()));
             quot = quot / arithmetic_value(*xprs[i]).get_rational();
         }
-        auto &tp = determine_type(xprs);
+        auto &tp = determine_type(*this, xprs);
         if (&get_int_type() == &tp)
             return std::make_shared<riddle::arith_item>(get_int_type(), quot);
         assert(&get_real_type() == &tp);
+1 −1		include/core.hpp
+1 −0		include/declaration.hpp
+5 −0		include/type.hpp
+3 −0		src/compilation_unit.cpp
+9 −6		src/core.cpp
+22 −0		src/declaration.cpp
+7 −2		src/statement.cpp
+2 −0		src/type.cpp