From af0bdf26f78dfbf301870ceeb60739426b9db127 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Fri, 16 May 2008 01:46:51 +0000 Subject: * interp/lisplib.boot (leaveIfErrors): Take constructor name parameter. (finalizeLisplib): Adjust call. (compDefineLisplib): Likewise. --- src/interp/compiler.boot | 2 +- src/interp/lisplib.boot | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/interp') diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 19c7a5ea..62d98f02 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -634,7 +634,7 @@ compCons1(["CONS",x,y],m,e) == --% SETQ compSetq: (%List,%Thing,%List) -> %List -compSetq1: (%List,%Thing,%Mode,%List) -> %List +compSetq1: (%Form,%Thing,%Mode,%List) -> %List compSetq(["LET",form,val],m,E) == compSetq1(form,val,m,E) diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 2176e394..1a3f911b 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -365,7 +365,7 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) == ok := false; UNWIND_-PROTECT( PROGN(res:= FUNCALL(fn,df,m,e,prefix,fal), - leaveIfErrors(), + leaveIfErrors(libName), sayMSG ['" finalizing ",$spadLibFT,:bright libName], ok := finalizeLisplib libName), RSHUT $libFile) @@ -422,9 +422,9 @@ initializeLisplib libName == ++ If compilation produces an error, issue inform user and ++ return to toplevel reader. -leaveIfErrors() == +leaveIfErrors libName == errorCount() ^=0 => - sayMSG ['" Errors in processing ",kind,'" ",:bright libName,'":"] + sayMSG ['" Errors in processing ",$liplibkind,'" ",:bright libName,'":"] sayMSG ['" not replacing ",$spadLibFT,'" for",:bright libName] spadThrow() @@ -463,7 +463,7 @@ finalizeLisplib libName == if $profileCompiler then profileWrite() if $lisplibForm and null CDR $lisplibForm then MAKEPROP(CAR $lisplibForm,'NILADIC,'T) - leaveIfErrors() + leaveIfErrors libName true lisplibDoRename(libName) == -- cgit v1.2.3