• R/O
  • SSH

Joypy: Commit

This repo is not current. Development has moved from Hg to Git. For the latest code use the "Source Code" tab above to go to the "Thun" git repo or navigate to:
https://osdn.net/projects/joypy/scm/git/Thun


Commit MetaInfo

Révision54e7dee3d864b4f232a443be4190ad4ea150daf7 (tree)
l'heure2020-11-24 02:06:36
AuteurSimon Forman <sforman@hush...>
CommiterSimon Forman

Message de Log

Fix a typo.

Change Summary

Modification

diff -r 051cef8623d1 -r 54e7dee3d864 joy/joy.py
--- a/joy/joy.py Mon Nov 23 08:59:20 2020 -0800
+++ b/joy/joy.py Mon Nov 23 09:06:36 2020 -0800
@@ -33,17 +33,10 @@
3333 def joy(stack, expression, dictionary, viewer=None):
3434 '''Evaluate a Joy expression on a stack.
3535
36-<<<<<<< working copy
3736 This function iterates through a sequence of terms which are either
3837 literals (strings, numbers, sequences of terms) or function symbols.
3938 Literals are put onto the stack and functions are looked up in the
4039 dictionary and executed.
41-=======
42- This function iterates through a sequence of terms which are either
43- literals (strings, numbers, sequences of terms) or function symbols.
44- Literals are put onto the stack and functions are looked up in the
45- disctionary and executed.
46->>>>>>> merge rev
4740
4841 The viewer is a function that is called with the stack and expression
4942 on every iteration, its return value is ignored.
Afficher sur ancien navigateur de dépôt.