diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-24 04:40:09 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-24 04:40:09 +0000 |
| commit | f2d31d8bc90b46e0c3373d2980cfa6f730148d1e (patch) | |
| tree | 986da80f585f5b6d221c61f54413ccf4c63d628f /src/interp | |
| parent | 7eca3ee736c49024a85ad00ff9b0a912d640380c (diff) | |
| download | open-axiom-f2d31d8bc90b46e0c3373d2980cfa6f730148d1e.tar.gz | |
* interp/c-util.boot (isSimple): Accept constructor instantiations.
* algebra/formula.spad.pamphlet: Avoid Lispisms.
* algebra/mathml.spad.pamphlet: Likewise.
* algebra/op.spad.pamphlet: Likewise.
* algebra/sex.spad.pamphlet: Likewise.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/c-util.boot | 6 | ||||
| -rw-r--r-- | src/interp/sys-constants.boot | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index 5820b091..318d03e1 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -691,9 +691,9 @@ isDomainInScope(domain,e) == true --is not a functor isSimple x == - atom x or $InteractiveMode => true - x is [op,:argl] and - isSideEffectFree op and (and/[isSimple y for y in argl]) + atomic? x => true + constructor? x.op or + isSideEffectFree x.op and (and/[isSimple y for y in x.args]) isSideEffectFree op == member(op,$SideEffectFreeFunctionList) or op is ["elt",.,op'] and diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot index 11779c82..aa0219dd 100644 --- a/src/interp/sys-constants.boot +++ b/src/interp/sys-constants.boot @@ -325,10 +325,8 @@ $SideEffectFreeFunctionList == _>_= _ _< _ _<_= _ - MEMBER _ _is _ - _isnt _ - ATOM) + _isnt) --% Types |