diff options
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/Makefile.in | 5 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 5 | ||||
| -rw-r--r-- | src/algebra/exposed.lsp.pamphlet | 1 | ||||
| -rw-r--r-- | src/algebra/string.spad.pamphlet | 24 |
4 files changed, 13 insertions, 22 deletions
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 34e9ce06..fc186f97 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -269,8 +269,7 @@ $(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT): $(OUT)/SEGCAT.$(FASLEXT) $(OUT)/SEGCAT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) $(OUT)/SETAGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/CLAGG.$(FASLEXT) -$(OUT)/STRICAT.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) -$(OUT)/STRING.$(FASLEXT): $(OUT)/STRICAT.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) +$(OUT)/STRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) $(OUT)/DIOPS.$(FASLEXT): $(OUT)/STRING.$(FASLEXT) $(OUT)/DIAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT) $(OUT)/KDAGG.$(FASLEXT): $(OUT)/DIAGG.$(FASLEXT) @@ -367,7 +366,7 @@ axiom_algebra_layer_0 = \ FSAGG FSAGG- STAGG STAGG- CLAGG CLAGG- \ RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ - DIOPS DIOPS- STRING STRICAT ISTRING ILIST \ + DIOPS DIOPS- STRING ISTRING ILIST \ LIST DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ RTVALUE SYSPTR PDDOM PDDOM- PDSPC PDSPC- \ diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 3d7ada70..c776844e 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -223,8 +223,7 @@ $(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT): $(OUT)/SEGCAT.$(FASLEXT) $(OUT)/SEGCAT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) $(OUT)/SETAGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/CLAGG.$(FASLEXT) -$(OUT)/STRICAT.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) -$(OUT)/STRING.$(FASLEXT): $(OUT)/STRICAT.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) +$(OUT)/STRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) $(OUT)/DIOPS.$(FASLEXT): $(OUT)/STRING.$(FASLEXT) $(OUT)/DIAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT) $(OUT)/KDAGG.$(FASLEXT): $(OUT)/DIAGG.$(FASLEXT) @@ -321,7 +320,7 @@ axiom_algebra_layer_0 = \ FSAGG FSAGG- STAGG STAGG- CLAGG CLAGG- \ RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ - DIOPS DIOPS- STRING STRICAT ISTRING ILIST \ + DIOPS DIOPS- STRING ISTRING ILIST \ LIST DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ RTVALUE SYSPTR PDDOM PDDOM- PDSPC PDSPC- \ diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet index ad128a63..89d16fa8 100644 --- a/src/algebra/exposed.lsp.pamphlet +++ b/src/algebra/exposed.lsp.pamphlet @@ -790,7 +790,6 @@ (|StepThrough| . STEP) (|StreamAggregate| . STAGG) (|StringAggregate| . SRAGG) - (|StringCategory| . STRICAT) (|StructuralConstantsPackage| . SCPKG) (|TableAggregate| . TBAGG) (|ThreeSpaceCategory| . SPACEC) diff --git a/src/algebra/string.spad.pamphlet b/src/algebra/string.spad.pamphlet index 54aed585..2469249d 100644 --- a/src/algebra/string.spad.pamphlet +++ b/src/algebra/string.spad.pamphlet @@ -461,7 +461,15 @@ the coercion. ++ This is the domain of character strings. MINSTRINGINDEX ==> 1 -- as of 3/14/90. -String(): StringCategory == IndexedString(MINSTRINGINDEX) add +String(): Public == Private where + Public == Join(StringAggregate(), OpenMath) with + string: Integer -> % + ++ \spad{string i} returns the decimal representation of + ++ \spad{i} in a string + string: DoubleFloat -> % + ++ \spad{string f} returns the decimal representation of + ++ \spad{f} in a string + Private == IndexedString(MINSTRINGINDEX) add string(n: Integer) == STRINGIMAGE(n)$Lisp string(f: DoubleFloat) == %f2s(f)$Foreign(Builtin) @@ -502,20 +510,7 @@ String(): StringCategory == IndexedString(MINSTRINGINDEX) add OMputEndObject(dev) @ -\section{category STRICAT StringCategory} -<<category STRICAT StringCategory>>= -)abbrev category STRICAT StringCategory -++ Description: -++ A category for string-like objects - -StringCategory():Category == Join(StringAggregate(), OpenMath) with - string: Integer -> % - ++ string(i) returns the decimal representation of i in a string - string: DoubleFloat -> % - ++ \spad{string f} returns the decimal representation of - ++ \spad{f} in a string -@ \section{License} <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. @@ -557,7 +552,6 @@ StringCategory():Category == Join(StringAggregate(), OpenMath) with <<domain CHAR Character>> <<domain CCLASS CharacterClass>> <<domain ISTRING IndexedString>> -<<category STRICAT StringCategory>> <<domain STRING String>> @ \eject |