From: Jim Pryor Date: Tue, 24 Aug 2010 22:32:13 +0000 (-0400) Subject: family_tree: add F# X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=477b05e15fd63f479eb8c85f188a3a3fd51d324f family_tree: add F# Signed-off-by: Jim Pryor --- diff --git a/family_tree_of_functional_programming_languages.mdwn b/family_tree_of_functional_programming_languages.mdwn index 1620ea08..479f0a80 100644 --- a/family_tree_of_functional_programming_languages.mdwn +++ b/family_tree_of_functional_programming_languages.mdwn @@ -103,7 +103,8 @@ instance, languages of the ML family are all statically-typed functional languages with strict/eager evaluation. These include [[!wikipedia Standard ML desc="SML"]] and [[!wikipedia Caml]] and [[!wikipedia Nemerle]]. SML in turn has several variants or implementations: [[!wikipedia MLton]], [[!wikipedia SML/NJ]], [[!wikipedia Moscow ML]], -and [[!wikipedia Mythryl]]. +and [[!wikipedia Mythryl]]. Microsoft's [[!wikipedia F Sharp (programming language) desc="F#"]] +is derived from Caml. Other statically-typed functional languages with strict/eager evaluation are [[!wikipedia Scala (programming language) desc="Scala"]] and [[!wikipedia