diff -uNr TEST.gcl/gcl/cmpnew/cmpblock.c agcl/agcl/cmpnew/cmpblock.c --- TEST.gcl/gcl/cmpnew/cmpblock.c Tue Sep 24 21:01:44 2002 +++ agcl/agcl/cmpnew/cmpblock.c Mon Nov 4 17:53:47 2002 @@ -453,7 +453,7 @@ V74= structure_ref((V72),VV[0],3); (void)((*(LnkLI51))(/* INLINE-ARGS */V74)); princ_str(");",VV[12]); - princ_str("\n if(fr==NULL) FEerror(\"The block ~s is missing.\",1,VV[",VV[12]); + princ_str("\n if(fr==NULL) Icall_error_handler(sKsimple_program_error,make_simple_string(\"The block ~s is missing.\"),1,VV[",VV[12]); V75= structure_ref((V72),VV[0],6); (void)((*(LnkLI52))(/* INLINE-ARGS */V75)); princ_str("]);",VV[12]); diff -uNr TEST.gcl/gcl/cmpnew/cmpblock.lsp agcl/agcl/cmpnew/cmpblock.lsp --- TEST.gcl/gcl/cmpnew/cmpblock.lsp Mon Dec 6 23:43:55 1999 +++ agcl/agcl/cmpnew/cmpblock.lsp Mon Nov 4 17:53:47 2002 @@ -163,7 +163,7 @@ (defun c2return-ccb (blk val) (wt-nl "{frame_ptr fr;") (wt-nl "fr=frs_sch(") (wt-ccb-vs (blk-ref-ccb blk)) (wt ");") - (wt-nl "if(fr==NULL) FEerror(\"The block ~s is missing.\",1,VV[" + (wt-nl "if(fr==NULL) Icall_error_handler(sKsimple_program_error,make_simple_string(\"The block ~s is missing.\"),1,VV[" (blk-var blk) "]);") (let ((*value-to-go* 'top)) (c2expr* val)) (wt-nl "unwind(fr,Cnil);}") diff -uNr TEST.gcl/gcl/cmpnew/cmpcatch.c agcl/agcl/cmpnew/cmpcatch.c --- TEST.gcl/gcl/cmpnew/cmpcatch.c Tue Sep 24 21:01:45 2002 +++ agcl/agcl/cmpnew/cmpcatch.c Mon Nov 4 17:53:47 2002 @@ -249,7 +249,7 @@ princ_str("\n fr=frs_sch_catch(",VV[6]); (void)((*(LnkLI31))((V41))); princ_str(");",VV[6]); - princ_str("\n if(fr==NULL) FEerror(\"The tag ~s is undefined.\",1,",VV[6]); + princ_str("\n if(fr==NULL) Icall_error_handler(sKsimple_program_error,make_simple_string(\"The tag ~s is undefined.\"),1,",VV[6]); (void)((*(LnkLI31))((V41))); princ_str(");",VV[6]); bds_bind(VV[4],VV[17]); diff -uNr TEST.gcl/gcl/cmpnew/cmpcatch.lsp agcl/agcl/cmpnew/cmpcatch.lsp --- TEST.gcl/gcl/cmpnew/cmpcatch.lsp Sat Jul 20 09:10:54 2002 +++ agcl/agcl/cmpnew/cmpcatch.lsp Mon Nov 4 17:53:47 2002 @@ -115,7 +115,7 @@ (let ((*value-to-go* loc)) (c2expr* tag)))) (wt-nl "fr=frs_sch_catch(" loc ");") - (wt-nl "if(fr==NULL) FEerror(\"The tag ~s is undefined.\",1," loc ");") + (wt-nl "if(fr==NULL) Icall_error_handler(sKsimple_program_error,make_simple_string(\"The tag ~s is undefined.\"),1," loc ");") (let ((*value-to-go* 'top)) (c2expr* val)) (wt-nl "unwind(fr," loc ");}") ; (wt-nl "return Cnil;}") diff -uNr TEST.gcl/gcl/cmpnew/cmpfun.c agcl/agcl/cmpnew/cmpfun.c --- TEST.gcl/gcl/cmpnew/cmpfun.c Mon Oct 14 07:24:42 2002 +++ agcl/agcl/cmpnew/cmpfun.c Mon Nov 4 17:53:47 2002 @@ -2921,7 +2921,10 @@ VMR50(V501)} goto T1146; T1146:; - FEerror("The ECASE key value ~s is illegal.",1,V492); + Icall_error_handler(sLsimple_type_error, + make_simple_string("The ECASE key value ~s is illegal."), + 1, + V492); {object V502 = Cnil; VMR50(V502)}} return Cnil; diff -uNr TEST.gcl/gcl/cmpnew/cmpif.c agcl/agcl/cmpnew/cmpif.c --- TEST.gcl/gcl/cmpnew/cmpif.c Mon Oct 14 07:24:42 2002 +++ agcl/agcl/cmpnew/cmpif.c Mon Nov 4 17:53:47 2002 @@ -1541,7 +1541,7 @@ T678:; if(!(((V206))==(Ct))){ goto T835;} - princ_str("\n FEerror(\"The ECASE key value ~s is illegal.\",1,V",VV[16]); + princ_str("\n Icall_error_handler(sLsimple_type_error,make_simple_string(\"The ECASE key value ~s is illegal.\"),1,V",VV[16]); (void)((*(LnkLI54))((V207))); princ_str(");",VV[16]); (void)((VFUN_NARGS=2,(*(LnkLI60))(Cnil,VV[17]))); diff -uNr TEST.gcl/gcl/cmpnew/cmpif.lsp agcl/agcl/cmpnew/cmpif.lsp --- TEST.gcl/gcl/cmpnew/cmpif.lsp Mon Aug 5 22:36:08 2002 +++ agcl/agcl/cmpnew/cmpif.lsp Mon Nov 4 17:53:47 2002 @@ -404,7 +404,7 @@ (wt-label label))) (if (eq default 't) - (progn (wt-nl "FEerror(\"The ECASE key value ~s is illegal.\",1,V" cvar ");") + (progn (wt-nl "Icall_error_handle(sLsimple_type_error,make_simple_string(\"The ECASE key value ~s is illegal.\"),1,V" cvar ");") (unwind-exit nil 'jump)) (c2expr default)) diff -uNr TEST.gcl/gcl/cmpnew/cmptag.c agcl/agcl/cmpnew/cmptag.c --- TEST.gcl/gcl/cmpnew/cmptag.c Mon Oct 14 07:24:42 2002 +++ agcl/agcl/cmpnew/cmptag.c Mon Nov 4 17:53:47 2002 @@ -691,7 +691,7 @@ goto T302;} goto T298; T298:; - princ_str("\n FEerror(\"The GO tag ~s is not established.\",1,nlj_tag);",VV[14]); + princ_str("\n Icall_error_handler(sKsimple_program_error,make_simple_string(\"The GO tag ~s is not established.\"),1,nlj_tag);",VV[14]); princ_str("\n }",VV[14]); base[3]= make_cons((V101),(VV[13]->s.s_dbind)); bds_bind(VV[13],base[3]); @@ -793,7 +793,7 @@ goto T370;} goto T366; T366:; - princ_str("\n FEerror(\"The GO tag ~s is not established.\",1,nlj_tag);",VV[14]); + princ_str("\n Icall_error_handler(sKsimple_program_error,make_simple_string(\"The GO tag ~s is not established.\"),1,nlj_tag);",VV[14]); princ_str("\n }",VV[14]); base[5]= make_cons((V112),(VV[13]->s.s_dbind)); bds_bind(VV[13],base[5]); @@ -979,7 +979,7 @@ V158= structure_ref((V157),VV[0],3); (void)((*(LnkLI77))(/* INLINE-ARGS */V158)); princ_str(");",VV[14]); - princ_str("\n if(fr==NULL)FEerror(\"The GO tag ~s is missing.\",1,VV[",VV[14]); + princ_str("\n if(fr==NULL)Icall_error_handler(sKsimple_program_error,make_simple_string(\"The GO tag ~s is missing.\"),1,VV[",VV[14]); V159= structure_ref((V157),VV[0],6); (void)((*(LnkLI60))(/* INLINE-ARGS */V159)); princ_str("]);",VV[14]); diff -uNr TEST.gcl/gcl/cmpnew/cmptag.lsp agcl/agcl/cmpnew/cmptag.lsp --- TEST.gcl/gcl/cmpnew/cmptag.lsp Mon Dec 6 23:43:57 1999 +++ agcl/agcl/cmpnew/cmptag.lsp Mon Nov 4 17:53:47 2002 @@ -201,7 +201,7 @@ (setf (tag-ref-clb tag) ref-clb) (wt-nl "if(eql(nlj_tag,VV[" (tag-var tag) "]))") (wt-go (tag-label tag))))) - (wt-nl "FEerror(\"The GO tag ~s is not established.\",1,nlj_tag);") + (wt-nl "Icall_error_handler(sKsimple_program_error,make_simple_string(\"The GO tag ~s is not established.\"),1,nlj_tag);") (wt-nl "}") (let ((*unwind-exit* (cons label *unwind-exit*))) (c2tagbody-body body)))) @@ -228,7 +228,7 @@ (when (tag-ref-ccb tag) (setf (tag-ref-ccb tag) ref-ccb)) (wt-nl "if(eql(nlj_tag,VV[" (tag-var tag) "]))") (wt-go (tag-label tag))))) - (wt-nl "FEerror(\"The GO tag ~s is not established.\",1,nlj_tag);") + (wt-nl "Icall_error_handler(sKsimple_program_error,make_simple_string(\"The GO tag ~s is not established.\"),1,nlj_tag);") (wt-nl "}") (let ((*unwind-exit* (cons label *unwind-exit*))) (c2tagbody-body body)))) @@ -273,7 +273,7 @@ (defun c2go-ccb (tag) (wt-nl "{frame_ptr fr;") (wt-nl "fr=frs_sch(") (wt-ccb-vs (tag-ref-ccb tag)) (wt ");") - (wt-nl "if(fr==NULL)FEerror(\"The GO tag ~s is missing.\",1,VV[" + (wt-nl "if(fr==NULL) Icall_error_handler(sKsimple_program_error,make_simple_string(\"The GO tag ~s is missing.\"),1,VV[" (tag-var tag) "]);") (wt-nl "vs_base=vs_top;") (wt-nl "unwind(fr,VV[" (tag-var tag) "]);}")) diff -uNr TEST.gcl/gcl/cmpnew/cmputil.c agcl/agcl/cmpnew/cmputil.c --- TEST.gcl/gcl/cmpnew/cmputil.c Mon Oct 14 07:24:42 2002 +++ agcl/agcl/cmpnew/cmputil.c Mon Nov 4 17:53:47 2002 @@ -54,7 +54,10 @@ setq(VV[5],number_plus(symbol_value(VV[5]),small_fixnum(1))); {frame_ptr fr; fr=frs_sch_catch(VV[6]); - if(fr==NULL) FEerror("The tag ~s is undefined.",1,VV[6]); + if(fr==NULL) Icall_error_handler(sKsimple_program_error, + make_simple_string("Syntax error: The tag ~s is undefined."), + 1, + VV[6]); base[1]= VV[7]; vs_top=(vs_base=base+1)+1; unwind(fr,VV[6]);} @@ -104,7 +107,10 @@ setq(VV[5],number_plus(symbol_value(VV[5]),small_fixnum(1))); {frame_ptr fr; fr=frs_sch_catch(VV[6]); - if(fr==NULL) FEerror("The tag ~s is undefined.",1,VV[6]); + if(fr==NULL) Icall_error_handler(sKsimple_program_error, + make_simple_string("Syntax error: The tag ~s is undefined."), + 1, + VV[6]); base[1]= VV[7]; vs_top=(vs_base=base+1)+1; unwind(fr,VV[6]);} @@ -133,7 +139,10 @@ setq(VV[5],number_plus(symbol_value(VV[5]),small_fixnum(1))); {frame_ptr fr; fr=frs_sch_catch(VV[6]); - if(fr==NULL) FEerror("The tag ~s is undefined.",1,VV[6]); + if(fr==NULL) Icall_error_handler(sKsimple_program_error, + make_simple_string("The tag ~s is undefined."), + 1, + VV[6]); base[1]= VV[7]; vs_top=(vs_base=base+1)+1; unwind(fr,VV[6]);}