From 9d9fad6dc931979e4517bd3c2c470e8c5f8a6cc9 Mon Sep 17 00:00:00 2001 From: Simon Forman Date: Mon, 23 Nov 2020 09:06:36 -0800 Subject: [PATCH] Fix a typo. --- joy/joy.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/joy/joy.py b/joy/joy.py index b29d509..d1e49b7 100644 --- a/joy/joy.py +++ b/joy/joy.py @@ -33,17 +33,10 @@ from .utils.stack import stack_to_string def joy(stack, expression, dictionary, viewer=None): '''Evaluate a Joy expression on a stack. -<<<<<<< working copy This function iterates through a sequence of terms which are either literals (strings, numbers, sequences of terms) or function symbols. Literals are put onto the stack and functions are looked up in the dictionary and executed. -======= - This function iterates through a sequence of terms which are either - literals (strings, numbers, sequences of terms) or function symbols. - Literals are put onto the stack and functions are looked up in the - disctionary and executed. ->>>>>>> merge rev The viewer is a function that is called with the stack and expression on every iteration, its return value is ignored.