Minor cleanup.

This commit is contained in:
Simon Forman
2020-05-20 15:34:30 -07:00
parent f9ac667cc5
commit ba0c24c39b
4 changed files with 27 additions and 29 deletions
+10 -10
View File
@@ -92,7 +92,7 @@
},
"outputs": [],
"source": [
"define('gsra == 1 swap [over / + 2 /] cons [dup] swoncat make_generator')"
"define('gsra 1 swap [over / + 2 /] cons [dup] swoncat make_generator')"
]
},
{
@@ -182,7 +182,7 @@
"metadata": {},
"outputs": [],
"source": [
"define('_within_P == [first - abs] dip <=')"
"define('_within_P [first - abs] dip <=')"
]
},
{
@@ -203,7 +203,7 @@
"metadata": {},
"outputs": [],
"source": [
"define('_within_B == roll< popop first')"
"define('_within_B roll< popop first')"
]
},
{
@@ -216,7 +216,7 @@
"\n",
"1. Discard a.\n",
"2. Use `x` combinator to generate next term from `G`.\n",
"3. Run `within` with `i` (it is a `primrec` function.)\n",
"3. Run `within` with `i` (it is a \"tail-recursive\" function.)\n",
"\n",
"Pretty straightforward:\n",
"\n",
@@ -236,7 +236,7 @@
"metadata": {},
"outputs": [],
"source": [
"define('_within_R == [popd x] dip')"
"define('_within_R [popd x] dip')"
]
},
{
@@ -257,8 +257,8 @@
"metadata": {},
"outputs": [],
"source": [
"define('within == x 0.000000001 [_within_P] [_within_B] [_within_R] primrec')\n",
"define('sqrt == gsra within')"
"define('within x 0.000000001 [_within_P] [_within_B] [_within_R] tailrec')\n",
"define('sqrt gsra within')"
]
},
{
@@ -367,14 +367,14 @@
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 2
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.12"
"pygments_lexer": "ipython3",
"version": "3.8.3"
}
},
"nbformat": 4,
+3 -3
View File
@@ -29,7 +29,7 @@ S = ()
def J(text, stack=S, dictionary=D):
print stack_to_string(run(text, stack, dictionary)[0])
print(stack_to_string(run(text, stack, dictionary)[0]))
def V(text, stack=S, dictionary=D):
@@ -39,8 +39,8 @@ def V(text, stack=S, dictionary=D):
except:
exc = format_exc()
tp.print_()
print '-' * 73
print exc
print('-' * 73)
print(exc)
else:
tp.print_()