diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-02-12 07:56:36 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-02-12 07:56:36 +0000 |
| commit | 2a55c3aecc924b89594512dbf5ea69480194b390 (patch) | |
| tree | 3e5ae1fc42a0fd918d08ce0488692fb4905d94fa /src | |
| parent | 2cced6d1f2fdabd01e8131c099c5289b11d2ef20 (diff) | |
| download | open-axiom-2a55c3aecc924b89594512dbf5ea69480194b390.tar.gz | |
* algebra/coerce.spad.pamphlet (Type): Redefine as empty Join.
* interp/category.boot (Join): Handle empty argument list.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/algebra/coerce.spad.pamphlet | 5 | ||||
| -rw-r--r-- | src/interp/category.boot | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4f5bee7c..54c14a4e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-02-12 Gabriel Dos Reis <gdr@cse.tamu.edu> + + * algebra/coerce.spad.pamphlet (Type): Redefine as empty Join. + * interp/category.boot (Join): Handle empty argument list. + 2012-02-11 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/define.boot (getParentsFor): Lose second parameter. Tidy. diff --git a/src/algebra/coerce.spad.pamphlet b/src/algebra/coerce.spad.pamphlet index 6d1402bb..f8a567c6 100644 --- a/src/algebra/coerce.spad.pamphlet +++ b/src/algebra/coerce.spad.pamphlet @@ -17,12 +17,11 @@ <<category TYPE Type>>= )abbrev category TYPE Type -++ The new fundamental Type (keeping Object for 1.5 as well) ++ Author: Richard Jenks ++ Date Created: 14 May 1992 -++ Date Last Updated: 14 May 1992 +++ Date Last Updated: February 12, 2012 ++ Description: The fundamental Type; -Type(): Category == with nil +Type(): Category == Join() @ diff --git a/src/interp/category.boot b/src/interp/category.boot index 16b7720d..c5289d51 100644 --- a/src/interp/category.boot +++ b/src/interp/category.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2011, Gabriel Dos Reis. +-- Copyright (C) 2007-2012, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -473,6 +473,7 @@ JoinInner(l,$e) == mkCategory("domain",sigl,attl,globalDomains,bufferToVector principal) Join(:l) == + l = nil => mkCategory("domain",nil,nil,nil,nil) e := null $e or $InteractiveMode => $CategoryFrame $e |