X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=index.mdwn;h=6df8b02ec42c217008927b0619eec5edbd4a2fc7;hp=c6b0166ed04778a0ea9f3da15546973829e57187;hb=0669c93a4922641c2c8c26ba90df1160a41eef90;hpb=cdb5864a32ec3d8fd66034a2e4dad67f1294327e diff --git a/index.mdwn b/index.mdwn index c6b0166e..6df8b02e 100644 --- a/index.mdwn +++ b/index.mdwn @@ -215,7 +215,7 @@ Other R7RS-friendly: [Gauche](http://practical-scheme.net/gauche), [Chibi](https [Lisp](http://en.wikipedia.org/wiki/Lisp_%28programming_language%29), [Scheme](http://en.wikipedia.org/wiki/Scheme_%28programming_language%29), [Racket](http://en.wikipedia.org/wiki/Racket_%28programming_language%29), and -and [Chicken](http://en.wikipedia.org/wiki/CHICKEN_%28Scheme_implementation%29).) +[Chicken](http://en.wikipedia.org/wiki/CHICKEN_%28Scheme_implementation%29).) * **Caml** is one of two major dialects of *ML*, which is another large family of programming languages. Caml has only one active "implementation", @@ -225,12 +225,11 @@ specifically in OCaml. (Wikipedia on [ML](http://en.wikipedia.org/wiki/ML_%28programming_language%29), -[Caml](http://en.wikipedia.org/wiki/Caml), -and [OCaml](http://en.wikipedia.org/wiki/OCaml).) +[Caml](http://en.wikipedia.org/wiki/Caml), and +[OCaml](http://en.wikipedia.org/wiki/OCaml).) -* Those of you with some programming background may have encountered a third -prominent functional programming language, **Haskell**. This is also used a +* **Haskell** is also used a lot in the academic contexts we'll be working through. Its surface syntax differs from Caml, and there are various important things one can do in each of Haskell and Caml that one can't (or can't as easily) do in the