~ chicken-core (chicken-5) 6d0465f84136712ea08742dd2b844231707b292a

commit 6d0465f84136712ea08742dd2b844231707b292a
Merge: d1f1408b 7367c220
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sat Aug 20 13:36:30 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sat Aug 20 13:36:30 2011 +0200

    resolved conflicts

diff --cc scrutinizer.scm
index a6885ff3,10797db0..7c621355
--- a/scrutinizer.scm
+++ b/scrutinizer.scm
@@@ -60,14 -58,12 +60,15 @@@
  ;       | (struct NAME)
  ;       | (procedure [NAME] (VAL1 ... [#!optional VALOPT1 ...] [#!rest [VAL | values]]) . RESULTS)
  ;       | BASIC
 +;       | COMPLEX
 +;       | (forall (VAR1 ...) VAL)
  ;       | deprecated
+ ;       | (deprecated NAME)
  ;   BASIC = * | string | symbol | char | number | boolean | list | pair | 
 -;           procedure | vector | null | eof | undefined | port | 
 +;           procedure | vector | null | eof | undefined | port |
  ;           blob | noreturn | pointer | locative | fixnum | float |
  ;           pointer-vector
 +;   COMPLEX = (pair VAL VAL) | (vector VAL) | (list VAL)
  ;   RESULTS = * 
  ;           | (VAL1 ...)
  ;