Merge branch 'pryor'

[lambda.git] / family_tree_of_functional_programming_languages.mdwn

diff --git a/family_tree_of_functional_programming_languages.mdwn b/family_tree_of_functional_programming_languages.mdwn
index 90db24e..4c488f4 100644 (file)
--- a/family_tree_of_functional_programming_languages.mdwn
+++ b/family_tree_of_functional_programming_languages.mdwn
@@ -12,7 +12,7 @@ typed and those that are statically typed.
 
 The **dynamically typed** languages give types more of a background role in the
 program. They include the Lisp family (which in turn includes all the variants
 
 The **dynamically typed** languages give types more of a background role in the
 program. They include the Lisp family (which in turn includes all the variants

-of [[!wikipedia Scheme]], and also [[!wikipedia Common Lisp]], and [[!wikipedia
+of [[!wikipedia Scheme (programming language) desc="Scheme"]], and also [[!wikipedia Common Lisp]], and [[!wikipedia

 Clojure]]). They also include [[!wikipedia Erlang]] and [[!wikipedia Joy]] and
 [[!wikipedia Pure]], and others.
 
 Clojure]]). They also include [[!wikipedia Erlang]] and [[!wikipedia Joy]] and
 [[!wikipedia Pure]], and others.
 


@@ -126,3 +126,9 @@ imperatival code.)
 We'll talk much more about monads, lazy vs strict evaluation, and functional vs
 imperatival code as we proceed.
 
 We'll talk much more about monads, lazy vs strict evaluation, and functional vs
 imperatival code as we proceed.
 

+We won't much discuss static vs dynamic typing; this has to do with lower-level
+implementation details than we'll be concerned with. However, you'll encounter
+the difference in practice as you work with Scheme and OCaml, respectively; and
+you'll see it referred to as you read around. So it's good for you to
+have placed it in your mental map.
+