diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 2 | ||||
| -rw-r--r-- | src/interp/lisplib.boot | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c7fba115..a62ce912 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2008-05-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/lisplib.boot (leaveIfErrors): Take constructor name + parameter. + (finalizeLisplib): Adjust call. + (compDefineLisplib): Likewise. + +2008-05-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/lisplib.boot (leaveIfErrors): New. (compDefineLisplib): Use it. (finalizeLisplib): Likewise. 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) == |