From ff6d427b2f7516ea76cc97eb574382d52549b05a Mon Sep 17 00:00:00 2001 From: Simon Forman Date: Fri, 24 Apr 2020 17:12:46 -0700 Subject: [PATCH] Fixes: #38238 rename pushback to concat. --- docs/Trees.ipynb | 88 +++++++++++++--------------- docs/sphinx_docs/notebooks/Intro.rst | 2 +- 2 files changed, 41 insertions(+), 49 deletions(-) diff --git a/docs/Trees.ipynb b/docs/Trees.ipynb index 48a2615..8dd1113 100644 --- a/docs/Trees.ipynb +++ b/docs/Trees.ipynb @@ -133,7 +133,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -423,9 +423,7 @@ { "cell_type": "code", "execution_count": 12, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [ { "name": "stdout", @@ -459,9 +457,7 @@ { "cell_type": "code", "execution_count": 13, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [ { "name": "stdout", @@ -535,9 +531,7 @@ { "cell_type": "code", "execution_count": 15, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [ { "name": "stdout", @@ -609,9 +603,7 @@ { "cell_type": "code", "execution_count": 17, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [ { "name": "stdout", @@ -906,12 +898,12 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 30, "metadata": {}, "outputs": [], "source": [ "from joy.library import FunctionWrapper\n", - "from joy.utils.stack import pushback\n", + "from joy.utils.stack import concat\n", "from notebook_preamble import D\n", "\n", "\n", @@ -934,7 +926,7 @@ " L\n", " '''\n", " L, (E, (G, (b, (a, stack)))) = stack\n", - " expression = pushback(G if a > b else L if a < b else E, expression)\n", + " expression = concat(G if a > b else L if a < b else E, expression)\n", " return stack, expression, dictionary\n", "\n", "\n", @@ -943,7 +935,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 31, "metadata": {}, "outputs": [], "source": [ @@ -992,7 +984,7 @@ }, { "cell_type": "code", - "execution_count": 31, + "execution_count": 32, "metadata": {}, "outputs": [ { @@ -1009,7 +1001,7 @@ }, { "cell_type": "code", - "execution_count": 32, + "execution_count": 33, "metadata": {}, "outputs": [ { @@ -1026,7 +1018,7 @@ }, { "cell_type": "code", - "execution_count": 33, + "execution_count": 34, "metadata": {}, "outputs": [ { @@ -1043,7 +1035,7 @@ }, { "cell_type": "code", - "execution_count": 34, + "execution_count": 35, "metadata": {}, "outputs": [], "source": [ @@ -1064,7 +1056,7 @@ }, { "cell_type": "code", - "execution_count": 35, + "execution_count": 36, "metadata": {}, "outputs": [ { @@ -1081,7 +1073,7 @@ }, { "cell_type": "code", - "execution_count": 36, + "execution_count": 37, "metadata": {}, "outputs": [ { @@ -1098,7 +1090,7 @@ }, { "cell_type": "code", - "execution_count": 37, + "execution_count": 38, "metadata": {}, "outputs": [ { @@ -1115,7 +1107,7 @@ }, { "cell_type": "code", - "execution_count": 38, + "execution_count": 39, "metadata": {}, "outputs": [ { @@ -1132,7 +1124,7 @@ }, { "cell_type": "code", - "execution_count": 39, + "execution_count": 40, "metadata": { "scrolled": true }, @@ -1265,7 +1257,7 @@ }, { "cell_type": "code", - "execution_count": 40, + "execution_count": 41, "metadata": {}, "outputs": [], "source": [ @@ -1274,7 +1266,7 @@ }, { "cell_type": "code", - "execution_count": 41, + "execution_count": 42, "metadata": {}, "outputs": [ { @@ -1398,7 +1390,7 @@ }, { "cell_type": "code", - "execution_count": 42, + "execution_count": 43, "metadata": {}, "outputs": [], "source": [ @@ -1421,7 +1413,7 @@ }, { "cell_type": "code", - "execution_count": 43, + "execution_count": 44, "metadata": {}, "outputs": [ { @@ -1438,7 +1430,7 @@ }, { "cell_type": "code", - "execution_count": 44, + "execution_count": 45, "metadata": {}, "outputs": [ { @@ -1455,7 +1447,7 @@ }, { "cell_type": "code", - "execution_count": 45, + "execution_count": 46, "metadata": {}, "outputs": [ { @@ -1886,7 +1878,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 47, "metadata": {}, "outputs": [], "source": [ @@ -1909,7 +1901,7 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": 48, "metadata": {}, "outputs": [ { @@ -1926,7 +1918,7 @@ }, { "cell_type": "code", - "execution_count": 24, + "execution_count": 49, "metadata": {}, "outputs": [ { @@ -1943,7 +1935,7 @@ }, { "cell_type": "code", - "execution_count": 25, + "execution_count": 50, "metadata": {}, "outputs": [ { @@ -1960,7 +1952,7 @@ }, { "cell_type": "code", - "execution_count": 26, + "execution_count": 51, "metadata": {}, "outputs": [ { @@ -1977,7 +1969,7 @@ }, { "cell_type": "code", - "execution_count": 30, + "execution_count": 52, "metadata": {}, "outputs": [ { @@ -2121,7 +2113,7 @@ }, { "cell_type": "code", - "execution_count": 46, + "execution_count": 53, "metadata": {}, "outputs": [], "source": [ @@ -2150,7 +2142,7 @@ }, { "cell_type": "code", - "execution_count": 47, + "execution_count": 54, "metadata": {}, "outputs": [ { @@ -2167,7 +2159,7 @@ }, { "cell_type": "code", - "execution_count": 48, + "execution_count": 55, "metadata": { "scrolled": true }, @@ -2186,7 +2178,7 @@ }, { "cell_type": "code", - "execution_count": 49, + "execution_count": 56, "metadata": {}, "outputs": [ { @@ -2235,7 +2227,7 @@ }, { "cell_type": "code", - "execution_count": 50, + "execution_count": 57, "metadata": {}, "outputs": [], "source": [ @@ -2244,7 +2236,7 @@ }, { "cell_type": "code", - "execution_count": 51, + "execution_count": 58, "metadata": {}, "outputs": [ { @@ -2261,7 +2253,7 @@ }, { "cell_type": "code", - "execution_count": 52, + "execution_count": 59, "metadata": {}, "outputs": [ { @@ -2314,7 +2306,7 @@ }, { "cell_type": "code", - "execution_count": 53, + "execution_count": 60, "metadata": {}, "outputs": [ { @@ -2351,7 +2343,7 @@ }, { "cell_type": "code", - "execution_count": 57, + "execution_count": 61, "metadata": { "scrolled": true }, @@ -2391,7 +2383,7 @@ }, { "cell_type": "code", - "execution_count": 55, + "execution_count": 62, "metadata": {}, "outputs": [ { diff --git a/docs/sphinx_docs/notebooks/Intro.rst b/docs/sphinx_docs/notebooks/Intro.rst index 96cee52..91736e7 100644 --- a/docs/sphinx_docs/notebooks/Intro.rst +++ b/docs/sphinx_docs/notebooks/Intro.rst @@ -224,7 +224,7 @@ Many of the functions are defined in Python, like ``dip``: def dip(stack, expression, dictionary): (quote, (x, stack)) = stack expression = x, expression - return stack, pushback(quote, expression), dictionary + return stack, concat(quote, expression), dictionary Some functions are defined in equations in terms of other functions.