visual-lambda: update redame

Author: bntre

README.md

@@ -5,7 +5,7 @@ and from https://bitbucket.org/bntr/visual-lambda too.
 
 ![logo](http://bntr.planet.ee/lambda/loop_.gif)
 
-Visual Lambda environment allows intuitive manipulation of lambda calculus expressions.
+The Visual Lambda environment enables intuitive manipulation of lambda calculus expressions.
 
 ## Screenshot
 
@@ -15,11 +15,12 @@ Visual Lambda environment allows intuitive manipulation of lambda calculus expre
 - [Basics](http://bntr.planet.ee/lambda/visual_lambda_bubble_notation.gif)
 - More detailed in this thesis [visual_lambda.pdf](http://bntr.planet.ee/lambda/work/visual_lambda.pdf)
 
-## Examples
+## Reduction animation examples
 - ['MULT 3 2' evaluation](http://bntr.planet.ee/lambda/visual_lambda_MULT_3_2_=_6.gif)
 - ['((λgm.m(gg))(λgm.m(gg)))M' building and evaluation](http://bntr.planet.ee/lambda/lambda_F_anim.gif)
 - ['Y I' evaluation](http://bntr.planet.ee/lambda/Y_I.gif)
 
+
 ## Dependencies
 - python 3
 - pygame 2.4.0
@@ -30,8 +31,12 @@ Visual Lambda environment allows intuitive manipulation of lambda calculus expre
 ## Controls
 - [controls.txt](controls.txt)
 
+## Predefined expression library
+- [library.txt](library.txt)
+
+
 ## Related works
-- [Programming with Visual Expressions, Wayne Citrin](http://users.encs.concordia.ca/~haarslev/vl95www/html-papers/citrin/citrin.html)
-- [A Graphical Notation for the Lambda Calculus, Dave Keenan](http://dkeenan.com/Lambda/)
-- [Lambda Animator, Mike Thyer](http://thyer.name/lambda-animator/)
+- [Programming with Visual Expressions, Wayne Citrin](https://web.archive.org/web/20110524135539/users.encs.concordia.ca/~haarslev/vl95www/html-papers/citrin/citrin.html)
+- [A Graphical Notation for the Lambda Calculus, Dave Keenan](https://dkeenan.com/Lambda/)
 - [Alligator Eggs, Bret Victor](http://worrydream.com/AlligatorEggs/)
+- More in [prathyvsh's catalog](https://github.com/prathyvsh/lambda-calculus-visualizations)

localstorage.py

@@ -25,6 +25,9 @@
     function addItem(expression) {
         setStorageValue("addItem", expression, "|");
     }
+    function clearWorkspace() {
+        setStorageValue("clearWorkspace", "1");
+    }
     function saveWorkspace(workspaceName) {
         setStorageValue("saveWorkspace", workspaceName);
     }
@@ -33,6 +36,7 @@
     }
     function help() {
         console.log("addItem(expression) - add an item by expression, e.g. addItem('\\x. x x')");
+        console.log("clearWorkspace() - clear the workspace");
         console.log("saveWorkspace(workspaceName) - save current workspace to localStorage, e.g. saveWorkspace('combinators3')");
         console.log("loadWorkspace(workspaceName) - load a workspace from localStorage, e.g. loadWorkspace('combinators3')");
     }

main.py

@@ -301,6 +301,10 @@ def __init__( self, caption ):
 
 
     async def run( self ):
+        
+        sleepSec = 0.02
+        if config.IS_WEB_PLATFORM:
+            sleepSec = 0  # pygbag asked for 0
 
         while True:
 
@@ -309,7 +313,7 @@ async def run( self ):
                 if e.type == pygame.QUIT:
                     return
 
-            await asyncio.sleep(0)
+            await asyncio.sleep(sleepSec)
 
 
 
@@ -610,9 +614,10 @@ def saveView( self ):
         self.viewMatrixSaved = self.viewMatrix.copy()
         print("The View was saved")
     def restoreView( self ):
-        self.viewMatrix = self.viewMatrixSaved
-        self.invalidate()
-        print("The View was restored")
+        if self.viewMatrixSaved:
+            self.viewMatrix = self.viewMatrixSaved
+            self.invalidate()
+            print("The View was restored")
 
 
     def updateSelectionStatus( self ):
@@ -817,6 +822,7 @@ def handleEvent( self, event ):
             if event.type == LOCALSTORAGE_TIMEREVENT:
                 # Check if user has called a browser console command, e.g. addItem('\\x. x x')
                 localstorage.handle_storage('addItem', self.onInputItem, "|")
+                localstorage.handle_storage('clearWorkspace', self.onClearWorkspace)
                 localstorage.handle_storage('saveWorkspace', self.onSaveWorkspaceName)
                 localstorage.handle_storage('loadWorkspace', self.onLoadWorkspaceName)
 
@@ -995,6 +1001,10 @@ def onSaveWorkspaceFileName( self, workspaceName ):
 
     if config.IS_WEB_PLATFORM:  # Save to/Load from localStorage
 
+        def onClearWorkspace( self, _ ):
+            if saving.load_from_file( self, "clear.xml" ):
+                self.invalidate()
+        
         def onSaveWorkspaceName( self, workspaceName ):
             xmlData = saving.save( self, pretty = True )
             if xmlData:

visual-lambda-2.0/build/web/index.html

@@ -491,17 +491,21 @@
         window.localStorage.setItem(key, value);
     }
 
-    function addtItem(expression) {
+    function addItem(expression) {
         setStorageValue("addItem", expression, "|");
     }
+    function clearWorkspace() {
+        setStorageValue("clearWorkspace", "1");
+    }
     function saveWorkspace(workspaceName) {
         setStorageValue("saveWorkspace", workspaceName);
     }
     function loadWorkspace(workspaceName) {
         setStorageValue("loadWorkspace", workspaceName);
     }
     function help() {
-        console.log("inputItem(expression) - add an item by expression, e.g. inputItem('\\x. x x')");
+        console.log("addItem(expression) - add an item by expression, e.g. addItem('\\x. x x')");
+        console.log("clearWorkspace() - clear the workspace");
         console.log("saveWorkspace(workspaceName) - save current workspace to localStorage, e.g. saveWorkspace('combinators3')");
         console.log("loadWorkspace(workspaceName) - load a workspace from localStorage, e.g. loadWorkspace('combinators3')");
     }

workspaces/library_demo.xml

@@ -66,6 +66,11 @@
 
   <item pos="-6,-40" figure="(\x. x x) (\x. x x)" />                      <item pos="0,-40"  text="LOOP = (\x. x x) (\x. x x)" />
 
+
+
+                                                        <item pos="0,-52" text="FACTORIAL" origin="1" />
+                                                        
+  <item pos="-8,-12" figure="FACT" />                <item pos="3,-6" text="FACT = Y (\f n. (ISZERO n) 1 (MULT (f (PRED n)) n))" />
 
  </items>
 </workspace>