diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-10-01 20:37:15 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-10-01 20:37:15 +0000 |
| commit | 640c78ea50adf4d902e66c7788ba384111b338d4 (patch) | |
| tree | 2ed286c007918c03ff2d675f10933d8af38c2b81 /src/algebra/mkfunc.spad.pamphlet | |
| parent | ea832606b8ad21eb020bc71dbc98427a8068ca3e (diff) | |
| download | open-axiom-640c78ea50adf4d902e66c7788ba384111b338d4.tar.gz | |
* algebra/mkfunc.spad.pamphlet (InputForm): Remove local mkProperOp.
(compile$InputForm): Tidy.
* algebra/boolean.spad.pamphlet (setelt$IndexedBits): A bit is
not a Boolean.
* interp/i-intern.boot (mkAtreeForToken): New.
Diffstat (limited to 'src/algebra/mkfunc.spad.pamphlet')
| -rw-r--r-- | src/algebra/mkfunc.spad.pamphlet | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/algebra/mkfunc.spad.pamphlet b/src/algebra/mkfunc.spad.pamphlet index 39c47899..a0edac2d 100644 --- a/src/algebra/mkfunc.spad.pamphlet +++ b/src/algebra/mkfunc.spad.pamphlet @@ -83,7 +83,6 @@ InputForm(): == SExpression add Rep := SExpression - mkProperOp: Symbol -> % strsym : % -> String tuplify : List Symbol -> % flatten0 : (%, Symbol, NonNegativeInteger) -> @@ -148,15 +147,11 @@ InputForm(): name compile(name, types) == + name' := convert(name)@% symbol car cdr car - selectLocalMms(mkProperOp name, convert(name)@%, + selectLocalMms(mkAtreeForToken(name')$Lisp, name', types, nil$List(%))$Lisp - mkProperOp name == - op := mkAtree(nme := convert(name)@%)$Lisp - transferPropsToNode(nme, op)$Lisp - convert op - binary(op, args) == (n := #args) < 2 => error "Need at least 2 arguments" n = 2 => convert([op, first args, last args]$List(%)) @@ -165,7 +160,7 @@ InputForm(): tuplify l == empty? rest l => convert first l conv - concat(convert("Tuple"::Symbol), [convert x for x in l]$List(%)) + concat(convert("tuple"::Symbol), [convert x for x in l]$List(%)) function(f, l, name) == nn := convert(new(1 + #l, convert(nil()$List(%)))$List(%))@% |