.gitignore

@@ -10,4 +10,3 @@ dist
 
 # Misc
 *.gif
-misc/secrets.sh

.vscode/settings.json

@@ -8,7 +8,6 @@
         "mdel",
         "onefile",
         "Packrat",
-        "printables",
         "pyparsing",
         "rlimit",
         "runstatus",

lamb_engine/parser.py

@@ -56,7 +56,7 @@ class LambdaParser:
 			(self.lp + self.pp_history + self.rp)
 		)
 
-		self.pp_command = pp.Suppress(":") + pp.Word(pp.alphas + "_") + pp.Word(pp.printables)[0, ...]
+		self.pp_command = pp.Suppress(":") + pp.Word(pp.alphas + "_") + pp.Word(pp.alphas + pp.nums + "_.")[0, ...]
 
 
 		self.pp_all = (

misc/demo.tape

@@ -1,4 +1,11 @@
-# See makedemo.sh
+# How to use this:
+# install vhs
+# enter venv
+# vhs < misc/demo.tape
+#
+# We need macros.lamb, so run this from
+# the root of this repository.
+
 
 #Output lambdemo.mp4
 Output lambdemo.gif
@@ -18,7 +25,7 @@ Enter
 Sleep 2000ms
 
 # Demo 1: load
-Type ":load ../macros.lamb"
+Type ":load macros.lamb"
 Sleep 500ms
 Enter
 Sleep 2000ms

misc/makedemo.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-# Should be run from the misc directory.
-# Will not work with any other root.
-
-# Create this file.
-# Should define two variables:
-# DAV_USER="name:password"
-# DAV_URL="https://site.com/dav-path"
-
-if [[ -f "secrets.sh" ]]; then
-	source secrets.sh
-else
-	echo "Cannot run without secrets.sh"
-	exit
-fi
-
-# Activate venv if not in venv
-if [[ "$VIRTUAL_ENV" == "" ]]; then
-	source ../venv/bin/activate
-fi
-
-# Make sure our venv is running the latest
-# version of lamb.
-pip install --editable ..
-
-
-# Make gif
-vhs < demo.tape
-
-# Upload
-curl \
-	--user $DAV_USER \
-	--url $DAV_URL \
-	--upload-file "lambdemo.gif"

pyproject.toml

@@ -15,7 +15,7 @@ lamb = "lamb_engine:main"
 [project]
 name = "lamb_engine"
 description = "A lambda calculus engine"
-version = "1.1.7"
+version = "1.1.6"
 dependencies = [
 	"prompt-toolkit==3.0.31",
 	"pyparsing==3.0.9"