diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-03-06 19:04:54 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-03-06 19:04:54 +0000 |
| commit | 4a7b8e70463ca239030c406e89777e209f393c33 (patch) | |
| tree | 8ee97a418aeba156a813b443be8c3ec8c6a06dd0 /src/algebra/integer.spad.pamphlet | |
| parent | 382517ec42b83bef4bb6effa31b2e8cc70dada5d (diff) | |
| download | open-axiom-4a7b8e70463ca239030c406e89777e209f393c33.tar.gz | |
* interp/g-opt.boot ($VMsideEffectFreeOperators): Include %c2s.
* interp/lisp-backend.boot: Translate it.
* algebra/integer.spad.pamphlet (Integer) [convert]: Tidy.
[latex]: Likewise.
* algebra/string.spad.pamphlet (Character)[latex]: Likewise.
Diffstat (limited to 'src/algebra/integer.spad.pamphlet')
| -rw-r--r-- | src/algebra/integer.spad.pamphlet | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/algebra/integer.spad.pamphlet b/src/algebra/integer.spad.pamphlet index 3e3d71f9..1ca330b1 100644 --- a/src/algebra/integer.spad.pamphlet +++ b/src/algebra/integer.spad.pamphlet @@ -102,6 +102,7 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with import %igt: (%,%) -> Boolean from Foreign Builtin import %ige: (%,%) -> Boolean from Foreign Builtin import %ilength: % -> % from Foreign Builtin + import %i2s: % -> String from Foreign Builtin x,y: % n: NonNegativeInteger @@ -175,11 +176,11 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with convert(x:%):Float == coerce(x)$Float convert(x:%):DoubleFloat == coerce(x)$DoubleFloat convert(x:%):InputForm == convert(x)$InputForm - convert(x:%):String == string(x)$String + convert(x:%):String == %i2s x latex(x:%):String == - s : String := string(x)$String - (-1 < (x pretend Integer)) and ((x pretend Integer) < 10) => s + s : String := convert x + -1 < x and x < 10 => s concat("{", concat(s, "}")$String)$String positiveRemainder(a, b) == |