diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/algebra/array2.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/interp/g-error.boot | 11 | ||||
| -rw-r--r-- | src/interp/msg.boot | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1ef3785e..07cd281c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2013-05-14 Gabriel Dos Reis <gdr@integrable-solutions.net> + * algebra/array2.spad.pamphlet (TwoDimensionalArrayCategory): Test + for BasicType satisfaction instead of existence of =. + +2013-05-14 Gabriel Dos Reis <gdr@integrable-solutions.net> + * algebra/array2.spad.pamphlet (InnerTwoDimensionalArray) [map]: Move implementation from TwoDimensionalArrayCategory. diff --git a/src/algebra/array2.spad.pamphlet b/src/algebra/array2.spad.pamphlet index 9be6ee45..51cc1d24 100644 --- a/src/algebra/array2.spad.pamphlet +++ b/src/algebra/array2.spad.pamphlet @@ -159,7 +159,7 @@ TwoDimensionalArrayCategory(R,Row,Col): Category == Definition where qsetelt!(m,i,j,v.k) m - if R has _= : (R,R) -> Boolean then + if R has BasicType then m = n == eq?(m,n) => true 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 |