*** eval.c.old	Fri Jul 28 19:23:52 2000
--- eval.c	Fri Jul 28 19:24:25 2000
***************
*** 2,8 ****
   *
   * e v a l . c				-- The evaluator
   *
!  * Copyright © 1993-1999 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
   * 
   *
   * Permission to use, copy, modify, distribute,and license this
--- 2,8 ----
   *
   * e v a l . c				-- The evaluator
   *
!  * Copyright © 1993-2000 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
   * 
   *
   * Permission to use, copy, modify, distribute,and license this
***************
*** 16,22 ****
   *
   *           Author: Erick Gallesio [eg@kaolin.unice.fr]
   *    Creation date: 23-Oct-1993 21:37
!  * Last file update:  9-Nov-1999 19:18 (eg)
   */
  
  #include "stk.h"
--- 16,22 ----
   *
   *           Author: Erick Gallesio [eg@kaolin.unice.fr]
   *    Creation date: 23-Oct-1993 21:37
!  * Last file update: 28-Jul-2000 19:24 (eg)
   */
  
  #include "stk.h"
***************
*** 636,642 ****
  				     CAR(CDR(CDR(param))));
  	 }
      case tc_ssubr:
! 	 return SUBRF(fct)(param, NIL, STk_llength(param));
      case tc_lsubr:
  	 return SUBRF(fct)(param, STk_llength(param));
      case tc_cont:
--- 636,642 ----
  				     CAR(CDR(CDR(param))));
  	 }
      case tc_ssubr:
!       return SUBRF(fct)(param, NIL, FALSE);
      case tc_lsubr:
  	 return SUBRF(fct)(param, STk_llength(param));
      case tc_cont:
***************
*** 688,694 ****
      case tc_subr_0_or_1:   return SUBRF(fct)(UNBOUND);
      case tc_subr_1_or_2:   break;
      case tc_subr_2_or_3:   break;
!     case tc_ssubr:	   return SUBRF(fct)(NIL, NIL, 0);
      case tc_lsubr:	   return SUBRF(fct)(NIL, 0);
      case tc_cont:	   STk_throw(fct, NIL);
      case tc_closure:       {
--- 688,694 ----
      case tc_subr_0_or_1:   return SUBRF(fct)(UNBOUND);
      case tc_subr_1_or_2:   break;
      case tc_subr_2_or_3:   break;
!     case tc_ssubr:	   return SUBRF(fct)(NIL, NIL, FALSE);
      case tc_lsubr:	   return SUBRF(fct)(NIL, 0);
      case tc_cont:	   STk_throw(fct, NIL);
      case tc_closure:       {
***************
*** 733,739 ****
      case tc_subr_0_or_1:   return SUBRF(fct)(param);
      case tc_subr_1_or_2:   return SUBRF(fct)(param, UNBOUND);
      case tc_subr_2_or_3:   break;
!     case tc_ssubr:	   return SUBRF(fct)(LIST1(param), NIL, 1);
      case tc_lsubr:	   return SUBRF(fct)(LIST1(param), 1);
      case tc_cont:	   STk_throw(fct, LIST1(param));
      case tc_closure:       { 
--- 733,739 ----
      case tc_subr_0_or_1:   return SUBRF(fct)(param);
      case tc_subr_1_or_2:   return SUBRF(fct)(param, UNBOUND);
      case tc_subr_2_or_3:   break;
!     case tc_ssubr:	   return SUBRF(fct)(LIST1(param), NIL, FALSE);
      case tc_lsubr:	   return SUBRF(fct)(LIST1(param), 1);
      case tc_cont:	   STk_throw(fct, LIST1(param));
      case tc_closure:       { 
***************
*** 778,784 ****
        case tc_subr_0_or_1: break;
        case tc_subr_1_or_2: return SUBRF(fct)(param1, param2);
        case tc_subr_2_or_3: return SUBRF(fct)(param1, param2, UNBOUND);
!       case tc_ssubr:	   return SUBRF(fct)(LIST2(param1, param2), NIL, 2);
        case tc_lsubr:	   return SUBRF(fct)(LIST2(param1, param2), 2);
        case tc_cont:        STk_throw(fct, LIST2(param1, param2));
        case tc_closure:     {
--- 778,784 ----
        case tc_subr_0_or_1: break;
        case tc_subr_1_or_2: return SUBRF(fct)(param1, param2);
        case tc_subr_2_or_3: return SUBRF(fct)(param1, param2, UNBOUND);
!       case tc_ssubr:	   return SUBRF(fct)(LIST2(param1, param2), NIL, FALSE);
        case tc_lsubr:	   return SUBRF(fct)(LIST2(param1, param2), 2);
        case tc_cont:        STk_throw(fct, LIST2(param1, param2));
        case tc_closure:     {