From b3a46c91b4848693476332bcd32350926396783d Mon Sep 17 00:00:00 2001 From: dos-reis Date: Tue, 14 May 2013 15:51:47 +0000 Subject: * algebra/array2.spad.pamphlet (TwoDimensionalArrayCategory): Test for BasicType satisfaction instead of existence of =. --- src/interp/g-error.boot | 11 +++++++++-- src/interp/msg.boot | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/interp') diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot index d18f20ea..914bd61f 100644 --- a/src/interp/g-error.boot +++ b/src/interp/g-error.boot @@ -103,11 +103,18 @@ errorSupervisor1(errorType,errorMsg,$BreakMode) == sayErrorly(errorLabel, msg) handleLispBreakLoop($BreakMode) +enterBreak() == + SETQ(_*PRINT_-ARRAY_*,true) + SETQ(_*PRINT_-CIRCLE_*,true) + SETQ(_*PRINT_-LENGTH_*,6) + SETQ(_*PRINT_-READABLY_*,false) + BREAK() + handleLispBreakLoop($BreakMode) == finishLine $OutputStream $BreakMode = 'break => sayBrightly '" " - BREAK() + enterBreak() $BreakMode = 'query => gotIt := nil while not gotIt repeat @@ -130,7 +137,7 @@ handleLispBreakLoop($BreakMode) == '"when you are ready to continue processing where you ",'"%l",_ '" interrupted the system, enter",:bright '"(TOP)",_ '"when you wish to return",'"%l",'" to top level.",'"%l",'"%l"] - BREAK() + enterBreak() sayBrightly '" Processing will continue where it was interrupted." THROW($SpadReaderTag, nil) diff --git a/src/interp/msg.boot b/src/interp/msg.boot index 9e14d732..8670f5ae 100644 --- a/src/interp/msg.boot +++ b/src/interp/msg.boot @@ -82,7 +82,7 @@ ncBug (erMsgKey, erArgL,:optAttr) == $newcompErrorCount := $newcompErrorCount + 1 processKeyedError msgCreate('bug,$nopos, erMsgKey, erArgL,$compBugPrefix,optAttr) - BREAK() + enterBreak() ncAbort() --% Lower level functions -- cgit v1.2.3