mark symbols that shouldn't be cached

Author: mmatera

mathics/builtin/assignment.py

@@ -65,6 +65,7 @@ class _SetOperator(object):
     def assign_elementary(self, lhs, rhs, evaluation, tags=None, upset=False):
         # TODO: This function should be splitted and simplified
 
+        evaluation.cache_result = False
         name = lhs.get_head_name()
         lhs._format_cache = None
         condition = None
@@ -547,7 +548,7 @@ class Set(BinaryOperator, _SetOperator):
 
     def apply(self, lhs, rhs, evaluation):
         "lhs_ = rhs_"
-
+        evaluation.cache_result = False
         self.assign(lhs, rhs, evaluation)
         return rhs
 
@@ -600,7 +601,7 @@ class SetDelayed(Set):
 
     def apply(self, lhs, rhs, evaluation):
         "lhs_ := rhs_"
-
+        evaluation.cache_result = False
         if self.assign(lhs, rhs, evaluation):
             return Symbol("Null")
         else:
@@ -648,7 +649,7 @@ class UpSet(BinaryOperator, _SetOperator):
 
     def apply(self, lhs, rhs, evaluation):
         "lhs_ ^= rhs_"
-
+        evaluation.cache_result = False
         self.assign_elementary(lhs, rhs, evaluation, upset=True)
         return rhs
 
@@ -681,7 +682,7 @@ class UpSetDelayed(UpSet):
 
     def apply(self, lhs, rhs, evaluation):
         "lhs_ ^:= rhs_"
-
+        evaluation.cache_result = False
         if self.assign_elementary(lhs, rhs, evaluation, upset=True):
             return Symbol("Null")
         else:
@@ -723,7 +724,7 @@ class TagSet(Builtin, _SetOperator):
 
     def apply(self, f, lhs, rhs, evaluation):
         "f_ /: lhs_ = rhs_"
-
+        evaluation.cache_result = False
         name = f.get_name()
         if not name:
             evaluation.message(self.get_name(), "sym", f, 1)
@@ -747,7 +748,7 @@ class TagSetDelayed(TagSet):
 
     def apply(self, f, lhs, rhs, evaluation):
         "f_ /: lhs_ := rhs_"
-
+        evaluation.cache_result = False
         name = f.get_name()
         if not name:
             evaluation.message(self.get_name(), "sym", f, 1)
@@ -1240,6 +1241,7 @@ def do_clear(self, definition):
 
     def apply(self, symbols, evaluation):
         "%(name)s[symbols___]"
+        evaluation.cache_result = False
         if isinstance(symbols, Symbol):
             symbols = [symbols]
         elif isinstance(symbols, Expression):
@@ -1276,6 +1278,8 @@ def apply(self, symbols, evaluation):
 
     def apply_all(self, evaluation):
         "Clear[System`All]"
+        evaluation.cache_result = False
+        evaluation.cache_expr = {}
         evaluation.definitions.set_user_definitions({})
         evaluation.definitions.clear_pymathics_modules()
         return
@@ -1315,6 +1319,8 @@ def do_clear(self, definition):
 
     def apply_all(self, evaluation):
         "ClearAll[System`All]"
+        evaluation.cache_result = False
+        evaluation.cache_expr = {}        
         evaluation.definitions.set_user_definitions({})
         evaluation.definitions.clear_pymathics_modules()
         return
@@ -1403,6 +1409,7 @@ class Unset(PostfixOperator):
 
     def apply(self, expr, evaluation):
         "Unset[expr_]"
