Merge branch 'master' of git@github.com:mzp/scheme-abc

diff --cc src/lisp.ml
index 2761629,e33b6c3..74e7d30
--- 1/src/lisp.ml
--- 2/src/lisp.ml
+++ b/src/lisp.ml
@@@ -1,13 -1,11 +1,14 @@@
  open Base
  open Sexp
  open ClosTrans
 +open Parsec
 +
 +exception Syntax_error
  
- let symbol = function
-     Symbol n -> n
-   | _ -> failwith "expected symbol"
+ let symbol = 
+   function
+       Symbol n -> n
+     | _ -> failwith "expected symbol"
  
  let qname symbol =
    try