From b441bb06b8bd06f306561697f851fb2a8c36163b Mon Sep 17 00:00:00 2001 From: Evan Hubinger Date: Sun, 20 Oct 2024 13:33:32 -0700 Subject: [PATCH] More pypy fixes --- coconut/compiler/util.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coconut/compiler/util.py b/coconut/compiler/util.py index 8aac0d30..59a663d9 100644 --- a/coconut/compiler/util.py +++ b/coconut/compiler/util.py @@ -745,9 +745,11 @@ def cached_parse( cache_prefixes=False, ): """Version of parse that caches the result when it's a pure ComputationNode.""" + if not include_tokens: + eval_parse_tree = False if not CPYPARSING: # caching is only supported on cPyparsing if scan_string: - for tokens, start, stop in all_matches(grammar, text, inner, eval_parse_tree=False): + for tokens, start, stop in all_matches(grammar, text, inner, eval_parse_tree): return tokens, start, stop return None, None, None else: @@ -841,7 +843,7 @@ def does_parse(grammar, text, inner=None): def cached_does_parse(cache, grammar, text, inner=None, **kwargs): """Cached version of does_parse.""" - return cached_try_parse(cache, grammar, text, inner, eval_parse_tree=False, include_tokens=False, **kwargs) + return cached_try_parse(cache, grammar, text, inner, include_tokens=False, **kwargs) def parse_where(grammar, text, inner=None): @@ -853,7 +855,7 @@ def parse_where(grammar, text, inner=None): def cached_parse_where(cache, grammar, text, inner=None, **kwargs): """Cached version of parse_where.""" - tokens, start, stop = cached_parse(cache, grammar, text, inner, scan_string=True, eval_parse_tree=False, include_tokens=False, **kwargs) + tokens, start, stop = cached_parse(cache, grammar, text, inner, scan_string=True, include_tokens=False, **kwargs) return start, stop