From 78e04c2afe4878aa29108785cce1e32b9072c265 Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Wed, 28 Oct 2026 10:29:05 +0100 Subject: Make formula evaluation fail only with Error Co-Authored-By: Claude Haiku 5.5 --- generat3d/formula.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'generat3d') diff --git a/generat3d/formula.py b/generat3d/formula.py index 4a6a0d9..67d25e0 100644 --- a/generat3d/formula.py +++ b/generat3d/formula.py @@ -68,14 +68,18 @@ class Graph: return None path.append(key) total, factor = prop.value, 1.0 - for stage, ops, source in self.formulas.get(key, ()): - r = self._run(key, ops, done, path, source) - if r is None: - continue - if stage == "sum": - total += r - else: - factor *= r + try: + for stage, ops, source in self.formulas.get(key, ()): + r = self._run(key, ops, done, path, source) + if r is None: + continue + if stage == "sum": + total += r + else: + factor *= r + except RecursionError: + # ponytail: recursive evaluation; make it iterative if real content hits this + raise Error("formula dependency chain too deep") from None path.pop() v = total * factor if prop.clamped: @@ -105,11 +109,16 @@ class Graph: stack.append(_spline_op(name, stack)) else: raise Error(f"{source}: unknown formula operation {name!r} for {key}") - except (IndexError, KeyError, TypeError, ZeroDivisionError, ValueError): + if len(stack) != 1: + raise Error(f"{source}: malformed formula for {key}") + r = stack[0] + if not (isinstance(r, (int, float)) and not isinstance(r, bool) + and math.isfinite(r)): + raise Error(f"{source}: malformed formula for {key}") + return r + except (IndexError, KeyError, TypeError, ZeroDivisionError, ValueError, + OverflowError): raise Error(f"{source}: malformed formula for {key}") from None - if len(stack) != 1: - raise Error(f"{source}: malformed formula for {key}") - return stack[0] def _spline_op(name, stack): -- cgit v1.2.3