From: Jim Pryor <profjim@jimpryor.net>
Date: Sat, 2 Oct 2010 12:23:49 +0000 (-0400)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=f755e97d71eb4e8885d6a235f3afe672dba3d0ae;hp=1d2451f95db396a48c879052228d9a1636d62fbb

Merge branch 'pryor'
---

diff --git a/offsite_reading.mdwn b/offsite_reading.mdwn
index d9c7f826..b39906cd 100644
--- a/offsite_reading.mdwn
+++ b/offsite_reading.mdwn
@@ -52,6 +52,7 @@ get more out of. (Rinse and repeat.)
 *	[Penn lambda calculator](http://www.ling.upenn.edu/lambda/) Pedagogical software developed by Lucas Champollion, Josh Tauberer and Maribel Romero.<p>
 
 <!-- Haskell Curry had ideas that he felt were validated upon reading a 1924 paper by M. Schönfinkel "Uber die Bausteine der mathematischen Logik" which used combinators in a similar way to his own ideas. Haskell then wrote "An analysis of logical substitution" which appeared in the American Journal of Mathematics in 1929. -->
+
 *	[[!wikipedia Moses Schönfinkel]]
 *	[[!wikipedia Haskell Curry]]
 *	[[!wikipedia Alonzo Church]]<p>
@@ -66,6 +67,8 @@ get more out of. (Rinse and repeat.)
 	<http://people.cs.uu.nl/jeroen/article/combinat/combinat.ps>
 *	[Chris Barker's Iota and Jot](http://semarch.linguistics.fas.nyu.edu/barker/Iota/)<p>
 
+*       [To Dissect a Mockingbird](http://dkeenan.com/Lambda/index.htm)
+
 ## Evaluation Order ##
 
 *	[[!wikipedia Evaluation strategy]]
@@ -92,7 +95,7 @@ get more out of. (Rinse and repeat.)
 *	[Y Combinator for Dysfunctional Non-Schemers](http://rayfd.wordpress.com/2007/05/06/y-combinator-for-dysfunctional-non-schemers/)
 *	[The Y Combinator](http://www.ece.uc.edu/~franco/C511/html/Scheme/ycomb.html)
 *	[The Y Combinator](http://dangermouse.brynmawr.edu/cs245/ycomb_jim.html) derives the applicative-order Y-combinator from scratch, in Scheme. This derivation is similar in flavor to the derivation found in The Little Schemer, but uses a slightly different starting approach...
-
+*       [The church of the least fixed point, by Sans Pareil](http://www.springerlink.com/content/n4t2v573m58g2755/)
 
 ## Types ##
 
diff --git a/temp b/temp
deleted file mode 100644
index 46f37af2..00000000
--- a/temp
+++ /dev/null
@@ -1,13 +0,0 @@
-let empty = (\f (\z z)) in
-let ml = (\h (\t (\f (\z ((f h) ((t f) z)))))) in
-let list = ((ml a) ((ml b) ((ml c) ((ml d) ((ml e) empty))))) in
-let map = (\f (\l (l (\h (\t ((ml (f h)) t)))))) in
-
-(
-
-list
-
-((map (\x x)) list)
-
-)
-
diff --git a/temp.mdwn b/temp.mdwn
deleted file mode 100644
index 585e666c..00000000
--- a/temp.mdwn
+++ /dev/null
@@ -1,78 +0,0 @@
-<textarea id="INPUT" style="border: 2px solid black; color: black; font-family: monospace; height: 3in; overflow: auto; padding: 0.5em; width: 100%;">
-let true = \x y. x in
-let false = \x y. y in
-let and = \l r. l r false in
-(
-	(and true true yes no)
-	(and true false yes no)
-	(and false true yes no)
-	(and false false yes no)
-)
-</textarea>
-<input id="PARSE" value="Normalize" type="button">
-<input id="ETA" type="checkbox">do eta-reductions too
-<noscript><p>You may not see it because you have JavaScript turned off. Uffff!</p></noscript>
-<script src="/code/lambda.js"></script>
-<script src="/code/tokens.js"></script>
-<script src="/code/parse.js"></script>
-<script src="/code/json2.js"></script>
-<pre id="OUTPUT">
-</pre>
-<script>
-/*jslint evil: true */
-
-/*members create, error, message, name, prototype, stringify, toSource,
-    toString, write
-*/
-
-/*global JSON, make_parse, parse, source, tree */
-
-// Make a new object that inherits members from an existing object.
-
-if (typeof Object.create !== 'function') {
-    Object.create = function (o) {
-        function F() {}
-        F.prototype = o;
-        return new F();
-    };
-}
-
-// Transform a token object into an exception object and throw it.
-
-Object.prototype.error = function (message, t) {
-    t = t || this;
-    t.name = "SyntaxError";
-    t.message = message;
-    throw t;
-};
-
-
-(function () {
-    var parse = make_parse();
-
-    function go(source) {
-        var string, tree, expr, eta;
-        try {
-            tree = parse(source);
- //           string = JSON.stringify(tree, ['key', 'name', 'message', 'value', 'arity', 'first', 'second', 'third', 'fourth'], 4);
-			expr = tree.handler();
-            // string = JSON.stringify(expr, ['key', 'name', 'message', 'value', 'arity', 'first', 'second', 'tag', 'variable', 'left', 'right', 'bound', 'body' ], 4);
-//			string = expr.to_string() + "\n\n~~>\n\n";
-			string = '';
-			eta = document.getElementById('ETA').checked;
-			string = string + reduce(expr, eta, false).to_string();
-        } catch (e) {
-            string = JSON.stringify(e, ['name', 'message', 'from', 'to', 'key',
-                    'value', 'arity', 'first', 'second', 'third', 'fourth'], 4);
-        }
-        document.getElementById('OUTPUT').innerHTML = string
-            .replace(/&/g, '&amp;')
-            .replace(/[<]/g, '&lt;');
-    }
-
-    document.getElementById('PARSE').onclick = function (e) {
-        go(document.getElementById('INPUT').value);
-    };
-}());
-
-</script>