diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-03-07 05:49:53 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-03-07 05:49:53 +0000 |
| commit | a03b7716749e9fb997d99659967aa49ae6ca1569 (patch) | |
| tree | f9ea530df62ac41622e2180077fb4d07aebd7d64 /src/algebra/integer.spad.pamphlet | |
| parent | 13c00cb56547feb8cd6b5b3c6386a881072862f6 (diff) | |
| download | open-axiom-a03b7716749e9fb997d99659967aa49ae6ca1569.tar.gz | |
* interp/sys-utility.boot (getSystemModulePath): Use
systemAlgebraDirectory.
* interp/database.boot (pathToDatabase): Use systemDatabaseDirectory.
* algebra/integer.spad.pamphlet (Integer) [latex]: Tidy.
* algebra/string.spad.pamphlet (Character) [latex]: Likewise.
* algebra/Makefile.in: Rework bootstrapping set up.
(COMPILE_LISP): Remove.
(axiom_algebra_layer_strap): Likewise.
(axiom_algebra_layer_strap_objects): Likewise.
(axiom_algebra_bootstrap): Likewise.
(oa_strap_0_fasls): New.
(oa_strap_1_fasls): Likewise.
(oa_strap_2_fasls): Likewise.
(oa_strap_0_sources): Likewise.
(oa_strap_1_sources): Likewise.
(oa_strap_2_sources): Likewise.
* src/algerab/strap: Remove.
Diffstat (limited to 'src/algebra/integer.spad.pamphlet')
| -rw-r--r-- | src/algebra/integer.spad.pamphlet | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/algebra/integer.spad.pamphlet b/src/algebra/integer.spad.pamphlet index 1ca330b1..f660ec96 100644 --- a/src/algebra/integer.spad.pamphlet +++ b/src/algebra/integer.spad.pamphlet @@ -103,6 +103,7 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with import %ige: (%,%) -> Boolean from Foreign Builtin import %ilength: % -> % from Foreign Builtin import %i2s: % -> String from Foreign Builtin + import %strconc: (String,String) -> String from Foreign Builtin x,y: % n: NonNegativeInteger @@ -181,7 +182,7 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with latex(x:%):String == s : String := convert x -1 < x and x < 10 => s - concat("{", concat(s, "}")$String)$String + %strconc("{", %strconc(s, "}")) positiveRemainder(a, b) == negative?(r := a rem b) => |