+        evaluation.cache_result = False
 
         name = expr.get_head_name()
         if name in system_symbols(
@@ -1659,7 +1666,7 @@ class Messages(Builtin):
 
     def apply(self, symbol, evaluation):
         "Messages[symbol_]"
-
+        evaluation.cache_result = False
         return get_symbol_values(symbol, "Messages", "messages", evaluation)
 
 
@@ -1922,6 +1929,7 @@ class LoadModule(Builtin):
 
     def apply(self, module, evaluation):
         "LoadModule[module_String]"
+        evaluation.cache_result = False        
         try:
             evaluation.definitions.load_pymathics_module(module.value)
         except PyMathicsLoadException:

mathics/builtin/control.py

@@ -337,6 +337,7 @@ class For(Builtin):
 
     def apply(self, start, test, incr, body, evaluation):
         "For[start_, test_, incr_, body_]"
+        evaluation.cache_result = False
         while test.evaluate(evaluation).is_true():
             evaluation.check_stopped()
             try:
@@ -382,7 +383,7 @@ class While(Builtin):
 
     def apply(self, test, body, evaluation):
         "While[test_, body_]"
-
+        evaluation.cache_result = False
         while test.evaluate(evaluation).is_true():
             try:
                 evaluation.check_stopped()
@@ -645,7 +646,7 @@ class Abort(Builtin):
 
     def apply(self, evaluation):
         "Abort[]"
-
+        evaluation.cache_result = False
         raise AbortInterrupt
 
 
@@ -662,7 +663,7 @@ class Interrupt(Builtin):
 
     def apply(self, evaluation):
         "Interrupt[]"
-
+        evaluation.cache_result = False
         raise AbortInterrupt
 
 
@@ -707,7 +708,7 @@ class Return(Builtin):
 
     def apply(self, expr, evaluation):
         "Return[expr_]"
-
+        evaluation.cache_result = False
         raise ReturnInterrupt(expr)
 
 
@@ -729,7 +730,7 @@ class Break(Builtin):
 
     def apply(self, evaluation):
         "Break[]"
-
+        evaluation.cache_result = False
         raise BreakInterrupt
 
 
@@ -753,7 +754,7 @@ class Continue(Builtin):
 
     def apply(self, evaluation):
         "Continue[]"
-
+        evaluation.cache_result = False
         raise ContinueInterrupt
 
 
@@ -790,6 +791,7 @@ class Catch(Builtin):
 
     def apply1(self, expr, evaluation):
         "Catch[expr_]"
+        evaluation.cache_result = False
         try:
             ret = expr.evaluate(evaluation)
         except WLThrowInterrupt as e:
@@ -798,6 +800,7 @@ def apply1(self, expr, evaluation):
 
     def apply3(self, expr, form, f, evaluation):
         "Catch[expr_, form_, f__:Identity]"
+        evaluation.cache_result = False
         try:
             ret = expr.evaluate(evaluation)
         except WLThrowInterrupt as e:
@@ -840,8 +843,10 @@ class Throw(Builtin):
 
     def apply1(self, value, evaluation):
         "Throw[value_]"
+        evaluation.cache_result = False
         raise WLThrowInterrupt(value)
 
     def apply_with_tag(self, value, tag, evaluation):
         "Throw[value_, tag_]"
+        evaluation.cache_result = False
         raise WLThrowInterrupt(value, tag)

mathics/builtin/datentime.py

@@ -121,6 +121,7 @@ class TimeRemaining(Builtin):
 
     def apply(self, evaluation):
         "TimeRemaining[]"
+        evaluation.cache_result = False
         if len(evaluation.timeout_queue) > 0:
             t, start_time = evaluation.timeout_queue[-1]
             curr_time = datetime.now().timestamp()
@@ -167,10 +168,12 @@ class TimeConstrained(Builtin):
 
         def apply_2(self, expr, t, evaluation):
             "TimeConstrained[expr_, t_]"
+            evaluation.cache_result = False
             return self.apply_3(expr, t, SymbolAborted, evaluation)
 
         def apply_3(self, expr, t, failexpr, evaluation):
             "TimeConstrained[expr_, t_, failexpr_]"
+            evaluation.cache_result = False
             t = t.evaluate(evaluation)
             if not t.is_numeric():
                 evaluation.message("TimeConstrained", "timc", t)
@@ -208,7 +211,7 @@ class Timing(Builtin):
 
     def apply(self, expr, evaluation):
         "Timing[expr_]"
-
+        evaluation.cache_result = False
         start = time.process_time()
         result = expr.evaluate(evaluation)
         stop = time.process_time()
@@ -232,7 +235,7 @@ class AbsoluteTiming(Builtin):
 
     def apply(self, expr, evaluation):
         "AbsoluteTiming[expr_]"
-
+        evaluation.cache_result = False
         start = time.time()
         result = expr.evaluate(evaluation)
         stop = time.time()
@@ -498,7 +501,6 @@ class DateList(_DateFormat):
     def apply(self, epochtime, evaluation):
         "%(name)s[epochtime_]"
         datelist = self.to_datelist(epochtime, evaluation)
-
         if datelist is None:
             return
 
@@ -754,7 +756,7 @@ class AbsoluteTime(_DateFormat):
 
     def apply_now(self, evaluation):
         "AbsoluteTime[]"
-
+        evaluation.cache_result = False
         return from_python(total_seconds(datetime.now() - EPOCH_START))
 
     def apply_spec(self, epochtime, evaluation):
@@ -849,6 +851,7 @@ def apply(self, evaluation):
         "TimeUsed[]"
         # time.process_time() is better than
         # time.clock(). See https://bugs.python.org/issue31803
+        evaluation.cache_result = False
         return Real(time.process_time())
 
 
@@ -865,6 +868,7 @@ class SessionTime(Builtin):
 
     def apply(self, evaluation):
         "SessionTime[]"
+        evaluation.cache_result = False
         return Real(time.time() - START_TIME)
 
 
@@ -886,11 +890,11 @@ class Pause(Builtin):
 
     def apply(self, n, evaluation):
         "Pause[n_]"
+        evaluation.cache_result = False
         sleeptime = n.to_python()
         if not isinstance(sleeptime, (int, float)) or sleeptime < 0:
             evaluation.message("Pause", "numnm", Expression("Pause", n))
             return
-
         time.sleep(sleeptime)
         return Symbol("Null")
 

mathics/builtin/evaluation.py

@@ -78,6 +78,7 @@ class RecursionLimit(Predefined):
     }
 
     def evaluate(self, evaluation) -> Integer:
+        evaluation.cache_result = False
         return Integer(self.value)
 
 
@@ -138,6 +139,7 @@ class IterationLimit(Predefined):
     }
 
     def evaluate(self, evaluation):
+        evaluation.cache_result = False
         return Integer(self.value)