Updating the docs. Playing with Joy Kernel.

docs/3._Developing_a_Program.ipynb

@@ -314,9 +314,7 @@
   {
    "cell_type": "markdown",
    "metadata": {},
-   "source": [
-    "We only want the terms *less than* 1000."
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -1092,9 +1090,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 2",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
-   "name": "python2"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -1106,7 +1104,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.7.10"
   }
  },
  "nbformat": 4,

docs/Joy in Jupyter.ipynb

@@ -29,6 +29,42 @@
   {
    "cell_type": "code",
    "execution_count": 2,
+   "id": "cbc09c4a",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "41 123"
+     ]
+    }
+   ],
+   "source": [
+    "123"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "id": "f310ec86",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "5043"
+     ]
+    }
+   ],
+   "source": [
+    "*"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
    "id": "8d86c75f",
    "metadata": {},
    "outputs": [
@@ -44,7 +80,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 5,
    "id": "ff9b5754",
    "metadata": {},
    "outputs": [
@@ -62,7 +98,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 6,
    "id": "e1027ca3",
    "metadata": {},
    "outputs": [
@@ -78,7 +114,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 7,
    "id": "aef6f509",
    "metadata": {},
    "outputs": [
@@ -111,7 +147,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 8,
    "id": "f491e33f",
    "metadata": {},
    "outputs": [
@@ -129,7 +165,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 9,
    "id": "31d6ec54",
    "metadata": {},
    "outputs": [
@@ -149,6 +185,111 @@
    "source": [
     "trace"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 10,
+   "id": "f85a149a",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": []
+    }
+   ],
+   "source": [
+    "clear"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 11,
+   "id": "2e13763d",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[dup cons]"
+     ]
+    }
+   ],
+   "source": [
+    "[dup cons]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 12,
+   "id": "e4509e6a",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "           [dup cons] • x\n",
+      "           [dup cons] • dup cons\n",
+      "[dup cons] [dup cons] • cons\n",
+      "[[dup cons] dup cons] • \n",
+      "\n",
+      "[[dup cons] dup cons]"
+     ]
+    }
+   ],
+   "source": [
+    "[x] trace"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 13,
+   "id": "8170053c",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[[dup cons] dup cons] • i\n",
+      "                      • [dup cons] dup cons\n",
+      "           [dup cons] • dup cons\n",
+      "[dup cons] [dup cons] • cons\n",
+      "[[dup cons] dup cons] • \n",
+      "\n",
+      "[[dup cons] dup cons]"
+     ]
+    }
+   ],
+   "source": [
+    "[i] trace"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 14,
+   "id": "50c24687",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": []
+    }
+   ],
+   "source": [
+    "clear"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "21c86a84",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

joy/library.py

@@ -223,12 +223,13 @@ def BinaryBuiltinWrapper(f):
             (a, (b, stack)) = stack
         except ValueError:
             raise StackUnderflowError('Not enough values on stack.')
-        if (   not isinstance(a, int)
-            or not isinstance(b, int)
-            or isinstance(a, bool)  # Because bools are ints in Python.
-            or isinstance(b, bool)
-            ):
-            raise NotAnIntError
+        # Boolean predicates like "or" fail here.  :(
+##        if (   not isinstance(a, int)
+##            or not isinstance(b, int)
+##            or isinstance(a, bool)  # Because bools are ints in Python.
+##            or isinstance(b, bool)
+##            ):
+##            raise NotAnIntError
         result = f(b, a)
         return (result, stack), expression, dictionary
     return inner