diff --git a/changelog b/changelog index 975de93..b597ab2 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,79 @@ +20100228 tpd src/axiom-website/patches.html 20100228.02.tpd.patch +20100228 tpd src/interp/wi2.lisp remove MAKESTRING macro +20100228 tpd src/interp/wi1.lisp remove MAKESTRING macro +20100228 tpd src/interp/vmlisp.lisp remove MAKESTRING macro +20100228 tpd src/interp/util.lisp remove MAKESTRING macro +20100228 tpd src/interp/topics.lisp remove MAKESTRING macro +20100228 tpd src/interp/template.lisp remove MAKESTRING macro +20100228 tpd src/interp/slam.lisp remove MAKESTRING macro +20100228 tpd src/interp/simpbool.lisp remove MAKESTRING macro +20100228 tpd src/interp/server.lisp remove MAKESTRING macro +20100228 tpd src/interp/record.lisp remove MAKESTRING macro +20100228 tpd src/interp/pspad2.lisp remove MAKESTRING macro +20100228 tpd src/interp/pspad1.lisp remove MAKESTRING macro +20100228 tpd src/interp/profile.lisp remove MAKESTRING macro +20100228 tpd src/interp/parsing.lisp remove MAKESTRING macro +20100228 tpd src/interp/package.lisp remove MAKESTRING macro +20100228 tpd src/interp/nruntime.lisp remove MAKESTRING macro +20100228 tpd src/interp/nrunopt.lisp remove MAKESTRING macro +20100228 tpd src/interp/nrungo.lisp remove MAKESTRING macro +20100228 tpd src/interp/nrunfast.lisp remove MAKESTRING macro +20100228 tpd src/interp/nruncomp.lisp remove MAKESTRING macro +20100228 tpd src/interp/newfort.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-s.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-f07.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-f02.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-f01.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-e04.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-e02.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-e01.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-d03.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-d02.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-d01.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-c06.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-c05.lisp remove MAKESTRING macro +20100228 tpd src/interp/nag-c02.lisp remove MAKESTRING macro +20100228 tpd src/interp/msgdb.lisp remove MAKESTRING macro +20100228 tpd src/interp/modemap.lisp remove MAKESTRING macro +20100228 tpd src/interp/match.lisp remove MAKESTRING macro +20100228 tpd src/interp/mark.lisp remove MAKESTRING macro +20100228 tpd src/interp/lisplib.lisp remove MAKESTRING macro +20100228 tpd src/interp/iterator.lisp remove MAKESTRING macro +20100228 tpd src/interp/interop.lisp remove MAKESTRING macro +20100228 tpd src/interp/info.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-util.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-spec2.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-spec1.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-resolv.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-output.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-map.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-intern.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-eval.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-coerce.lisp remove MAKESTRING macro +20100228 tpd src/interp/i-analy.lisp remove MAKESTRING macro +20100228 tpd src/interp/htcheck.lisp remove MAKESTRING macro +20100228 tpd src/interp/ht-util.lisp remove MAKESTRING macro +20100228 tpd src/interp/hashcode.lisp remove MAKESTRING macro +20100228 tpd src/interp/g-util.lisp remove MAKESTRING macro +20100228 tpd src/interp/g-timer.lisp remove MAKESTRING macro +20100228 tpd src/interp/g-opt.lisp remove MAKESTRING macro +20100228 tpd src/interp/g-error.lisp remove MAKESTRING macro +20100228 tpd src/interp/g-cndata.lisp remove MAKESTRING macro +20100228 tpd src/interp/g-boot.lisp remove MAKESTRING macro +20100228 tpd src/interp/functor.lisp remove MAKESTRING macro +20100228 tpd src/interp/fortcall.lisp remove MAKESTRING macro +20100228 tpd src/interp/format.lisp remove MAKESTRING macro +20100228 tpd src/interp/define.lisp remove MAKESTRING macro +20100228 tpd src/interp/database.lisp remove MAKESTRING macro +20100228 tpd src/interp/compiler.lisp remove MAKESTRING macro +20100228 tpd src/interp/clam.lisp remove MAKESTRING macro +20100228 tpd src/interp/cattable.lisp remove MAKESTRING macro +20100228 tpd src/interp/category.lisp remove MAKESTRING macro +20100228 tpd src/interp/c-util.lisp remove MAKESTRING macro +20100228 tpd src/interp/c-doc.lisp remove MAKESTRING macro +20100228 tpd src/interp/br-con.lisp remove MAKESTRING macro +20100228 tpd src/interp/bc-matrix.lisp remove MAKESTRING macro +20100228 tpd src/interp/as.lisp remove MAKESTRING macro 20100228 tpd src/axiom-website/patches.html 20100228.01.tpd.patch 20100228 tpd src/interp/wi2.lisp remove non-common lisp macros 20100228 tpd src/interp/wi1.lisp remove non-common lisp macros @@ -165,7 +241,7 @@ 20100203 tpd src/interp/Makefile remove monitor.lisp 20100203 tpd src/interp/monitor.lisp removed 20100203 tpd src/input/Makefile add monitortest -20100203 tpd src/input/monitortest.input.pamphlet unit test monitor code +20100203 tpd src/input/monitortest.input unit test monitor code 20100203 tpd books/bookvol5 merge and remove monitor.lisp 20100202 tpd src/axiom-website/patches.html 20100202.01.tpd.patch 20100202 tpd src/interp/varini.lisp pick up functions from intint @@ -237,7 +313,7 @@ 20100118 tpd src/axiom-website/patches.html 20100118.04.tpd.patch 20100118 tpd src/share/doc/msgs/s2-us.msgs removed unused file 20100118 tpd src/axiom-website/patches.html 20100118.03.tpd.patch -20100118 tpd src/interp/vmlisp.lisp.pamphlet update sourceFileList with INPUT +20100118 tpd src/interp/vmlisp.lisp update sourceFileList with INPUT 20100118 tpd src/interp/pathname.lisp removed 20100118 tpd src/interp/lisplib.lisp move functions from pathname.lisp 20100118 tpd src/interp/Makefile merge and remove pathname.lisp diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html index 540e2a8..07abcd4 100644 --- a/src/axiom-website/patches.html +++ b/src/axiom-website/patches.html @@ -2503,5 +2503,7 @@ src/interp/vmlisp.lisp remove some define-functions
src/interp/vmlisp.lisp remove unused functions
20100228.01.tpd.patch src/interp/vmlisp.lisp remove non-common lisp macros
+20100228.02.tpd.patch +src/interp/*.lisp.pamphlet remove MAKESTRING macro
diff --git a/src/interp/as.lisp.pamphlet b/src/interp/as.lisp.pamphlet index 3432d5f..74d47e9 100644 --- a/src/interp/as.lisp.pamphlet +++ b/src/interp/as.lisp.pamphlet @@ -41,9 +41,9 @@ (PROG (|instream| |lines|) (RETURN (SEQ (PROGN - (OBEY (MAKESTRING "rm -f temp.text")) - (OBEY (MAKESTRING "ls as/*.asy > temp.text")) - (SPADLET |instream| (OPEN (MAKESTRING "temp.text"))) + (OBEY "rm -f temp.text") + (OBEY "ls as/*.asy > temp.text") + (SPADLET |instream| (OPEN "temp.text")) (SPADLET |lines| (PROG (G166062) (SPADLET G166062 NIL) @@ -71,7 +71,7 @@ NIL) (SEQ (EXIT (PROGN (|sayBrightly| - (CONS (MAKESTRING "-----> ") + (CONS "-----> " (CONS |x| NIL))) (|asTran| |x|))))) '|done|))) @@ -84,7 +84,7 @@ (DEFUN |as| (|name|) (PROGN - (|astran| (STRCONC (STRINGIMAGE |name|) (MAKESTRING ".asy"))) + (|astran| (STRCONC (STRINGIMAGE |name|) ".asy")) '|done|)) ;astran asyFile == @@ -128,7 +128,7 @@ (SPADLET |$asyFile| |asyFile|) (SPADLET |$asFilename| (STRCONC (PATHNAME-NAME |asyFile|) - (MAKESTRING ".as"))) + ".as")) (|asytran| |asyFile|) (SPADLET |conlist| (PROG (G166115) @@ -469,7 +469,7 @@ (SPADLET |filestring| (STRCONC (PATHNAME-NAME (STRINGIMAGE |filename|)) - (MAKESTRING ".as"))) + ".as")) (SPADLET |constantPart| (AND (HGET |$constantHash| |con|) (CONS (CONS '|constant| 'T) NIL))) @@ -715,9 +715,9 @@ (DEFUN |displayDatabase,fn| (|x| |y|) (SEQ (|sayBrightly| - (CONS (MAKESTRING "----------------- ") + (CONS "----------------- " (CONS |y| - (CONS (MAKESTRING " --------------------") NIL)))) + (CONS " --------------------" NIL)))) (EXIT (|pp| (GETDATABASE |x| |y|))))) (DEFUN |displayDatabase| (|x|) @@ -764,12 +764,12 @@ (RETURN (SEQ (PROGN (SPADLET |banner| - (MAKESTRING "==============================")) + "==============================") (|sayBrightly| (CONS |banner| - (CONS (MAKESTRING " ") + (CONS " " (CONS |con| - (CONS (MAKESTRING " ") + (CONS " " (CONS |banner| NIL)))))) (DO ((G166534 |alist| (CDR G166534)) (G166523 NIL)) ((OR (ATOM G166534) @@ -784,7 +784,7 @@ (SEQ (EXIT (PROGN (|sayBrightlyNT| (CONS |prop| - (CONS (MAKESTRING ": ") NIL))) + (CONS ": " NIL))) (|pp| |value|)))))))))) ;asGetModemaps(opAlist,oform,kind,modemap) == @@ -1094,9 +1094,9 @@ (PROG (|k|) (RETURN (COND - ((SPADLET |k| (STRPOS (MAKESTRING "Description:") |str| 0 NIL)) + ((SPADLET |k| (STRPOS "Description:" |str| 0 NIL)) (|asyExtractDescription| (SUBSTRING |str| (PLUS |k| 12) NIL))) - ((SPADLET |k| (STRPOS (MAKESTRING "Author:") |str| 0 NIL)) + ((SPADLET |k| (STRPOS "Author:" |str| 0 NIL)) (|asyExtractDescription| (SUBSTRING |str| 0 |k|))) ('T |str|))))) @@ -1110,8 +1110,8 @@ (PROG (|m|) (RETURN (COND - ((OR (NULL |str|) (BOOT-EQUAL |str| (MAKESTRING ""))) - (MAKESTRING "")) + ((OR (NULL |str|) (BOOT-EQUAL |str| "")) + "") ('T (SPADLET |m| (MAXINDEX |str|)) (SPADLET |str| (SUBSTRING |str| 0 |m|)) (|trimString| |str|)))))) @@ -1474,7 +1474,7 @@ (SEQ (PROGN (SPADLET |inStream| (OPEN |fn|)) (|sayBrightly| - (CONS (MAKESTRING " Reading ") (CONS |fn| NIL))) + (CONS " Reading " (CONS |fn| NIL))) (SPADLET |u| (VMREAD |inStream|)) (SPADLET |$niladics| (|mkNiladics| |u|)) (DO ((G167029 |$niladics| (CDR G167029)) (|x| NIL)) @@ -1587,7 +1587,7 @@ (COND ((BOOT-EQUAL |id| '|failed|) |id|) ((NEQUAL (KAR |dform|) '|Declare|) - (|systemError| (MAKESTRING "asytranDeclaration"))) + (|systemError| "asytranDeclaration")) ('T (COND ((BOOT-EQUAL |levels| '(|top|)) @@ -1600,7 +1600,7 @@ (HPUT |$constantHash| |id| 'T)) ('T NIL)))) (SPADLET |comments| - (OR (LASSOC '|documentation| |r|) (MAKESTRING ""))) + (OR (LASSOC '|documentation| |r|) "")) (SPADLET |idForm| (COND ((AND (PAIRP |levels|) @@ -2007,8 +2007,7 @@ (|asytranForm1| CDR |levels| |local?|)) ('T (|asytranForm1| |x| |levels| |local?|)))) ('T - (|error| (MAKESTRING - "DEFINE forms are not handled yet"))))) + (|error| "DEFINE forms are not handled yet")))) ('T (COND ((BOOT-EQUAL |form| '%) (SPADLET |$hasPerCent| 'T))) @@ -2148,7 +2147,7 @@ (AND (PAIRP |ISTMP#1|) (PROGN (SPADLET |name| (QCAR |ISTMP#1|)) 'T)))) |name|) - ('T (|error| (MAKESTRING "Bad Enumeration entry"))))))) + ('T (|error| "Bad Enumeration entry")))))) ;asytranApplySpecial(x, levels, local?) == ; x is ['Declare, name, typ, :.] => [":",name,asytranForm(typ, levels, local?)] @@ -2417,8 +2416,7 @@ 'T)))))) (COND ((IFCAR |r|) - (|error| (MAKESTRING - "ELSE expressions not allowed yet in conditionals"))) + (|error| "ELSE expressions not allowed yet in conditionals")) ('T (SPADLET |pred| (COND @@ -2670,7 +2668,7 @@ ((BOOT-EQUAL |fn| '|With|) 'T) ('T NIL))) ((BOOT-EQUAL |t| '|Type|) 'T) - ('T (|error| (MAKESTRING "Unknown atomic type"))))) + ('T (|error| "Unknown atomic type")))) ('T (|error| NIL)))))) ;asyAbbreviation(id,n) == chk(id,main) where --> n = number of arguments @@ -2835,7 +2833,7 @@ (RETURN (COND ((NULL (SPADLET |k| - (STRPOS (MAKESTRING "Abbrev: ") |str| 0 NIL))) + (STRPOS "Abbrev: " |str| 0 NIL))) NIL) ('T (SPADLET |str| (SUBSTRING |str| (PLUS |k| 8) NIL)) (SPADLET |k| (STRPOS |$stringNewline| |str| 0 NIL)) @@ -4543,7 +4541,7 @@ (SEQ (EXIT (|asCategoryParts,build| |x| |pred|)))))) (IF (|member| |item| '(|noBranch|)) (EXIT '|ok|)) (IF (NULL |item|) (EXIT '|ok|)) - (EXIT (|systemError| (MAKESTRING "build error"))))))) + (EXIT (|systemError| "build error")))))) (DEFUN |asCategoryParts| (&REST G169422 &AUX |options| |category| |conform| |kind|) diff --git a/src/interp/bc-matrix.lisp.pamphlet b/src/interp/bc-matrix.lisp.pamphlet index 04026bb..a480dc3 100644 --- a/src/interp/bc-matrix.lisp.pamphlet +++ b/src/interp/bc-matrix.lisp.pamphlet @@ -43,7 +43,7 @@ (RETURN (PROGN (SPADLET |page| - (|htInitPage| (MAKESTRING "Matrix Basic Command") NIL)) + (|htInitPage| "Matrix Basic Command" NIL)) (|htpSetProperty| |page| '|exitFunction| |exitFunctionOrNil|) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -104,7 +104,7 @@ (RETURN (PROGN (SPADLET |page| - (|htInitPage| (MAKESTRING "Basic Matrix Command") + (|htInitPage| "Basic Matrix Command" (|htpPropertyList| |htPage|))) (|htMakePage| '((|domainConditions| (|isDomain| S (|Symbol|)) @@ -122,7 +122,7 @@ . "Enter the general {\\em formula} for the entries:") (|text| . "\\newline\\tab{2} ") (|bcStrings| (40 "1/(x - i - j - 1)" |formula| FE)))) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|bcInputMatrixByFormulaGen|) (SPADLET |nrows| (COND @@ -167,12 +167,12 @@ (SPADLET |colVar| (|htpLabelInputString| |htPage| '|colVar|)) (SPADLET |nrows| (|htpProperty| |htPage| '|nrows|)) (SPADLET |ncols| (|htpProperty| |htPage| '|ncols|)) - (|bcGen| (STRCONC (MAKESTRING "matrix([[") |formula| - (MAKESTRING " for ") |colVar| - (MAKESTRING " in 1..") (STRINGIMAGE |ncols|) - (MAKESTRING "] for ") |rowVar| - (MAKESTRING " in 1..") (STRINGIMAGE |nrows|) - (MAKESTRING "])")))))))) + (|bcGen| (STRCONC "matrix([[" |formula| + " for " |colVar| + " in 1.." (STRINGIMAGE |ncols|) + "] for " |rowVar| + " in 1.." (STRINGIMAGE |nrows|) + "])"))))))) ;bcInputExplicitMatrix(htPage,junk) == ; nrows := @@ -252,18 +252,15 @@ (PROGN (SPADLET |rowpart| (STRCONC - (MAKESTRING - "{\\em Row") + "{\\em Row" (|htStringPad| |i| |wrows|))) (SPADLET |colpart| (STRCONC - (MAKESTRING - ", Column") + ", Column" (|htStringPad| |j| |wcols|) - (MAKESTRING - ":}\\space{2}"))) + ":}\\space{2}")) (SPADLET |prefix| (STRCONC |rowpart| @@ -275,7 +272,7 @@ (PLUS |k| 1))))) (CONS |prefix| (CONS - (MAKESTRING "") + "" (CONS 30 (CONS 0 (CONS |name| @@ -289,11 +286,11 @@ (CONS (CONS '|inputStrings| |labelList|) NIL))) (SPADLET |page| - (|htInitPage| (MAKESTRING "Solve Basic Command") + (|htInitPage| "Solve Basic Command" (|htpPropertyList| |htPage|))) - (|bcHt| (MAKESTRING "Enter the entries of the matrix:")) + (|bcHt| "Enter the entries of the matrix:") (|htMakePage| |labelList|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|bcGenExplicitMatrix|) (|htpSetProperty| |page| '|nrows| |nrows|) (|htpSetProperty| |page| '|ncols| |ncols|) @@ -347,12 +344,12 @@ (SPADLET |formula| (ELT |formula| 0)) (SPADLET |rowVar| (ELT (LASSOC '|rowVar| |mat|) 0)) (SPADLET |colVar| (ELT (LASSOC '|colVar| |mat|) 0)) - (STRCONC (MAKESTRING "matrix([[") |formula| - (MAKESTRING " for ") |colVar| - (MAKESTRING " in 1..") (STRINGIMAGE |ncols|) - (MAKESTRING "] for ") |rowVar| - (MAKESTRING " in 1..") (STRINGIMAGE |nrows|) - (MAKESTRING "])"))) + (STRCONC "matrix([[" |formula| + " for " |colVar| + " in 1.." (STRINGIMAGE |ncols|) + "] for " |rowVar| + " in 1.." (STRINGIMAGE |nrows|) + "])")) ((SPADLET |mat| (|htpProperty| |htPage| '|matrix|)) (SPADLET |mat| (REVERSE |mat|)) (SPADLET |k| (SPADDIFFERENCE 1)) @@ -407,16 +404,16 @@ (SETQ G166181 (CONS (|bcwords2liststring| |x|) G166181))))))))) - (STRCONC (MAKESTRING "matrix(") |matstring| - (MAKESTRING ")"))) + (STRCONC "matrix(" |matstring| + ")")) ('T (|systemError| NIL)))))))) ;--Hypertex commands other than solve and matrix ;bcDrawIt2(ind,a,b) == STRCONC('"{}",ind,'"=",a,'"{}..",b,'"{}") (DEFUN |bcDrawIt2| (|ind| |a| |b|) - (STRCONC (MAKESTRING "{}") |ind| (MAKESTRING "=") |a| - (MAKESTRING "{}..") |b| (MAKESTRING "{}"))) + (STRCONC "{}" |ind| "=" |a| + "{}.." |b| "{}")) ;bcIndefiniteIntegrate() == ; htInitPage("Indefinite Integration Basic Command",nil) @@ -471,8 +468,8 @@ (SPADLET |integrand| (|htpLabelInputString| |htPage| '|integrand|)) (SPADLET |var| (|htpLabelInputString| |htPage| '|symbol|)) - (|bcGen| (STRCONC (MAKESTRING "integrate(") |integrand| - (MAKESTRING ",") |var| '|)|)))))) + (|bcGen| (STRCONC "integrate(" |integrand| + "," |var| '|)|)))))) ;bcDefiniteIntegrate() == ; htInitPage("Definite Integration Basic Command",nil) @@ -579,18 +576,18 @@ (|htpButtonValue| |htPage| '|fromButton|) '|fromPoint|) (|htpLabelInputString| |htPage| '|from|)) - ('T (MAKESTRING "%minusInfinity")))) + ('T "%minusInfinity"))) (SPADLET |upperLimit| (COND ((BOOT-EQUAL (|htpButtonValue| |htPage| '|toButton|) '|toPoint|) (|htpLabelInputString| |htPage| '|to|)) - ('T (MAKESTRING "%plusInfinity")))) + ('T "%plusInfinity"))) (SPADLET |varpart| - (STRCONC |var| (MAKESTRING " = ") |lowerLimit| - (MAKESTRING "..") |upperLimit|)) - (|bcGen| (STRCONC (MAKESTRING "integrate(") |integrand| - (MAKESTRING ",") |varpart| (MAKESTRING ")"))))))) + (STRCONC |var| " = " |lowerLimit| + ".." |upperLimit|)) + (|bcGen| (STRCONC "integrate(" |integrand| + "," |varpart| ")")))))) ;bcSum() == ; htInitPage("Sum Basic Command",nil) @@ -663,9 +660,9 @@ (SPADLET |index| (|htpLabelInputString| |htPage| '|index|)) (SPADLET CAR (|htpLabelInputString| |htPage| '|first|)) (SPADLET |last| (|htpLabelInputString| |htPage| '|last|)) - (|bcGen| (STRCONC (MAKESTRING "sum(") |mand| (MAKESTRING ",") - |index| (MAKESTRING " = ") CAR - (MAKESTRING "..") |last| (MAKESTRING ")"))))))) + (|bcGen| (STRCONC "sum(" |mand| "," + |index| " = " CAR + ".." |last| ")")))))) ;bcProduct() == ; htInitPage("Product Basic Command",nil) @@ -721,9 +718,9 @@ (SPADLET |index| (|htpLabelInputString| |htPage| '|index|)) (SPADLET CAR (|htpLabelInputString| |htPage| '|first|)) (SPADLET |last| (|htpLabelInputString| |htPage| '|last|)) - (|bcGen| (STRCONC (MAKESTRING "product(") |mand| - (MAKESTRING ",") |index| (MAKESTRING ",") CAR - (MAKESTRING ",") |last| (MAKESTRING ")"))))))) + (|bcGen| (STRCONC "product(" |mand| + "," |index| "," CAR + "," |last| ")")))))) ;bcDifferentiate() == ; htInitPage("Differentiate Basic Command",nil) @@ -777,7 +774,7 @@ . "\\newline List the number of {\\em times} you want to differentiate with respect to each variable (leave blank if once for each)") (|text| . "\\newline\\tab{2} ") (|bcStrings| (55 "1 2" |times| S . |quoteString|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|bcDifferentiateGen|) + (|htMakeDoneButton| "Continue" '|bcDifferentiateGen|) (|htShowPage|))) ;bcDifferentiateGen htPage == @@ -821,16 +818,15 @@ (|bcwords2liststring| |indexList|)) ('T (|bcError| - (MAKESTRING - "You must say how many times you want to differentiate with respect to each variable---or leave that entry blank"))))) + "You must say how many times you want to differentiate with respect to each variable---or leave that entry blank")))) (SPADLET |lastPart| (COND (|indexpart| - (STRCONC (MAKESTRING ",") |indexpart| - (MAKESTRING ")"))) - ('T (MAKESTRING ")")))) - (|bcGen| (STRCONC (MAKESTRING "differentiate(") |mand| - (MAKESTRING ",") |varpart| |lastPart|)))))) + (STRCONC "," |indexpart| + ")")) + ('T ")"))) + (|bcGen| (STRCONC "differentiate(" |mand| + "," |varpart| |lastPart|)))))) ;bcDraw() == ; htInitPage('"Draw Basic Command",nil) @@ -854,31 +850,23 @@ (DEFUN |bcDraw| () (PROGN - (|htInitPage| (MAKESTRING "Draw Basic Command") NIL) - (|bcHt| (MAKESTRING "What would you like to draw?")) - (|bcHt| (MAKESTRING - "\\newline\\centerline{{\\em Two Dimensional Plots}}\\newline")) - (|bcHt| (MAKESTRING - "\\lispdownlink{A function of one variable}{(|bcDraw2Dfun|)}")) - (|bcHt| (MAKESTRING "\\space{2}y = f(x)\\newline")) - (|bcHt| (MAKESTRING - "\\lispdownlink{A parametrically defined curve}{(|bcDraw2Dpar|)}")) - (|bcHt| (MAKESTRING "\\space{2}(x(t), y(t))\\newline")) - (|bcHt| (MAKESTRING - "\\lispdownlink{A solution to a polynomial equation}{(|bcDraw2DSolve|)}")) - (|bcHt| (MAKESTRING "\\space{2} p(x,y) = 0\\newline")) - (|bcHt| (MAKESTRING "\\vspace{1}\\newline ")) - (|bcHt| (MAKESTRING - "\\centerline{{\\em Three Dimensional Surfaces}}\\newline\\newline")) - (|bcHt| (MAKESTRING - "\\lispdownlink{A function of two variables}{(|bcDraw3Dfun|)}")) - (|bcHt| (MAKESTRING "\\space{2} z = f(x,y)\\newline")) - (|bcHt| (MAKESTRING - "\\lispdownlink{A parametrically defined tube}{(|bcDraw3Dpar|)}")) - (|bcHt| (MAKESTRING "\\space{2}(x(t), y(t), z(t))\\newline")) - (|bcHt| (MAKESTRING - "\\lispdownlink{A parameterically defined surface}{(|bcDraw3Dpar1|)}")) - (|bcHt| (MAKESTRING "\\space{2}(x(u,v), y(u,v), z(u,v))\\newline")) + (|htInitPage| "Draw Basic Command" NIL) + (|bcHt| "What would you like to draw?") + (|bcHt| "\\newline\\centerline{{\\em Two Dimensional Plots}}\\newline") + (|bcHt| "\\lispdownlink{A function of one variable}{(|bcDraw2Dfun|)}") + (|bcHt| "\\space{2}y = f(x)\\newline") + (|bcHt| "\\lispdownlink{A parametrically defined curve}{(|bcDraw2Dpar|)}") + (|bcHt| "\\space{2}(x(t), y(t))\\newline") + (|bcHt| "\\lispdownlink{A solution to a polynomial equation}{(|bcDraw2DSolve|)}") + (|bcHt| "\\space{2} p(x,y) = 0\\newline") + (|bcHt| "\\vspace{1}\\newline ") + (|bcHt| "\\centerline{{\\em Three Dimensional Surfaces}}\\newline\\newline") + (|bcHt| "\\lispdownlink{A function of two variables}{(|bcDraw3Dfun|)}") + (|bcHt| "\\space{2} z = f(x,y)\\newline") + (|bcHt| "\\lispdownlink{A parametrically defined tube}{(|bcDraw3Dpar|)}") + (|bcHt| "\\space{2}(x(t), y(t), z(t))\\newline") + (|bcHt| "\\lispdownlink{A parameterically defined surface}{(|bcDraw3Dpar1|)}") + (|bcHt| "\\space{2}(x(u,v), y(u,v), z(u,v))\\newline") (|htShowPage|))) ;bcDraw2Dfun() == @@ -917,7 +905,7 @@ (DEFUN |bcDraw2Dfun| () (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Draw Basic Command") NIL) + (|htInitPage| "Draw Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| F (|Float|)) (|isDomain| SY (|Symbol|))) @@ -967,15 +955,15 @@ (SPADLET |to1| (|htpLabelInputString| |htPage| '|to1|)) (SPADLET |title| (|htpLabelInputString| |htPage| '|title|)) (COND - ((NEQUAL |title| (MAKESTRING "")) + ((NEQUAL |title| "") (SPADLET |titlePart| - (STRCONC (MAKESTRING "{}") - (MAKESTRING "title ==\"") |title| - (MAKESTRING "\""))) - (|bcFinish| (MAKESTRING "draw") |fun| + (STRCONC "{}" + "title ==\"" |title| + "\"")) + (|bcFinish| "draw" |fun| (|bcDrawIt2| |ind| |from1| |to1|) |titlePart|)) ('T - (|bcFinish| (MAKESTRING "draw") |fun| + (|bcFinish| "draw" |fun| (|bcDrawIt2| |ind| |from1| |to1|)))))))) ;bcDraw2Dpar() == @@ -1013,7 +1001,7 @@ (DEFUN |bcDraw2Dpar| () (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Draw Basic Command") NIL) + (|htInitPage| "Draw Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| F (|Float|)) (|isDomain| SY (|Symbol|))) @@ -1065,22 +1053,22 @@ (SPADLET |to1| (|htpLabelInputString| |htPage| '|to1|)) (SPADLET |title| (|htpLabelInputString| |htPage| '|title|)) (SPADLET |curvePart| - (STRCONC (MAKESTRING "curve(") (MAKESTRING "{}") - |fun1| (MAKESTRING ",{}") |fun2| - (MAKESTRING ")"))) + (STRCONC "curve(" "{}" + |fun1| ",{}" |fun2| + ")")) (COND - ((NEQUAL |title| (MAKESTRING "")) + ((NEQUAL |title| "") (SPADLET |titlePart| (COND - ((BOOT-EQUAL |title| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |title| "") NIL) ('T - (STRCONC (MAKESTRING "{}") - (MAKESTRING "title ==\"") |title| - (MAKESTRING "\""))))) - (|bcFinish| (MAKESTRING "draw") |curvePart| + (STRCONC "{}" + "title ==\"" |title| + "\"")))) + (|bcFinish| "draw" |curvePart| (|bcDrawIt2| |ind| |from1| |to1|) |titlePart|)) ('T - (|bcFinish| (MAKESTRING "draw") |curvePart| + (|bcFinish| "draw" |curvePart| (|bcDrawIt2| |ind| |from1| |to1|)))))))) ;bcDraw2DSolve() == @@ -1120,7 +1108,7 @@ (DEFUN |bcDraw2DSolve| () (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Draw Basic Command") NIL) + (|htInitPage| "Draw Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| F (|Float|)) (|isDomain| SY (|Symbol|))) @@ -1144,7 +1132,7 @@ (|text| "\\indent{0}\\vspace{1}\\newline\\menuitemstyle{}\\tab{2} " "Optionally enter a {\\em title} for your curve:") (|bcStrings| (15 "" |title| S)) (|text| . "\\indent{0}"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|bcDraw2DSolveGen|) + (|htMakeDoneButton| "Continue" '|bcDraw2DSolveGen|) (|htShowPage|))) ;bcDraw2DSolveGen htPage == @@ -1179,25 +1167,25 @@ (SPADLET |to2| (|htpLabelInputString| |htPage| '|to2|)) (SPADLET |title| (|htpLabelInputString| |htPage| '|title|)) (SPADLET |clipPart| - (STRCONC (MAKESTRING "{}") (MAKESTRING "range==[{}") - |from1| (MAKESTRING "..") |to1| '|,{}| - |from2| (MAKESTRING "..") |to2| - (MAKESTRING "]"))) + (STRCONC "{}" "range==[{}" + |from1| ".." |to1| '|,{}| + |from2| ".." |to2| + "]")) (COND - ((NEQUAL |title| (MAKESTRING "")) + ((NEQUAL |title| "") (SPADLET |titlePart| (COND - ((BOOT-EQUAL |title| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |title| "") NIL) ('T - (STRCONC (MAKESTRING "{}") - (MAKESTRING "title ==\"") |title| - (MAKESTRING "\""))))) - (|bcFinish| (MAKESTRING "draw") - (STRCONC |fun| (MAKESTRING " = 0 ")) |ind1| |ind2| + (STRCONC "{}" + "title ==\"" |title| + "\"")))) + (|bcFinish| "draw" + (STRCONC |fun| " = 0 ") |ind1| |ind2| |clipPart| |titlePart|)) ('T - (|bcFinish| (MAKESTRING "draw") - (STRCONC |fun| (MAKESTRING " = 0 ")) |ind1| |ind2| + (|bcFinish| "draw" + (STRCONC |fun| " = 0 ") |ind1| |ind2| |clipPart|))))))) ;bcDraw3Dfun() == @@ -1241,7 +1229,7 @@ (DEFUN |bcDraw3Dfun| () (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Three Dimensional Draw Basic Command") + (|htInitPage| "Three Dimensional Draw Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -1305,19 +1293,19 @@ (SPADLET |to2| (|htpLabelInputString| |htPage| '|to2|)) (SPADLET |title| (|htpLabelInputString| |htPage| '|title|)) (COND - ((NEQUAL |title| (MAKESTRING "")) + ((NEQUAL |title| "") (SPADLET |titlePart| (COND - ((BOOT-EQUAL |title| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |title| "") NIL) ('T - (STRCONC (MAKESTRING "{}") - (MAKESTRING "title ==\"") |title| - (MAKESTRING "\""))))) - (|bcFinish| (MAKESTRING "draw") |fun| + (STRCONC "{}" + "title ==\"" |title| + "\"")))) + (|bcFinish| "draw" |fun| (|bcDrawIt2| |ind1| |from1| |to1|) (|bcDrawIt2| |ind2| |from2| |to2|) |titlePart|)) ('T - (|bcFinish| (MAKESTRING "draw") |fun| + (|bcFinish| "draw" |fun| (|bcDrawIt2| |ind1| |from1| |to1|) (|bcDrawIt2| |ind2| |from2| |to2|)))))))) @@ -1358,7 +1346,7 @@ (DEFUN |bcDraw3Dpar| () (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Draw Basic Command") NIL) + (|htInitPage| "Draw Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| F (|Float|)) (|isDomain| SY (|Symbol|))) @@ -1418,25 +1406,25 @@ (SPADLET |to1| (|htpLabelInputString| |htPage| '|to1|)) (SPADLET |title| (|htpLabelInputString| |htPage| '|title|)) (SPADLET |curvePart| - (STRCONC (MAKESTRING "curve(") (MAKESTRING "{}") - |fun1| (MAKESTRING ",{}") |fun2| - (MAKESTRING ",{}") |fun3| (MAKESTRING ")"))) + (STRCONC "curve(" "{}" + |fun1| ",{}" |fun2| + ",{}" |fun3| ")")) (SPADLET |tubePart| - (MAKESTRING "{}tubeRadius==.25,{}tubePoints==16")) + "{}tubeRadius==.25,{}tubePoints==16") (COND - ((NEQUAL |title| (MAKESTRING "")) + ((NEQUAL |title| "") (SPADLET |titlePart| (COND - ((BOOT-EQUAL |title| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |title| "") NIL) ('T - (STRCONC (MAKESTRING "{}") - (MAKESTRING "title ==\"") |title| - (MAKESTRING "\""))))) - (|bcFinish| (MAKESTRING "draw") |curvePart| + (STRCONC "{}" + "title ==\"" |title| + "\"")))) + (|bcFinish| "draw" |curvePart| (|bcDrawIt2| |ind| |from1| |to1|) |tubePart| |titlePart|)) ('T - (|bcFinish| (MAKESTRING "draw") |curvePart| + (|bcFinish| "draw" |curvePart| (|bcDrawIt2| |ind| |from1| |to1|) |tubePart|))))))) ;bcDraw3Dpar1() == @@ -1487,7 +1475,7 @@ (DEFUN |bcDraw3Dpar1| () (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Draw Basic Command") NIL) + (|htInitPage| "Draw Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| F (|Float|)) (|isDomain| SY (|Symbol|))) @@ -1523,7 +1511,7 @@ "Optionally enter a {\\em title} for your surface:") (|bcStrings| (15 "surface" |title| S)) (|text| . "\\indent{0}"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|bcDraw3Dpar1Gen|) + (|htMakeDoneButton| "Continue" '|bcDraw3Dpar1Gen|) (|htShowPage|))) ;bcDraw3Dpar1Gen htPage == @@ -1564,21 +1552,21 @@ (SPADLET |r1| (|bcDrawIt2| |ind1| |from1| |to1|)) (SPADLET |r2| (|bcDrawIt2| |ind2| |from2| |to2|)) (SPADLET |surfacePart| - (STRCONC (MAKESTRING "surface(") (MAKESTRING "{}") - |fun1| (MAKESTRING ",{}") |fun2| - (MAKESTRING ",{}") |fun3| (MAKESTRING ")"))) + (STRCONC "surface(" "{}" + |fun1| ",{}" |fun2| + ",{}" |fun3| ")")) (COND - ((NEQUAL |title| (MAKESTRING "")) + ((NEQUAL |title| "") (SPADLET |titlePart| (COND - ((BOOT-EQUAL |title| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |title| "") NIL) ('T - (STRCONC (MAKESTRING "{}") - (MAKESTRING "title ==\"") |title| - (MAKESTRING "\""))))) - (|bcFinish| (MAKESTRING "draw") |surfacePart| |r1| |r2| + (STRCONC "{}" + "title ==\"" |title| + "\"")))) + (|bcFinish| "draw" |surfacePart| |r1| |r2| |titlePart|)) - ('T (|bcFinish| (MAKESTRING "draw") |surfacePart| |r1| |r2|))))))) + ('T (|bcFinish| "draw" |surfacePart| |r1| |r2|))))))) ;bcSeries() == ; htInitPage('"Series Basic Command",nil) @@ -1601,7 +1589,7 @@ (DEFUN |bcSeries| () (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Series Basic Command") NIL) + (|htInitPage| "Series Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| S (|String|)) (|isDomain| SY (|Symbol|))) @@ -1652,7 +1640,7 @@ (declare (ignore |a| |b|)) (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Series Expansion Basic Command") NIL) + (|htInitPage| "Series Expansion Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| EEM (|Expression| |$EmptyMode|)) @@ -1673,7 +1661,7 @@ . "Enter the {\\em point} about which you want to expand") (|text| . "\\tab{49}") (|bcStrings| (8 "\\%pi/2" |point| EM)))) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|bcSeriesExpansionGen|) (|htShowPage|))) @@ -1694,7 +1682,7 @@ (SPADLET |terms| (|htpLabelInputString| |htPage| '|numberOfTerms|)) (|bcFinish| '|series| |fun| - (STRCONC |var| (MAKESTRING " = ") |point|)))))) + (STRCONC |var| " = " |point|)))))) ;bcSeriesByFormula(a,b) == ; htInitPage('"Power Series Basic Command",nil) @@ -1716,7 +1704,7 @@ (DEFUN |bcSeriesByFormula| (|a| |b|) (declare (ignore |a| |b|)) (PROGN - (|htInitPage| (MAKESTRING "Power Series Basic Command") NIL) + (|htInitPage| "Power Series Basic Command" NIL) (|htMakePage| '((|text| . "Select the kind of power series you want to create:") @@ -1788,7 +1776,7 @@ (declare (ignore |a| |b|)) (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Taylor Series Basic Command") NIL) + (|htInitPage| "Taylor Series Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| EEM (|Expression| |$EmptyMode|)) @@ -1880,7 +1868,7 @@ (DEFUN |bcLaurentSeries| (|a| |b|) (declare (special |$EmptyMode|) (ignore |a| |b|)) (PROGN - (|htInitPage| (MAKESTRING "Laurent Series Basic Command") NIL) + (|htInitPage| "Laurent Series Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| EEM (|Expression| |$EmptyMode|)) @@ -1971,7 +1959,7 @@ (DEFUN |bcPuiseuxSeries| (|a| |b|) (declare (special |$EmptyMode|) (ignore |a| |b|)) (PROGN - (|htInitPage| (MAKESTRING "Puiseux Series Basic Command") NIL) + (|htInitPage| "Puiseux Series Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| EEM (|Expression| |$EmptyMode|)) @@ -2052,10 +2040,10 @@ (SPADLET |index| (|htpLabelInputString| |htPage| '|index|)) (SPADLET |var| (|htpLabelInputString| |htPage| '|variable|)) (SPADLET |point| (|htpLabelInputString| |htPage| '|point|)) - (SPADLET |varPart| (STRCONC |var| (MAKESTRING " = ") |point|)) - (SPADLET |minPart| (STRCONC |min| (MAKESTRING ".."))) - (|bcFinish| (MAKESTRING "series") - (STRCONC |index| (MAKESTRING " +-> ") |formula|) |varPart| + (SPADLET |varPart| (STRCONC |var| " = " |point|)) + (SPADLET |minPart| (STRCONC |min| "..")) + (|bcFinish| "series" + (STRCONC |index| " +-> " |formula|) |varPart| |minPart| |step|))))) ;bcLimit() == @@ -2086,7 +2074,7 @@ (DEFUN |bcLimit| () (declare (special |$EmptyMode|)) (PROGN - (|htInitPage| (MAKESTRING "Limit Basic Command") NIL) + (|htInitPage| "Limit Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| S (|String|)) (|isDomain| SY (|Symbol|))) @@ -2145,7 +2133,7 @@ (DEFUN |bcRealLimit| (|a| |b|) (declare (special |$EmptyMode|) (ignore |a| |b|)) (PROGN - (|htInitPage| (MAKESTRING "Real Limit Basic Command") NIL) + (|htInitPage| "Real Limit Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| S (|String|)) (|isDomain| F (|Float|)) @@ -2203,13 +2191,13 @@ (SPADLET |loc| (COND ((BOOT-EQUAL |p| '|plusInfinity|) - (MAKESTRING "%plusInfinity")) - ('T (MAKESTRING "%minusInfinity")))) - (|bcFinish| (MAKESTRING "limit") |fun| - (STRCONC |var| (MAKESTRING " = ") |loc|))) + "%plusInfinity") + ('T "%minusInfinity"))) + (|bcFinish| "limit" |fun| + (STRCONC |var| " = " |loc|))) ('T (SPADLET |page| - (|htInitPage| (MAKESTRING "Real Limit Basic Command") + (|htInitPage| "Real Limit Basic Command" NIL)) (|htMakePage| '((|text| . "Compute the limit") @@ -2246,14 +2234,14 @@ (SPADLET |direction| (COND ((BOOT-EQUAL |key| '|right|) - (MAKESTRING "\"right\"")) - ((BOOT-EQUAL |key| '|left|) (MAKESTRING "\"left\"")) + "\"right\"") + ((BOOT-EQUAL |key| '|left|) "\"left\"") ('T NIL))) (SPADLET |fun| (|htpProperty| |htPage| '|fun|)) (SPADLET |var| (|htpProperty| |htPage| '|var|)) (SPADLET |loc| (|htpProperty| |htPage| '|loc|)) - (SPADLET |varPart| (STRCONC |var| (MAKESTRING " = ") |loc|)) - (|bcFinish| (MAKESTRING "limit") |fun| |varPart| |direction|))))) + (SPADLET |varPart| (STRCONC |var| " = " |loc|)) + (|bcFinish| "limit" |fun| |varPart| |direction|))))) ;bcComplexLimit(a,b) == ; htInitPage('"Complex Limit Basic Command",nil) @@ -2291,7 +2279,7 @@ (DEFUN |bcComplexLimit| (|a| |b|) (declare (special |$EmptyMode|) (ignore |a| |b|)) (PROGN - (|htInitPage| (MAKESTRING "Complex Limit Basic Command") NIL) + (|htInitPage| "Complex Limit Basic Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) (|isDomain| S (|String|)) (|isDomain| F (|Float|)) @@ -2360,25 +2348,25 @@ '|complex|)) (SPADLET |complexPart| (COND - ((BOOT-EQUAL |comp| (MAKESTRING "0")) - (MAKESTRING "")) - ((BOOT-EQUAL |comp| (MAKESTRING "1")) - (MAKESTRING "%i")) - ('T (STRCONC |comp| (MAKESTRING "*%i"))))) + ((BOOT-EQUAL |comp| "0") + "") + ((BOOT-EQUAL |comp| "1") + "%i") + ('T (STRCONC |comp| "*%i")))) (COND - ((BOOT-EQUAL |real| (MAKESTRING "0")) + ((BOOT-EQUAL |real| "0") (COND - ((BOOT-EQUAL |complexPart| (MAKESTRING "")) + ((BOOT-EQUAL |complexPart| "") '|0|) ('T |complexPart|))) - ((BOOT-EQUAL |complexPart| (MAKESTRING "")) + ((BOOT-EQUAL |complexPart| "") |real|) ('T - (STRCONC |real| (MAKESTRING " + ") + (STRCONC |real| " + " |complexPart|)))) - ('T (MAKESTRING "%infinity")))) - (SPADLET |varPart| (STRCONC |var| (MAKESTRING " = ") |loc|)) - (|bcFinish| (MAKESTRING "complexLimit") |fun| |varPart|))))) + ('T "%infinity"))) + (SPADLET |varPart| (STRCONC |var| " = " |loc|)) + (|bcFinish| "complexLimit" |fun| |varPart|))))) ; -- HyperTeX basic Solve Command ;$systemType := nil @@ -2409,7 +2397,7 @@ (DEFUN |bcSolve| () (PROGN - (|htInitPage| (MAKESTRING "Solve Basic Command") NIL) + (|htInitPage| "Solve Basic Command" NIL) (|htMakePage| '((|text| . "What do you want to solve? ") (|text| . "\\beginmenu") (|text| . "\\item ") @@ -2447,7 +2435,7 @@ (DEFUN |bcLinearSolve| (|p| |nn|) (declare (ignore |p| |nn|)) (PROGN - (|htInitPage| (MAKESTRING "Basic Solve Command") NIL) + (|htInitPage| "Basic Solve Command" NIL) (|htMakePage| '((|text| . "How do you want to enter the equations?") (|text| . "\\beginmenu") (|text| . "\\item ") @@ -2477,13 +2465,13 @@ (DEFUN |bcLinearSolveEqns| (|htPage| |p|) (declare (ignore |htPage| |p|)) (PROGN - (|htInitPage| (MAKESTRING "Basic Solve Command") NIL) + (|htInitPage| "Basic Solve Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) (|inputStrings| ("Enter the {\\em number} of equations:" "" 5 2 |numberOfEquations| PI)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|bcLinearSolveEqns1|) + (|htMakeDoneButton| "Continue" '|bcLinearSolveEqns1|) (|htShowPage|))) ;bcSystemSolve(htPage, p) == @@ -2498,13 +2486,13 @@ (DEFUN |bcSystemSolve| (|htPage| |p|) (declare (ignore |htPage| |p|)) (PROGN - (|htInitPage| (MAKESTRING "Basic Solve Command") NIL) + (|htInitPage| "Basic Solve Command" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) (|inputStrings| ("Enter the {\\em number} of equations:" "" 5 2 |numberOfEquations| PI)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|bcSystemSolveEqns1|) + (|htMakeDoneButton| "Continue" '|bcSystemSolveEqns1|) (|htShowPage|))) ;bcSolveSingle(htPage,p) == @@ -2572,7 +2560,7 @@ (RETURN (PROGN (SPADLET |page| - (|htInitPage| (MAKESTRING "Solve Basic Command") + (|htInitPage| "Solve Basic Command" (|htpPropertyList| |htPage|))) (|htpSetProperty| |page| '|numberOfEquations| (|htpProperty| |htPage| '|numberOfEquations|)) @@ -2661,17 +2649,16 @@ (SEQ (IF (> |i| 99) (EXIT 0)) (IF (> |i| 9) (EXIT 1)) (EXIT 2))) (SPADLET |prefix| - (STRCONC (MAKESTRING - "\\newline\\tab{2}{\\em Equation ") - (STRINGIMAGE |i|) (MAKESTRING ":}"))) + (STRCONC "\\newline\\tab{2}{\\em Equation " + (STRINGIMAGE |i|) ":}")) (SPADLET |prefix| - (STRCONC |prefix| (MAKESTRING "\\space{") - (STRINGIMAGE |spacer|) (MAKESTRING "}"))) + (STRCONC |prefix| "\\space{" + (STRINGIMAGE |spacer|) "}")) (SPADLET |lnam| - (INTERN (STRCONC (MAKESTRING "l") + (INTERN (STRCONC "l" (STRINGIMAGE |i|)))) (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") + (INTERN (STRCONC "r" (STRINGIMAGE |i|)))) (SPADLET |var| (SEQ (IF |linearp| @@ -2741,20 +2728,20 @@ (|isDomain| PI (|PositiveInteger|))) |labelList|)) (SPADLET |page| - (|htInitPage| (MAKESTRING "Solve Basic Command") + (|htInitPage| "Solve Basic Command" (|htpPropertyList| |htPage|))) (|htpSetProperty| |page| '|numberOfEquations| |numEqs|) (|htpSetProperty| |page| '|solutionMethod| |solutionMethod|) - (|htSay| (MAKESTRING "\\newline\\menuitemstyle{}\\tab{2}")) + (|htSay| "\\newline\\menuitemstyle{}\\tab{2}") (|htSay| (COND ((EQL |numEqs| 1) - (MAKESTRING "Enter the {\\em Equation}:")) - ('T (MAKESTRING "Enter the {\\em Equations}:")))) - (|htSay| (MAKESTRING "\\newline\\tab{2}")) + "Enter the {\\em Equation}:") + ('T "Enter the {\\em Equations}:"))) + (|htSay| "\\newline\\tab{2}") (|htMakePage| |equationPart|) - (|bcHt| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING "\\newline\\menuitemstyle{}\\tab{2}")) + (|bcHt| "\\blankline ") + (|htSay| "\\newline\\menuitemstyle{}\\tab{2}") (|htMakePage| (COND ((EQL |numEqs| 1) @@ -2776,7 +2763,7 @@ (CONS 'P NIL)))) NIL)) NIL)))))) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|bcInputEquationsEnd|) (|htShowPage|)))))) @@ -2784,7 +2771,7 @@ ; STRCONC('"x",STRINGIMAGE i) (DEFUN |bcCreateVariableString| (|i|) - (STRCONC (MAKESTRING "x") (STRINGIMAGE |i|))) + (STRCONC "x" (STRINGIMAGE |i|))) ;bcMakeUnknowns(number)== ; APPLY('CONCAT,[STRCONC(bcCreateVariableString(i)," ") for i in 1..number]) @@ -2918,7 +2905,7 @@ (RETURN (PROGN (SPADLET |page| - (|htInitPage| (MAKESTRING "Solve Basic Command") + (|htInitPage| "Solve Basic Command" (|htpPropertyList| |htPage|))) (|htMakePage| '((|text| . "What would you like?") @@ -2932,7 +2919,7 @@ (|inputStrings| ("Enter the number of desired {\\em digits} of accuracy" "" 5 20 |acc| PI)))) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|bcSolveNumerically1|) (|htShowPage|))))) @@ -2980,8 +2967,8 @@ (SPADLET |accString| (COND ((|member| |kind| '(|rf| |cf|)) - (STRCONC (MAKESTRING "1.e-") |digits|)) - ('T (STRCONC (MAKESTRING "1/10**") |digits|)))))) + (STRCONC "1.e-" |digits|)) + ('T (STRCONC "1/10**" |digits|)))))) (SPADLET |alist| (|htpProperty| |htPage| '|inputArea|)) (SPADLET |varpart| (CADAR |alist|)) (SPADLET |r| (CDR |alist|)) @@ -2996,15 +2983,15 @@ (SPADLET |name| (COND ((|member| |kind| '(|rf| |rr|)) - (MAKESTRING "solve")) - ('T (MAKESTRING "complexSolve")))) + "solve") + ('T "complexSolve"))) (|bcFinish| |name| |eqnString| |accString|)) ('T (SPADLET |name| (COND ((BOOT-EQUAL |solutionMethod| '|radical|) - (MAKESTRING "radicalSolve")) - ('T (MAKESTRING "solve")))) + "radicalSolve") + ('T "solve"))) (|bcFinish| |name| |eqnString| |varString| |accString|))))))) ;bcLinearSolveMatrix(htPage,junk) == @@ -3030,7 +3017,7 @@ (PROGN (SPADLET |page| (|htInitPage| - (MAKESTRING "Linear Solve Basic Command") + "Linear Solve Basic Command" (|htpPropertyList| |htPage|))) (|htpSetProperty| |page| '|matrix| (|bcLinearExtractMatrix| |htPage|)) @@ -3080,16 +3067,16 @@ (SEQ (IF (> |i| 99) (EXIT 0)) (IF (> |i| 9) (EXIT 1)) (EXIT 2))) (SPADLET |prefix| - (STRCONC (MAKESTRING "{\\em Coefficient ") - (STRINGIMAGE |i|) (MAKESTRING ":}"))) + (STRCONC "{\\em Coefficient " + (STRINGIMAGE |i|) ":}")) (IF (NEQUAL |spacer| 0) (SPADLET |prefix| - (STRCONC |prefix| (MAKESTRING "\\space{") + (STRCONC |prefix| "\\space{" (STRINGIMAGE |spacer|) - (MAKESTRING "}"))) + "}")) NIL) (SPADLET |name| - (INTERN (STRCONC (MAKESTRING "c") + (INTERN (STRCONC "c" (STRINGIMAGE |i|)))) (EXIT (CONS |prefix| (CONS '|| @@ -3118,7 +3105,7 @@ G166692)))))))) (SPADLET |page| (|htInitPage| - (MAKESTRING "Linear Solve Basic Command") + "Linear Solve Basic Command" (|htpPropertyList| |htPage|))) (|htpSetProperty| |page| '|matrix| (|htpProperty| |htPage| '|matrix|)) @@ -3172,7 +3159,7 @@ (SPADLET |matform| (|bcMatrixGen| |htPage|)) (COND ((BOOT-EQUAL |key| '|homo|) - (|bcFinish| (MAKESTRING "nullSpace") |matform|)) + (|bcFinish| "nullSpace" |matform|)) ('T (SPADLET |vector| (PROG (G166720) @@ -3193,11 +3180,11 @@ (CONS (ELT |x| 1) G166720)))))))) (SPADLET |vecform| (|bcVectorGen| |vector|)) (SPADLET |form| - (|bcMkFunction| (MAKESTRING "solve") |matform| + (|bcMkFunction| "solve" |matform| (CONS |vecform| NIL))) (|bcGen| (COND ((BOOT-EQUAL |key| '|particular|) - (STRCONC |form| (MAKESTRING ".particular"))) + (STRCONC |form| ".particular")) ('T |form|)))))))))) ;linearFinalRequest(nhh,mat,vect) == @@ -3214,13 +3201,12 @@ (RETURN (PROGN (|sayBrightly| - (MAKESTRING - "Do you want more information on the meaning of the output")) - (|sayBrightly| (MAKESTRING " (1) no ")) - (|sayBrightly| (MAKESTRING " (2) yes ")) + "Do you want more information on the meaning of the output") + (|sayBrightly| " (1) no ") + (|sayBrightly| " (2) yes ") (SPADLET |tt| (|bcQueryInteger| 1 2 'T)) (COND - ((EQL |tt| 1) (|sayBrightly| (MAKESTRING "Bye Bye"))) + ((EQL |tt| 1) (|sayBrightly| "Bye Bye")) ((EQL |tt| 2) (|explainLinear| |nhh|))))))) ;explainLinear(flag) == @@ -3258,16 +3244,15 @@ (PROG (|tt|) (RETURN (PROGN - (|sayBrightly| (MAKESTRING "Do you like:")) + (|sayBrightly| "Do you like:") (|sayBrightly| - (MAKESTRING " (1) the solutions how they are displayed")) - (|sayBrightly| (MAKESTRING " (2) to get ????")) + " (1) the solutions how they are displayed") + (|sayBrightly| " (2) to get ????") (|sayBrightly| - (MAKESTRING - " (3) more information on the meaning of the output")) + " (3) more information on the meaning of the output") (SPADLET |tt| (|bcQueryInteger| 1 3 'T)) (COND - ((EQL |tt| 1) (|sayBrightly| (MAKESTRING "Bye Bye"))) + ((EQL |tt| 1) (|sayBrightly| "Bye Bye")) ((EQL |tt| 2) (|moreExactSolution| |equations| |unknowns|)) ((EQL |tt| 3) (|explainExact| |equations| |unknowns|))))))) @@ -3297,7 +3282,7 @@ ('T (CAR |varlist|)))) (SPADLET |alist| (CDR |alist|)))) (SPADLET |eqnString| (|bcGenEquations| |alist|)) - (|bcFinish| (MAKESTRING "solve") |eqnString| |varString|))))) + (|bcFinish| "solve" |eqnString| |varString|))))) ;bcGenEquations alist == ; y := alist @@ -3324,7 +3309,7 @@ (SPADLET |eqnlist| (CONS (STRCONC |left| - (MAKESTRING " = ") |right|) + " = " |right|) |eqnlist|)))))) (COND ((CDR |eqnlist|) (|bcwords2liststring| |eqnlist|)) @@ -3359,7 +3344,7 @@ (|x| (SETQ G166797 (CONS |x| G166797)))))))))) - (STRCONC |name| (MAKESTRING "(") |arg| + (STRCONC |name| "(" |arg| (PROG (G166809) (SPADLET G166809 "") (RETURN @@ -3372,8 +3357,8 @@ G166809) (SEQ (EXIT (SETQ G166809 (STRCONC G166809 - (STRCONC (MAKESTRING ",") |x|)))))))) - (MAKESTRING ")"))))))) + (STRCONC "," |x|)))))))) + ")")))))) ;bcString2HyString2 s == ; (STRINGP s) and (s.0 = char '_") => @@ -3387,9 +3372,9 @@ (COND ((AND (STRINGP |s|) (BOOT-EQUAL (ELT |s| 0) (|char| '|"|))) (SPADLET |len| (|#| |s|)) - (STRCONC (MAKESTRING "\\\"") + (STRCONC "\\\"" (SUBSTRING |s| 1 (SPADDIFFERENCE |len| 2)) - (MAKESTRING "\\\""))) + "\\\"")) ('T |s|))))) ;bcString2HyString s == s @@ -3427,20 +3412,20 @@ (PROG (|string|) (RETURN (PROGN - (|htInitPage| (MAKESTRING "Basic Command") NIL) + (|htInitPage| "Basic Command" NIL) (SPADLET |string| (COND ((QSLESSP (|#| |command|) 50) - (STRCONC (MAKESTRING "{\\centerline{\\tt ") - |command| (MAKESTRING " }}"))) + (STRCONC "{\\centerline{\\tt " + |command| " }}")) ('T - (STRCONC (MAKESTRING "{\\tt ") |command| - (MAKESTRING " }"))))) + (STRCONC "{\\tt " |command| + " }")))) (|htMakePage| (CONS '(|text| "{Here is the AXIOM command you could have issued to compute this result:}" "\\vspace{2}\\newline ") (CONS (CONS '|text| |string|) NIL))) - (|htMakeDoitButton| (MAKESTRING "Do It") |command|) + (|htMakeDoitButton| "Do It" |command|) (|htShowPage|))))) ;-- bcGen for axiom - nag link @@ -3462,19 +3447,19 @@ (PROG (|string|) (RETURN (PROGN - (|htInitPage| (MAKESTRING "AXIOM-Nag Link Command") NIL) + (|htInitPage| "AXIOM-Nag Link Command" NIL) (SPADLET |string| (COND ((QSLESSP (|#| |command|) 50) - (STRCONC (MAKESTRING "{\\centerline{ ") |command| - (MAKESTRING " }}"))) + (STRCONC "{\\centerline{ " |command| + " }}")) ('T |command|))) (|htMakePage| (CONS '(|text| "\\centerline{{\\em Here is the AXIOM command}}" "\\centerline{{\\em you could have issued to compute this result:}}" "\\vspace{2}\\newline ") (CONS (CONS '|text| |string|) NIL))) - (|htMakeDoitButton| (MAKESTRING "Do It") |command|) + (|htMakeDoitButton| "Do It" |command|) (|htShowPage|))))) ;bcOptional s == @@ -3482,11 +3467,11 @@ ; s (DEFUN |bcOptional| (|s|) - (COND ((BOOT-EQUAL |s| (MAKESTRING "")) (MAKESTRING "2")) ('T |s|))) + (COND ((BOOT-EQUAL |s| "") "2") ('T |s|))) ;bcvspace() == bcHt '"\vspace{1}\newline " -(DEFUN |bcvspace| () (|bcHt| (MAKESTRING "\\vspace{1}\\newline "))) +(DEFUN |bcvspace| () (|bcHt| "\\vspace{1}\\newline ")) ;bcString2WordList s == fn(s,0,MAXINDEX s) where ; fn(s,i,n) == @@ -3533,15 +3518,15 @@ ; STRCONC('", ",first u,fn rest u) (DEFUN |bcwords2liststring,fn| (|u|) - (SEQ (IF (NULL |u|) (EXIT (MAKESTRING "]"))) - (EXIT (STRCONC (MAKESTRING ", ") (CAR |u|) + (SEQ (IF (NULL |u|) (EXIT "]")) + (EXIT (STRCONC ", " (CAR |u|) (|bcwords2liststring,fn| (CDR |u|)))))) (DEFUN |bcwords2liststring| (|u|) (COND ((NULL |u|) NIL) ('T - (STRCONC (MAKESTRING "[") (CAR |u|) + (STRCONC "[" (CAR |u|) (|bcwords2liststring,fn| (CDR |u|)))))) ;bcVectorGen vec == bcwords2liststring vec @@ -3554,13 +3539,13 @@ (DEFUN |bcError| (|string|) (PROGN - (|sayBrightlyNT| (MAKESTRING "NOTE: ")) + (|sayBrightlyNT| "NOTE: ") (|sayBrightly| |string|))) ;bcDrawIt(ind,a,b) == STRCONC(ind,'"=",a,'"..",b) (DEFUN |bcDrawIt| (|ind| |a| |b|) - (STRCONC |ind| (MAKESTRING "=") |a| (MAKESTRING "..") |b|)) + (STRCONC |ind| "=" |a| ".." |b|)) ;bcNotReady htPage == ; htInitPage('"Basic Command",nil) @@ -3572,7 +3557,7 @@ (DEFUN |bcNotReady| (|htPage|) (declare (ignore |htPage|)) (PROGN - (|htInitPage| (MAKESTRING "Basic Command") NIL) + (|htInitPage| "Basic Command" NIL) (|htMakePage| '((|text| . "{\\centerline{\\em This facility will soon be available}}"))) @@ -3589,9 +3574,9 @@ (PROGN (SPADLET |s| (STRINGIMAGE |n|)) (SPADLET |ws| (|#| |s|)) - (STRCONC (MAKESTRING "\\space{") + (STRCONC "\\space{" (STRINGIMAGE (PLUS (SPADDIFFERENCE |w| |ws|) 1)) - (MAKESTRING "}") |s|))))) + "}" |s|))))) ;stringList2String x == ; null x => '"()" @@ -3601,9 +3586,9 @@ (PROG () (RETURN (SEQ (COND - ((NULL |x|) (MAKESTRING "()")) + ((NULL |x|) "()") ('T - (STRCONC (MAKESTRING "(") (CAR |x|) + (STRCONC "(" (CAR |x|) (PROG (G166923) (SPADLET G166923 "") (RETURN @@ -3616,9 +3601,9 @@ G166923) (SEQ (EXIT (SETQ G166923 (STRCONC G166923 - (STRCONC (MAKESTRING ",") + (STRCONC "," |y|)))))))) - (MAKESTRING ")")))))))) + ")"))))))) ;htMkName(s,n) == STRCONC(s,STRINGIMAGE n) diff --git a/src/interp/br-con.lisp.pamphlet b/src/interp/br-con.lisp.pamphlet index 9dba180..e5fc1a3 100644 --- a/src/interp/br-con.lisp.pamphlet +++ b/src/interp/br-con.lisp.pamphlet @@ -260,31 +260,31 @@ (PROG (|sourceFileName| |filename|) (RETURN (PROGN - (|htSay| '|{\\sf | |name| (MAKESTRING "}")) + (|htSay| '|{\\sf | |name| "}") (COND ((NEQUAL |abbrev| |name|) (|bcHt| (CONS '| has abbreviation | (CONS |abbrev| NIL))))) (COND - (|file?| (|bcHt| (CONS (MAKESTRING " is a source file.") NIL)))) + (|file?| (|bcHt| (CONS " is a source file." NIL)))) (COND ((EQL |nargs| 0) (COND - ((NEQUAL |abbrev| |name|) (|bcHt| (MAKESTRING "."))) + ((NEQUAL |abbrev| |name|) (|bcHt| ".")) ('T NIL))) ('T (COND - ((NEQUAL |abbrev| |name|) (|bcHt| (MAKESTRING " and")))) + ((NEQUAL |abbrev| |name|) (|bcHt| " and"))) (|bcHt| (COND ((EQL |nargs| 1) - (MAKESTRING " takes one argument:")) + " takes one argument:") ('T (CONS '| takes | (CONS (STRINGIMAGE |nargs|) (CONS '| arguments:| NIL)))))))) (|htSaturnBreak|) - (|htSayStandard| (MAKESTRING "\\indentrel{2}")) + (|htSayStandard| "\\indentrel{2}") (COND ((> |nargs| 0) (|kPageArgs| |conform| |signature|))) - (|htSayStandard| (MAKESTRING "\\indentrel{-2}")) + (|htSayStandard| "\\indentrel{-2}") (COND ((BOOT-EQUAL (ELT |name| (SPADDIFFERENCE (|#| |name|) 1)) (|char| '&)) @@ -295,23 +295,21 @@ (SPADLET |filename| (|extractFileNameFromPath| |sourceFileName|)) (COND - ((NEQUAL |filename| (MAKESTRING "")) - (|htSayStandard| (MAKESTRING "\\newline{}")) - (|htSay| (MAKESTRING - "The source code for the constructor is found in ")))) + ((NEQUAL |filename| "") + (|htSayStandard| "\\newline{}") + (|htSay| "The source code for the constructor is found in "))) (|htMakePage| (CONS (CONS '|text| - (CONS (MAKESTRING "\\unixcommand{") + (CONS "\\unixcommand{" (CONS |filename| (CONS - (MAKESTRING - "}{\\$AXIOM/lib/SPADEDIT ") + "}{\\$AXIOM/lib/SPADEDIT " (CONS |sourceFileName| - (CONS (MAKESTRING " ") + (CONS " " (CONS |name| - (CONS (MAKESTRING "}") NIL)))))))) + (CONS "}" NIL)))))))) NIL)) - (COND ((NEQUAL |nargs| 0) (|htSay| (MAKESTRING ".")))) + (COND ((NEQUAL |nargs| 0) (|htSay| "."))) (|htSaturnBreak|))))) ;kArgPage(htPage,arg) == @@ -357,7 +355,7 @@ (ELT '(|First| |Second| |Third| |Fourth| |Fifth|) |n|)))) (|htpSetProperty| |htPage| '|rank| |rank|) - (|htpSetProperty| |htPage| '|thing| (MAKESTRING "argument")) + (|htpSetProperty| |htPage| '|thing| "argument") (|dbShowCons| |htPage| '|names|))))) ;reportCategory(conform,typeForm,arg) == @@ -386,32 +384,32 @@ (PROG (|LETTMP#1| |conlist| |attrlist| |oplist| |u|) (RETURN (PROGN - (|htSay| (MAKESTRING "Argument {\\em ") |arg| (MAKESTRING "}")) + (|htSay| "Argument {\\em " |arg| "}") (SPADLET |LETTMP#1| (|categoryParts| |conform| |typeForm| 'T)) (SPADLET |conlist| (CAR |LETTMP#1|)) (SPADLET |attrlist| (CADR |LETTMP#1|)) (SPADLET |oplist| (CDDR |LETTMP#1|)) - (|htSay| (MAKESTRING " must ")) + (|htSay| " must ") (COND - (|conlist| (|htSay| (MAKESTRING "belong to ")) + (|conlist| (|htSay| "belong to ") (COND ((AND (PAIRP |conlist|) (EQ (QCDR |conlist|) NIL) (PROGN (SPADLET |u| (QCAR |conlist|)) 'T)) - (|htSay| (MAKESTRING "category ")) + (|htSay| "category ") (|bcConform| (CAR |u|)) (|bcPred| (CDR |u|))) - ('T (|htSay| (MAKESTRING "categories:")) + ('T (|htSay| "categories:") (|bcConPredTable| |conlist| (|opOf| |conform|)) - (|htSay| (MAKESTRING "\\newline ")))))) + (|htSay| "\\newline "))))) (COND - (|attrlist| (COND (|conlist| (|htSay| (MAKESTRING " and ")))) - (|reportAO| (MAKESTRING "attribute") |attrlist|) - (|htSay| (MAKESTRING "\\newline ")))) + (|attrlist| (COND (|conlist| (|htSay| " and "))) + (|reportAO| "attribute" |attrlist|) + (|htSay| "\\newline "))) (COND (|oplist| (COND ((OR |conlist| |attrlist|) - (|htSay| (MAKESTRING " and ")))) - (|reportAO| (MAKESTRING "operation") |oplist|)) + (|htSay| " and "))) + (|reportAO| "operation" |oplist|)) ('T NIL)))))) ;reportAO(kind,oplist) == @@ -435,7 +433,7 @@ (PROG (|op| |sig| |pred| |attr| |ops| |sigs|) (RETURN (SEQ (PROGN - (|htSay| (MAKESTRING "have ") |kind| (MAKESTRING ":")) + (|htSay| "have " |kind| ":") (DO ((G165885 |oplist| (CDR G165885)) (G165871 NIL)) ((OR (ATOM G165885) (PROGN (SETQ G165871 (CAR G165885)) NIL) @@ -448,20 +446,20 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\newline ") (COND ((EQL (|#| |oplist|) 1) - (|htSay| (MAKESTRING "\\centerline{")))) + (|htSay| "\\centerline{"))) (COND ((BOOT-EQUAL |kind| - (MAKESTRING "attribute")) + "attribute") (SPADLET |attr| (|form2String| (CONS |op| |sig|))) (|satDownLink| |attr| - (CONS (MAKESTRING "(|attrPage| '|") + (CONS "(|attrPage| '|" (CONS |attr| - (CONS (MAKESTRING "|)") NIL))))) + (CONS "|)" NIL))))) ('T (SPADLET |ops| (|escapeSpecialChars| @@ -470,18 +468,18 @@ (|form2HtString| (CONS '|Mapping| |sig|))) (|satDownLink| |ops| - (CONS (MAKESTRING "(|opPage| '|") + (CONS "(|opPage| '|" (CONS |ops| - (CONS (MAKESTRING "| |") + (CONS "| |" (CONS |sigs| - (CONS (MAKESTRING "|)") NIL)))))) - (|htSay| (MAKESTRING ": ")) + (CONS "|)" NIL)))))) + (|htSay| ": ") (|bcConform| (CONS '|Mapping| |sig|)))) (COND ((EQL (|#| |oplist|) 1) - (|htSay| (MAKESTRING "}"))) + (|htSay| "}")) ('T NIL)))))) - (|htSay| (MAKESTRING "\\newline "))))))) + (|htSay| "\\newline ")))))) ;mkDomTypeForm(typeForm,conform,domname) == --called by kargPage ; domname => SUBLISLIS(rest domname,rest conform,typeForm) @@ -709,12 +707,12 @@ (|errorPage| |htPage| |domname|)) ('T (SPADLET |heading| - (CONS (MAKESTRING "Description of ") + (CONS "Description of " (CONS (|capitalize| |kind|) - (CONS (MAKESTRING " {\\sf ") + (CONS " {\\sf " (CONS |name| (CONS |args| - (CONS (MAKESTRING "}") NIL))))))) + (CONS "}" NIL))))))) (SPADLET |page| (|htInitPage| |heading| (|htCopyProplist| |htPage|))) @@ -787,14 +785,14 @@ (SPADLET |conname| (|opOf| |conform|)) (SPADLET |heading| (CONS (|capitalize| |kind|) - (CONS (MAKESTRING " {\\sf ") + (CONS " {\\sf " (CONS (COND (|domname| (|form2HtString| |domname| NIL 'T)) ('T |constring|)) - (CONS (MAKESTRING "}") NIL))))) + (CONS "}" NIL))))) (SPADLET |data| (|sublisFormal| (OR (IFCDR |domname|) (CDR |conform|)) @@ -831,15 +829,15 @@ (PLUS (PLUS (|#| |conlist|) (|#| |attrlist|)) (|#| |oplist|)) - (MAKESTRING "Export") - (MAKESTRING "Exports"))) + "Export" + "Exports")) (SPADLET |page| (|htInitPage| (APPEND |prefix| - (CONS (MAKESTRING " of ") + (CONS " of " |heading|)) (|htCopyProplist| |htPage|))) - (|htSayStandard| (MAKESTRING "\\beginmenu ")) + (|htSayStandard| "\\beginmenu ") (|htpSetProperty| |page| '|data| |data|) (COND (|conlist| @@ -847,27 +845,26 @@ (CONS (CONS '|bcLinks| (CONS (CONS (|menuButton|) - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbShowCons1| (CONS |conlist| (CONS '|names| NIL))))) NIL)) NIL)) - (|htSayStandard| (MAKESTRING "\\tab{2}")) - (|htSay| (MAKESTRING - "All attributes and operations from:")) + (|htSayStandard| "\\tab{2}") + (|htSay| "All attributes and operations from:") (|bcConPredTable| |conlist| (|opOf| |conform|) (CDR |conform|)))) (COND (|attrlist| (COND (|conlist| (|htBigSkip|))) - (|kePageDisplay| |page| (MAKESTRING "attribute") + (|kePageDisplay| |page| "attribute" (|kePageOpAlist| |attrlist|)))) (COND (|oplist| (COND ((OR |conlist| |attrlist|) (|htBigSkip|))) - (|kePageDisplay| |page| (MAKESTRING "operation") + (|kePageDisplay| |page| "operation" (|kePageOpAlist| |oplist|)))) - (|htSayStandard| (MAKESTRING " \\endmenu ")) + (|htSayStandard| " \\endmenu ") (|htShowPage|)))))))) ;kePageOpAlist oplist == @@ -953,44 +950,44 @@ ((EQL |count| 0) NIL) ('T (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpSetProperty| |htPage| '|opAlist| |opAlist|)) ('T (|htpSetProperty| |htPage| '|attrAlist| |opAlist|))) (SPADLET |expandProperty| (COND ((BOOT-EQUAL |which| - (MAKESTRING "operation")) + "operation") '|expandOperations|) ('T '|expandAttributes|))) (|htpSetProperty| |htPage| |expandProperty| '|lists|) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS (|menuButton|) - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|names| NIL))))) NIL)) NIL)) - (|htSayStandard| (MAKESTRING "\\tab{2}")) + (|htSayStandard| "\\tab{2}") (COND ((NEQUAL |count| |total|) (COND ((EQL |count| 1) - (|htSay| (MAKESTRING "1 name for "))) + (|htSay| "1 name for ")) ('T (|htSay| (STRINGIMAGE |count|) - (MAKESTRING " names for ")))))) + " names for "))))) (COND ((> |total| 1) - (|htSay| (STRINGIMAGE |total|) (MAKESTRING " ") + (|htSay| (STRINGIMAGE |total|) " " (|pluralize| |which|) - (MAKESTRING " are explicitly exported:"))) + " are explicitly exported:")) ('T - (|htSay| (MAKESTRING "1 ") |which| - (MAKESTRING " is explicitly exported:")))) - (|htSaySaturn| (MAKESTRING "\\\\")) + (|htSay| "1 " |which| + " is explicitly exported:"))) + (|htSaySaturn| "\\\\") (SPADLET |data| (|dbGatherData| |htPage| |opAlist| |which| '|names|)) @@ -1044,29 +1041,28 @@ ((NULL |domname|) (|htpProperty| |htPage| '|heading|)) ('T - (CONS (MAKESTRING "{\\sf ") + (CONS "{\\sf " (CONS (|form2HtString| |domname| NIL 'T) - (CONS (MAKESTRING "}") NIL)))))) + (CONS "}" NIL)))))) (COND (|domname| (|htpSetProperty| |htPage| '|domname| |domname|) (|htpSetProperty| |htPage| '|heading| |heading|))) (SPADLET |domain| (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) NIL) + ((BOOT-EQUAL |kind| "category") NIL) ('T (EVAL |domname|)))) (SPADLET |conform| (|htpProperty| |htPage| '|conform|)) (SPADLET |page| (|htInitPageNoScroll| (|htCopyProplist| |htPage|) - (CONS (MAKESTRING "Search order for ") + (CONS "Search order for " |heading|))) - (|htSay| (MAKESTRING - "When an operation is not defined by the domain, the following domains are searched in order for a \"default definition")) - (|htSayStandard| (MAKESTRING "\\beginscroll ")) + (|htSay| "When an operation is not defined by the domain, the following domains are searched in order for a \"default definition") + (|htSayStandard| "\\beginscroll ") (SPADLET |u| (|dbSearchOrder| |conform| |domname| |domain|)) (|htpSetProperty| |htPage| '|cAlist| |u|) (|htpSetProperty| |htPage| '|thing| - (MAKESTRING "constructor")) + "constructor") (|dbShowCons| |htPage| '|names|))))))) ;dbSearchOrder(conform,domname,$domain) == --domain = nil or set to live domain @@ -1282,12 +1278,12 @@ ((NULL |domname|) (|htpProperty| |htPage| '|heading|)) ('T - (CONS (MAKESTRING "{\\sf ") + (CONS "{\\sf " (CONS (|form2HtString| |domname| NIL 'T) - (CONS (MAKESTRING "}") NIL)))))) + (CONS "}" NIL)))))) (SPADLET |page| (|htInitPage| - (CONS (MAKESTRING "Cross Reference for ") + (CONS "Cross Reference for " |heading|) (|htCopyProplist| |htPage|))) (COND @@ -1295,39 +1291,35 @@ (|htpSetProperty| |htPage| '|domname| |domname|) (|htpSetProperty| |htPage| '|heading| |heading|))) (COND - ((AND (BOOT-EQUAL |kind| (MAKESTRING "category")) + ((AND (BOOT-EQUAL |kind| "category") (|dbpHasDefaultCategory?| |xpart|)) - (|htSay| (MAKESTRING - "This category has default package ")) - (|bcCon| (STRCONC |name| (|char| '&)) (MAKESTRING "")))) - (|htSayStandard| (MAKESTRING "\\newline")) (|htBeginMenu| 3) - (|htSayStandard| (MAKESTRING "\\item ")) + (|htSay| "This category has default package ") + (|bcCon| (STRCONC |name| (|char| '&)) ""))) + (|htSayStandard| "\\newline") (|htBeginMenu| 3) + (|htSayStandard| "\\item ") (SPADLET |message| (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) - (CONS (MAKESTRING - "Categories it directly extends") + ((BOOT-EQUAL |kind| "category") + (CONS "Categories it directly extends" NIL)) ('T - (CONS (MAKESTRING "Categories the ") + (CONS "Categories the " (CONS (COND ((BOOT-EQUAL |kind| - (MAKESTRING "default package")) - (MAKESTRING "package")) + "default package") + "package") ('T |kind|)) (CONS - (MAKESTRING - " belongs to by assertion") + " belongs to by assertion" NIL)))))) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING - "\\menuitemstyle{Parents}") + (CONS (CONS "\\menuitemstyle{Parents}" (CONS (CONS (CONS '|text| (CONS - (MAKESTRING "\\tab{12}") + "\\tab{12}" |message|)) NIL) (CONS '|kcpPage| @@ -1337,24 +1329,22 @@ (|satBreak|) (SPADLET |message| (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) - (CONS (MAKESTRING - "All categories it is an extension of") + ((BOOT-EQUAL |kind| "category") + (CONS "All categories it is an extension of" NIL)) ('T - (CONS (MAKESTRING "All categories the ") + (CONS "All categories the " (CONS |kind| - (CONS (MAKESTRING " belongs to") + (CONS " belongs to" NIL)))))) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING - "\\menuitemstyle{Ancestors}") + (CONS (CONS "\\menuitemstyle{Ancestors}" (CONS (CONS (CONS '|text| (CONS - (MAKESTRING "\\tab{12}") + "\\tab{12}" |message|)) NIL) (CONS '|kcaPage| @@ -1362,19 +1352,17 @@ NIL)) NIL)) (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) (|satBreak|) + ((BOOT-EQUAL |kind| "category") (|satBreak|) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\menuitemstyle{Children}") + "\\menuitemstyle{Children}" (CONS (CONS (CONS '|text| - (CONS (MAKESTRING "\\tab{12}") + (CONS "\\tab{12}" (CONS - (MAKESTRING - "Categories which directly extend this category") + "Categories which directly extend this category" NIL))) NIL) (CONS '|kccPage| (CONS NIL NIL)))) @@ -1384,15 +1372,13 @@ (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\menuitemstyle{Descendants}") + "\\menuitemstyle{Descendants}" (CONS (CONS (CONS '|text| - (CONS (MAKESTRING "\\tab{12}") + (CONS "\\tab{12}" (CONS - (MAKESTRING - "All categories which extend this category") + "All categories which extend this category" NIL))) NIL) (CONS '|kcdPage| (CONS NIL NIL)))) @@ -1401,17 +1387,15 @@ (COND ((NULL (|asharpConstructorName?| |conname|)) (|satBreak|) (SPADLET |message| - (MAKESTRING - "Constructors mentioning this as an argument type")) + "Constructors mentioning this as an argument type") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\menuitemstyle{Dependents}") + "\\menuitemstyle{Dependents}" (CONS (CONS (CONS '|text| - (CONS (MAKESTRING "\\tab{12}") + (CONS "\\tab{12}" (CONS |message| NIL))) NIL) (CONS '|kcdePage| (CONS NIL NIL)))) @@ -1419,37 +1403,33 @@ NIL)))) (COND ((AND (NULL (|asharpConstructorName?| |conname|)) - (NEQUAL |kind| (MAKESTRING "category"))) + (NEQUAL |kind| "category")) (|satBreak|) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\menuitemstyle{Lineage}") + "\\menuitemstyle{Lineage}" (CONS - (MAKESTRING - "\\tab{12}Constructor hierarchy used for operation lookup") + "\\tab{12}Constructor hierarchy used for operation lookup" (CONS '|ksPage| (CONS NIL NIL)))) NIL)) NIL)))) (COND ((NULL (|asharpConstructorName?| |conname|)) (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) + ((BOOT-EQUAL |kind| "category") (|satBreak|) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\menuitemstyle{Domains}") + "\\menuitemstyle{Domains}" (CONS (CONS (CONS '|text| (CONS - (MAKESTRING "\\tab{12}") + "\\tab{12}" (CONS - (MAKESTRING - "All domains which are of this category") + "All domains which are of this category" NIL))) NIL) (CONS '|kcdoPage| @@ -1457,50 +1437,44 @@ NIL)) NIL)))) (COND - ((NEQUAL |kind| (MAKESTRING "category")) (|satBreak|) + ((NEQUAL |kind| "category") (|satBreak|) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\menuitemstyle{Clients}") + "\\menuitemstyle{Clients}" (CONS - (MAKESTRING - "\\tab{12}Constructors") + "\\tab{12}Constructors" (CONS '|kcuPage| (CONS NIL NIL)))) NIL)) NIL)) (COND ((HGET |$defaultPackageNamesHT| |conname|) - (|htSay| (MAKESTRING - " which {\\em may use} this default package"))) + (|htSay| " which {\\em may use} this default package")) ('T - (|htSay| (MAKESTRING " which {\\em use} this ") + (|htSay| " which {\\em use} this " |kind|)))) ('T NIL)))) (COND - ((OR (NEQUAL |kind| (MAKESTRING "category")) + ((OR (NEQUAL |kind| "category") (|dbpHasDefaultCategory?| |xpart|)) (|satBreak|) (SPADLET |message| (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) - (CONS (MAKESTRING - "Constructors {\\em used by} its default package") + ((BOOT-EQUAL |kind| "category") + (CONS "Constructors {\\em used by} its default package" NIL)) ('T - (CONS (MAKESTRING - "Constructors {\\em used by} the ") + (CONS "Constructors {\\em used by} the " (CONS |kind| NIL))))) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\menuitemstyle{Benefactors}") + "\\menuitemstyle{Benefactors}" (CONS (CONS (CONS '|text| - (CONS (MAKESTRING "\\tab{12}") + (CONS "\\tab{12}" |message|)) NIL) (CONS '|kcnPage| (CONS NIL NIL)))) @@ -1511,18 +1485,16 @@ (|hasNewInfoAlist| |conname|)) (|satBreak|) (SPADLET |message| - (CONS (MAKESTRING - "Cross reference for capsule implementation") + (CONS "Cross reference for capsule implementation" NIL)) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\menuitemstyle{CapsuleInfo}") + "\\menuitemstyle{CapsuleInfo}" (CONS (CONS (CONS '|text| - (CONS (MAKESTRING "\\tab{12}") + (CONS "\\tab{12}" |message|)) NIL) (CONS '|kciPage| (CONS NIL NIL)))) @@ -1579,9 +1551,9 @@ ((NULL |domname|) (|htpProperty| |htPage| '|heading|)) ('T - (CONS (MAKESTRING "{\\sf ") + (CONS "{\\sf " (CONS (|form2HtString| |domname| NIL 'T) - (CONS (MAKESTRING "}") NIL)))))) + (CONS "}" NIL)))))) (COND (|domname| (|htpSetProperty| |htPage| '|domname| |domname|) @@ -1590,7 +1562,7 @@ (SPADLET |conname| (|opOf| |conform|)) (SPADLET |page| (|htInitPage| - (CONS (MAKESTRING "Parents of ") |heading|) + (CONS "Parents of " |heading|) (|htCopyProplist| |htPage|))) (SPADLET |parents| (|parentsOf| |conname|)) (COND @@ -1598,7 +1570,7 @@ (SUBLISLIS (CDR |domname|) (CDR |conform|) |parents|)))) (|htpSetProperty| |htPage| '|cAlist| |parents|) - (|htpSetProperty| |htPage| '|thing| (MAKESTRING "parent")) + (|htpSetProperty| |htPage| '|thing| "parent") (SPADLET |choice| (COND (|domname| '|parameters|) ('T '|names|))) (|dbShowCons| |htPage| |choice|))))))) @@ -1643,24 +1615,24 @@ (DEFUN |kcaPage| (|htPage| |junk|) (declare (ignore |junk|)) - (|kcaPage1| |htPage| (MAKESTRING "category") (MAKESTRING " an ") - (MAKESTRING "ancestor") (|function| |ancestorsOf|) NIL)) + (|kcaPage1| |htPage| "category" " an " + "ancestor" (|function| |ancestorsOf|) NIL)) ;kcdPage(htPage,junk) == ; kcaPage1(htPage,'"category",'" a ",'"descendant",function descendantsOf,true) (DEFUN |kcdPage| (|htPage| |junk|) (declare (ignore |junk|)) - (|kcaPage1| |htPage| (MAKESTRING "category") (MAKESTRING " a ") - (MAKESTRING "descendant") (|function| |descendantsOf|) 'T)) + (|kcaPage1| |htPage| "category" " a " + "descendant" (|function| |descendantsOf|) 'T)) ;kcdoPage(htPage,junk)== ; kcaPage1(htPage,'"domain",'" a ",'"descendant",function domainsOf, false) (DEFUN |kcdoPage| (|htPage| |junk|) (declare (ignore |junk|)) - (|kcaPage1| |htPage| (MAKESTRING "domain") (MAKESTRING " a ") - (MAKESTRING "descendant") (|function| |domainsOf|) NIL)) + (|kcaPage1| |htPage| "domain" " a " + "descendant" (|function| |domainsOf|) NIL)) ;kcaPage1(htPage,kind,article,whichever,fn, isCatDescendants?) == ; [kind,name,nargs,xpart,sig,args,abbrev,comments] := htpProperty(htPage,'parts) @@ -1714,9 +1686,9 @@ ((NULL |domname|) (|htpProperty| |htPage| '|heading|)) ('T - (CONS (MAKESTRING "{\\sf ") + (CONS "{\\sf " (CONS (|form2HtString| |domname| NIL 'T) - (CONS (MAKESTRING "}") NIL)))))) + (CONS "}" NIL)))))) (COND ((AND |domname| (NULL |isCatDescendants?|)) (|htpSetProperty| |htPage| '|domname| |domname|) @@ -1725,7 +1697,7 @@ (SPADLET |conname| (|opOf| |conform|)) (SPADLET |ancestors| (FUNCALL |fn| |conform| |domname|)) (COND - ((NEQUAL |whichever| (MAKESTRING "ancestor")) + ((NEQUAL |whichever| "ancestor") (SPADLET |ancestors| (|augmentHasArgs| |ancestors| |conform|)))) (SPADLET |ancestors| @@ -1781,9 +1753,9 @@ ((NULL |domname|) (|htpProperty| |htPage| '|heading|)) ('T - (CONS (MAKESTRING "{\\sf ") + (CONS "{\\sf " (CONS (|form2HtString| |domname| NIL 'T) - (CONS (MAKESTRING "}") NIL)))))) + (CONS "}" NIL)))))) (COND (|domname| (|htpSetProperty| |htPage| '|domname| |domname|) @@ -1792,7 +1764,7 @@ (SPADLET |conname| (|opOf| |conform|)) (SPADLET |page| (|htInitPage| - (CONS (MAKESTRING "Children of ") |heading|) + (CONS "Children of " |heading|) (|htCopyProplist| |htPage|))) (SPADLET |children| (|augmentHasArgs| (|childrenOf| |conform|) @@ -1803,7 +1775,7 @@ (|reduceAlistForDomain| |children| |domname| |conform|)))) (|htpSetProperty| |htPage| '|cAlist| |children|) - (|htpSetProperty| |htPage| '|thing| (MAKESTRING "child")) + (|htpSetProperty| |htPage| '|thing| "child") (|dbShowCons| |htPage| '|names|))))))) ;augmentHasArgs(alist,conform) == @@ -1895,7 +1867,7 @@ (SPADLET |constring| (STRCONC |name| |args|)) (SPADLET |conform| (COND - ((NEQUAL |kind| (MAKESTRING "default package")) + ((NEQUAL |kind| "default package") (|ncParseFromString| |constring|)) ('T (CONS (INTERN |name|) @@ -1923,7 +1895,7 @@ G166636)))))))) (|htpSetProperty| |htPage| '|cAlist| |cAlist|) (|htpSetProperty| |htPage| '|thing| - (MAKESTRING "dependent")) + "dependent") (|dbShowCons| |htPage| '|names|)))))) ;kcuPage(htPage,junk) == @@ -1962,7 +1934,7 @@ (SPADLET |constring| (STRCONC |name| |args|)) (SPADLET |conform| (COND - ((NEQUAL |kind| (MAKESTRING "default package")) + ((NEQUAL |kind| "default package") (|ncParseFromString| |constring|)) ('T (CONS (INTERN |name|) @@ -1970,7 +1942,7 @@ (STRCONC (|char| '|d|) |args|))))))) (SPADLET |pakname| (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) + ((BOOT-EQUAL |kind| "category") (INTERN (STRCONC |name| (|char| '&)))) ('T (|opOf| |conform|)))) (SPADLET |domList| (|getUsersOfConstructor| |pakname|)) @@ -1992,7 +1964,7 @@ 'T) G166692)))))))) (|htpSetProperty| |htPage| '|cAlist| |cAlist|) - (|htpSetProperty| |htPage| '|thing| (MAKESTRING "user")) + (|htpSetProperty| |htPage| '|thing| "user") (|dbShowCons| |htPage| '|names|)))))) ;kcnPage(htPage,junk) == @@ -2045,10 +2017,10 @@ ((NULL |domname|) (|htpProperty| |htPage| '|heading|)) ('T - (CONS (MAKESTRING "{\\sf ") + (CONS "{\\sf " (CONS (|form2HtString| |domname| NIL 'T) - (CONS (MAKESTRING "}") NIL)))))) + (CONS "}" NIL)))))) (COND (|domname| (|htpSetProperty| |htPage| '|domname| |domname|) @@ -2056,7 +2028,7 @@ (SPADLET |conform| (|htpProperty| |htPage| '|conform|)) (SPADLET |pakname| (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) + ((BOOT-EQUAL |kind| "category") (INTERN (STRCONC (PNAME |conname|) (|char| '&)))) ('T (|opOf| |conform|)))) @@ -2083,7 +2055,7 @@ (CONS (CONS |x| 'T) G166749)))))))) (|htpSetProperty| |htPage| '|cAlist| |cAlist|) (|htpSetProperty| |htPage| '|thing| - (MAKESTRING "benefactor")) + "benefactor") (|dbShowCons| |htPage| '|names|)))))))) ;koPageInputAreaUnchanged?(htPage, nargs) == @@ -2103,7 +2075,7 @@ (CONS (|htpLabelInputString| |htPage| (INTERN - (STRCONC (MAKESTRING "*") + (STRCONC "*" (STRINGIMAGE |i|)))) G166784))))))) (|htpProperty| |htPage| '|inputAreaList|)))))) @@ -2219,26 +2191,23 @@ 0) (CONS '|error| (CONS NIL - (CONS (MAKESTRING - "\\centerline{You gave values for only {\\em ") + (CONS "\\centerline{You gave values for only {\\em " (CONS |n| (CONS - (MAKESTRING " } of the {\\em ") + " } of the {\\em " (CONS (|#| |args|) - (CONS (MAKESTRING "}}") + (CONS "}}" (CONS - (MAKESTRING - "\\centerline{parameters of {\\sf ") + "\\centerline{parameters of {\\sf " (CONS |name| (CONS - (MAKESTRING - "}}\\vspace{1}\\centerline{Please enter either {\\em all} or {\\em none} of the type parameters}") + "}}\\vspace{1}\\centerline{Please enter either {\\em all} or {\\em none} of the type parameters}" NIL))))))))))) ('T NIL))) ('T (SPADLET |argString| (COND - ((NULL |args|) (MAKESTRING "()")) + ((NULL |args|) "()") ('T (SPADLET |argTailPart| (PROG (G166866) @@ -2264,7 +2233,7 @@ (DO ((G166882 (CONS - (MAKESTRING ",") + "," |x|) (CDR G166882)) (G166796 NIL)) @@ -2286,10 +2255,10 @@ (SPADLET G166888 "") (RETURN (DO ((G166893 - (CONS (MAKESTRING "(") + (CONS "(" (APPEND (CAR |args|) (CONS |argTailPart| - (CONS (MAKESTRING ")") NIL)))) + (CONS ")" NIL)))) (CDR G166893)) (G166797 NIL)) ((OR (ATOM G166893) @@ -2329,7 +2298,7 @@ (PROG (|form|) (RETURN (COND - ((BOOT-EQUAL |s| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |s| "") NIL) ((AND |domain?| (SPADLET |form| (|conSpecialString?| |s|))) (COND ((NULL (KDR |form|)) @@ -2475,14 +2444,14 @@ (PROG (|form| |parse|) (RETURN (COND - ((NEQUAL |kind| (MAKESTRING "default package")) + ((NEQUAL |kind| "default package") (SPADLET |form| (STRCONC |name| |argString|)) (SPADLET |parse| (|parseNoMacroFromString| |form|)) (COND ((NULL |parse|) - (|sayBrightlyNT| (MAKESTRING "Won't parse: ")) + (|sayBrightlyNT| "Won't parse: ") (|pp| |form|) - (|systemError| (MAKESTRING "Keywords in argument list?"))) + (|systemError| "Keywords in argument list?")) ((ATOM |parse|) (CONS |parse| NIL)) ('T |parse|))) ('T @@ -2508,7 +2477,7 @@ (PROGN (SPADLET |updown| (|dbCompositeWithMap| |htPage|)) (COND - ((BOOT-EQUAL |updown| (MAKESTRING "DOWN")) + ((BOOT-EQUAL |updown| "DOWN") (SPADLET |domname| (|htpProperty| |htPage| '|domname|)) (|conOpPage1| (|dbExtractUnderlyingDomain| |domname|) (CONS (CONS '|updomain| |domname|) NIL))) @@ -2528,7 +2497,7 @@ (PROG (|domain| |opAlist|) (RETURN (COND - ((|htpProperty| |htPage| '|updomain|) (MAKESTRING "UP")) + ((|htpProperty| |htPage| '|updomain|) "UP") ('T (SPADLET |domain| (|htpProperty| |htPage| '|domname|)) (COND ((NULL |domain|) NIL) @@ -2536,7 +2505,7 @@ (COND ((|dbExtractUnderlyingDomain| (|htpProperty| |htPage| '|domname|)) - (MAKESTRING "DOWN")) + "DOWN") ('T NIL))))))))) ;dbExtractUnderlyingDomain domain == or/[x for x in KDR domain | isValidType x] @@ -2625,7 +2594,7 @@ (SPADLET |abbrev| (CADDR (CDDDDR |parts|))) (SPADLET |comments| (CADDDR (CDDDDR |parts|))) (SPADLET |isFile| (NULL |kind|)) - (SPADLET |kind| (OR |kind| (MAKESTRING "package"))) + (SPADLET |kind| (OR |kind| "package")) (RPLACA |parts| |kind|) (SPADLET |constring| (STRCONC |name| |args|)) (SPADLET |conform| (|mkConform| |kind| |name| |args|)) @@ -2634,16 +2603,16 @@ (SPADLET |sourceFileName| (|dbSourceFile| (INTERN |name|))) (SPADLET |emString| - (CONS (MAKESTRING "{\\sf ") + (CONS "{\\sf " (CONS |constring| - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) (SPADLET |heading| (CONS |capitalKind| - (CONS (MAKESTRING " ") |emString|))) + (CONS " " |emString|))) (COND ((NULL (|isExposedConstructor| |conname|)) (SPADLET |heading| - (CONS (MAKESTRING "Unexposed ") |heading|)))) + (CONS "Unexposed " |heading|)))) (SPADLET |page| (|htInitPage| |heading| NIL)) (|htpSetProperty| |page| '|isFile| 'T) (|htpSetProperty| |page| '|fromConOpPage1| 'T) @@ -2671,7 +2640,7 @@ NIL)) NIL) (SEQ (EXIT (|htpSetProperty| |page| |a| |b|)))) - (|koPage| |page| (MAKESTRING "operation"))))))))) + (|koPage| |page| "operation")))))))) ;--======================================================================= ;-- Operation Page from Main Page @@ -2739,9 +2708,9 @@ ('T |constring|))) (SPADLET |heading| (CONS (|capitalize| |kind|) - (CONS (MAKESTRING " {\\sf ") + (CONS " {\\sf " (CONS |headingString| - (CONS (MAKESTRING "}") NIL))))) + (CONS "}" NIL))))) (|htpSetProperty| |htPage| '|which| |which|) (|htpSetProperty| |htPage| '|heading| |heading|) (|koPageAux| |htPage| |which| |domname| |heading|))))))) @@ -2776,10 +2745,10 @@ (SPADLET |heading| (|htpProperty| |htPage| '|heading|)) (SPADLET |opAlist| (COND - ((BOOT-EQUAL |which| (MAKESTRING "attribute")) + ((BOOT-EQUAL |which| "attribute") (|koAttrs| |conform| |domname|)) ((BOOT-EQUAL |which| - (MAKESTRING "general operation")) + "general operation") (|koOps| |conform| |domname| 'T)) ('T (|koOps| |conform| |domname|)))) (COND @@ -2818,7 +2787,7 @@ (RETURN (SEQ (COND ((BOOT-EQUAL (|htpLabelInputString| |htPage| '|filter|) - (MAKESTRING "")) + "") (|koaPageFilterByCategory| |htPage| |functionToCall|)) ('T (SPADLET |filter| @@ -3091,7 +3060,7 @@ (SPADLET |sig| (CAR G167382)) (SPADLET |doc| (CDR G167382)) G167382 - (SEQ (IF (BOOT-EQUAL |$which| (MAKESTRING "attribute")) + (SEQ (IF (BOOT-EQUAL |$which| "attribute") (EXIT (AND (AND (PAIRP |sig|) (EQ (QCAR |sig|) '|attribute|) (EQUAL (QCDR |sig|) |$sig|)) @@ -3350,7 +3319,7 @@ (CONS |x| G167520)))))))))) (COND ((NULL |u|) - (|emptySearchPage| (MAKESTRING "constructor") + (|emptySearchPage| "constructor" |filter|)) ('T (SPADLET |htPage| @@ -3516,7 +3485,7 @@ ((SPADLET |u| (|htpProperty| |page| '|specialMessage|)) (APPLY (CAR |u|) (CDR |u|)))) - (|htSayStandard| (MAKESTRING "\\beginscroll ")) + (|htSayStandard| "\\beginscroll ") (|htpSetProperty| |page| '|cAlist| |cAlist|) (SPADLET |$conformsAreDomains| (|htpProperty| |page| '|domname|)) @@ -3615,8 +3584,7 @@ (declare (special |$atLeastOneUnexposed|)) (SEQ (COND (|$atLeastOneUnexposed| - (EXIT (|htSay| (MAKESTRING - "\\newline{}-------------\\newline{}{\\em *} = unexposed"))))))) + (EXIT (|htSay| "\\newline{}-------------\\newline{}{\\em *} = unexposed")))))) ;-- DUPLICATE DEF - ALSO in br-saturn.boot ;-- dbShowConsKinds cAlist == @@ -3743,7 +3711,7 @@ (SPADLET |sig| '((CATEGORY |domain|) (|SetCategory|) (|SetCategory|))) - (|displayDomainOp| |htPage| (MAKESTRING "constructor") + (|displayDomainOp| |htPage| "constructor" |conform| |conname| |sig| 'T |doc| |indexOrNil| '|dbSelectCon| NIL NIL)) ('T (SPADLET |exposeFlag| (|isExposedConstructor| |conname|)) @@ -3759,11 +3727,11 @@ (SUBLISLIS |conargs| |$TriangleVariableList| |signature|)) ('T (|sublisFormal| |conargs| |signature|)))) - (|htSaySaturn| (MAKESTRING "\\begin{description}")) - (|displayDomainOp| |htPage| (MAKESTRING "constructor") + (|htSaySaturn| "\\begin{description}") + (|displayDomainOp| |htPage| "constructor" |conform| |conname| |sig| 'T |doc| |indexOrNil| '|dbSelectCon| (NULL |exposeFlag|) NIL) - (|htSaySaturn| (MAKESTRING "\\end{description}")))))))) + (|htSaySaturn| "\\end{description}"))))))) ; --NOTE that we pass conform is as "origin" ;getConstructorDocumentation conname == @@ -3789,7 +3757,7 @@ (SPADLET |line| (QCAR |ISTMP#3|)) 'T))))))) |line|) - (MAKESTRING ""))))) + "")))) ;dbSelectCon(htPage,which,index) == ; conPage opOf first htpProperty(htPage,'cAlist) . index @@ -3828,18 +3796,18 @@ (SPADLET |consNoPred| (CAR |LETTMP#1|)) (SPADLET |consPred| (CDR |LETTMP#1|)) (SPADLET |singular| - (CONS |kind| (CONS (MAKESTRING " is") NIL))) + (CONS |kind| (CONS " is" NIL))) (SPADLET |plural| (CONS (|pluralize| (STRINGIMAGE |kind|)) - (CONS (MAKESTRING " are") NIL))) + (CONS " are" NIL))) (|dbSayItems| (|#| |consNoPred|) |singular| |plural| - (MAKESTRING " unconditional")) - (|htSaySaturn| (MAKESTRING "\\\\")) + " unconditional") + (|htSaySaturn| "\\\\") (|bcConPredTable| |consNoPred| |conname|) (|htSayHrule|) (|dbSayItems| (|#| |consPred|) |singular| |plural| - (MAKESTRING " conditional")) - (|htSaySaturn| (MAKESTRING "\\\\")) + " conditional") + (|htSaySaturn| "\\\\") (|bcConPredTable| |consPred| |conname|))))) ;dbConsHeading(htPage,conlist,view,kind) == @@ -3885,7 +3853,7 @@ (PROGN (SPADLET |thing| (OR (AND |htPage| (|htpProperty| |htPage| '|thing|)) - (MAKESTRING "constructor"))) + "constructor")) (SPADLET |place| (COND (|htPage| @@ -3894,25 +3862,25 @@ ('T NIL))) (SPADLET |count| (|#| (REMDUP |conlist|))) (COND - ((BOOT-EQUAL |thing| (MAKESTRING "benefactor")) + ((BOOT-EQUAL |thing| "benefactor") (CONS (STRINGIMAGE |count|) - (CONS (MAKESTRING " Constructors Used by ") + (CONS " Constructors Used by " (CONS (|form2HtString| |place| NIL 'T) NIL)))) ('T (SPADLET |modifier| (COND - ((BOOT-EQUAL |thing| (MAKESTRING "argument")) + ((BOOT-EQUAL |thing| "argument") (SPADLET |rank| (AND |htPage| (|htpProperty| |htPage| '|rank|))) - (CONS (MAKESTRING " Possible ") - (CONS |rank| (CONS (MAKESTRING " ") NIL)))) + (CONS " Possible " + (CONS |rank| (CONS " " NIL)))) ((BOOT-EQUAL |kind| '|constructor|) - (CONS (MAKESTRING " ") NIL)) + (CONS " " NIL)) ('T - (CONS (MAKESTRING " ") + (CONS " " (CONS (|capitalize| (STRINGIMAGE |kind|)) - (CONS (MAKESTRING " ") NIL)))))) + (CONS " " NIL)))))) (SPADLET |exposureWord| (COND (|$exposedOnlyIfTrue| '(" Exposed ")) @@ -3926,7 +3894,7 @@ ('T (SPADLET |firstWord| (COND - ((EQL |count| 0) (MAKESTRING "No ")) + ((EQL |count| 0) "No ") ('T (STRINGIMAGE |count|)))) (CONS |firstWord| (APPEND |exposureWord| @@ -3937,7 +3905,7 @@ NIL))))))) (SPADLET |placepart| (COND - (|place| (CONS (MAKESTRING " of {\\em ") + (|place| (CONS " of {\\em " (CONS (|form2HtString| |place| NIL 'T) (CONS '} NIL)))) @@ -3946,19 +3914,19 @@ (SPADLET |connective| (COND ((|member| |view| '(|abbrs| |files| |kinds|)) - (MAKESTRING " as ")) - ('T (MAKESTRING " with ")))) + " as ") + ('T " with "))) (COND ((AND (NEQUAL |count| 0) (|member| |view| '(|abbrs| |files| |parameters| |conditions|))) (SPADLET |heading| (APPEND |heading| - (CONS (MAKESTRING " viewed") + (CONS " viewed" (CONS |connective| - (CONS (MAKESTRING "{\\em ") + (CONS "{\\em " (CONS (STRINGIMAGE |view|) - (CONS (MAKESTRING "}") NIL))))))))) + (CONS "}" NIL))))))))) |heading|)))))) ;dbShowConstructorLines lines == @@ -4010,7 +3978,7 @@ (PROG (|firstTime| |ft| |filename|) (RETURN (SEQ (PROGN - (|htSay| (MAKESTRING "\\newline")) + (|htSay| "\\newline") (|htBeginTable|) (SPADLET |firstTime| 'T) (DO ((G167861 |u| (CDR G167861)) (|x| NIL)) @@ -4020,8 +3988,8 @@ (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) - (|htSay| (MAKESTRING "{")) + ('T (|htSaySaturn| "&"))) + (|htSay| "{") (SPADLET |ft| (COND ((|isAsharpFileName?| |x|) @@ -4034,15 +4002,14 @@ (|htMakePage| (CONS (CONS '|text| (CONS - (MAKESTRING "\\unixcommand{") + "\\unixcommand{" (CONS (PATHNAME-NAME |x|) (CONS - (MAKESTRING - "}{$AXIOM/lib/SPADEDIT ") + "}{$AXIOM/lib/SPADEDIT " (CONS |filename| - (CONS (MAKESTRING "} ") NIL)))))) + (CONS "} " NIL)))))) NIL)) - (|htSay| (MAKESTRING "}")))))) + (|htSay| "}"))))) (|htEndTable|)))))) ;isAsharpFileName? con == false @@ -4070,9 +4037,9 @@ (PROGN (SPADLET |conform| (|getConstructorForm| |conname|)) (SPADLET |heading| - (CONS (MAKESTRING "Description of Domain {\\sf ") + (CONS "Description of Domain {\\sf " (CONS (|form2HtString| |conform|) - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) (SPADLET |page| (|htInitPage| |heading| NIL)) (|htpSetProperty| |page| '|conname| |conname|) (SPADLET |$conformsAreDomains| NIL) @@ -4101,15 +4068,15 @@ (|dbSpecialExpandIfNecessary| |conform| (CDR (GETL |conname| '|documentation|)))) (SPADLET |fromHeading| - (CONS (MAKESTRING " from domain {\\sf ") + (CONS " from domain {\\sf " (CONS (|form2HtString| |conform|) - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) (|htpSetProperty| |page| '|fromHeading| |fromHeading|) (|htpSetProperty| |page| '|conform| |conform|) (|htpSetProperty| |page| '|opAlist| |opAlist|) (|htpSetProperty| |page| '|noUsage| 'T) (|htpSetProperty| |page| '|condition?| '|no|) - (|dbShowOp1| |page| |opAlist| (MAKESTRING "operation") + (|dbShowOp1| |page| |opAlist| "operation" '|names|))))) ;dbSpecialExports(conname) == @@ -4126,14 +4093,14 @@ (SPADLET |conform| (|getConstructorForm| |conname|)) (SPADLET |page| (|htInitPage| - (CONS (MAKESTRING "Exports of {\\sf ") + (CONS "Exports of {\\sf " (CONS (|form2HtString| |conform|) - (CONS (MAKESTRING "}") NIL))) + (CONS "}" NIL))) NIL)) (SPADLET |opAlist| (|dbSpecialExpandIfNecessary| |conform| (CDR (GETL |conname| '|documentation|)))) - (|kePageDisplay| |page| (MAKESTRING "operation") |opAlist|) + (|kePageDisplay| |page| "operation" |opAlist|) (|htShowPage|))))) ;dbSpecialExpandIfNecessary(conform,opAlist) == @@ -4198,20 +4165,17 @@ ;X := '"{\sf Record(a:A,b:B)} is used to create the class of pairs of objects made up of a value of type {\em A} selected by the symbol {\em a} and a value of type {\em B} selected by the symbol {\em b}. " (SPADLET X - (MAKESTRING - "{\\sf Record(a:A,b:B)} is used to create the class of pairs of objects made up of a value of type {\\em A} selected by the symbol {\\em a} and a value of type {\\em B} selected by the symbol {\\em b}. ")) + "{\\sf Record(a:A,b:B)} is used to create the class of pairs of objects made up of a value of type {\\em A} selected by the symbol {\\em a} and a value of type {\\em B} selected by the symbol {\\em b}. ") ;Y := '"In general, the {\sf Record} constructor can take any number of arguments and thus can be used to create aggregates of heterogeneous components of arbitrary size selectable by name. " (SPADLET Y - (MAKESTRING - "In general, the {\\sf Record} constructor can take any number of arguments and thus can be used to create aggregates of heterogeneous components of arbitrary size selectable by name. ")) + "In general, the {\\sf Record} constructor can take any number of arguments and thus can be used to create aggregates of heterogeneous components of arbitrary size selectable by name. ") ;Z := '"{\sf Record} is a primitive domain of \Language{} which cannot be defined in the \Language{} language." (SPADLET Z - (MAKESTRING - "{\\sf Record} is a primitive domain of \\Language{} which cannot be defined in the \\Language{} language.")) + "{\\sf Record} is a primitive domain of \\Language{} which cannot be defined in the \\Language{} language.") ;MESSAGE := STRCONC(X,Y,Z) @@ -4258,14 +4222,12 @@ ;X := '"{\sf Union(A,B)} denotes the class of objects which are which are either members of domain {\em A} or of domain {\em B}. The {\sf Union} constructor can take any number of arguments. " (SPADLET X - (MAKESTRING - "{\\sf Union(A,B)} denotes the class of objects which are which are either members of domain {\\em A} or of domain {\\em B}. The {\\sf Union} constructor can take any number of arguments. ")) + "{\\sf Union(A,B)} denotes the class of objects which are which are either members of domain {\\em A} or of domain {\\em B}. The {\\sf Union} constructor can take any number of arguments. ") ;Y := '"For an alternate form of {\sf Union} with _"tags_", see \downlink{Union(a:A,b:B)}{DomainUnion}. {\sf Union} is a primitive domain of \Language{} which cannot be defined in the \Language{} language." (SPADLET Y - (MAKESTRING - "For an alternate form of {\\sf Union} with \"tags\", see \\downlink{Union(a:A,b:B)}{DomainUnion}. {\\sf Union} is a primitive domain of \\Language{} which cannot be defined in the \\Language{} language.")) + "For an alternate form of {\\sf Union} with \"tags\", see \\downlink{Union(a:A,b:B)}{DomainUnion}. {\\sf Union} is a primitive domain of \\Language{} which cannot be defined in the \\Language{} language.") ;MESSAGE := STRCONC(X,Y) @@ -4311,32 +4273,27 @@ ;X := '"{\sf Union(a:A,b:B)} denotes the class of objects which are either members of domain {\em A} or of domain {\em B}. " (SPADLET X - (MAKESTRING - "{\\sf Union(a:A,b:B)} denotes the class of objects which are either members of domain {\\em A} or of domain {\\em B}. ")) + "{\\sf Union(a:A,b:B)} denotes the class of objects which are either members of domain {\\em A} or of domain {\\em B}. ") ;Y := '"The symbols {\em a} and {\em b} are called _"tags_" and are used to identify the two _"branches_" of the union. " (SPADLET Y - (MAKESTRING - "The symbols {\\em a} and {\\em b} are called \"tags\" and are used to identify the two \"branches\" of the union. ")) + "The symbols {\\em a} and {\\em b} are called \"tags\" and are used to identify the two \"branches\" of the union. ") ;Z := '"The {\sf Union} constructor can take any number of arguments and has an alternate form without {\em tags} (see \downlink{Union(A,B)}{UntaggedUnion}). " (SPADLET Z - (MAKESTRING - "The {\\sf Union} constructor can take any number of arguments and has an alternate form without {\\em tags} (see \\downlink{Union(A,B)}{UntaggedUnion}). ")) + "The {\\sf Union} constructor can take any number of arguments and has an alternate form without {\\em tags} (see \\downlink{Union(A,B)}{UntaggedUnion}). ") ;W := '"This tagged {\sf Union} type is necessary, for example, to disambiguate two branches of a union where {\em A} and {\em B} denote the same type. " (SPADLET W - (MAKESTRING - "This tagged {\\sf Union} type is necessary, for example, to disambiguate two branches of a union where {\\em A} and {\\em B} denote the same type. ")) + "This tagged {\\sf Union} type is necessary, for example, to disambiguate two branches of a union where {\\em A} and {\\em B} denote the same type. ") ;A := '"{\sf Union} is a primitive domain of \Language{} which cannot be defined in the \Language{} language." (SPADLET A - (MAKESTRING - "{\\sf Union} is a primitive domain of \\Language{} which cannot be defined in the \\Language{} language.")) + "{\\sf Union} is a primitive domain of \\Language{} which cannot be defined in the \\Language{} language.") ;MESSAGE := STRCONC(X,Y,Z,W,A) @@ -4382,20 +4339,17 @@ ;X := '"{\sf Mapping(T,S,...)} denotes the class of objects which are mappings from a source domain ({\em S,...}) into a target domain {\em T}. The {\sf Mapping} constructor can take any number of arguments." (SPADLET X - (MAKESTRING - "{\\sf Mapping(T,S,...)} denotes the class of objects which are mappings from a source domain ({\\em S,...}) into a target domain {\\em T}. The {\\sf Mapping} constructor can take any number of arguments.")) + "{\\sf Mapping(T,S,...)} denotes the class of objects which are mappings from a source domain ({\\em S,...}) into a target domain {\\em T}. The {\\sf Mapping} constructor can take any number of arguments.") ;Y := '" All but the first argument is regarded as part of a source tuple for the mapping. For example, {\sf Mapping(T,A,B)} denotes the class of mappings from {\em (A,B)} into {\em T}. " (SPADLET Y - (MAKESTRING - " All but the first argument is regarded as part of a source tuple for the mapping. For example, {\\sf Mapping(T,A,B)} denotes the class of mappings from {\\em (A,B)} into {\\em T}. ")) + " All but the first argument is regarded as part of a source tuple for the mapping. For example, {\\sf Mapping(T,A,B)} denotes the class of mappings from {\\em (A,B)} into {\\em T}. ") ;Z := '"{\sf Mapping} is a primitive domain of \Language{} which cannot be defined in the \Language{} language." (SPADLET Z - (MAKESTRING - "{\\sf Mapping} is a primitive domain of \\Language{} which cannot be defined in the \\Language{} language.")) + "{\\sf Mapping} is a primitive domain of \\Language{} which cannot be defined in the \\Language{} language.") ;MESSAGE := STRCONC(X,Y,Z) @@ -4416,14 +4370,12 @@ ;X := '"{\em Enumeration(a1, a2 ,..., aN)} creates an object which is exactly one of the N symbols {\em a1}, {\em a2}, ..., or {\em aN}, N > 0. " (SPADLET X - (MAKESTRING - "{\\em Enumeration(a1, a2 ,..., aN)} creates an object which is exactly one of the N symbols {\\em a1}, {\\em a2}, ..., or {\\em aN}, N > 0. ")) + "{\\em Enumeration(a1, a2 ,..., aN)} creates an object which is exactly one of the N symbols {\\em a1}, {\\em a2}, ..., or {\\em aN}, N > 0. ") ;Y := '" The {\em Enumeration} can constructor can take any number of symbols as arguments." (SPADLET Y - (MAKESTRING - " The {\\em Enumeration} can constructor can take any number of symbols as arguments.")) + " The {\\em Enumeration} can constructor can take any number of symbols as arguments.") ;MESSAGE := STRCONC(X, Y) @@ -4508,7 +4460,7 @@ (PROG (|str| |c| |n| |segment|) (RETURN (SEQ (PROGN - (SPADLET |str| (MAKESTRING "")) + (SPADLET |str| "") (DO ((G168025 (MAXINDEX |s|)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G168025) NIL) (SEQ (EXIT (PROGN @@ -4621,57 +4573,54 @@ (SPADLET |$CatLst| NIL) (SPADLET |$PakLst| NIL) (SPADLET |$DefLst| NIL) - (|deleteFile| (MAKESTRING "temp.text")) + (|deleteFile| "temp.text") (SPADLET |$outStream| - (MAKE-OUTSTREAM (MAKESTRING "temp.text"))) + (MAKE-OUTSTREAM "temp.text")) (COND ((NULL |domainList|) (SPADLET |comments| - (MAKESTRING - "\\spad{Union(A,B,...,C)} is a primitive type in AXIOM used to represent objects of type \\spad{A} or of type \\spad{B} or...or of type \\spad{C}.")) + "\\spad{Union(A,B,...,C)} is a primitive type in AXIOM used to represent objects of type \\spad{A} or of type \\spad{B} or...or of type \\spad{C}.") (|writedb| (|buildLibdbString| - (CONS (MAKESTRING "dUnion") + (CONS "dUnion" (CONS 1 - (CONS (MAKESTRING "x") - (CONS (MAKESTRING "special") - (CONS (MAKESTRING "(A,B,...,C)") + (CONS "x" + (CONS "special" + (CONS "(A,B,...,C)" (CONS 'UNION (CONS |comments| NIL))))))))) (SPADLET |comments| - (MAKESTRING - "\\spad{Record(a:A,b:B,...,c:C)} is a primitive type in AXIOM used to represent composite objects made up of objects of type \\spad{A}, \\spad{B},..., \\spad{C} which are indexed by \"keys\" (identifiers) \\spad{a},\\spad{b},...,\\spad{c}.")) + "\\spad{Record(a:A,b:B,...,c:C)} is a primitive type in AXIOM used to represent composite objects made up of objects of type \\spad{A}, \\spad{B},..., \\spad{C} which are indexed by \"keys\" (identifiers) \\spad{a},\\spad{b},...,\\spad{c}.") (|writedb| (|buildLibdbString| - (CONS (MAKESTRING "dRecord") + (CONS "dRecord" (CONS 1 - (CONS (MAKESTRING "x") - (CONS (MAKESTRING "special") + (CONS "x" + (CONS "special" (CONS - (MAKESTRING "(a:A,b:B,...,c:C)") + "(a:A,b:B,...,c:C)" (CONS 'RECORD (CONS |comments| NIL))))))))) (SPADLET |comments| - (MAKESTRING "\\spad{Mapping(T,S)} is a primitive type in AXIOM used to represent mappings from source type \\spad{S} to target type \\spad{T}. Similarly, \\spad{Mapping(T,A,B)} denotes a mapping from source type \\spad{(A,B)} to target type \\spad{T}.")) + "\\spad{Mapping(T,S)} is a primitive type in AXIOM used to represent mappings from source type \\spad{S} to target type \\spad{T}. Similarly, \\spad{Mapping(T,A,B)} denotes a mapping from source type \\spad{(A,B)} to target type \\spad{T}.") (|writedb| (|buildLibdbString| - (CONS (MAKESTRING "dMapping") + (CONS "dMapping" (CONS 1 - (CONS (MAKESTRING "x") - (CONS (MAKESTRING "special") - (CONS (MAKESTRING "(T,S)") + (CONS "x" + (CONS "special" + (CONS "(T,S)" (CONS 'MAPPING (CONS |comments| NIL))))))))) (SPADLET |comments| - (MAKESTRING - "\\spad{Enumeration(a,b,...,c)} is a primitive type in AXIOM used to represent the object composed of the symbols \\spad{a},\\spad{b},..., and \\spad{c}.")) + "\\spad{Enumeration(a,b,...,c)} is a primitive type in AXIOM used to represent the object composed of the symbols \\spad{a},\\spad{b},..., and \\spad{c}.") (|writedb| (|buildLibdbString| - (CONS (MAKESTRING "dEnumeration") + (CONS "dEnumeration" (CONS 1 - (CONS (MAKESTRING "x") - (CONS (MAKESTRING "special") - (CONS (MAKESTRING "(a,b,...,c)") + (CONS "x" + (CONS "special" + (CONS "(a,b,...,c)" (CONS 'ENUM (CONS |comments| NIL))))))))))) (SPADLET |$conname| NIL) @@ -4701,17 +4650,14 @@ ('T (OBEY (COND ((BOOT-EQUAL |$machineType| 'RIOS) - (MAKESTRING - "sort -f -T /tmp -y200 \"temp.text\" > \"libdb.text\"")) + "sort -f -T /tmp -y200 \"temp.text\" > \"libdb.text\"") ((BOOT-EQUAL |$machineType| 'SPARC) - (MAKESTRING - "sort -f \"temp.text\" > \"libdb.text\"")) + "sort -f \"temp.text\" > \"libdb.text\"") ('T - (MAKESTRING - "sort \"temp.text\" > \"libdb.text\"")))) - (RENAME-FILE (MAKESTRING "libdb.text") - (MAKESTRING "olibdb.text")) - (|deleteFile| (MAKESTRING "temp.text"))))))))) + "sort \"temp.text\" > \"libdb.text\""))) + (RENAME-FILE "libdb.text" + "olibdb.text") + (|deleteFile| "temp.text")))))))) ;buildLibdbConEntry conname == ; NULL GETDATABASE(conname, 'CONSTRUCTORMODEMAP) => nil @@ -4759,8 +4705,8 @@ (SPADLET |$exposed?| (COND ((|isExposedConstructor| |conname|) - (MAKESTRING "x")) - ('T (MAKESTRING "n")))) + "x") + ('T "n"))) (SPADLET |$doc| (GETDATABASE |conname| 'DOCUMENTATION)) (SPADLET |pname| (PNAME |conname|)) (SPADLET |kind| (GETDATABASE |conname| 'CONSTRUCTORKIND)) @@ -4809,7 +4755,7 @@ (SPADLET |r| (QCDR |ISTMP#2|)) 'T))))) (|libdbTrim| (|concatWithBlanks| |r|))) - ('T (MAKESTRING "")))) + ('T ""))) (SPADLET |argpart| (SUBSTRING (|form2HtString| (CONS '|f| |argl|)) 1 NIL)) @@ -4850,7 +4796,7 @@ G168204) (SEQ (EXIT (SETQ G168204 (STRCONC G168204 - (STRCONC (MAKESTRING "`") + (STRCONC "`" (STRINGIMAGE |y|))))))))))))))) ;libConstructorSig [conname,:argl] == @@ -4993,7 +4939,7 @@ (COND ((NULL (|ncParseFromString| |sigpart|)) (|sayBrightly| - (CONS (MAKESTRING "Won't parse: ") + (CONS "Won't parse: " (CONS |sigpart| NIL))))) |sigpart|))))) @@ -5013,10 +4959,10 @@ (SPADLET |tail| (QCDR |r|)) 'T)) (COND - (|tail| (STRCONC |head| (MAKESTRING " ") + (|tail| (STRCONC |head| " " (|concatWithBlanks| |tail|))) ('T |head|))) - ('T (MAKESTRING "")))))) + ('T ""))))) ;writedb(u) == ; not STRINGP u => nil --skip if not a string @@ -5041,7 +4987,7 @@ ((> (|#| |s|) |n|) (STRCONC (SUBSTRING |s| 0 |n|) (|addPatchesToLongLines| - (STRCONC (MAKESTRING "--") (SUBSTRING |s| |n| NIL)) + (STRCONC "--" (SUBSTRING |s| |n| NIL)) |n|))) ('T |s|))) @@ -5101,17 +5047,17 @@ (|form2LispString| (CONS '|Mapping| |nsig|))) (SPADLET |predString| (COND - ((BOOT-EQUAL |pred| 'T) (MAKESTRING "")) + ((BOOT-EQUAL |pred| 'T) "") ('T (|form2LispString| |pred|)))) (SPADLET |sop| (COND ((BOOT-EQUAL (SPADLET |s| (STRINGIMAGE |op|)) - (MAKESTRING "One")) - (MAKESTRING "1")) - ((BOOT-EQUAL |s| (MAKESTRING "Zero")) - (MAKESTRING "0")) + "One") + "1") + ((BOOT-EQUAL |s| "Zero") + "0") ('T |s|))) - (SPADLET |header| (STRCONC (MAKESTRING "o") |sop|)) + (SPADLET |header| (STRCONC "o" |sop|)) (SPADLET |conform| (STRCONC |$kind| (|form2LispString| |$conform|))) (SPADLET |comments| @@ -5198,26 +5144,24 @@ (COND ((BOOT-EQUAL |kind| '|attribute|) (CONS |sop| - (CONS (MAKESTRING "(") + (CONS "(" (CONS |sigpart| - (CONS (MAKESTRING ")") NIL))))) + (CONS ")" NIL))))) ('T (CONS |sop| - (CONS (MAKESTRING ": ") + (CONS ": " (CONS |sigpart| NIL)))))) (|sayBrightly| - (CONS (MAKESTRING "(") + (CONS "(" (CONS |$conname| - (CONS (MAKESTRING - " documentation) missing left brace--> ") + (CONS " documentation) missing left brace--> " |tail|)))))) (COND ((> |count| 0) (|sayBrightly| - (CONS (MAKESTRING "(") + (CONS "(" (CONS |$conname| - (CONS (MAKESTRING - " documentation) missing right brace--> ") + (CONS " documentation) missing right brace--> " |tail|)))))) (COND ((OR (NEQUAL |count| 0) |missingLeft|) @@ -5263,7 +5207,7 @@ (RETURN (PROGN (SPADLET |header| - (STRCONC (MAKESTRING "a") (STRINGIMAGE |name|))) + (STRCONC "a" (STRINGIMAGE |name|))) (SPADLET |argPart| (SUBSTRING (|form2LispString| (CONS '|f| |argl|)) 1 NIL)) @@ -5272,10 +5216,10 @@ |pred|)) (SPADLET |predString| (COND - ((BOOT-EQUAL |pred| 'T) (MAKESTRING "")) + ((BOOT-EQUAL |pred| 'T) "") ('T (|form2LispString| |pred|)))) (SPADLET |header| - (STRCONC (MAKESTRING "a") (STRINGIMAGE |name|))) + (STRCONC "a" (STRINGIMAGE |name|))) (SPADLET |conname| (STRCONC |$kind| (|form2LispString| |$conname|))) (SPADLET |comments| @@ -5314,7 +5258,7 @@ (RETURN (SEQ (PROGN (SPADLET |instream| - (MAKE-INSTREAM (MAKESTRING "libdb.text"))) + (MAKE-INSTREAM "libdb.text")) (DO () ((NULL (NULL (EOFP |instream|))) NIL) (SEQ (EXIT (PROGN (SPADLET |fp| (FILE-POSITION |instream|)) @@ -5358,12 +5302,12 @@ (SPADLET |abb| (|constructor?| |conname|)) (SPADLET |ucname| (UPCASE (STRINGIMAGE |abb|))) (SPADLET |pathname| - (STRCONC (|getEnv| (MAKESTRING "AXIOM")) - (MAKESTRING "/doc/hypertex/pages/") |ucname| - (MAKESTRING ".ht"))) + (STRCONC (|getEnv| "AXIOM") + "/doc/hypertex/pages/" |ucname| + ".ht")) (COND ((|isExistingFile| |pathname|) - (INTERN (STRCONC |sname| (MAKESTRING "XmpPage")))) + (INTERN (STRCONC |sname| "XmpPage"))) ('T NIL)))))) ;dbRead(n) == @@ -5379,8 +5323,8 @@ (PROGN (SPADLET |instream| (MAKE-INSTREAM - (STRCONC (|getEnv| (MAKESTRING "AXIOM")) - (MAKESTRING "/algebra/libdb.text")))) + (STRCONC (|getEnv| "AXIOM") + "/algebra/libdb.text"))) (FILE-POSITION |instream| |n|) (SPADLET |line| (READLINE |instream|)) (SHUT |instream|) @@ -5404,12 +5348,12 @@ (PROG (|instream| |line| |x| |k| |j| |xtralines|) (RETURN (SEQ (COND - ((EQL |n| 0) (MAKESTRING "")) + ((EQL |n| 0) "") ('T (SPADLET |instream| (MAKE-INSTREAM - (STRCONC (|getEnv| (MAKESTRING "AXIOM")) - (MAKESTRING "/algebra/comdb.text")))) + (STRCONC (|getEnv| "AXIOM") + "/algebra/comdb.text"))) (FILE-POSITION |instream| |n|) (SPADLET |line| (READLINE |instream|)) (SPADLET |k| (|dbTickIndex| |line| 1 1)) @@ -5488,14 +5432,14 @@ (RETURN (SEQ (PROGN (SPADLET |instream| - (MAKE-INSTREAM (MAKESTRING "olibdb.text"))) + (MAKE-INSTREAM "olibdb.text")) (SPADLET |outstream| - (MAKE-OUTSTREAM (MAKESTRING "libdb.text"))) + (MAKE-OUTSTREAM "libdb.text")) (SPADLET |comstream| - (MAKE-OUTSTREAM (MAKESTRING "comdb.text"))) + (MAKE-OUTSTREAM "comdb.text")) (PRINTEXP 0 |comstream|) (PRINTEXP |$tick| |comstream|) - (PRINTEXP (MAKESTRING "") |comstream|) + (PRINTEXP "" |comstream|) (TERPRI |comstream|) (DO () ((NULL (NULL (EOFP |instream|))) NIL) (SEQ (EXIT (PROGN @@ -5536,7 +5480,7 @@ (SHUT |instream|) (SHUT |outstream|) (SHUT |comstream|) - (OBEY (MAKESTRING "rm olibdb.text"))))))) + (OBEY "rm olibdb.text")))))) ;dbSplit(line,n,k) == ; k := charPosition($tick,line,k + 1) @@ -5566,7 +5510,7 @@ (PROG (|k| |u|) (RETURN (COND - ((BOOT-EQUAL |line| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |line| "") NIL) ('T (SPADLET |k| (|charPosition| (|char| '-) |line| (PLUS |n| 2))) (COND @@ -5645,25 +5589,24 @@ (SPADLET |$constructorName| NIL) (SPADLET |$exposeFlag| 'T) (SPADLET |$outStream| - (MAKE-OUTSTREAM (MAKESTRING "temp.text"))) + (MAKE-OUTSTREAM "temp.text")) (SPADLET |$x| NIL) (SPADLET |$attribute?| 'T) (SPADLET |pathname| - (STRCONC (|getEnv| (MAKESTRING "AXIOM")) - (MAKESTRING "/algebra/gloss.text"))) + (STRCONC (|getEnv| "AXIOM") + "/algebra/gloss.text")) (SPADLET |instream| (MAKE-INSTREAM |pathname|)) - (SPADLET |keypath| (MAKESTRING "glosskey.text")) - (OBEY (STRCONC (MAKESTRING "rm -f ") |keypath|)) + (SPADLET |keypath| "glosskey.text") + (OBEY (STRCONC "rm -f " |keypath|)) (SPADLET |outstream| (MAKE-OUTSTREAM |keypath|)) - (SPADLET |htpath| (MAKESTRING "gloss.ht")) - (OBEY (STRCONC (MAKESTRING "rm -f ") |htpath|)) + (SPADLET |htpath| "gloss.ht") + (OBEY (STRCONC "rm -f " |htpath|)) (SPADLET |htstream| (MAKE-OUTSTREAM |htpath|)) - (SPADLET |defpath| (MAKESTRING "glossdef.text")) + (SPADLET |defpath| "glossdef.text") (SPADLET |defstream| (MAKE-OUTSTREAM |defpath|)) (SPADLET |pairs| (|getGlossLines| |instream|)) (PRINTEXP - (MAKESTRING - "\\begin{page}{GlossaryPage}{G l o s s a r y}\\beginscroll\\beginmenu") + "\\begin{page}{GlossaryPage}{G l o s s a r y}\\beginscroll\\beginmenu" |htstream|) (DO ((G168653 |pairs| (CDR G168653)) (G168626 NIL)) ((OR (ATOM G168653) @@ -5689,11 +5632,10 @@ (PRINTEXP |defP| |outstream|) (TERPRI |outstream|) (PRINTEXP - (MAKESTRING - "\\item\\newline{\\em \\menuitemstyle{}}{\\em ") + "\\item\\newline{\\em \\menuitemstyle{}}{\\em " |htstream|) (PRINTEXP |name| |htstream|) - (PRINTEXP (MAKESTRING "}\\space{}") + (PRINTEXP "}\\space{}" |htstream|) (TERPRI |htstream|) (DO ((G168667 |lines| (CDR G168667)) @@ -5729,12 +5671,11 @@ (STRCONC G168673 G168623))))))) |htstream|) (TERPRI |htstream|))))) - (PRINTEXP (MAKESTRING "\\endmenu\\endscroll") |htstream|) + (PRINTEXP "\\endmenu\\endscroll" |htstream|) (PRINTEXP - (MAKESTRING - "\\lispdownlink{Search}{(|htGloss| \"\\stringvalue{pattern}\")} for glossary entry matching \\inputstring{pattern}{24}{*}") + "\\lispdownlink{Search}{(|htGloss| \"\\stringvalue{pattern}\")} for glossary entry matching \\inputstring{pattern}{24}{*}" |htstream|) - (PRINTEXP (MAKESTRING "\\end{page}") |htstream|) + (PRINTEXP "\\end{page}" |htstream|) (SHUT |instream|) (SHUT |outstream|) (SHUT |defstream|) @@ -5756,7 +5697,7 @@ (DEFUN |spreadGlossText| (|line|) (COND - ((BOOT-EQUAL |line| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |line| "") NIL) ((> (MAXINDEX |line|) 500) (CONS (SUBSTRING |line| 0 500) (|spreadGlossText| (SUBSTRING |line| 500 NIL)))) @@ -5817,17 +5758,16 @@ ((EQL (|#| |last|) 0) (COND (|lastLineHadTick| - (MAKESTRING "")) + "") ('T - (MAKESTRING - "\\blankline ")))) + "\\blankline "))) ((AND (> (|#| |last|) 0) (NEQUAL (ELT |last| (MAXINDEX |last|)) |$charBlank|)) |$charBlank|) - ('T (MAKESTRING "")))) + ('T ""))) (SPADLET |lastLineHadTick| NIL) (SPADLET |text| (CONS @@ -5965,7 +5905,7 @@ (SPADLET |pakname| (INTERN (STRCONC (PNAME |catAncestor|) - (MAKESTRING "&")))) + "&"))) (COND ((|getCDTEntry| |pakname| 'T) (SPADLET |acc| (CONS |pakname| |acc|)))) @@ -6248,7 +6188,7 @@ (IF (BOOT-EQUAL |x| '$$) (EXIT '$$)) (IF (STRINGP |x|) (EXIT |x|)) (EXIT (|systemError| - (MAKESTRING "bad argument in template"))))))) + "bad argument in template")))))) (DEFUN |getImports| (|conname|) (PROG (|conform| |infovec| |template| |ISTMP#1| |op| |u|) @@ -7370,20 +7310,20 @@ ('T (|buildLibdb| |conlist|) (SPADLET |$newConstructorList| (|union| |conlist| |$newConstructorList|)) - (SPADLET |localLibdb| (MAKESTRING "libdb.text")) + (SPADLET |localLibdb| "libdb.text") (COND - ((NULL (PROBE-FILE (MAKESTRING "libdb.text"))) - (RENAME-FILE (MAKESTRING "temp.text") - (MAKESTRING "libdb.text"))) + ((NULL (PROBE-FILE "libdb.text")) + (RENAME-FILE "temp.text" + "libdb.text")) ('T (SPADLET |oldlines| (|purgeNewConstructorLines| (|dbReadLines| |localLibdb|) |conlist|)) (SPADLET |newlines| - (|dbReadLines| (MAKESTRING "temp.text"))) + (|dbReadLines| "temp.text")) (|dbWriteLines| (MSORT (|union| |oldlines| |newlines|)) - (MAKESTRING "libdb.text")) - (|deleteFile| (MAKESTRING "temp.text"))))))))) + "libdb.text") + (|deleteFile| "temp.text")))))))) ;$returnNowhereFromGoGet := false @@ -7459,8 +7399,7 @@ (RETURN (SEQ (PROGN (|sayBrightly| - (MAKESTRING - "-------------Operation summary-----------------")) + "-------------Operation summary-----------------") (SPADLET |missingOnlyFlag| (KAR |options|)) (SPADLET |domainForm| (|devaluate| |dom|)) (SPADLET |nam| (CAR |domainForm|)) @@ -7494,15 +7433,13 @@ (|sayBrightly| (COND (|nowheres| - (CONS (MAKESTRING - "Functions exported but not implemented by") + (CONS "Functions exported but not implemented by" (APPEND (|bright| (|form2String| |domainForm|)) - (CONS (MAKESTRING ":") NIL)))) + (CONS ":" NIL)))) ('T (APPEND (|bright| (|form2String| |domainForm|)) - (CONS (MAKESTRING - "implements all exported operations") + (CONS "implements all exported operations" NIL))))) (|showDomainsOp1| |nowheres| '|nowhere|) (COND @@ -7523,13 +7460,13 @@ (APPEND (|bright| (|form2String| |key|)) - (CONS (MAKESTRING ":") NIL)))) + (CONS ":" NIL)))) ('T (CONS '|Functions implemented by| (APPEND (|bright| (|form2String| |key|)) - (CONS (MAKESTRING ":") NIL)))))) + (CONS ":" NIL)))))) (SPADLET |u| (|showDomainsOp1| |u| |key|)))))) (SPADLET |u| (SORTBY 'CDDR |defexports|)) @@ -7547,12 +7484,11 @@ (CONS |defop| (CDDR |key|))) (|sayBrightly| (CONS - (MAKESTRING - "Default functions from") + "Default functions from" (APPEND (|bright| (|form2String| |domainForm|)) - (CONS (MAKESTRING ":") NIL)))) + (CONS ":" NIL)))) (SPADLET |u| (|showDomainsOp1| |u| |key|)))))) (SPADLET |u| (SORTBY 'CDDR |unexports|)) @@ -7561,7 +7497,7 @@ (SPADLET |LETTMP#1| (CAR |u|)) (SPADLET |key| (CDDR |LETTMP#1|)) (|sayBrightly| - (CONS (MAKESTRING "Not exported: ") + (CONS "Not exported: " NIL)) (SPADLET |u| (|showDomainsOp1| |u| |key|))))))))))))) @@ -7629,9 +7565,9 @@ NIL) (SEQ (EXIT (PROGN (|sayBrightly| - (|concat| (MAKESTRING "From ") + (|concat| "From " (|form2String| |conform|) - (MAKESTRING ":"))) + ":")) (DO ((G169967 |l| (CDR G169967)) (G169924 NIL)) ((OR (ATOM G169967) @@ -7648,7 +7584,7 @@ NIL) (SEQ (EXIT (|sayBrightly| - (CONS (MAKESTRING " ") + (CONS " " (|formatOpSignature| |op| |sig|))))))))))))))) ;--======================================================================= @@ -7999,7 +7935,7 @@ NIL) (SEQ (EXIT (PROGN (|sayBrightly| - (CONS (MAKESTRING " ") + (CONS " " (|formatOpSignature| |op| |sig|))) (SPADLET |u| (CDR |u|)))))) |u|))))) @@ -8080,8 +8016,7 @@ (RETURN (SEQ (PROGN (|sayBrightly| - (MAKESTRING - "--------------------Predicate summary-------------------")) + "--------------------Predicate summary-------------------") (SPADLET |conname| (CAR (ELT |dom| 0))) (SPADLET |predvector| (ELT |dom| 3)) (SPADLET |predicateList| @@ -8097,8 +8032,8 @@ (COND ((|testBitVector| |predvector| |i|) - (MAKESTRING "true : ")) - ('T (MAKESTRING "false: ")))) + "true : ") + ('T "false: "))) (|sayBrightly| (CONS |prefix| (|pred2English| |p|)))))))))))) @@ -8119,8 +8054,7 @@ (RETURN (SEQ (PROGN (|sayBrightly| - (MAKESTRING - "--------------------Attribute summary-------------------")) + "--------------------Attribute summary-------------------") (SPADLET |conname| (CAR (ELT |dom| 0))) (SPADLET |abb| (|getConstructorAbbreviation| |conname|)) (SPADLET |predvector| (ELT |dom| 3)) @@ -8140,8 +8074,8 @@ (COND ((|testBitVector| |predvector| |p|) - (MAKESTRING "true : ")) - ('T (MAKESTRING "false: ")))) + "true : ") + ('T "false: "))) (|sayBrightly| (|concat| |prefix| (|form2String| |a|)))))))))))) @@ -8222,7 +8156,7 @@ |whereNumber|)))) (|sayBrightly| (CONS |i| - (CONS (MAKESTRING ": ") + (CONS ": " (APPEND (|formatOpSignature| |op| |signumList|) @@ -8347,7 +8281,7 @@ ((STRINGP |x|) (NEQUAL (|dbPart| |x| 2 1) - (MAKESTRING "0"))) + "0")) ('T (KAR |x|))))))))))))))))))))) ;--============================================================================ @@ -8407,14 +8341,14 @@ (OR (|htpProperty| |htPage| '|key|) '|names|)))) (SPADLET |opAlist| (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpProperty| |htPage| '|opAlist|)) ('T (|htpProperty| |htPage| '|attrAlist|)))) (COND ((BOOT-EQUAL |key| '|generalise|) (SPADLET |arg| (STRINGIMAGE (CAAR |opAlist|))) (COND - ((BOOT-EQUAL |which| (MAKESTRING "attribute")) + ((BOOT-EQUAL |which| "attribute") (|aPage| |arg|)) ('T (|oPage| |arg|)))) ((BOOT-EQUAL |key| '|allDomains|) @@ -8455,7 +8389,7 @@ (|htInitPageNoScroll| (|htCopyProplist| |htPage|))) (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpSetProperty| |htPage| '|opAlist| |opAlist|)) ('T @@ -8501,7 +8435,7 @@ |opAlist|) ('T (|dbExpandOpAlistIfNecessary| |htPage| |opAlist| - (MAKESTRING "operation") 'T NIL) + "operation" 'T NIL) (SPADLET |bitNumber| (HGET |$topicHash| |$groupChoice|)) (SPADLET |res| (PROG (G170603) @@ -8706,7 +8640,7 @@ (|htInitPageNoScroll| (|htCopyProplist| |htPage|))) (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpSetProperty| |htPage| '|opAlist| |opAlist|)) ('T (|htpSetProperty| |htPage| '|attrAlist| @@ -8835,7 +8769,7 @@ ((COND ((AND (BOOT-EQUAL |what| - (MAKESTRING "Name")) + "Name") |$exposedOnlyIfTrue|) (ATOM |x|)) ('T 'T)) @@ -8847,12 +8781,12 @@ (SPADLET |ops| (|escapeSpecialChars| (STRINGIMAGE (CAAR |opAlist|)))) - (CONS (MAKESTRING " {\\em ") + (CONS " {\\em " (CONS |ops| - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) ('T NIL))) (COND - ((AND (BOOT-EQUAL |what| (MAKESTRING "Condition")) + ((AND (BOOT-EQUAL |what| "Condition") (NULL (KAR (KAR |data|)))) (SPADLET |dataCount| (SPADDIFFERENCE |dataCount| 1)))) (SPADLET |exposurePart| @@ -8862,7 +8796,7 @@ (SPADLET |firstPart| (COND ((EQL |opCount| 0) - (CONS (MAKESTRING "No ") + (CONS "No " (APPEND |exposurePart| (CONS (|pluralize| @@ -8877,7 +8811,7 @@ |namedPart|))) ('T (CONS (STRINGIMAGE |opCount|) - (CONS (MAKESTRING " ") + (CONS " " (APPEND |exposurePart| (CONS (|pluralize| @@ -8888,9 +8822,9 @@ (|pluralSay| |dataCount| |what| |whats|)) (APPEND |prefix| - (CONS (MAKESTRING " for ") + (CONS " for " (CONS (STRINGIMAGE |opCount|) - (CONS (MAKESTRING " ") + (CONS " " (CONS (|pluralize| (|capitalize| |which|)) @@ -8908,7 +8842,7 @@ ((SPADLET |u| (|htpProperty| |page| '|specialMessage|)) (APPLY (CAR |u|) (CDR |u|)))) - (|htSayStandard| (MAKESTRING "\\beginscroll ")) + (|htSayStandard| "\\beginscroll ") (FUNCALL |fn| |page| |opAlist| |which| |data|) (|dbOpsExposureMessage|) (|htSayStandard| '|\\endscroll |) @@ -8944,7 +8878,7 @@ ((OR (NULL |$exposedOnlyIfTrue|) (BOOT-EQUAL |which| - (MAKESTRING "attribute"))) + "attribute")) (|#| |items|)) ('T (PROG (G170814) @@ -8988,12 +8922,12 @@ (SPADLET |suffix| (COND ((BOOT-EQUAL |branch| '|parameters|) - (MAKESTRING " viewed with parameters")) + " viewed with parameters") ((BOOT-EQUAL |branch| '|origins|) - (MAKESTRING " organized by origins")) + " organized by origins") ((BOOT-EQUAL |branch| '|conditions|) - (MAKESTRING " organized by conditions")) - ('T (MAKESTRING "")))) + " organized by conditions") + ('T ""))) (APPEND |heading| (CONS |suffix| NIL)))))) ;dbOpsExposureMessage() == @@ -9003,7 +8937,7 @@ (declare (special |$atLeastOneUnexposed|)) (SEQ (COND (|$atLeastOneUnexposed| - (EXIT (|htSay| (MAKESTRING "{\\em *} = unexposed"))))))) + (EXIT (|htSay| "{\\em *} = unexposed")))))) ;fromHeading htPage == ; null htPage => '"" @@ -9032,11 +8966,11 @@ (declare (special |$pn|)) (RETURN (SEQ (COND - ((NULL |htPage|) (MAKESTRING "")) + ((NULL |htPage|) "") ('T (SPADLET |$pn| (CONS (ELT |htPage| 0) - (CONS (MAKESTRING "}{") NIL))) + (CONS "}{" NIL))) (COND ((SPADLET |updomain| (|htpProperty| |htPage| '|updomain|)) @@ -9046,15 +8980,14 @@ (SPADLET |dnFence| (|form2Fence| |dnForm|)) (SPADLET |upFence| (|form2Fence| |updomain|)) (SPADLET |upOp| (PNAME (|opOf| |updomain|))) - (CONS (MAKESTRING " {\\em from} ") + (CONS " {\\em from} " (APPEND (|dbConformGen| |dnForm|) - (CONS (MAKESTRING - " {\\em under} \\ops{") + (CONS " {\\em under} \\ops{" (CONS |upOp| - (CONS (MAKESTRING "}{") + (CONS "}{" (APPEND |$pn| (APPEND |upFence| - (CONS (MAKESTRING "}") NIL))))))))) + (CONS "}" NIL))))))))) ('T (SPADLET |domname| (|htpProperty| |htPage| '|domname|)) @@ -9082,7 +9015,7 @@ (CONS |x| G170850))))))))))) (COND ((KDR |domname|) - (CONS (MAKESTRING " {\\em from} ") + (CONS " {\\em from} " (|dbConformGen| |domname|))) ('T (|htpProperty| |htPage| '|fromHeading|))))))))))) @@ -9150,7 +9083,7 @@ (RETURN (SEQ (PROGN (SPADLET |exception| - (OR |exception| (MAKESTRING "%%%nothing%%%"))) + (OR |exception| "%%%nothing%%%")) (SPADLET |op1| (CAR |form|)) (SPADLET |args| (CDR |form|)) (SPADLET |op| @@ -9287,7 +9220,7 @@ (COND (|keyword| (CONS |keyword| - (CONS (MAKESTRING ": ") + (CONS ": " |res|))) ('T |res|))) G170961)))))))) @@ -9300,7 +9233,7 @@ (|special| (CONS |op| NIL)) ('T (APPLY |opFn| (CONS |form| NIL))))) (APPEND |head| - (CONS (MAKESTRING "(") + (CONS "(" (APPEND (CAR |sargl|) (APPEND (PROG (G170996) @@ -9322,7 +9255,7 @@ (SETQ G170996 (APPEND G170996 (CONS '|,| |y|)))))))) - (CONS (MAKESTRING ")") NIL)))))))))))))) + (CONS ")" NIL)))))))))))))) ;dbMapping2StringList [target,:sl] == ; null sl => target @@ -9365,13 +9298,13 @@ (SPADLET |sourcePart| (COND (|restPart| - (CONS (MAKESTRING "(") + (CONS "(" (APPEND (CAR |sl|) (APPEND |restPart| - (CONS (MAKESTRING ")") NIL))))) + (CONS ")" NIL))))) ('T (CAR |sl|)))) (APPEND |sourcePart| - (CONS (MAKESTRING " -> ") |target|))))))))) + (CONS " -> " |target|))))))))) ;dbOuttran form == ; if LISTP form then @@ -9480,10 +9413,10 @@ (CONS '|\\ops{| (APPEND (|conform2StringList| |form| #'|conname2StringList| #'|conformString| NIL) - (CONS (MAKESTRING "}{") + (CONS "}{" (APPEND |$pn| (APPEND (|form2Fence| |form|) - (CONS (MAKESTRING "}") NIL))))))) + (CONS "}" NIL))))))) ;dbConformGen form == dbConformGen1(form,true) @@ -9654,7 +9587,7 @@ (SPADLET |opAlist| (COND ((BOOT-EQUAL |which| - (MAKESTRING "operation")) + "operation") (|htpProperty| |htPage| '|opAlist|)) ('T (|htpProperty| |htPage| '|attrAlist|)))))) @@ -9664,8 +9597,7 @@ ((AND |htPage| (|htpProperty| |htPage| '|conform|) (NEQUAL |which| - (MAKESTRING - "package operation"))) + "package operation")) 'T) ('T NIL))) (DO ((G171198 |opAlist| (CDR G171198)) @@ -9902,7 +9834,7 @@ (SPADLET |conform| (|htpProperty| |htPage| '|conform|)) (SPADLET |domainForm| (|htpProperty| |htPage| '|domname|)) (SPADLET |dom| (EVAL |domainForm|)) - (SPADLET |which| (MAKESTRING "operation")) + (SPADLET |which| "operation") (SPADLET |nam| (CAR |domainForm|)) (SPADLET |$domainArgs| (CDR |domainForm|)) (SPADLET |$predicateList| (GETDATABASE |nam| 'PREDICATES)) @@ -10004,7 +9936,7 @@ (|dbReduceByForm| |opAlist| (CAR |data|))) ('T (|systemError| - (CONS (MAKESTRING "Unexpected branch: ") (CONS |branch| NIL)))))) + (CONS "Unexpected branch: " (CONS |branch| NIL)))))) ;dbReduceByOpSignature(opAlist,datalist) == ;--reduces opAlist by implementation datalist, one of the form @@ -10288,7 +10220,7 @@ (PROGN (SPADLET |sig| (CAR G171613)) (COND - ((BOOT-EQUAL |$which| (MAKESTRING "attribute")) + ((BOOT-EQUAL |$which| "attribute") (CONS |op| (CONS |sig| NIL))) ('T (|dbMakeContrivedForm| |op| |sig|))))))) @@ -10343,10 +10275,9 @@ (SPADLET |ops| (|escapeSpecialChars| (STRINGIMAGE (CAAR |opAlist|)))) - (|htSayStandard| (MAKESTRING "Select a view below")) + (|htSayStandard| "Select a view below") (|htSaySaturn| - (MAKESTRING - "Select a view with the right mouse button"))) + "Select a view with the right mouse button")) ('T (SPADLET |exposedOnly?| (AND |$exposedOnlyIfTrue| @@ -10386,7 +10317,7 @@ (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) + ('T (|htSaySaturn| "&"))) (COND ((ATOM |item|) (SPADLET |op| |item|) (SPADLET |exposeFlag| 'T)) @@ -10399,20 +10330,20 @@ (COND ((OR |exposeFlag| (NULL |exposedOnly?|)) (PROGN - (|htSay| (MAKESTRING "{")) + (|htSay| "{") (|bcStarSpaceOp| |ops| |exposeFlag|) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS |ops| - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS |i| NIL))))) NIL)) NIL)) - (|htSay| (MAKESTRING "}"))))))))) + (|htSay| "}")))))))) (|htEndTable|)))))) ;dbShowOpAllDomains(htPage,opAlist,which) == @@ -10568,9 +10499,9 @@ (|getConstructorForm| (CAR |pair|)))))) (|htpSetProperty| |htPage| '|cAlist| |cAlist|) (|htpSetProperty| |htPage| '|thing| - (MAKESTRING "constructor")) + "constructor") (|htpSetProperty| |htPage| '|specialHeading| - (MAKESTRING "hoho")) + "hoho") (|dbShowCons| |htPage| '|names|)))))) ;simpOrDumb(new,old) == @@ -10590,14 +10521,14 @@ (DEFUN |dbShowOpOrigins| (|htPage| |opAlist| |which| |data|) (|dbGatherThenShow| |htPage| |opAlist| |which| |data| 'T - (MAKESTRING "from") (|function| |bcStarConform|))) + "from" (|function| |bcStarConform|))) ;dbShowOpImplementations(htPage,opAlist,which,data) == ; dbGatherThenShow(htPage,opAlist,which,data,true,'"by",function bcStarConform) (DEFUN |dbShowOpImplementations| (|htPage| |opAlist| |which| |data|) (|dbGatherThenShow| |htPage| |opAlist| |which| |data| 'T - (MAKESTRING "by") (|function| |bcStarConform|))) + "by" (|function| |bcStarConform|))) ;dbShowOpConditions(htPage,opAlist,which,data) == ; dbGatherThenShow(htPage,opAlist,which,data,nil,nil,function bcPred) @@ -10626,8 +10557,8 @@ ((BOOT-EQUAL (ELT (SPADLET |s| (PNAME |conname|)) (MAXINDEX |s|)) '&) - (MAKESTRING "default package")) - ('T (MAKESTRING "domain")))) + "default package") + ('T "domain"))) ('T (PNAME |kind|))))))) ;dbShowOpSignatures(htPage,opAlist,which,data) == dbShowOpSigList(which,data,0) @@ -10681,17 +10612,17 @@ (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) + ('T (|htSaySaturn| "&"))) (SPADLET |ops| (|escapeSpecialChars| (STRINGIMAGE |op|))) - (|htSay| (MAKESTRING "{")) + (|htSay| "{") (|htSayExpose| |ops| |exposureFlag|) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS |ops| - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS |count| NIL))))) @@ -10699,16 +10630,16 @@ NIL)) (COND ((BOOT-EQUAL |which| - (MAKESTRING "attribute")) + "attribute") (|htSay| (|args2HtString| (AND |sig| (CONS |sig| NIL))))) - ('T (|htSay| (MAKESTRING ": ")) + ('T (|htSay| ": ") (COND ((BOOT-EQUAL |tail| 'ASCONST) (|bcConform| (CAR |sig|))) ('T (|bcConform| (CONS '|Mapping| |sig|)))))) - (|htSay| (MAKESTRING "}")) + (|htSay| "}") (SPADLET |count| (PLUS |count| 1)))))) (|htEndTable|) |count|))))) @@ -10765,7 +10696,7 @@ (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) + ('T (|htSaySaturn| "&"))) (SPADLET |opform| (CAR |item|)) (SPADLET |exposeFlag| (CADR |item|)) (SPADLET |tail| (CDDR |item|)) @@ -10774,7 +10705,7 @@ (SPADLET |ops| (|escapeSpecialChars| (STRINGIMAGE |op|))) - (|htSay| (MAKESTRING "{")) + (|htSay| "{") (|htSayExpose| |ops| |exposeFlag|) (SPADLET |n| (|#| |opform|)) (|do| (COND @@ -10782,17 +10713,17 @@ (LASSOC '|Nud| (PROPLIST |op|))) (|dbShowOpParameterJump| |ops| |which| |count| |single?|) - (|htSay| (MAKESTRING " {\\em ") - (KAR |args|) (MAKESTRING "}"))) + (|htSay| " {\\em " + (KAR |args|) "}")) ((AND (EQL |n| 3) (LASSOC '|Led| (PROPLIST |op|))) - (|htSay| (MAKESTRING "{\\em ") - (KAR |args|) (MAKESTRING "} ")) + (|htSay| "{\\em " + (KAR |args|) "} ") (|dbShowOpParameterJump| |ops| |which| |count| |single?|) - (|htSay| (MAKESTRING " {\\em ") + (|htSay| " {\\em " (KAR (KDR |args|)) - (MAKESTRING "}"))) + "}")) ('T (|dbShowOpParameterJump| |ops| |which| |count| |single?|) @@ -10802,16 +10733,16 @@ (|member| |op| '(0 1)) (AND (BOOT-EQUAL |which| - (MAKESTRING "attribute")) + "attribute") (NULL (IFCAR |args|)))) '|skip|) - ('T (|htSay| (MAKESTRING "(")) + ('T (|htSay| "(") (COND ((IFCAR |args|) (|htSay| - (MAKESTRING "{\\em ") + "{\\em " (IFCAR |args|) - (MAKESTRING "}")))) + "}"))) (DO ((G171917 (IFCDR |args|) (CDR G171917)) @@ -10824,10 +10755,10 @@ (SEQ (EXIT (|htSay| - (MAKESTRING ",{\\em ") |x| - (MAKESTRING "}"))))) - (|htSay| (MAKESTRING ")"))))))) - (|htSay| (MAKESTRING "}")) + ",{\\em " |x| + "}")))) + (|htSay| ")")))))) + (|htSay| "}") (SPADLET |count| (PLUS |count| 1)))))) (|htEndTable|)))))) @@ -10837,12 +10768,12 @@ (DEFUN |dbShowOpParameterJump| (|ops| |which| |count| |single?|) (COND - (|single?| (|htSay| (MAKESTRING "{\\em ") |ops| (MAKESTRING "}"))) + (|single?| (|htSay| "{\\em " |ops| "}")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS |ops| - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS |count| NIL))))) @@ -10905,7 +10836,7 @@ (SPADLET |opAlist| (COND ((BOOT-EQUAL |which| - (MAKESTRING "operation")) + "operation") (|htpProperty| |htPage| '|opAlist|)) ('T (|htpProperty| |htPage| '|attrAlist|)))))) (SPADLET |newWhich| @@ -10917,8 +10848,8 @@ '|conform|))) (COND ((BOOT-EQUAL |which| - (MAKESTRING "package operation")) - (MAKESTRING "operation")) + "package operation") + "operation") ('T |which|)))) (SPADLET |expand| (|dbExpandOpAlistIfNecessary| |htPage| |opAlist| @@ -10941,7 +10872,7 @@ (QCDR |ISTMP#1|)) (AND (PAIRP |ISTMP#2|) (EQ (QCDR |ISTMP#2|) NIL))))))) - (|htSaySaturn| (MAKESTRING "\\begin{description}")) + (|htSaySaturn| "\\begin{description}") (DO ((G171988 |opAlist| (CDR G171988)) (G171965 NIL)) ((OR (ATOM G171988) @@ -10979,7 +10910,7 @@ (COND ((AND (NEQUAL |comments| - (MAKESTRING "")) + "") (STRINGP |comments|) (SPADLET |k| (|string2Integer| @@ -10987,7 +10918,7 @@ (SPADLET |comments| (COND ((MEMQ |k| '(0 1)) - (MAKESTRING "")) + "") ('T (|dbReadComments| |k|)))) @@ -11000,7 +10931,7 @@ ((AND (STRINGP |comments|) (NEQUAL |comments| - (MAKESTRING ""))) + "")) |comments|) ('T NIL))) (SPADLET |pred| @@ -11011,8 +10942,7 @@ ('T (PLUS |base| |j|)))) (COND ((BOOT-EQUAL |which| - (MAKESTRING - "package operation")) + "package operation") (SPADLET |sig| (MSUBST |conform| '$ |sig|)) @@ -11024,7 +10954,7 @@ |sig| |pred| |doc| |index| '|dbChooseDomainOp| (NULL |exposeFlag|) 'T)))))))))))) - (|htSaySaturn| (MAKESTRING "\\end{description}"))))))) + (|htSaySaturn| "\\end{description}")))))) ;dbChooseDomainOp(htPage,which,index) == ; [opKey,entryKey] := DIVIDE(index,8192) @@ -11051,7 +10981,7 @@ (SPADLET |entryKey| (CADR |LETTMP#1|)) (SPADLET |opAlist| (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpProperty| |htPage| '|opAlist|)) ('T (|htpProperty| |htPage| '|attrAlist|)))) (SPADLET |LETTMP#1| (ELT |opAlist| |opKey|)) @@ -11061,7 +10991,7 @@ (SPADLET |htPage| (|htInitPageNoScroll| (|htCopyProplist| |htPage|))) (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpSetProperty| |htPage| '|opAlist| (CONS (CONS |op| (CONS |entry| NIL)) NIL))) ('T @@ -11087,9 +11017,9 @@ (COND (|flag| (|htBlank|)) ((BOOT-EQUAL (ELT |op| 0) (|char| '*)) - (|htSay| (MAKESTRING "{\\em *} "))) + (|htSay| "{\\em *} ")) ('T (|htSayUnexposed|)))) - ('T (|htSay| (MAKESTRING ""))))) + ('T (|htSay| "")))) ;--============================================================================ ;-- Branch-in From Other Places @@ -11171,34 +11101,34 @@ (SPADLET |exposePart| (COND ((|isExposedConstructor| (|opOf| |conform|)) - (MAKESTRING "")) - ('T (MAKESTRING " Unexposed ")))) + "") + ('T " Unexposed "))) (SPADLET |fromPart| (COND (|domform| (|evalableConstructor2HtString| |domform|)) ('T (|form2HtString| |conform|)))) (SPADLET |heading| - (CONS (MAKESTRING " from ") + (CONS " from " (CONS |exposePart| (CONS |kind| - (CONS (MAKESTRING " {\\em ") + (CONS " {\\em " (CONS |fromPart| - (CONS (MAKESTRING "}") NIL))))))) + (CONS "}" NIL))))))) (SPADLET |expandProperty| (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") '|expandOperations|) ('T '|expandAttributes|))) (|htpSetProperty| |htPage| |expandProperty| '|lists|) (|htpSetProperty| |htPage| '|fromHeading| |heading|) (SPADLET |reducedOpAlist| (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|reduceByGroup| |htPage| |opAlist|)) ('T |opAlist|))) (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpSetProperty| |htPage| '|principalOpAlist| |opAlist|) (|htpSetProperty| |htPage| '|opAlist| |reducedOpAlist|)) @@ -11360,18 +11290,18 @@ (|listSort| (|function| LEXLESSEQP) (NREVERSE |opAlist|))) (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpSetProperty| |htPage| '|opAlist| |opAlist|)) ('T (|htpSetProperty| |htPage| '|attrAlist| |opAlist|))) (SPADLET |expandProperty| (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") '|expandOperations|) ('T '|expandAttributes|))) (|htpSetProperty| |htPage| |expandProperty| '|strings|) (|dbResetOpAlistCondition| |htPage| |which| |opAlist|) (COND - ((AND (BOOT-EQUAL |which| (MAKESTRING "attribute")) + ((AND (BOOT-EQUAL |which| "attribute") (BOUNDP '|$attributeArgs|) |$attributeArgs|) (|dbExpandOpAlistIfNecessary| |htPage| |opAlist| |which| NIL NIL) @@ -11546,7 +11476,7 @@ (SPADLET |value| NIL) (SPADLET |expandProperty| (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") '|expandOperations|) ('T '|expandAttributes|))) (SPADLET |expandFlag| @@ -11613,7 +11543,7 @@ (|ncParseFromString| |sigs|)) (COND ((BOOT-EQUAL |which| - (MAKESTRING "operation")) + "operation") (COND ((NULL (AND (PAIRP |sig|) @@ -11621,11 +11551,10 @@ '|Mapping|))) (|sayBrightly| (CONS - (MAKESTRING - "Unexpected signature for ") + "Unexpected signature for " (CONS |name| (CONS - (MAKESTRING ": ") + ": " (CONS |sigs| NIL)))))) ('T (SPADLET |sig| @@ -11751,7 +11680,7 @@ (COND ((AND (NULL |doc|) (BOOT-EQUAL |which| - (MAKESTRING "attribute"))) + "attribute")) (SPADLET |doc| (|getRegistry| |op| |sig|)))) @@ -11810,7 +11739,7 @@ (SETQ G172408 (OR G172408 |y|)))))))))) (CADR |match|)) - ('T (MAKESTRING "")))))))) + ('T ""))))))) ;evalableConstructor2HtString domform == ; if VECP domform then domform := devaluate domform @@ -11986,7 +11915,7 @@ (PROGN (SPADLET |a| (QCAR |ISTMP#1|)) 'T)))) - (STRCONC (MAKESTRING "'") + (STRCONC "'" (PROG (G172582) (SPADLET G172582 "") (RETURN @@ -12074,10 +12003,10 @@ (EXIT (SETQ G172610 (STRCONC G172610 - (STRCONC (MAKESTRING ",") + (STRCONC "," (STRINGIMAGE |x|)))))))))) - (STRCONC (MAKESTRING "[") (STRINGIMAGE (CAR |arg|)) - |tailPart| (MAKESTRING "]"))) + (STRCONC "[" (STRINGIMAGE (CAR |arg|)) + |tailPart| "]")) ((AND (PAIRP |form|) (EQ (QCAR |form|) 'BRACKET) (PROGN (SPADLET |ISTMP#1| (QCDR |form|)) @@ -12119,9 +12048,9 @@ (EXIT (SETQ G172621 (STRCONC G172621 - (STRCONC (MAKESTRING ",") |x|))))))))) - (STRCONC (MAKESTRING "[") (CAR |arg|) |tailPart| - (MAKESTRING "]"))) + (STRCONC "," |x|))))))))) + (STRCONC "[" (CAR |arg|) |tailPart| + "]")) ((ATOM |form|) |form|) ('T (PROG (G172632) @@ -12464,7 +12393,7 @@ (EXIT NIL)))) (IF (BOOT-EQUAL |pred| 'T) (EXIT 'T)) (EXIT (|systemError| - (MAKESTRING "unknown atomic predicate form"))))))) + "unknown atomic predicate form")))))) (DEFUN |evalDomainOpPred,evpred| (|dom| |pred|) (PROG (|k|) @@ -12586,8 +12515,7 @@ |p|) NIL))))))) (EXIT (|systemError| - (MAKESTRING - "unknown predicate form")))))) + "unknown predicate form"))))) (IF (BOOT-EQUAL |pred| 'T) (EXIT 'T)) (EXIT (|systemError| NIL)))))) @@ -12651,23 +12579,23 @@ (SPADLET |kind| (QCAR |ISTMP#1|)) (SPADLET |r| (QCDR |ISTMP#1|)) 'T)))) - (|htSay| (MAKESTRING "a ") |kind| (MAKESTRING " ")) + (|htSay| "a " |kind| " ") (|htSayExplicitExports| |r|)) ((BOOT-EQUAL |key| '|is|) - (|htSay| (MAKESTRING "the domain ")) + (|htSay| "the domain ") (|bcConform| |u| 'T)) ('T (|htSay| (COND ((BOOT-EQUAL |key| '|is|) - (MAKESTRING "the domain ")) + "the domain ") ('T (SPADLET |kind| (GETDATABASE (|opOf| |u|) 'CONSTRUCTORKIND)) (COND ((BOOT-EQUAL |kind| '|domain|) - (MAKESTRING "an element of ")) - ('T (MAKESTRING "a domain of ")))))) + "an element of ") + ('T "a domain of "))))) (COND ((AND (PAIRP |u|) (EQ (QCAR |u|) '|Join|) (PROGN @@ -12685,7 +12613,7 @@ (SPADLET |middle| (NREVERSE |middle|)) 'T)))) (COND - ((CDR |middle|) (|htSay| (MAKESTRING "categories ")) + ((CDR |middle|) (|htSay| "categories ") (|bcConform| (CAR |middle|) 'T) (DO ((G172987 (CDR |middle|) (CDR G172987)) (|x| NIL)) @@ -12693,7 +12621,7 @@ (PROGN (SETQ |x| (CAR G172987)) NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING ", ")) + (|htSay| ", ") (|bcConform| |x| 'T))))) (COND ((AND (PAIRP |r|) (EQ (QCAR |r|) 'CATEGORY) @@ -12703,11 +12631,11 @@ (PROGN (SPADLET |r| (QCDR |ISTMP#1|)) 'T)))) - (|htSay| (MAKESTRING " and ")) + (|htSay| " and ") (|htSayExplicitExports| |r|)) - ('T (|htSay| (MAKESTRING " and ")) + ('T (|htSay| " and ") (|bcConform| |r| 'T)))) - ('T (|htSay| (MAKESTRING "category ")) + ('T (|htSay| "category ") (|bcConform| (CAR |middle|) 'T) (COND ((AND (PAIRP |r|) (EQ (QCAR |r|) 'CATEGORY) @@ -12717,11 +12645,11 @@ (PROGN (SPADLET |r| (QCDR |ISTMP#1|)) 'T)))) - (|htSay| (MAKESTRING " ")) + (|htSay| " ") (|htSayExplicitExports| |r|)) - ('T (|htSay| (MAKESTRING " and ")) + ('T (|htSay| " and ") (|bcConform| |r| 'T)))))) - ('T (|htSay| |kind| (MAKESTRING " ")) + ('T (|htSay| |kind| " ") (|bcConform| |u| 'T))))))))) ;htSayExplicitExports r == @@ -12747,16 +12675,16 @@ (declare (special |$displayReturnValue|)) (RETURN (SEQ (PROGN - (|htSay| (MAKESTRING "with explicit exports")) + (|htSay| "with explicit exports") (COND (|$displayReturnValue| NIL) - ('T (|htSay| (MAKESTRING ":")) + ('T (|htSay| ":") (DO ((G173049 |r| (CDR G173049)) (|x| NIL)) ((OR (ATOM G173049) (PROGN (SETQ |x| (CAR G173049)) NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\newline ") (COND ((AND (PAIRP |x|) (EQ (QCAR |x|) 'SIGNATURE) @@ -12782,12 +12710,12 @@ (CONS '|bcLinks| (CONS (CONS |ops| - (CONS (MAKESTRING "") + (CONS "" (CONS '|oPage| (CONS |ops| NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING ": ")) + (|htSay| ": ") (|bcConform| (CONS '|Mapping| |sig|))) ((AND (PAIRP |x|) (EQ (QCAR |x|) 'ATTRIBUTE) @@ -12805,13 +12733,13 @@ (CONS '|bcLinks| (CONS (CONS |ops| - (CONS (MAKESTRING "") + (CONS "" (CONS '|aPage| (CONS |s| NIL)))) NIL)) NIL))) ((AND (PAIRP |x|) (EQ (QCAR |x|) 'IF)) - (|htSay| (MAKESTRING "{\\em if ...}"))) + (|htSay| "{\\em if ...}")) ('T (|systemError|)))))))))))))) ;displayBreakIntoAnds pred == @@ -12855,16 +12783,16 @@ (SPADLET |target| (QCAR |ISTMP#1|)) (SPADLET |source| (QCDR |ISTMP#1|)) 'T)))) - (|htSay| (MAKESTRING "a function from ")) - (|htSayTuple| |source|) (|htSay| (MAKESTRING " to ")) + (|htSay| "a function from ") + (|htSayTuple| |source|) (|htSay| " to ") (|htSayArgument| |target|)) ((BOOT-EQUAL |t| '(|Category|)) - (|htSay| (MAKESTRING "a category"))) + (|htSay| "a category")) ((OR (AND (PAIRP |t|) (PROGN (SPADLET |op| (QCAR |t|)) 'T) (MEMQ |op| '(|Join| CATEGORY))) (|constructor?| (|opOf| |t|))) (|htSayConstructor| NIL |t|)) - ('T (|htSay| (MAKESTRING "an element of domain ")) + ('T (|htSay| "an element of domain ") (|htSayArgument| |t|)))))) ;htSayArgument t == --called only for operations not for constructors @@ -12891,28 +12819,27 @@ (RETURN (COND ((NULL |$signature|) - (|htSay| (CONS (MAKESTRING "{\\em ") - (CONS |t| (CONS (MAKESTRING "}") NIL))))) + (|htSay| (CONS "{\\em " + (CONS |t| (CONS "}" NIL))))) ((MEMQ |t| '($ %)) (COND - ((AND (BOOT-EQUAL |$conkind| (MAKESTRING "category")) + ((AND (BOOT-EQUAL |$conkind| "category") (> |$conlength| 20)) (COND (|$generalSearch?| - (|htSay| (MAKESTRING - "{\\em D} of the origin category"))) + (|htSay| "{\\em D} of the origin category")) ('T (|addWhereList| '$ '|is| NIL) - (|htSayStandard| (MAKESTRING "{\\em $}")) - (|htSaySaturn| (MAKESTRING "{\\em \\%}"))))) - ('T (|htSayStandard| (MAKESTRING "{\\em $}")) - (|htSaySaturn| (MAKESTRING "{\\em \\%}"))))) + (|htSayStandard| "{\\em $}") + (|htSaySaturn| "{\\em \\%}")))) + ('T (|htSayStandard| "{\\em $}") + (|htSaySaturn| "{\\em \\%}")))) ((NULL (IDENTP |t|)) (|bcConform| |t| 'T)) ('T (SPADLET |k| (|position| |t| |$conargs|)) (COND ((> |k| (SPADDIFFERENCE 1)) (SPADLET |typeOfArg| (ELT (CDR |$signature|) |k|)) (|addWhereList| |t| '|member| |typeOfArg|))) - (|htSay| (MAKESTRING "{\\em ") |t| (MAKESTRING "}"))))))) + (|htSay| "{\\em " |t| "}")))))) ;addWhereList(id,kind,typ) == ; $whereList := insert([id,kind,:typ],$whereList) @@ -12933,17 +12860,17 @@ (DEFUN |htSayTuple| (|t|) (SEQ (COND - ((NULL |t|) (|htSay| (MAKESTRING "()"))) + ((NULL |t|) (|htSay| "()")) ((NULL (CDR |t|)) (|htSayArgument| (CAR |t|))) - ('T (|htSay| (MAKESTRING "(")) (|htSayArgument| (CAR |t|)) + ('T (|htSay| "(") (|htSayArgument| (CAR |t|)) (DO ((G173112 (CDR |t|) (CDR G173112)) (|d| NIL)) ((OR (ATOM G173112) (PROGN (SETQ |d| (CAR G173112)) NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING ",")) + (|htSay| ",") (|htSayArgument| |d|))))) - (|htSay| (MAKESTRING ")")))))) + (|htSay| ")"))))) ;dbGetDisplayFormForOp(op,sig,doc) == ; dbGetFormFromDocumentation(op,sig,doc) or dbGetContrivedForm(op,sig) @@ -12971,9 +12898,9 @@ (SPADLET |doc| (COND ((STRINGP |x|) |x|) ('T (CAR |x|)))) (COND ((AND (STRINGP |doc|) - (OR (AND (|stringPrefix?| (MAKESTRING "\\spad{") |doc|) + (OR (AND (|stringPrefix?| "\\spad{" |doc|) (SPADLET |k| 6)) - (AND (|stringPrefix?| (MAKESTRING "\\s{") |doc|) + (AND (|stringPrefix?| "\\s{" |doc|) (SPADLET |k| 3)))) (SPADLET |n| (|charPosition| |$charRbrace| |doc| |k|)) (SPADLET |s| (SUBSTRING |doc| |k| (SPADDIFFERENCE |n| |k|))) @@ -13027,8 +12954,8 @@ (PROG () (RETURN (SEQ (COND - ((BOOT-EQUAL |op| (MAKESTRING "0")) (CONS 0 NIL)) - ((BOOT-EQUAL |op| (MAKESTRING "1")) (CONS 1 NIL)) + ((BOOT-EQUAL |op| "0") (CONS 0 NIL)) + ((BOOT-EQUAL |op| "1") (CONS 1 NIL)) ('T (CONS |op| (PROG (G173161) @@ -13091,8 +13018,8 @@ (COND ((NEQUAL |kind| '|category|) (COND - ((OR (|anySubstring?| (MAKESTRING "Integer") |s| 0) - (|anySubstring?| (MAKESTRING "Number") |s| 0)) + ((OR (|anySubstring?| "Integer" |s| 0) + (|anySubstring?| "Number" |s| 0)) (SPADLET |x| (CAR |$NumberList|)) (SPADLET |$NumberList| (CDR |$NumberList|)) |x|) ('T @@ -13446,8 +13373,8 @@ (SPADLET |u| (|whoUses| |opl| |conform|)) (SPADLET |prefix| (|pluralSay| (|#| |u|) - (MAKESTRING "constructor uses") - (MAKESTRING "constructors use"))) + "constructor uses" + "constructors use")) (SPADLET |suffix| (COND ((AND (PAIRP |opAlist|) @@ -13462,16 +13389,16 @@ (QCDR |ISTMP#1|)) (AND (PAIRP |ISTMP#2|) (EQ (QCDR |ISTMP#2|) NIL)))))) - (CONS (MAKESTRING " operation {\\em ") + (CONS " operation {\\em " (CONS (|escapeSpecialChars| (STRINGIMAGE |op1|)) - (CONS (MAKESTRING ":") + (CONS ":" (CONS (|form2HtString| (CONS '|Mapping| |sig|)) - (CONS (MAKESTRING "}") NIL)))))) + (CONS "}" NIL)))))) ('T - (CONS (MAKESTRING " these operations") NIL)))) + (CONS " these operations" NIL)))) (SPADLET |page| (|htInitPage| (APPEND |prefix| |suffix|) (|htCopyProplist| |htPage|))) @@ -13522,27 +13449,27 @@ (STRINGIMAGE |op|))) (SPADLET |usedList| (CONS |pair| |usedList|)) - (|htSay| (MAKESTRING "Users of {\\em ") - |ops| (MAKESTRING ": ")) + (|htSay| "Users of {\\em " + |ops| ": ") (|bcConform| (CONS '|Mapping| (|sublisFormal| |conargs| |sig|))) - (|htSay| (MAKESTRING "}\\newline")) + (|htSay| "}\\newline") (|bcConTable| (|listSort| (|function| GLESSEQP) (REMDUP |namelist|))))))) (SPADLET |noOneUses| (SETDIFFERENCE |opl| |usedList|)) (COND ((> (|#| |noOneUses|) 0) - (|htSay| (MAKESTRING "No constructor uses the ")) + (|htSay| "No constructor uses the ") (|htSay| (COND ((EQL (|#| |noOneUses|) 1) - (MAKESTRING "operation: ")) + "operation: ") ('T (CONS (|#| |noOneUses|) - (CONS (MAKESTRING " operations:") + (CONS " operations:" NIL))))) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\newline ") (DO ((G173475 |noOneUses| (CDR G173475)) (G173397 NIL)) ((OR (ATOM G173475) @@ -13555,15 +13482,15 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING "\\tab{2}{\\em ") + (|htSay| "\\tab{2}{\\em " (|escapeSpecialChars| (STRINGIMAGE |op|)) - (MAKESTRING ": ")) + ": ") (|bcConform| (CONS '|Mapping| (|sublisFormal| |conargs| |sig|))) - (|htSay| (MAKESTRING "}\\newline")))))))) - (|htSayStandard| (MAKESTRING "\\endscroll ")) + (|htSay| "}\\newline"))))))) + (|htSayStandard| "\\endscroll ") (|dbPresentOps| |page| |which| '|usage|) (|htShowPageNoScroll|))))))) @@ -14401,11 +14328,11 @@ (|htInitPageNoScroll| (|htCopyProplist| |htPage|) (|dbHeading| |opAlist| |which| (|htpProperty| |htPage| '|heading|)))) - (|htSay| (MAKESTRING "Select a category ancestor below or ")) + (|htSay| "Select a category ancestor below or ") (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "filter") - (CONS (MAKESTRING "on:") + (CONS (CONS "filter" + (CONS "on:" (CONS |calledFrom| (CONS '|filter| NIL)))) NIL)) @@ -14413,11 +14340,11 @@ (|htMakePage| (CONS (CONS '|bcStrings| (CONS (CONS 13 - (CONS (MAKESTRING "") + (CONS "" (CONS '|filter| (CONS 'EM NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "\\beginscroll ")) + (|htSay| "\\beginscroll ") (SPADLET |conform| (|htpProperty| |htPage| '|conform|)) (SPADLET |domname| (|htpProperty| |htPage| '|domname|)) (SPADLET |ancestors| @@ -14481,7 +14408,7 @@ ('T (|pluralSay| |count| NIL (|pluralize| |capwhich|))))) - (APPEND |prefix| (CONS (MAKESTRING " for ") |heading|))))))) + (APPEND |prefix| (CONS " for " |heading|))))))) ;koaPageFilterByCategory1(htPage,i) == ; ancestor := htpProperty(htPage,'ancestors) . i @@ -14633,9 +14560,9 @@ (CONS (CONS |op| (NREVERSE |alist|)) |falist|))))) (|htpSetProperty| |htPage| '|fromcat| - (CONS (MAKESTRING " from category {\\sf ") + (CONS " from category {\\sf " (CONS (|form2HtString| |ancestor|) - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) (|dbShowOperationsFromConform| |htPage| |which| |falist|)))))) ;--======================================================================= @@ -14656,7 +14583,7 @@ (SPADLET |htPage| (|htInitPage| NIL NIL)) (|htpSetProperty| |htPage| '|opAlist| |opAlist|) (|htpSetProperty| |htPage| '|expandOperations| '|lists|) - (SPADLET |which| (MAKESTRING "operation")) + (SPADLET |which| "operation") (|dbShowOp1| |htPage| |opAlist| |which| '|names|))))) ;opPageFastPath opstring == @@ -14792,7 +14719,7 @@ (SPADLET |ntarget| (CONS '|Union| (CONS |target| - (CONS (MAKESTRING "failed") NIL)))) + (CONS "failed" NIL)))) (SPADLET |dcSig| (MSUBST |ntarget| |target| |dcSig|)))) (SPADLET |alist| (OR (|findSubstitutionOrder?| @@ -14802,7 +14729,7 @@ (SPADLET |nsig| (|substInOrder| |alist| |sig|)) (COND ((OR (|hasPatternVar| |nsig|) (|hasPatternVar| |predList|)) - (|pp| (MAKESTRING "--------------")) (|pp| |op|) + (|pp| "--------------") (|pp| |op|) (|pp| |predList|) (|pp| |nsig|) (|pp| |mm|) (SPADLET |$badStack| (CONS (CONS |op| (CONS |mm| NIL)) |$badStack|)))) @@ -14991,8 +14918,8 @@ (RETURN (PROGN (SPADLET |$localLibdb| - (AND (|fnameExists?| (MAKESTRING "libdb.text")) - (MAKESTRING "libdb.text"))) + (AND (|fnameExists?| "libdb.text") + "libdb.text")) (SPADLET |lines| (|grepConstruct1| |s| |key|)) (COND ((IFCAR |options|) @@ -15273,7 +15200,7 @@ (|not?| (|grepf| (CAR |argl|) |s| NIL)) ('T (SPADLET |lines| - (|grepf| (|mkGrepPattern| (MAKESTRING "*") + (|grepf| (|mkGrepPattern| "*" |$key|) |s| NIL)) (|grepf| (CAR |argl|) |lines| 'T)))) @@ -15323,13 +15250,11 @@ (OR (AND (SPADLET |parse| (|pmParseFromString| |s|)) (|checkPmParse| |parse|)) (CONS '|error| - (CONS (MAKESTRING "Illegal search string") - (CONS (MAKESTRING - "\\vspace{3}\\center{{\\em Your search string} ") + (CONS "Illegal search string" + (CONS "\\vspace{3}\\center{{\\em Your search string} " (CONS (|escapeSpecialChars| |s|) (CONS - (MAKESTRING - " {\\em has incorrect syntax}}") + " {\\em has incorrect syntax}}" NIL))))))) ((PROG (G174630) (SPADLET G174630 NIL) @@ -15353,9 +15278,8 @@ (SPADDIFFERENCE |i| 1)) (|char| |$charUnderscore|))))))))))) (CONS '|error| - (CONS (MAKESTRING "Illegal search string") - (CONS (MAKESTRING - "\\vspace{3}\\center{Consecutive {\\em *}'s are not allowed in search patterns}") + (CONS "Illegal search string" + (CONS "\\vspace{3}\\center{Consecutive {\\em *}'s are not allowed in search patterns}" NIL)))) ('T |s|))))))) @@ -15554,7 +15478,7 @@ (SETQ G174779 (STRCONC G174779 (STRCONC - (MAKESTRING " ") |x|))))))))))) + " " |x|))))))))))) (EXIT (CONS |op| (PROG (G174794) (SPADLET G174794 NIL) @@ -15630,7 +15554,7 @@ (DEFUN |pmPreparse,fn| (|s| |n| |siz|) (PROG (|i| |j| |t| |middle|) (RETURN - (SEQ (IF (BOOT-EQUAL |n| |siz|) (EXIT (MAKESTRING ""))) + (SEQ (IF (BOOT-EQUAL |n| |siz|) (EXIT "")) (SPADLET |i| (OR (|firstNonDelim| |s| |n|) (RETURN (SUBSTRING |s| |n| NIL)))) @@ -15735,9 +15659,8 @@ (COND (|doc?| (SPADLET |instream2| (OPEN (STRCONC - (|getEnv| (MAKESTRING "AXIOM")) - (MAKESTRING - "/algebra/libdb.text")))))) + (|getEnv| "AXIOM") + "/algebra/libdb.text"))))) (SPADLET CONS (SPADLET |atts| (SPADLET |doms| NIL))) (DO () ((NULL (AND (PAIRP |lines|) @@ -15788,15 +15711,15 @@ ((BOOT-EQUAL |kind| (|char| '-)) '|skip|) ('T (|systemError| '|kind|))))))) (COND (|doc?| (CLOSE |instream2|))) - (CONS (CONS (MAKESTRING "attribute") (NREVERSE |atts|)) - (CONS (CONS (MAKESTRING "operation") + (CONS (CONS "attribute" (NREVERSE |atts|)) + (CONS (CONS "operation" (NREVERSE |ops|)) - (CONS (CONS (MAKESTRING "category") + (CONS (CONS "category" (NREVERSE |cats|)) - (CONS (CONS (MAKESTRING "domain") + (CONS (CONS "domain" (NREVERSE |doms|)) (CONS - (CONS (MAKESTRING "package") + (CONS "package" (NREVERSE |paks|)) NIL)))))))))) @@ -15816,7 +15739,7 @@ (EXIT |c|))) (DEFUN |mkUpDownPattern,recurse| (|s| |i| |n|) - (SEQ (IF (BOOT-EQUAL |i| |n|) (EXIT (MAKESTRING ""))) + (SEQ (IF (BOOT-EQUAL |i| |n|) (EXIT "")) (EXIT (STRCONC (|mkUpDownPattern,fixchar| (ELT |s| |i|)) (|mkUpDownPattern,recurse| |s| (PLUS |i| 1) |n|))))) @@ -15924,13 +15847,13 @@ 'T)) |x|) (EXIT |x|)) - (EXIT (MAKESTRING "[^x]")))) - (SPADLET |tick| (MAKESTRING "[^`]*`")) + (EXIT "[^x]"))) + (SPADLET |tick| "[^`]*`") (IF (BOOT-EQUAL |one| '|w|) (EXIT |s|)) (IF (BOOT-EQUAL |one| '|none|) - (EXIT (SEQ (IF (BOOT-EQUAL |s| (MAKESTRING "`")) - (EXIT (MAKESTRING "^."))) - (EXIT (STRCONC (MAKESTRING "^") |s|))))) + (EXIT (SEQ (IF (BOOT-EQUAL |s| "`") + (EXIT "^.")) + (EXIT (STRCONC "^" |s|))))) (SPADLET |prefix| (SEQ (IF (BOOT-EQUAL |one| '|t|) (EXIT (STRCONC |tick| |tick| |tick| |tick| @@ -15942,13 +15865,13 @@ (IF (BOOT-EQUAL |one| '|s|) (EXIT (STRCONC |tick| |tick| |tick|))) (IF (BOOT-EQUAL |one| '|k|) - (EXIT (MAKESTRING "[cdp]"))) + (EXIT "[cdp]")) (IF (BOOT-EQUAL |one| '|y|) - (EXIT (MAKESTRING "[cdpx]"))) + (EXIT "[cdpx]")) (EXIT (STRINGIMAGE |one|)))) (IF (BOOT-EQUAL |s| |$wild1|) - (EXIT (STRCONC (MAKESTRING "^") |prefix|))) - (EXIT (STRCONC (MAKESTRING "^") |prefix| |s|)))))) + (EXIT (STRCONC "^" |prefix|))) + (EXIT (STRCONC "^" |prefix| |s|)))))) (DEFUN |mkGrepPattern1,charPosition| (|c| |t| |startpos|) (PROG (|n| |k|) @@ -15998,8 +15921,8 @@ (SPADLET |k| (|mkGrepPattern1,charPosition| (|char| |$charUnderscore|) |s| 0))) - (EXIT (STRCONC (SUBSTRING |s| 0 |k|) (MAKESTRING "[") - (ELT |s| (PLUS |k| 1)) (MAKESTRING "]") + (EXIT (STRCONC (SUBSTRING |s| 0 |k|) "[" + (ELT |s| (PLUS |k| 1)) "]" (|mkGrepPattern1,remUnderscores| (SUBSTRING |s| (PLUS |k| 2) NIL))))) (EXIT |s|))))) @@ -16017,8 +15940,8 @@ (CONS |$wild1| (CONS |s| |res|))))) (SPADLET |res| (CDR |res|)) (IF (NULL (MEMQ '|w| |$options|)) - (IF (NEQUAL (CAR |res|) (MAKESTRING "")) - (SPADLET |res| (CONS (MAKESTRING "`") |res|)) + (IF (NEQUAL (CAR |res|) "") + (SPADLET |res| (CONS "`" |res|)) (IF (AND (AND (PAIRP |res|) (PROGN (SPADLET |ISTMP#1| (QCDR |res|)) @@ -16057,7 +15980,7 @@ (DEFUN |mkGrepPattern1,addWilds| (|sl|) (declare (special |$wild1|)) - (SEQ (IF (BOOT-EQUAL (IFCAR |sl|) (MAKESTRING "")) + (SEQ (IF (BOOT-EQUAL (IFCAR |sl|) "") (EXIT (|mkGrepPattern1,h| (IFCDR |sl|) (CONS |$wild1| NIL)))) (EXIT (|mkGrepPattern1,h| |sl| NIL)))) @@ -16188,11 +16111,11 @@ ((NULL |itemlist|) (|systemError| (CONS |conform| - (CONS (MAKESTRING " has no operation named ") + (CONS " has no operation named " (CONS |opname| NIL))))) ('T (SPADLET |opAlist| (CONS |itemlist| NIL)) (|dbShowOperationsFromConform| |htPage| - (MAKESTRING "operation") |opAlist|))))))) + "operation" |opAlist|))))))) ;aPage(a,:b) == --called by \spadatt{a} ; $attributeArgs : local := nil @@ -16236,11 +16159,10 @@ (SPADLET |form| (OR (|ncParseFromString| |s|) (|systemError| - (CONS (MAKESTRING "Argument: ") + (CONS "Argument: " (CONS |s| (CONS - (MAKESTRING - " to spadType won't parse") + " to spadType won't parse" NIL)))))) (COND ((ATOM |form|) (SPADLET |form| (CONS |form| NIL)))) (SPADLET |op| (|opOf| |form|)) @@ -16311,11 +16233,10 @@ (SPADLET |form| (OR (|ncParseFromString| |s|) (|systemError| - (CONS (MAKESTRING "Argument: ") + (CONS "Argument: " (CONS |s| (CONS - (MAKESTRING - " to spadType won't parse") + " to spadType won't parse" NIL)))))) (|htSystemCommands| (PNAME (|opOf| |form|))))))) @@ -16348,7 +16269,7 @@ (RETURN (SEQ (COND ((NULL (SPADLET |filter| (|checkFilter| |filter|))) NIL) - ((BOOT-EQUAL |filter| (MAKESTRING "*")) (|htErrorStar|)) + ((BOOT-EQUAL |filter| "*") (|htErrorStar|)) ('T (SPADLET |includeDoc?| (NULL (IFCAR |options|))) (SPADLET |regSearchAlist| (|grepConstruct| (STRINGIMAGE |filter|) @@ -16473,7 +16394,7 @@ (SPADLET |count| (PLUS |regCount| |docCount|)) (COND ((EQL |count| 0) - (|emptySearchPage| (MAKESTRING "entry") |filter| 'T)) + (|emptySearchPage| "entry" |filter| 'T)) ((EQL |count| 1) (SPADLET |alist| (COND @@ -16534,19 +16455,19 @@ (SPADLET |plural| (COND (|$exposedOnlyIfTrue| - (MAKESTRING "exposed entries match")) - ('T (MAKESTRING "entries match")))) + "exposed entries match") + ('T "entries match"))) (SPADLET |prefix| - (|pluralSay| |count| (MAKESTRING "") + (|pluralSay| |count| "" |plural|)) (SPADLET |emfilter| - (CONS (MAKESTRING "{\\em ") + (CONS "{\\em " (CONS (|escapeSpecialChars| (STRINGIMAGE |filter|)) - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) (SPADLET |header| (APPEND |prefix| - (CONS (MAKESTRING " ") |emfilter|))) + (CONS " " |emfilter|))) (SPADLET |page| (|htInitPage| |header| NIL)) (|htpSetProperty| |page| '|regSearchAlist| |regSearchAlist|) @@ -16556,11 +16477,10 @@ (COND (|docSearchAlist| (|dbSayItems| - (CONS (MAKESTRING - "{\\bf Construct Summary:} ") + (CONS "{\\bf Construct Summary:} " (CONS |regCount| NIL)) - (MAKESTRING "name matches") - (MAKESTRING "names match")))) + "name matches" + "names match"))) (DO ((G175327 |regSearchAlist| (CDR G175327)) (G175275 NIL) (|i| 0 (QSADD1 |i|))) ((OR (ATOM G175327) @@ -16578,23 +16498,22 @@ ((> (|#| (CAR |pair|)) 0) (PROGN (|bcHt| - (MAKESTRING "\\newline{}")) + "\\newline{}") (|htSayStandard| - (MAKESTRING "\\tab{2}")) + "\\tab{2}") (|genSearchSay| |pair| |summarize?| |kind| |i| '|showConstruct|))))))) (COND (|docSearchAlist| - (|htSaySaturn| (MAKESTRING "\\bigskip{}")) + (|htSaySaturn| "\\bigskip{}") (|dbSayItems| - (CONS (MAKESTRING - "\\newline{\\bf Documentation Summary:} ") + (CONS "\\newline{\\bf Documentation Summary:} " (CONS |docCount| NIL)) - (MAKESTRING "mention") - (MAKESTRING "mentions") - (MAKESTRING " of {\\em ") |key| - (MAKESTRING "}")) + "mention" + "mentions" + " of {\\em " |key| + "}") (DO ((G175343 |docSearchAlist| (CDR G175343)) (G175280 NIL) (|i| 0 (QSADD1 |i|))) @@ -16614,7 +16533,7 @@ (PROGN (|bcHt| '|\\newline{}|) (|htSayStandard| - (MAKESTRING "\\tab{2}")) + "\\tab{2}") (|genSearchSay| |pair| 'T |kind| |i| '|showDoc|))))))))) (|htShowPageStar|)))))))))) @@ -16799,7 +16718,7 @@ (PROGN (SPADLET |kind| (CAR G175516)) (SPADLET |lines| (CDDR G175516)) - (|dbSearch| |lines| |kind| (MAKESTRING "")))))) + (|dbSearch| |lines| |kind| ""))))) ;genSearchSay(pair,summarize,kind,who,fn) == ; [u,:fullLineList] := pair @@ -16852,7 +16771,7 @@ (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS (|menuButton|) - (CONS (MAKESTRING "") + (CONS "" (CONS '|genSearchSayJump| (CONS (CONS |fullLineList| @@ -16862,21 +16781,21 @@ NIL)) (COND ((EQL |count| 0) - (|htSay| (MAKESTRING "{\\em No ") |kind| - (MAKESTRING "} "))) + (|htSay| "{\\em No " |kind| + "} ")) ((EQL |count| 1) - (|htSay| (MAKESTRING "{\\em 1 ") |kind| - (MAKESTRING "} "))) + (|htSay| "{\\em 1 " |kind| + "} ")) ('T - (|htSay| (MAKESTRING "{\\em ") |count| (MAKESTRING " ") - (|pluralize| |kind|) (MAKESTRING "} ")))) + (|htSay| "{\\em " |count| " " + (|pluralize| |kind|) "} "))) (COND (|short| '|done|) ('T (COND ((NEQUAL |uniqueCount| 1) - (|htSayStandard| (MAKESTRING "\\indent{4}")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSayStandard| "\\indent{4}") + (|htSay| "\\newline ") (|htBeginTable|))) (SPADLET |lastid| NIL) (SPADLET |groups| (|organizeByName| |u|)) @@ -16913,7 +16832,7 @@ (OR G175554 (|dbExposed?| |item| (|dbKind| |item|)))))))))))) - (|bcHt| (MAKESTRING "{")) + (|bcHt| "{") (COND (|$includeUnexposed?| (COND @@ -16924,7 +16843,7 @@ (CONS '|bcLinks| (CONS (CONS |id| - (CONS (MAKESTRING "") + (CONS "" (CONS |fn| (CONS (PLUS |who| (TIMES 8 |i|)) @@ -16932,10 +16851,10 @@ NIL)) NIL)) (SPADLET |i| (PLUS |i| (|#| |group|))) - (|bcHt| (MAKESTRING "}")))))) + (|bcHt| "}"))))) (COND ((NEQUAL |uniqueCount| 1) (|htEndTable|) - (|htSayStandard| (MAKESTRING "\\indent{0}"))) + (|htSayStandard| "\\indent{0}")) ('T NIL))))))))) ;organizeByName u == @@ -17048,18 +16967,18 @@ (SPADLET |options| (QCDR |options|)) 'T)) |x|) - ('T (MAKESTRING "")))) + ('T ""))) (SPADLET |colon| (COND - ((IFCAR |options|) (MAKESTRING ":")) - ('T (MAKESTRING "")))) + ((IFCAR |options|) ":") + ('T ""))) (COND ((EQL |count| 0) - (|concat| (MAKESTRING "No ") |singular| |item|)) + (|concat| "No " |singular| |item|)) ((EQL |count| 1) - (|concat| (MAKESTRING "1 ") |singular| |item| |colon|)) + (|concat| "1 " |singular| |item| |colon|)) ('T - (|concat| |count| (MAKESTRING " ") |plural| |item| |colon|))))))) + (|concat| |count| " " |plural| |item| |colon|))))))) ;--======================================================================= ;-- Documentation Search @@ -17078,7 +16997,7 @@ (RETURN (SEQ (COND ((NULL (SPADLET |filter| (|checkFilter| |filter|))) NIL) - ((BOOT-EQUAL |filter| (MAKESTRING "*")) (|htErrorStar|)) + ((BOOT-EQUAL |filter| "*") (|htErrorStar|)) ('T (SPADLET |key| (|removeSurroundingStars| |filter|)) (SPADLET |docSearchAlist| (|grepConstruct| |filter| '|w| 'T)) @@ -17137,7 +17056,7 @@ (SPADLET |count| (|searchCount| |docSearchAlist|)) (COND ((EQL |count| 0) - (|emptySearchPage| (MAKESTRING "entry") |filter| 'T)) + (|emptySearchPage| "entry" |filter| 'T)) ((EQL |count| 1) (|showNamedConstruct| (PROG (G175713) @@ -17160,28 +17079,27 @@ ('T (SPADLET |prefix| (|pluralSay| |count| - (MAKESTRING "entry matches") - (MAKESTRING "entries match"))) + "entry matches" + "entries match")) (SPADLET |emfilter| - (CONS (MAKESTRING "{\\em ") + (CONS "{\\em " (CONS (|escapeSpecialChars| (STRINGIMAGE |filter|)) - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) (SPADLET |header| (APPEND |prefix| - (CONS (MAKESTRING " ") |emfilter|))) + (CONS " " |emfilter|))) (SPADLET |page| (|htInitPage| |header| NIL)) (|htpSetProperty| |page| '|docSearchAlist| |docSearchAlist|) (|htpSetProperty| |page| '|regSearchAlist| NIL) (|htpSetProperty| |page| '|filter| |filter|) (|dbSayItems| - (CONS (MAKESTRING - "\\newline Documentation Summary: ") + (CONS "\\newline Documentation Summary: " (CONS |count| NIL)) - (MAKESTRING "mention") (MAKESTRING "mentions") - (MAKESTRING " of {\\em ") |filter| - (MAKESTRING "}")) + "mention" "mentions" + " of {\\em " |filter| + "}") (DO ((G175737 |docSearchAlist| (CDR G175737)) (G175708 NIL) (|i| 0 (QSADD1 |i|))) ((OR (ATOM G175737) @@ -17196,9 +17114,9 @@ (SEQ (EXIT (COND ((> (|#| (CAR |pair|)) 0) (PROGN - (|bcHt| (MAKESTRING "\\newline{}")) + (|bcHt| "\\newline{}") (|htSayStandard| - (MAKESTRING "\\tab{2}")) + "\\tab{2}") (|genSearchSay| |pair| 'T |kind| |i| '|showDoc|))))))) (|htShowPageStar|)))))))) @@ -17252,7 +17170,7 @@ (declare (special |$blank|)) (RETURN (PROGN - (|htSay| (MAKESTRING "{\\em ")) + (|htSay| "{\\em ") (COND ((AND (PAIRP |message|) (PROGN @@ -17278,19 +17196,19 @@ (SPADLET |rightEnd| (QCAR |ISTMP#4|)) 'T)))))))))) - (|htSay| |leftEnd| |left| (MAKESTRING "}")) + (|htSay| |leftEnd| |left| "}") (COND - ((AND (NEQUAL |left| (MAKESTRING "")) + ((AND (NEQUAL |left| "") (BOOT-EQUAL (ELT |left| (MAXINDEX |left|)) |$blank|)) (|htBlank|))) (|htSay| |middle|) (COND - ((AND (NEQUAL |right| (MAKESTRING "")) + ((AND (NEQUAL |right| "") (BOOT-EQUAL (ELT |right| 0) |$blank|)) (|htBlank|))) - (|htSay| (MAKESTRING "{\\em ") |right| |rightEnd|)) + (|htSay| "{\\em " |right| |rightEnd|)) ('T (|htSay| |message|))) - (|htSay| (MAKESTRING "}")))))) + (|htSay| "}"))))) ;stripOffSegments(s,n) == ; progress := true @@ -17354,7 +17272,7 @@ (PROGN (SPADLET |filter| (STRINGIMAGE |filter|)) (COND - ((BOOT-EQUAL |filter| (MAKESTRING "")) (MAKESTRING "*")) + ((BOOT-EQUAL |filter| "") "*") ('T (|trimString| |filter|))))) ;aSearch filter == --called from HD (man0.ht): general attribute search @@ -17366,7 +17284,7 @@ ((NULL (SPADLET |filter| (|checkFilter| |filter|))) NIL) ('T (|dbSearch| (|grepConstruct| |filter| '|a|) - (MAKESTRING "attribute") |filter|)))) + "attribute" |filter|)))) ;oSearch filter == -- called from HD (man0.ht): operation search ; opAlist := opPageFastPath filter => opPageFast opAlist @@ -17384,13 +17302,13 @@ ('T (SPADLET |key| '|o|) (COND ((NULL (SPADLET |filter| (|checkFilter| |filter|))) NIL) - ((BOOT-EQUAL |filter| (MAKESTRING "*")) - (|grepSearchQuery| (MAKESTRING "operation") + ((BOOT-EQUAL |filter| "*") + (|grepSearchQuery| "operation" (CONS |filter| (CONS |key| - (CONS (MAKESTRING "operation") + (CONS "operation" (CONS '|oSearchGrep| NIL)))))) - ('T (|oSearchGrep| |filter| |key| (MAKESTRING "operation"))))))))) + ('T (|oSearchGrep| |filter| |key| "operation")))))))) ;oSearchGrep(filter,key,kind) == --called from grepSearchQuery/oSearch ; dbSearch(grepConstruct(filter,'o),kind,filter) @@ -17409,13 +17327,12 @@ (PROG (|page|) (RETURN (PROGN - (SPADLET |page| (|htInitPage| (MAKESTRING "Query Page") NIL)) + (SPADLET |page| (|htInitPage| "Query Page" NIL)) (|htpSetProperty| |page| '|items| |items|) (|htQuery| - (CONS (MAKESTRING - "{\\em Do you want a list of {\\em all} ") + (CONS "{\\em Do you want a list of {\\em all} " (CONS (|pluralize| |kind|) - (CONS (MAKESTRING "?\\vspace{1}}") NIL))) + (CONS "?\\vspace{1}}" NIL))) '|grepSearchJump| 'T) (|htShowPage|))))) @@ -17424,42 +17341,42 @@ (DEFUN |cSearch| (|filter|) (|constructorSearch| (|checkFilter| |filter|) '|c| - (MAKESTRING "category"))) + "category")) ;dSearch filter == --called from HD (man0.ht): domain search ; constructorSearch(checkFilter filter,'d,'"domain") (DEFUN |dSearch| (|filter|) (|constructorSearch| (|checkFilter| |filter|) '|d| - (MAKESTRING "domain"))) + "domain")) ;pSearch filter == --called from HD (man0.ht): package search ; constructorSearch(checkFilter filter,'p,'"package") (DEFUN |pSearch| (|filter|) (|constructorSearch| (|checkFilter| |filter|) '|p| - (MAKESTRING "package"))) + "package")) ;xSearch filter == --called from HD (man0.ht): default package search ; constructorSearch(checkFilter filter,'x,'"default package") (DEFUN |xSearch| (|filter|) (|constructorSearch| (|checkFilter| |filter|) '|x| - (MAKESTRING "default package"))) + "default package")) ;kSearch filter == --called from HD (man0.ht): constructor search (no defaults) ; constructorSearch(checkFilter filter,'k,'"constructor") (DEFUN |kSearch| (|filter|) (|constructorSearch| (|checkFilter| |filter|) '|k| - (MAKESTRING "constructor"))) + "constructor")) ;ySearch filter == --called from conPage: like kSearch but defaults included ; constructorSearch(checkFilter filter,'y,'"constructor") (DEFUN |ySearch| (|filter|) (|constructorSearch| (|checkFilter| |filter|) '|y| - (MAKESTRING "constructor"))) + "constructor")) ;constructorSearch(filter,key,kind) == ; null filter => nil --in case of filter error @@ -17516,36 +17433,35 @@ (SPADLET |newkind| (COND ((BOOT-EQUAL |code| (|char| '|p|)) - (MAKESTRING "package")) + "package") ((BOOT-EQUAL |code| (|char| '|d|)) - (MAKESTRING "domain")) + "domain") ((BOOT-EQUAL |code| (|char| '|c|)) - (MAKESTRING "category")) + "category") ('T NIL))) (COND - ((OR (BOOT-EQUAL |kind| (MAKESTRING "constructor")) + ((OR (BOOT-EQUAL |kind| "constructor") (BOOT-EQUAL |kind| |newkind|)) (|kPage| |line|)) ('T (SPADLET |page| - (|htInitPage| (MAKESTRING "Query Page") NIL)) + (|htInitPage| "Query Page" NIL)) (|htpSetProperty| |page| '|line| |line|) (SPADLET |message| - (CONS (MAKESTRING "{\\em ") + (CONS "{\\em " (CONS (|dbName| |line|) (CONS - (MAKESTRING "} is not a {\\em ") + "} is not a {\\em " (CONS |kind| (CONS - (MAKESTRING "} but a {\\em ") + "} but a {\\em " (CONS |newkind| (CONS - (MAKESTRING - "}. Would you like to view it?\\vspace{1}") + "}. Would you like to view it?\\vspace{1}" NIL)))))))) (|htQuery| |message| '|grepConstructorSearch| 'T) (|htShowPage|)))) - ((BOOT-EQUAL |filter| (MAKESTRING "*")) + ((BOOT-EQUAL |filter| "*") (|grepSearchQuery| |kind| (CONS |filter| (CONS |key| @@ -17618,7 +17534,7 @@ ((OR (MEMQ (KAR |form|) '(|and| |or| |not|)) (CONTAINED '* |form|)) NIL) - ((BOOT-EQUAL |filter| (MAKESTRING "Mapping")) NIL) + ((BOOT-EQUAL |filter| "Mapping") NIL) ((SPADLET |u| (|kisValidType| |form|)) |u|) (|secondTime| NIL) ('T @@ -17721,7 +17637,7 @@ (SETQ G176053 (OR G176053 |j|))))))))) (RETURN NIL))) - (SPADLET |buf| (MAKESTRING "")) + (SPADLET |buf| "") (DO () ((NULL (AND (<= |k| |maxIndex|) (NULL (|member| @@ -17890,7 +17806,7 @@ (SPADLET |conlist| (CDR G176172)) (COND ((NULL |conlist|) - (|emptySearchPage| (MAKESTRING "abbreviation") + (|emptySearchPage| "abbreviation" |filter|)) ('T (SPADLET |kind| (|intern| |kind|)) (COND @@ -17942,7 +17858,7 @@ (CONS (CONS |con| 'T) G176208)))))))) (SPADLET |htPage| - (|htInitPage| (MAKESTRING "") NIL)) + (|htInitPage| "" NIL)) (|htpSetProperty| |htPage| '|cAlist| |cAlist|) (|htpSetProperty| |htPage| '|thing| NIL) (RETURN (|dbShowCons| |htPage| '|names|)) @@ -17950,10 +17866,9 @@ (|htInitPage| (CONS (|#| |conlist|) (CONS - (MAKESTRING - " Abbreviations Match {\\em ") + " Abbreviations Match {\\em " (CONS (STRINGIMAGE |filter|) - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) NIL)) (DO ((G176230 |conlist| (CDR G176230)) (G176166 NIL)) @@ -17971,16 +17886,15 @@ NIL) (SEQ (EXIT (PROGN (SPADLET |kind| (LASSOC '|kind| |r|)) - (|htSay| (MAKESTRING - "\\newline{\\em ") + (|htSay| "\\newline{\\em " (SPADLET |s| (STRINGIMAGE |abbr|))) (|htSayStandard| - (MAKESTRING "\\tab{10}")) - (|htSay| (MAKESTRING "}")) + "\\tab{10}") + (|htSay| "}") (|htSay| |kind|) (|htSayStandard| - (MAKESTRING "\\tab{19}")) + "\\tab{19}") (|bcCon| |nam|))))) (|htShowPage|)))))))))) @@ -18038,12 +17952,10 @@ (PROGN (SPADLET |page| (|htInitPage| - (MAKESTRING "Detailed Search with Options") NIL)) + "Detailed Search with Options" NIL)) (SPADLET |filter| (|escapeSpecialChars| (PNAME |filter|))) - (|bcHt| (MAKESTRING - "Select what you want to search for, then click on {\\em Search} below")) - (|bcHt| (MAKESTRING - "\\newline{\\it Note:} Logical searches using {\\em and}, {\\em or}, and {\\em not} are not permitted here.")) + (|bcHt| "Select what you want to search for, then click on {\\em Search} below") + (|bcHt| "\\newline{\\it Note:} Logical searches using {\\em and}, {\\em or}, and {\\em not} are not permitted here.") (|htSayHrule|) (|htMakePage| '((|text| . "\\newline") @@ -18158,7 +18070,7 @@ (COND ((BOOT-EQUAL |which| '|ops|) (|char| '|o|)) ((BOOT-EQUAL |which| '|attrs|) (|char| '|a|)) - ('T (SPADLET |acc| (MAKESTRING "")) + ('T (SPADLET |acc| "") (COND ((|htButtonOn?| |htPage| '|cats|) (SPADLET |acc| (STRCONC (|char| '|c|) |acc|)))) @@ -18174,7 +18086,7 @@ (SPADLET |n| (|#| |acc|)) (COND ((OR (EQL |n| 0) (EQL |n| 4)) - (MAKESTRING "[cdpx]")) + "[cdpx]") ((EQL |n| 1) |acc|) ('T (STRCONC (|char| '[) |acc| (|char| ']))))))) (SPADLET |form| @@ -18191,19 +18103,19 @@ ((EQL |n| 1) (COND ((|htButtonOn?| |htPage| '|cats|) - (MAKESTRING "category")) + "category") ((|htButtonOn?| |htPage| '|doms|) - (MAKESTRING "domain")) + "domain") ((|htButtonOn?| |htPage| '|paks|) - (MAKESTRING "package")) - ('T (MAKESTRING "default package")))) - ('T (MAKESTRING "constructor")))) + "package") + ('T "default package"))) + ('T "constructor"))) ((BOOT-EQUAL |which| '|ops|) - (MAKESTRING "operation")) - ('T (MAKESTRING "attribute")))) + "operation") + ('T "attribute"))) (COND ((NULL |lines|) (|emptySearchPage| |kind| NIL)) - ('T (|dbSearch| |lines| |kind| (MAKESTRING "filter")))))))) + ('T (|dbSearch| |lines| |kind| "filter"))))))) ;generalSearchString(htPage,sel) == ; string := htpLabelInputString(htPage,sel) @@ -18216,7 +18128,7 @@ (PROGN (SPADLET |string| (|htpLabelInputString| |htPage| |sel|)) (COND - ((BOOT-EQUAL |string| (MAKESTRING "")) (MAKESTRING "*")) + ((BOOT-EQUAL |string| "") "*") ('T |string|)))))) ;htButtonOn?(htPage,key) == @@ -18230,7 +18142,7 @@ (LASSOC |key| (|htpInputAreaAlist| |htPage|))) (AND (PAIRP |ISTMP#1|) (PROGN (SPADLET |a| (QCAR |ISTMP#1|)) 'T))) - (BOOT-EQUAL |a| (MAKESTRING " t")))))) + (BOOT-EQUAL |a| " t"))))) ;mkDetailedGrepPattern(kind,name,nargs,argOrSig) == main where ; main == @@ -18282,7 +18194,7 @@ (DEFUN |mkDetailedGrepPattern,conc| (|a| |b|) (declare (special |$tick|)) - (SEQ (IF (OR (BOOT-EQUAL |b| (MAKESTRING "[^`]*")) + (SEQ (IF (OR (BOOT-EQUAL |b| "[^`]*") (BOOT-EQUAL |b| (|char| (INTERN "." "BOOT")))) (EXIT |a|)) (EXIT (STRCONC |a| |$tick| |b|)))) @@ -18292,7 +18204,7 @@ (declare (special |$saturn| |$tick|)) (RETURN (PROGN - (SPADLET |nottick| (MAKESTRING "[^`]")) + (SPADLET |nottick| "[^`]") (SPADLET |name| (|replaceGrepStar| |name|)) (SPADLET |firstPart| (COND @@ -18325,7 +18237,7 @@ (COND ((> |i| |final|) |s|) ('T - (STRCONC (SUBSTRING |s| 0 |i|) (MAKESTRING "[^`]*") + (STRCONC (SUBSTRING |s| 0 |i|) "[^`]*" (|replaceGrepStar| (SUBSTRING |s| (PLUS |i| 1) NIL)))))))))) @@ -18343,7 +18255,7 @@ ((BOOT-EQUAL (ELT |s| 0) (|char| '|(|)) |s|) ('T (SPADLET |k| - (OR (STRPOS (MAKESTRING "->") |s| 0 NIL) + (OR (STRPOS "->" |s| 0 NIL) (RETURN |s|))) (COND ((BOOT-EQUAL (ELT |s| (SPADDIFFERENCE |k| 1)) @@ -18362,12 +18274,12 @@ (DEFUN |underscoreDollars,fn| (|s| |i| |n|) (PROG (|m|) (RETURN - (SEQ (IF (> |i| |n|) (EXIT (MAKESTRING ""))) + (SEQ (IF (> |i| |n|) (EXIT "")) (IF (> (SPADLET |m| (|charPosition| (|char| '$) |s| |i|)) |n|) (EXIT (SUBSTRING |s| |i| NIL))) (EXIT (STRCONC (SUBSTRING |s| |i| (SPADDIFFERENCE |m| |i|)) - (MAKESTRING "_$") + "_$" (|underscoreDollars,fn| |s| (PLUS |m| 1) |n|))))))) (DEFUN |underscoreDollars| (|s|) @@ -18397,7 +18309,7 @@ (RETURN (PROGN (SPADLET |pathname| (|mkGrepFile| |kind|)) - (|obey| (STRCONC (MAKESTRING "rm -f ") |pathname|)) + (|obey| (STRCONC "rm -f " |pathname|)) |pathname|)))) ;dbWriteLines(s, :options) == @@ -18486,9 +18398,9 @@ (declare (special $SPADROOT |$localLibdb|)) (COND ((BOOT-EQUAL |key| '|libdb|) - (STRCONC $SPADROOT (MAKESTRING "/algebra/libdb.text"))) + (STRCONC $SPADROOT "/algebra/libdb.text")) ((BOOT-EQUAL |key| '|gloss|) - (STRCONC $SPADROOT (MAKESTRING "/algebra/glosskey.text"))) + (STRCONC $SPADROOT "/algebra/glosskey.text")) ((BOOT-EQUAL |key| |$localLibdb|) |$localLibdb|) ('T (|mkGrepTextfile| @@ -18501,7 +18413,7 @@ (DEFUN |mkGrepTextfile| (|s|) (declare (special $spadroot)) (STRCONC $SPADROOT '|/algebra/| (STRINGIMAGE |s|) - (MAKESTRING ".text"))) + ".text")) ;mkGrepFile s == --called to generate a path name for a temporary grep file ; prefix := @@ -18518,10 +18430,10 @@ (SPADLET |prefix| (COND ((OR |$standard| |$aixTestSaturn|) - (MAKESTRING "/tmp/")) - ('T (STRCONC $SPADROOT (MAKESTRING "/algebra/"))))) - (SPADLET |suffix| (|getEnv| (MAKESTRING "SPADNUM"))) - (STRCONC |prefix| (PNAME |s|) (MAKESTRING ".txt.") |suffix|))))) + "/tmp/") + ('T (STRCONC $SPADROOT "/algebra/")))) + (SPADLET |suffix| (|getEnv| "SPADNUM")) + (STRCONC |prefix| (PNAME |s|) ".txt." |suffix|))))) ;--======================================================================= ;-- Grepping Code @@ -18569,21 +18481,21 @@ (SPADLET |casepart| (COND ((MEMQ '|iv| |options|) - (MAKESTRING "-vi")) - ('T (MAKESTRING "-i")))) + "-vi") + ('T "-i"))) (SPADLET |command| - (STRCONC (MAKESTRING "grep ") |casepart| - (MAKESTRING " '") |pattern| - (MAKESTRING "' ") |source|)) + (STRCONC "grep " |casepart| + " '" |pattern| + "' " |source|)) (|obey| (COND ((|member| |key| '(|a| |o| |c| |d| |p| |x|)) (STRCONC |command| - (MAKESTRING " | sed 's/~/") + " | sed 's/~/" (STRINGIMAGE |key|) - (MAKESTRING "/' > ") |target|)) + "/' > " |target|)) ('T - (STRCONC |command| (MAKESTRING " > ") + (STRCONC |command| " > " |target|)))) (|dbReadLines| |target|)) ('T (SPADLET |invert?| (MEMQ '|iv| |options|)) @@ -18662,7 +18574,7 @@ ;$wild1 := '"[^`]*" --phrase used to convert keys to grep strings -(SPADLET |$wild1| (MAKESTRING "[^`]*")) +(SPADLET |$wild1| "[^`]*") ;$browseCountThreshold := 10 --the maximum number of names that will display @@ -18744,16 +18656,16 @@ $dbKindAlist := ; [char 'c,:'"category"],[char 'x,:'"default_ package"]] (SPADLET |$dbKindAlist| - (CONS (CONS (|char| '|a|) (MAKESTRING "attribute")) - (CONS (CONS (|char| '|o|) (MAKESTRING "operation")) - (CONS (CONS (|char| '|d|) (MAKESTRING "domain")) + (CONS (CONS (|char| '|a|) "attribute") + (CONS (CONS (|char| '|o|) "operation") + (CONS (CONS (|char| '|d|) "domain") (CONS (CONS (|char| '|p|) - (MAKESTRING "package")) + "package") (CONS (CONS (|char| '|c|) - (MAKESTRING "category")) + "category") (CONS (CONS (|char| '|x|) - (MAKESTRING "default package")) + "default package") NIL))))))) ;$OpViewTable := '( @@ -18779,7 +18691,7 @@ $dbKindAlist := ;bcBlankLine() == bcHt '"\vspace{1}\newline " -(DEFUN |bcBlankLine| () (|bcHt| (MAKESTRING "\\vspace{1}\\newline "))) +(DEFUN |bcBlankLine| () (|bcHt| "\\vspace{1}\\newline ")) ;pluralize k == ; k = '"child" => '"children" @@ -18789,11 +18701,11 @@ $dbKindAlist := (DEFUN |pluralize| (|k|) (COND - ((BOOT-EQUAL |k| (MAKESTRING "child")) (MAKESTRING "children")) - ((BOOT-EQUAL |k| (MAKESTRING "category")) - (MAKESTRING "categories")) - ((BOOT-EQUAL |k| (MAKESTRING "entry")) (MAKESTRING "entries")) - ('T (STRCONC |k| (MAKESTRING "s"))))) + ((BOOT-EQUAL |k| "child") "children") + ((BOOT-EQUAL |k| "category") + "categories") + ((BOOT-EQUAL |k| "entry") "entries") + ('T (STRCONC |k| "s")))) ;capitalize s == ; LASSOC(s,'( @@ -18836,7 +18748,7 @@ $dbKindAlist := ((EQL (|#| |u|) 1) (COND ((|member| |u| |$htSpecialChars|) - (CONS (CONCAT (MAKESTRING "\\") |u|) NIL)) + (CONS (CONCAT "\\" |u|) NIL)) ('T (CONS |u| NIL)))) ('T (SPADLET |c| (|char| (ELT |u| 0))) (COND @@ -18852,7 +18764,7 @@ $dbKindAlist := (SEQ (EXIT (SETQ G176470 (OR G176470 (BOOT-EQUAL |c| (|char| |y|))))))))) - (CONS (CONCAT (MAKESTRING "\\") |u|) NIL)) + (CONS (CONCAT "\\" |u|) NIL)) ('T (CONS |u| NIL))))))))) ;escapeString com == --this makes changes on single comment lines @@ -18877,12 +18789,12 @@ $dbKindAlist := (SPADLET |look| NIL)) ('T (SPADLET |look| - (STRPOSL (MAKESTRING "${}#%") + (STRPOSL "${}#%" |com| |look| NIL)) (COND (|look| (SPADLET |com| (RPLACSTR |com| |look| 0 - (MAKESTRING "\\"))) + "\\")) (SPADLET |look| (PLUS |look| 2))) ('T NIL))))))) |com|))))) @@ -18937,11 +18849,11 @@ $dbKindAlist := (RETURN (SEQ (SPADLET |s| (|form2HtString| |c|)) (IF (|member| |s| |$emList|) - (EXIT (|htSay| (MAKESTRING "{\\em ") |s| - (MAKESTRING "}")))) + (EXIT (|htSay| "{\\em " |s| + "}"))) (EXIT (|satDownLink| |s| - (CONS (MAKESTRING "(|aPage| '|") - (CONS |s| (CONS (MAKESTRING "|)") NIL))))))))) + (CONS "(|aPage| '|" + (CONS |s| (CONS "|)" NIL))))))))) (DEFUN |htPred2English,gn| (|x| |op| |l| |prec|) (declare (ignore |prec|)) @@ -18949,19 +18861,19 @@ $dbKindAlist := (declare (special |$emList|)) (RETURN (SEQ (IF (MEMQ |op| '(NOT |not|)) - (EXIT (SEQ (|htSay| (MAKESTRING "not ")) + (EXIT (SEQ (|htSay| "not ") (EXIT (|htPred2English,fn| (CAR |l|) 0))))) (IF (BOOT-EQUAL |op| '|HasCategory|) (EXIT (SEQ (|bcConform| (CAR |l|) |$emList|) - (|htSay| (MAKESTRING " has ")) + (|htSay| " has ") (EXIT (|bcConform| (CADADR |l|) |$emList|))))) (IF (BOOT-EQUAL |op| '|HasAttribute|) (EXIT (SEQ (|bcConform| (CAR |l|) |$emList|) - (|htSay| (MAKESTRING " has ")) + (|htSay| " has ") (EXIT (|htPred2English,fnAttr| (CADADR |l|)))))) (IF (MEMQ |op| '(|has| |ofCategory|)) (EXIT (SEQ (|bcConform| (CAR |l|) |$emList|) - (|htSay| (MAKESTRING " has ")) + (|htSay| " has ") (PROGN (SPADLET |a| (CAR |l|)) (SPADLET |b| (CADR |l|)) @@ -19001,7 +18913,7 @@ $dbKindAlist := 'T))) (EXIT (SEQ (IF (> |iprec| |prec|) - (|htSay| (MAKESTRING "(")) NIL) + (|htSay| "(") NIL) (|htPred2English,fn| (CAR |l|) |iprec|) (DO @@ -19014,22 +18926,22 @@ $dbKindAlist := NIL)) NIL) (SEQ - (|htSay| (MAKESTRING " ") + (|htSay| " " (OR |rename| |op|) - (MAKESTRING " ")) + " ") (EXIT (|htPred2English,fn| |y| |iprec|)))) (EXIT (IF (> |iprec| |prec|) - (|htSay| (MAKESTRING ")")) NIL))))) - (IF (> 5 |prec|) (|htSay| (MAKESTRING "(")) + (|htSay| ")") NIL))))) + (IF (> 5 |prec|) (|htSay| "(") NIL) (|htPred2English,gn| |x| |op| |l| |prec|) (EXIT (IF (> 5 |prec|) - (|htSay| (MAKESTRING ")")) NIL))))) + (|htSay| ")") NIL))))) (IF (BOOT-EQUAL |x| '|etc|) - (EXIT (|htSay| (MAKESTRING "...")))) + (EXIT (|htSay| "..."))) (IF (AND (IDENTP |x|) (NULL (MEMQ |x| |$emList|))) (EXIT (|htSay| (|escapeSpecialIds| (PNAME |x|))))) (EXIT (|htSay| (|form2HtString| |x| |$emList|))))))) @@ -19087,7 +18999,7 @@ $dbKindAlist := (SEQ (IF (IDENTP |u|) (EXIT (|escapeSpecialIds| (PNAME |u|)))) (IF (STRINGP |u|) (EXIT (|escapeString| |u|))) (IF (ATOM |u|) (EXIT (|systemError|))) - (EXIT (CONS (MAKESTRING "(") + (EXIT (CONS "(" (APPEND (PROG (G176603) (SPADLET G176603 NIL) (RETURN @@ -19104,10 +19016,10 @@ $dbKindAlist := (SETQ G176603 (APPEND G176603 (|lisp2HT,fn| |x|)))))))) - (CONS (MAKESTRING ")") NIL)))))))) + (CONS ")" NIL)))))))) -(DEFUN |lisp2HT| (|u|) (CONS (MAKESTRING "'") (|lisp2HT,fn| |u|))) +(DEFUN |lisp2HT| (|u|) (CONS "'" (|lisp2HT,fn| |u|))) ;args2HtString(x,:options) == ; null x => '"" @@ -19119,7 +19031,7 @@ $dbKindAlist := (PROG (|emList|) (RETURN (COND - ((NULL |x|) (MAKESTRING "")) + ((NULL |x|) "") ('T (SPADLET |emList| (IFCAR |options|)) (SUBSTRING (|form2HtString| (CONS '|f| |x|) |emList|) 1 NIL)))))) @@ -19158,12 +19070,12 @@ $dbKindAlist := ; STRCONC('",",fn first x,fnTailTail rest x) (DEFUN |form2HtString,fnTailTail| (|x|) - (SEQ (IF (NULL |x|) (EXIT (MAKESTRING ""))) - (EXIT (STRCONC (MAKESTRING ",") (|form2HtString,fn| (CAR |x|)) + (SEQ (IF (NULL |x|) (EXIT "")) + (EXIT (STRCONC "," (|form2HtString,fn| (CAR |x|)) (|form2HtString,fnTailTail| (CDR |x|)))))) (DEFUN |form2HtString,fnTail| (|x| |str|) - (SEQ (IF (NULL |x|) (EXIT (MAKESTRING ""))) + (SEQ (IF (NULL |x|) (EXIT "")) (EXIT (STRCONC (ELT |str| 0) (|form2HtString,fn| (CAR |x|)) (|form2HtString,fnTailTail| (CDR |x|)) (ELT |str| 1))))) @@ -19174,37 +19086,37 @@ $dbKindAlist := (RETURN (SEQ (IF (ATOM |x|) (EXIT (SEQ (IF (MEMQ |x| |$FormalMapVariableList|) - (EXIT (STRCONC (MAKESTRING "\\") + (EXIT (STRCONC "\\" (STRINGIMAGE |x|)))) (SPADLET |u| (|escapeSpecialChars| (STRINGIMAGE |x|))) (IF (MEMQ |x| |$emList|) - (EXIT (STRCONC (MAKESTRING "{\\em ") |u| - (MAKESTRING "}")))) + (EXIT (STRCONC "{\\em " |u| + "}"))) (IF (STRINGP |x|) - (EXIT (STRCONC (MAKESTRING "\"") |u| - (MAKESTRING "\"")))) + (EXIT (STRCONC "\"" |u| + "\""))) (EXIT |u|)))) (IF (BOOT-EQUAL (CAR |x|) 'QUOTE) - (EXIT (STRCONC (MAKESTRING "'") + (EXIT (STRCONC "'" (|sexpr2HtString| (CAR (CDR |x|)))))) (IF (BOOT-EQUAL (CAR |x|) '|:|) (EXIT (STRCONC (|form2HtString,fn| (CAR (CDR |x|))) - (MAKESTRING ": ") + ": " (|form2HtString,fn| (CAR (CDR (CDR |x|))))))) (IF (BOOT-EQUAL (CAR |x|) '|Mapping|) (EXIT (STRCONC (|form2HtString,fnTail| (CDR (CDR |x|)) - (MAKESTRING "()")) - (MAKESTRING "->") + "()") + "->" (|form2HtString,fn| (CAR (CDR |x|)))))) (IF (BOOT-EQUAL (CAR |x|) '|construct|) (EXIT (|form2HtString,fnTail| (CDR |x|) - (MAKESTRING "[]")))) + "[]"))) (SPADLET |tail| (|form2HtString,fnTail| (CDR |x|) - (MAKESTRING "()"))) + "()")) (SPADLET |head| (|form2HtString,fn| (CAR |x|))) (EXIT (STRCONC |head| |tail|)))))) @@ -19233,11 +19145,11 @@ $dbKindAlist := (RETURN (SEQ (SPADLET |r| (CDR |x|)) (SPADLET |suffix| - (SEQ (IF (NULL |r|) (EXIT (MAKESTRING ""))) + (SEQ (IF (NULL |r|) (EXIT "")) (IF (ATOM |r|) - (EXIT (STRCONC (MAKESTRING " . ") + (EXIT (STRCONC " . " (|form2HtString| (CDR |x|))))) - (EXIT (STRCONC (MAKESTRING " ") + (EXIT (STRCONC " " (|sexpr2HtString,fn| |r|))))) (EXIT (STRCONC (|sexpr2HtString| (CAR |x|)) |suffix|)))))) @@ -19245,8 +19157,8 @@ $dbKindAlist := (COND ((ATOM |x|) (|form2HtString| |x|)) ('T - (STRCONC (MAKESTRING "(") (|sexpr2HtString,fn| |x|) - (MAKESTRING ")"))))) + (STRCONC "(" (|sexpr2HtString,fn| |x|) + ")")))) ;form2LispString(x) == ; atom x => @@ -19267,19 +19179,19 @@ $dbKindAlist := (COND ((ATOM |x|) (COND - ((BOOT-EQUAL |x| '$) (MAKESTRING "_$")) + ((BOOT-EQUAL |x| '$) "_$") ((MEMQ |x| |$FormalMapVariableList|) (STRCONC (STRINGIMAGE '_) (STRINGIMAGE |x|))) ((STRINGP |x|) - (STRCONC (MAKESTRING "\"") (STRINGIMAGE |x|) - (MAKESTRING "\""))) + (STRCONC "\"" (STRINGIMAGE |x|) + "\"")) ('T (STRINGIMAGE |x|)))) ((AND (PAIRP |x|) (EQ (QCAR |x|) 'QUOTE) (PROGN (SPADLET |ISTMP#1| (QCDR |x|)) (AND (PAIRP |ISTMP#1|) (EQ (QCDR |ISTMP#1|) NIL) (PROGN (SPADLET |a| (QCAR |ISTMP#1|)) 'T)))) - (STRCONC (MAKESTRING "'") (|sexpr2LispString| |a|))) + (STRCONC "'" (|sexpr2LispString| |a|))) ((AND (PAIRP |x|) (EQ (QCAR |x|) '|:|) (PROGN (SPADLET |ISTMP#1| (QCDR |x|)) @@ -19289,14 +19201,14 @@ $dbKindAlist := (SPADLET |ISTMP#2| (QCDR |ISTMP#1|)) (AND (PAIRP |ISTMP#2|) (EQ (QCDR |ISTMP#2|) NIL) (PROGN (SPADLET |b| (QCAR |ISTMP#2|)) 'T)))))) - (STRCONC (|form2LispString| |a|) (MAKESTRING ":") + (STRCONC (|form2LispString| |a|) ":" (|form2LispString| |b|))) ((BOOT-EQUAL (CAR |x|) '|Mapping|) (COND ((NULL (CDR (SPADLET |r| (CDR |x|)))) - (STRCONC (MAKESTRING "()->") (|form2LispString| (CAR |r|)))) + (STRCONC "()->" (|form2LispString| (CAR |r|)))) ('T - (STRCONC (|args2LispString| (CDR |r|)) (MAKESTRING "->") + (STRCONC (|args2LispString| (CDR |r|)) "->" (|form2LispString| (CAR |r|)))))) ('T (STRCONC (|form2LispString| (CAR |x|)) @@ -19317,11 +19229,11 @@ $dbKindAlist := (RETURN (SEQ (SPADLET |r| (CDR |x|)) (SPADLET |suffix| - (SEQ (IF (NULL |r|) (EXIT (MAKESTRING ""))) + (SEQ (IF (NULL |r|) (EXIT "")) (IF (ATOM |r|) - (EXIT (STRCONC (MAKESTRING " . ") + (EXIT (STRCONC " . " (|form2LispString| (CDR |x|))))) - (EXIT (STRCONC (MAKESTRING " ") + (EXIT (STRCONC " " (|sexpr2LispString,fn| |r|))))) (EXIT (STRCONC (|sexpr2HtString| (CAR |x|)) |suffix|)))))) @@ -19329,8 +19241,8 @@ $dbKindAlist := (COND ((ATOM |x|) (|form2LispString| |x|)) ('T - (STRCONC (MAKESTRING "(") (|sexpr2LispString,fn| |x|) - (MAKESTRING ")"))))) + (STRCONC "(" (|sexpr2LispString,fn| |x|) + ")")))) ;args2LispString x == ; null x => '"" @@ -19340,17 +19252,17 @@ $dbKindAlist := ; STRCONC('",",form2LispString first x,fnTailTail rest x) (DEFUN |args2LispString,fnTailTail| (|x|) - (SEQ (IF (NULL |x|) (EXIT (MAKESTRING ""))) - (EXIT (STRCONC (MAKESTRING ",") (|form2LispString| (CAR |x|)) + (SEQ (IF (NULL |x|) (EXIT "")) + (EXIT (STRCONC "," (|form2LispString| (CAR |x|)) (|args2LispString,fnTailTail| (CDR |x|)))))) (DEFUN |args2LispString| (|x|) (COND - ((NULL |x|) (MAKESTRING "")) + ((NULL |x|) "") ('T - (STRCONC (MAKESTRING "(") (|form2LispString| (CAR |x|)) + (STRCONC "(" (|form2LispString| (CAR |x|)) (|args2LispString,fnTailTail| (CDR |x|)) - (MAKESTRING ")"))))) + ")")))) ;dbConstructorKind x == ; target := CADAR GETDATABASE(x,'CONSTRUCTORMODEMAP) @@ -19439,15 +19351,15 @@ $dbKindAlist := (COND ((STRINGP |comments|) (COND - ((BOOT-EQUAL |comments| (MAKESTRING "")) NIL) - ('T (|htSay| (MAKESTRING "\\newline ")) - (COND (|italics?| (|htSay| (MAKESTRING "{\\em ")))) + ((BOOT-EQUAL |comments| "") NIL) + ('T (|htSay| "\\newline ") + (COND (|italics?| (|htSay| "{\\em "))) (|htSay| |comments|) (COND - (|italics?| (|htSay| (MAKESTRING "}"))) + (|italics?| (|htSay| "}")) ('T NIL))))) ((NULL |comments|) NIL) - ('T (|htSay| (MAKESTRING "\\newline ")) + ('T (|htSay| "\\newline ") (COND (|italics?| (|htSay| '|{\\em |))) (|htSay| (CAR |comments|)) (DO ((G176760 (CDR |comments|) (CDR G176760)) @@ -19455,9 +19367,9 @@ $dbKindAlist := ((OR (ATOM G176760) (PROGN (SETQ |x| (CAR G176760)) NIL)) NIL) - (SEQ (EXIT (|htSay| (MAKESTRING " ") |x|)))) + (SEQ (EXIT (|htSay| " " |x|)))) (COND - (|italics?| (|htSay| (MAKESTRING "}"))) + (|italics?| (|htSay| "}")) ('T NIL))))))))) ;bcConform(form,:options) == @@ -19549,7 +19461,7 @@ $dbKindAlist := ;htSayItalics s == htSay('"{\em ",s,'"}") (DEFUN |htSayItalics| (|s|) - (|htSay| (MAKESTRING "{\\em ") |s| (MAKESTRING "}"))) + (|htSay| "{\\em " |s| "}")) ;bcCon(name,:options) == ; argString := IFCAR options or '"" @@ -19563,7 +19475,7 @@ $dbKindAlist := (PROG (|argString| |s|) (RETURN (PROGN - (SPADLET |argString| (OR (IFCAR |options|) (MAKESTRING ""))) + (SPADLET |argString| (OR (IFCAR |options|) "")) (SPADLET |s| (STRINGIMAGE |name|)) (|bcStar| |name|) (|htSayConstructorName| |s| |s|) @@ -19620,7 +19532,7 @@ $dbKindAlist := ((NULL |exposed?|) (|htSayUnexposed|) (COND ((BOOT-EQUAL (ELT |op| 0) (|char| '*)) - (|htSay| (MAKESTRING " "))) + (|htSay| " ")) ('T NIL))) ('T (|htBlank|)))) @@ -19644,10 +19556,10 @@ $dbKindAlist := (PROGN (SPADLET |u| (GETDATABASE |name| 'SOURCEFILE)) (COND - ((NULL |u|) (MAKESTRING "")) + ((NULL |u|) "") ('T (SPADLET |n| (PATHNAME-NAME |u|)) (SPADLET |t| (PATHNAME-TYPE |u|)) - (STRCONC |n| (MAKESTRING ".") |t|))))))) + (STRCONC |n| "." |t|))))))) ;asharpConstructorName? name == ; u:= GETDATABASE(name,'SOURCEFILE) @@ -19658,7 +19570,7 @@ $dbKindAlist := (RETURN (PROGN (SPADLET |u| (GETDATABASE |name| 'SOURCEFILE)) - (AND |u| (BOOT-EQUAL (PATHNAME-TYPE |u|) (MAKESTRING "as"))))))) + (AND |u| (BOOT-EQUAL (PATHNAME-TYPE |u|) "as")))))) ;asharpConstructors() == ; [x for x in allConstructors() | not asharpConstructorName? x] @@ -19719,19 +19631,19 @@ $dbKindAlist := (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) - (|htSay| (MAKESTRING "{")) + ('T (|htSaySaturn| "&"))) + (|htSay| "{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS (|escapeSpecialChars| (STRINGIMAGE (|opOf| |op|))) - (CONS (MAKESTRING "") + (CONS "" (CONS |fn| (CONS |i| NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "}")))))) + (|htSay| "}"))))) (|htEndTable|)))))) ;bcNameConTable u == @@ -19772,11 +19684,11 @@ $dbKindAlist := (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) - (|htSay| (MAKESTRING "{")) + ('T (|htSaySaturn| "&"))) + (|htSay| "{") (|bcStarSpace| (|opOf| |con|)) (|bcConform| |con|) - (|htSay| (MAKESTRING "}")))))) + (|htSay| "}"))))) (|htEndTable|)))))) ;bcAbbTable u == @@ -19805,7 +19717,7 @@ $dbKindAlist := (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) + ('T (|htSaySaturn| "&"))) (COND ((AND (PAIRP |x|) (PROGN @@ -19816,9 +19728,9 @@ $dbKindAlist := (SPADLET |abb| (QCAR |ISTMP#1|)) 'T)))) - (|htSay| (MAKESTRING "{")) + (|htSay| "{") (|bcAbb| |con| |abb|) - (|htSay| (MAKESTRING "}"))) + (|htSay| "}")) ('T NIL)))))) (|htEndTable|)))))) @@ -19864,8 +19776,8 @@ $dbKindAlist := (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) - (|htSay| (MAKESTRING "{")) + ('T (|htSaySaturn| "&"))) + (|htSay| "{") (|bcStarSpace| (|opOf| |conform|)) (SPADLET |form| (COND @@ -19885,13 +19797,13 @@ $dbKindAlist := (SPADLET |pred| (QCDR |ISTMP#1|)) 'T))) - (|htSay| (MAKESTRING " {\\em of} ")) + (|htSay| " {\\em of} ") (|bcConform| (CONS |conname| |arglist|) |italicList| 'T))) (COND ((NEQUAL |pred| '|etc|) (|bcPred| |pred| |italicList|))) - (|htSay| (MAKESTRING "}")))))) + (|htSay| "}"))))) (|htEndTable|)))))) ;bcPred(pred,:options) == @@ -19905,13 +19817,13 @@ $dbKindAlist := (PROG (|italicList|) (RETURN (COND - ((OR (BOOT-EQUAL |pred| (MAKESTRING "")) (BOOT-EQUAL |pred| 'T) + ((OR (BOOT-EQUAL |pred| "") (BOOT-EQUAL |pred| 'T) (NULL |pred|)) '|skip|) ('T (SPADLET |italicList| (IFCAR |options|)) (COND ((NULL (IFCAR (IFCDR |options|))) - (|htSay| (MAKESTRING " {\\em if} ")))) + (|htSay| " {\\em if} "))) (|htPred2English| |pred| |italicList|)))))) ;extractHasArgs pred == @@ -20013,7 +19925,7 @@ $dbKindAlist := (PROG (|firstTime| |s|) (RETURN (SEQ (PROGN - (|htSay| (MAKESTRING "\\newline")) + (|htSay| "\\newline") (|htBeginTable|) (SPADLET |firstTime| 'T) (DO ((G177128 |u| (CDR G177128)) (|x| NIL)) @@ -20023,8 +19935,8 @@ $dbKindAlist := (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) - (|htSay| (MAKESTRING "{")) + ('T (|htSaySaturn| "&"))) + (|htSay| "{") (COND ((IFCAR |option|) (|bcStar| |x|))) (|htMakePage| (CONS (CONS '|bcLinks| @@ -20033,11 +19945,11 @@ $dbKindAlist := (SPADLET |s| (|escapeSpecialChars| (STRINGIMAGE |x|))) - (CONS (MAKESTRING "") + (CONS "" (CONS |fn| (CONS |s| NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "}")))))) + (|htSay| "}"))))) (|htEndTable|)))))) ;bcNameCountTable(u,fn,gn,:options) == @@ -20065,7 +19977,7 @@ $dbKindAlist := (COND ((IFCAR |options|) '|bcLispLinks|) ('T '|bcLinks|))) - (|htSay| (MAKESTRING "\\newline")) + (|htSay| "\\newline") (|htBeginTable|) (SPADLET |firstTime| 'T) (DO ((|i| 0 (QSADD1 |i|)) (G177152 |u| (CDR G177152)) @@ -20076,17 +19988,17 @@ $dbKindAlist := (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "&")))) - (|htSay| (MAKESTRING "{")) + ('T (|htSaySaturn| "&"))) + (|htSay| "{") (|htMakePage| (CONS (CONS |linkFunction| (CONS (CONS (FUNCALL |fn| |x|) - (CONS (MAKESTRING "") + (CONS "" (CONS |gn| (CONS |i| NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "}")))))) + (|htSay| "}"))))) (|htEndTable|)))))) ;dbSayItemsItalics(:u) == @@ -20097,9 +20009,9 @@ $dbKindAlist := (DEFUN |dbSayItemsItalics| (&REST G177169 &AUX |u|) (DSETQ |u| G177169) (PROGN - (|htSay| (MAKESTRING "{\\em ")) + (|htSay| "{\\em ") (APPLY (|function| |dbSayItems|) |u|) - (|htSay| (MAKESTRING "}")))) + (|htSay| "}"))) ;dbSayItems(countOrPrefix,singular,plural,:options) == ; bcHt '"\newline " @@ -20121,7 +20033,7 @@ $dbKindAlist := (PROG (|ISTMP#1| |c| |prefix| |count|) (RETURN (SEQ (PROGN - (|bcHt| (MAKESTRING "\\newline ")) + (|bcHt| "\\newline ") (SPADLET |count| (COND ((AND (PAIRP |countOrPrefix|) @@ -20141,16 +20053,16 @@ $dbKindAlist := ('T |countOrPrefix|))) (COND ((EQL |count| 0) - (|htSay| (MAKESTRING "No ") |singular|)) - ((EQL |count| 1) (|htSay| (MAKESTRING "1 ") |singular|)) - ('T (|htSay| |count| (MAKESTRING " ") |plural|))) + (|htSay| "No " |singular|)) + ((EQL |count| 1) (|htSay| "1 " |singular|)) + ('T (|htSay| |count| " " |plural|))) (DO ((G177179 |options| (CDR G177179)) (|x| NIL)) ((OR (ATOM G177179) (PROGN (SETQ |x| (CAR G177179)) NIL)) NIL) (SEQ (EXIT (|bcHt| |x|)))) (COND - ((NEQUAL |count| 0) (|bcHt| (MAKESTRING ":"))) + ((NEQUAL |count| 0) (|bcHt| ":")) ('T NIL))))))) ;dbBasicConstructor? conname == MEMBER(dbSourceFile conname,'("catdef" "coerce")) @@ -20222,22 +20134,20 @@ $dbKindAlist := (PROGN (SPADLET |skipNamePart| (IFCAR |options|)) (SPADLET |heading| - (CONS (MAKESTRING "No ") + (CONS "No " (CONS (|capitalize| |kind|) - (CONS (MAKESTRING " Found") NIL)))) + (CONS " Found" NIL)))) (|htInitPage| |heading| NIL) (SPADLET |exposePart| (COND ((NULL |$includeUnexposed?|) - (MAKESTRING "{\\em exposed} ")) - ('T (MAKESTRING "")))) - (|htSay| (MAKESTRING - "\\vspace{1}\\newline\\centerline{There is no ") + "{\\em exposed} ") + ('T ""))) + (|htSay| "\\vspace{1}\\newline\\centerline{There is no " |exposePart| |kind| - (MAKESTRING - " matching pattern}\\newline\\centerline{{\\em ")) + " matching pattern}\\newline\\centerline{{\\em ") (COND (|filter| (|htPred2English| |filter|))) - (|htSay| (MAKESTRING "}}")) + (|htSay| "}}") (|htShowPage|))))) ;isLoaded? conform == GET(constructor? opOf conform,'LOADED) @@ -20277,8 +20187,8 @@ $dbKindAlist := (PROGN (SPADLET |s| (|htpLabelInputString| |htPage| '|filter|)) (COND - ((OR (NULL |s|) (BOOT-EQUAL |s| (MAKESTRING ""))) - (MAKESTRING "*")) + ((OR (NULL |s|) (BOOT-EQUAL |s| "")) + "*") ('T |s|)))))) ;--======================================================================= @@ -20306,7 +20216,7 @@ $dbKindAlist := (SEQ (EXIT (|htSay| |x|)))) (|htShowPage|)) ('T - (|systemError| (MAKESTRING "Unexpected error message")))))))) + (|systemError| "Unexpected error message"))))))) ;errorPage(htPage,[heading,kind,:info]) == ; kind = 'invalidType => kInvalidTypePage first info @@ -20330,7 +20240,7 @@ $dbKindAlist := ('T (COND ((BOOT-EQUAL |heading| '|error|) - (|htInitPage| (MAKESTRING "Error") NIL)) + (|htInitPage| "Error" NIL)) ('T (|htInitPage| |heading| NIL))) (|bcBlankLine|) (DO ((G177299 |info| (CDR G177299)) (|x| NIL)) @@ -20345,10 +20255,9 @@ $dbKindAlist := (DEFUN |htErrorStar| () (|errorPage| NIL - (CONS (MAKESTRING "{\\em *} not a valid search string") + (CONS "{\\em *} not a valid search string" (CONS NIL - (CONS (MAKESTRING - "\\vspace{3}\\centerline{{\\em *} is not a valid search string for a general search}\\centerline{\\em {it would match everything!}}") + (CONS "\\vspace{3}\\centerline{{\\em *} is not a valid search string for a general search}\\centerline{\\em {it would match everything!}}" NIL))))) ;htQueryPage(htPage,heading,message,query,fn) == @@ -20386,29 +20295,29 @@ $dbKindAlist := (PROGN (SPADLET |upLink?| (IFCAR |options|)) (COND - (|question| (|htSay| (MAKESTRING "\\vspace{1}\\centerline{")) - (|htSay| |question|) (|htSay| (MAKESTRING "}")))) - (|htSay| (MAKESTRING "\\centerline{")) + (|question| (|htSay| "\\vspace{1}\\centerline{") + (|htSay| |question|) (|htSay| "}"))) + (|htSay| "\\centerline{") (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\fbox{Yes}") - (CONS (MAKESTRING "") + (CONS (CONS "\\fbox{Yes}" + (CONS "" (CONS |fn| (CONS '|yes| NIL)))) NIL)) NIL)) (|htBlank| 4) (COND (|upLink?| - (|htSay| (MAKESTRING "\\downlink{\\fbox{No}}{UpPage}"))) + (|htSay| "\\downlink{\\fbox{No}}{UpPage}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\fbox{No}") - (CONS (MAKESTRING "") + (CONS (CONS "\\fbox{No}" + (CONS "" (CONS |fn| (CONS '|no| NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}")))))) + (|htSay| "}"))))) ;kInvalidTypePage form == ; htInitPage('"Error",nil) @@ -20419,11 +20328,10 @@ $dbKindAlist := (DEFUN |kInvalidTypePage| (|form|) (PROGN - (|htInitPage| (MAKESTRING "Error") NIL) + (|htInitPage| "Error" NIL) (|bcBlankLine|) - (|htSay| (MAKESTRING - "\\centerline{You gave an invalid type:}\\newline\\centerline{{\\sf ")) - (|htSay| (|form2HtString| |form|) (MAKESTRING "}}")) + (|htSay| "\\centerline{You gave an invalid type:}\\newline\\centerline{{\\sf ") + (|htSay| (|form2HtString| |form|) "}}") (|htShowPage|))) ;dbNotAvailablePage(:options) == @@ -20435,11 +20343,10 @@ $dbKindAlist := (DEFUN |dbNotAvailablePage| (&REST G177333 &AUX |options|) (DSETQ |options| G177333) (PROGN - (|htInitPage| (MAKESTRING "Missing Page") NIL) + (|htInitPage| "Missing Page" NIL) (|bcBlankLine|) (|htSay| (OR (IFCAR |options|) - (MAKESTRING - "\\centerline{This page is not available yet}"))) + "\\centerline{This page is not available yet}")) (|htShowPage|))) ;--======================================================================= @@ -20590,12 +20497,12 @@ $dbKindAlist := |infoAlist| |opAlist|) (RETURN (PROGN - (SPADLET |which| (MAKESTRING "operation")) + (SPADLET |which| "operation") (|htpSetProperty| |htPage| '|which| |which|) (SPADLET |domname| (|htpProperty| |htPage| '|domname|)) (SPADLET |conform| (|htpProperty| |htPage| '|conform|)) (SPADLET |heading| - (CONS (MAKESTRING "Capsule Cross Reference for ") + (CONS "Capsule Cross Reference for " (|htpProperty| |htPage| '|heading|))) (SPADLET |page| (|htInitPage| |heading| (|htCopyProplist| |htPage|))) @@ -20930,7 +20837,7 @@ $dbKindAlist := (COND ((BOOT-EQUAL |kind| '|category|) (CONS (INTERN (STRCONC (PNAME |conname|) - (MAKESTRING "&"))) + "&")) (CONS '$ (CDR |conform|)))) ('T |conform|))) (SPADLET |faTypes| @@ -20947,20 +20854,20 @@ $dbKindAlist := (|escapeSpecialChars| (STRINGIMAGE (|zeroOneConvert| |op|)))) (SPADLET |oppart| - (CONS (MAKESTRING "{\\em ") - (CONS |ops| (CONS (MAKESTRING "}") NIL)))) + (CONS "{\\em " + (CONS |ops| (CONS "}" NIL)))) (SPADLET |head| (COND (|sig| (APPEND |oppart| - (CONS (MAKESTRING ": ") + (CONS ": " (|dbConformGen| (|dbInfoSig| |sig|))))) ('T |oppart|))) (SPADLET |heading| (APPEND |head| - (CONS (MAKESTRING " from {\\sf ") + (CONS " from {\\sf " (CONS (|form2HtString| |conform|) - (CONS (MAKESTRING "}") NIL))))) + (CONS "}" NIL))))) (DO ((G177589 |alist| (CDR G177589)) (|u| NIL)) ((OR (ATOM G177589) (PROGN (SETQ |u| (CAR G177589)) NIL)) @@ -21041,7 +20948,7 @@ $dbKindAlist := (SETQ G177606 (OR G177606 |x|))))))))) (|systemError| - (MAKESTRING "cannot find signature")))) + "cannot find signature"))) (SPADLET |sig| (CAR |item|)) (SPADLET |pred| (CADR |item|)) (SPADLET |origin| (CADDR |item|)) @@ -21049,13 +20956,11 @@ $dbKindAlist := (SPADLET |doc| (CAR (CDDDDR |item|))) (|htpSetProperty| |htPage| '|fromAlist| |fromAlist|) (|htSayHline|) - (|htSay| (MAKESTRING - "\\center{Cross Reference for definition of {\\em ") - |ops| (MAKESTRING "}}\\beginmenu ")) + (|htSay| "\\center{Cross Reference for definition of {\\em " + |ops| "}}\\beginmenu ") (COND (|locals| - (|htSay| (MAKESTRING - "\\item\\menuitemstyle{}{\\em local variables:}\\newline")) + (|htSay| "\\item\\menuitemstyle{}{\\em local variables:}\\newline") (|dbShowInfoList| |locals| 8192 NIL))) (SPADLET |bincount| 2) (DO ((G177635 |fromAlist| (CDR G177635)) @@ -21070,15 +20975,13 @@ $dbKindAlist := NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING "\\item")) + (|htSay| "\\item") (COND ((IDENTP |con|) - (|htSay| (MAKESTRING - "\\menuitemstyle{} {\\em calls to} ")) + (|htSay| "\\menuitemstyle{} {\\em calls to} ") (COND ((NEQUAL |con| '|Rep|) - (|htSay| (MAKESTRING - "{\\em argument} ")))) + (|htSay| "{\\em argument} "))) (|htSay| |con|) (COND ((PROG (G177642) @@ -21120,8 +21023,7 @@ $dbKindAlist := |orig|)) (BOOT-EQUAL |origin| |orig|)))))))))) - (|htSay| (MAKESTRING - " {\\em of type} ")) + (|htSay| " {\\em of type} ") (|bcConform| |orig|))) (SPADLET |buttonForOp| NIL)) ('T @@ -21130,20 +21032,20 @@ $dbKindAlist := (CONS '|bcLinks| (CONS (CONS - (MAKESTRING "\\menuitemstyle{}") - (CONS (MAKESTRING "") + "\\menuitemstyle{}" + (CONS "" (CONS '|dbInfoChoose| (CONS |bincount| NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "{\\em calls to} ")) + (|htSay| "{\\em calls to} ") (|bcConform| |con|) (SPADLET |buttonForOp| 'T))) - (|htSay| (MAKESTRING ":\\newline ")) + (|htSay| ":\\newline ") (|dbShowInfoList| |fns| (TIMES |bincount| 8192) |buttonForOp|) (SPADLET |bincount| (PLUS |bincount| 1)))))) - (|htSay| (MAKESTRING "\\endmenu "))))))) + (|htSay| "\\endmenu ")))))) ;dbShowInfoList(dataItems,count,buttonForOp?) == ;--dataItems are [op,:sig] @@ -21176,7 +21078,7 @@ $dbKindAlist := (RETURN (SEQ (PROGN (SPADLET |single?| (NULL (CDR |dataItems|))) - (|htSay| (MAKESTRING "\\table{")) + (|htSay| "\\table{") (DO ((G177759 |dataItems| (CDR G177759)) (|item| NIL)) ((OR (ATOM G177759) (PROGN (SETQ |item| (CAR G177759)) NIL)) @@ -21208,12 +21110,12 @@ $dbKindAlist := (SPADLET |ops| (|escapeSpecialChars| (STRINGIMAGE |op|))) - (|htSay| (MAKESTRING "{")) + (|htSay| "{") (COND ((OR (> 16384 |count|) (NULL |buttonForOp?|)) (|htSay| (CONS |ops| - (CONS (MAKESTRING ": ") NIL))) + (CONS ": " NIL))) (COND ((ATOM |sig|) (|bcConform| |sig|)) ('T (|bcConform| (|dbInfoSig| |sig|))))) @@ -21223,18 +21125,18 @@ $dbKindAlist := (CONS '|bcLinks| (CONS (CONS |ops| - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbInfoChooseSingle| (CONS |count| NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING ": ")) + (|htSay| ": ") (COND ((ATOM |sig|) (|htSay| |sig|)) ('T (|bcConform| (|dbInfoSig| |sig|)))))) - (|htSay| (MAKESTRING "}")) + (|htSay| "}") (SPADLET |count| (PLUS |count| 1)))))) - (|htSay| (MAKESTRING "} ")) + (|htSay| "} ") |count|))))) ;dbInfoFindCat(conform,conArgTypes,u) == @@ -21455,7 +21357,7 @@ $dbKindAlist := (|htpSetProperty| |page| '|kind| (PNAME (GETDATABASE (|opOf| |con|) 'CONSTRUCTORKIND))) (|dbShowOperationsFromConform| |page| - (MAKESTRING "operation") |opAlist|)))))) + "operation" |opAlist|)))))) ;dbInfoSigMatch(x,alist) == ; [op,:sigAlist] := x @@ -21593,7 +21495,7 @@ $dbKindAlist := (|koOps| (|htpProperty| |htPage| '|conform|) NIL)) (|htpSetProperty| |htPage| '|opAlist| |opAlist|) (|dbExpandOpAlistIfNecessary| |htPage| |opAlist| - (MAKESTRING "operation") NIL NIL))) + "operation" NIL NIL))) (|htpProperty| |htPage| '|opAlist|))))) ;--============================================================================ @@ -21693,20 +21595,20 @@ $dbKindAlist := (COND (|cat?| (SPADLET |conname| (INTERN (STRCONC (STRINGIMAGE |conname|) - (MAKESTRING "&")))))) + "&"))))) (SPADLET |abb| (OR (|constructor?| |conname|) - (RETURN (MAKESTRING "not a constructor")))) + (RETURN "not a constructor"))) (SPADLET |fs| - (STRCONC (PNAME |abb|) (MAKESTRING ".nrlib/info"))) + (STRCONC (PNAME |abb|) ".nrlib/info")) (SPADLET |inStream| (COND ((PROBE-FILE |fs|) (OPEN |fs|)) ('T (SPADLET |filename| - (STRCONC (MAKESTRING "/spad/int/algebra/") + (STRCONC "/spad/int/algebra/" (PNAME |abb|) - (MAKESTRING ".nrlib/info"))) + ".nrlib/info")) (COND ((PROBE-FILE |filename|) (OPEN |filename|)) ('T (RETURN NIL)))))) @@ -21729,7 +21631,7 @@ $dbKindAlist := ;--$standard:= true --true to write browser output on AIX ;$saturnAmpersand := '"\&\&" -(SPADLET |$saturnAmpersand| (MAKESTRING "\\&\\&")) +(SPADLET |$saturnAmpersand| "\\&\\&") ;$saturnFileNumber --true to write DOS files for Thinkpad (testing only) ; := false @@ -21838,7 +21740,7 @@ $dbKindAlist := (SPADLET |$saturn| 'T) (SPADLET |$saturnFileNumber| NIL) (SPADLET |$standard| NIL) - (|saturnEvalToFile| |command| (MAKESTRING "/tmp/sat.text")))) + (|saturnEvalToFile| |command| "/tmp/sat.text"))) ;ut() == ; $saturn := false @@ -21857,7 +21759,7 @@ $dbKindAlist := (declare (special |$saturnFileNumber|)) (PROGN (SPADLET |$saturnFileNumber| 1) - (|obey| (MAKESTRING "dosdir")))) + (|obey| "dosdir"))) ;offDisk() == ; $saturnFileNumber := false @@ -21884,9 +21786,9 @@ $dbKindAlist := (DEFUN |htSayCold| (|x|) (PROGN - (|htSay| (MAKESTRING "\\lispLink{}{")) + (|htSay| "\\lispLink{}{") (|htSay| |x|) - (|htSay| (MAKESTRING "}")))) + (|htSay| "}"))) ;htSayIfStandard(x, :options) == --do only for $standard ; $standard => htSayBind(x,options) @@ -21983,7 +21885,7 @@ $dbKindAlist := (DEFUN |htShowPage| () (PROGN - (|htSayStandard| (MAKESTRING "\\endscroll")) + (|htSayStandard| "\\endscroll") (|htShowPageNoScroll|))) ;------------------> NEW DEFINITION (see ht-util.boot.pamphlet) @@ -22016,7 +21918,7 @@ $dbKindAlist := |$saturn| |$standard|)) (RETURN (PROGN - (|htSayStandard| (MAKESTRING "\\autobuttons")) + (|htSayStandard| "\\autobuttons") (COND (|$standard| (|htpSetPageDescription| |$curPage| @@ -22067,19 +21969,17 @@ $dbKindAlist := (COND (|$saturn| (SPADLET |$marg| 0) (SPADLET |$linelength| 80) (|writeSaturn| - (MAKESTRING - "\\inputonce{/doc/browser/browmacs.tex}")) + "\\inputonce{/doc/browser/browmacs.tex}") (|writeSaturnPrefix|) (|writeSaturn| |line|) (|writeSaturnSuffix|) (COND (|$saturnFileNumber| (SPADLET |fn| - (STRCONC (MAKESTRING "sat") + (STRCONC "sat" (STRINGIMAGE |$saturnFileNumber|) - (MAKESTRING ".tex"))) - (|obey| (STRCONC (MAKESTRING - "doswrite -a saturn.tex ") - |fn| (MAKESTRING ".tex"))) + ".tex")) + (|obey| (STRCONC "doswrite -a saturn.tex " + |fn| ".tex")) (SPADLET |$saturnFileNumber| (PLUS |$saturnFileNumber| 1))) ('T NIL))) @@ -22108,16 +22008,16 @@ $dbKindAlist := (PLUS |$saturnContextMenuIndex| 1)))) (|writeSaturnLines| - (CONS (MAKESTRING "\\newmenu{BCM") + (CONS "\\newmenu{BCM" (CONS |index| - (CONS (MAKESTRING "}{") + (CONS "}{" (APPEND (NREVERSE |$saturnContextMenuLines|) (CONS - (MAKESTRING "}\\usemenu{BCM") + "}\\usemenu{BCM" (CONS |index| - (CONS (MAKESTRING "}{\\vbox{") + (CONS "}{\\vbox{" NIL)))))))))))))))) ;writeSaturnSuffix() == @@ -22127,7 +22027,7 @@ $dbKindAlist := (declare (special |$saturnContextMenuLines|)) (SEQ (COND (|$saturnContextMenuLines| - (EXIT (|saturnPRINTEXP| (MAKESTRING "}}"))))))) + (EXIT (|saturnPRINTEXP| "}}")))))) ;issueHTStandard line == --called by htMakePageNoScroll and htMakeErrorPage ; if $standard then @@ -22181,7 +22081,7 @@ $dbKindAlist := NIL) (SEQ (EXIT (PROGN (COND - ((AND (NEQUAL |line| (MAKESTRING "")) + ((AND (NEQUAL |line| "") (BOOT-EQUAL (ELT |line| 0) (|char| '|\\|))) (|saturnTERPRI|))) @@ -22271,19 +22171,19 @@ $dbKindAlist := (|writeSaturnPrint| |segment|) (COND ((EQL |code| 1) - (|writeSaturnPrint| (MAKESTRING "\\\\")) + (|writeSaturnPrint| "\\\\") (|writeSaturn| (SUBSTRING |line| (PLUS |k| 2) NIL))) ((EQL |code| 2) - (|writeSaturnPrint| (MAKESTRING " &")) + (|writeSaturnPrint| " &") (|writeSaturn| (SUBSTRING |line| (PLUS |k| 4) NIL))) ((EQL |code| 3) - (|writeSaturnPrint| (MAKESTRING "\\item")) + (|writeSaturnPrint| "\\item") (|writeSaturn| (SUBSTRING |line| (PLUS |k| 5) NIL))) ((EQL |code| 4) - (|writeSaturnPrint| (MAKESTRING "\\newline")) + (|writeSaturnPrint| "\\newline") (|writeSaturn| (SUBSTRING |line| (PLUS |k| 8) NIL))) ((EQL |code| 5) - (|writeSaturnPrint| (MAKESTRING "\\table{")) + (|writeSaturnPrint| "\\table{") (SPADLET |$marg| (PLUS |$marg| 3)) (|writeSaturnTable| (SUBSTRING |line| (PLUS |k| 7) NIL))) @@ -22302,11 +22202,11 @@ $dbKindAlist := ((EQL |code| 8) (SPADLET |i| (COND - ((|substring?| (MAKESTRING "\\beginmenu") + ((|substring?| "\\beginmenu" |line| |k|) (PLUS |k| 9)) ((|substring?| - (MAKESTRING "\\beginscroll") |line| + "\\beginscroll" |line| |k|) (PLUS |k| 11)) ('T @@ -22326,10 +22226,10 @@ $dbKindAlist := ((EQL |code| 9) (SPADLET |i| (COND - ((|substring?| (MAKESTRING "\\endmenu") + ((|substring?| "\\endmenu" |line| |k|) (PLUS |k| 7)) - ((|substring?| (MAKESTRING "\\endscroll") + ((|substring?| "\\endscroll" |line| |k|) (PLUS |k| 9)) ('T @@ -22382,15 +22282,15 @@ $dbKindAlist := ((BOOT-EQUAL |char2| (|char| '|\\|)) 1) ((BOOT-EQUAL |char2| (|char| '&)) (COND - ((|substring?| (MAKESTRING "&\\&") |line| |k|) 2) + ((|substring?| "&\\&" |line| |k|) 2) ('T NIL))) ((BOOT-EQUAL |char2| (|char| '|i|)) (COND - ((|substring?| (MAKESTRING "item") |line| |k|) 3) + ((|substring?| "item" |line| |k|) 3) ('T NIL))) ((BOOT-EQUAL |char2| (|char| '|n|)) (COND - ((|substring?| (MAKESTRING "newline") |line| |k|) 4) + ((|substring?| "newline" |line| |k|) 4) ('T NIL))) ((BOOT-EQUAL |char2| (|char| '|t|)) (COND @@ -22401,18 +22301,18 @@ $dbKindAlist := (COND ((> (SPADLET |k| (PLUS |k| 1)) |n|) NIL) ((BOOT-EQUAL (ELT |line| |k|) (|char| '{)) 6) - ((|substring?| (MAKESTRING "table") |line| + ((|substring?| "table" |line| (SPADDIFFERENCE |k| 3)) 5) ('T NIL))))) ((BOOT-EQUAL |char2| (|char| '!)) 7) ((BOOT-EQUAL |char2| (|char| '|b|)) (COND - ((|substring?| (MAKESTRING "begin") |line| |k|) 8) + ((|substring?| "begin" |line| |k|) 8) ('T NIL))) ((BOOT-EQUAL |char2| (|char| '|e|)) (COND - ((|substring?| (MAKESTRING "end") |line| |k|) 9) + ((|substring?| "end" |line| |k|) 9) ('T NIL))) ('T NIL))))))) @@ -22427,7 +22327,7 @@ $dbKindAlist := (DO ((G178364 (SPADDIFFERENCE |$marg| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G178364) NIL) - (SEQ (EXIT (|saturnPRINTEXP| (MAKESTRING " "))))) + (SEQ (EXIT (|saturnPRINTEXP| " ")))) (|saturnPRINTEXP| |s|) (|saturnTERPRI|)))) @@ -22468,15 +22368,15 @@ $dbKindAlist := (RETURN (PROGN (SPADLET |open| - (|charPosition| (|char| (MAKESTRING "{")) |line| 0)) + (|charPosition| (|char| "{") |line| 0)) (SPADLET |close| - (|charPosition| (|char| (MAKESTRING "}")) |line| 0)) + (|charPosition| (|char| "}") |line| 0)) (COND ((> |close| |open|) (SPADLET |close| (OR (|findBalancingBrace| |line| (PLUS |open| 1) (MAXINDEX |line|) 0) - (|error| (MAKESTRING "no balancing brace")))) + (|error| "no balancing brace"))) (|writeSaturnPrint| (SUBSTRING |line| 0 (PLUS |close| 1))) (|writeSaturnTable| (SUBSTRING |line| (PLUS |close| 1) NIL))) ('T (SPADLET |$marg| (SPADDIFFERENCE |$marg| 3)) @@ -22638,7 +22538,7 @@ $dbKindAlist := (|htProcessDoitButton| |items|)) ('T (|systemError| - (MAKESTRING "unexpected branch")))))))))))) + "unexpected branch"))))))))))) ;saturnTran x == ; x is [[kind, [s1, s2, :callTail]]] and MEMQ(kind,'(bcLinks bcLispLinks)) => @@ -22689,9 +22589,9 @@ $dbKindAlist := ((SPADLET |y| (|isMenuItemStyle?| |s1|)) (SPADLET |t1| (|mkDocLink| |fs| (|mkMenuButton|))) (COND - ((BOOT-EQUAL |y| (MAKESTRING "")) + ((BOOT-EQUAL |y| "") (COND - ((BOOT-EQUAL |s2| (MAKESTRING "")) |t1|) + ((BOOT-EQUAL |s2| "") |t1|) ('T (|mkTabularItem| (CONS |t1| (CONS |text| NIL)))))) ('T (SPADLET |t2| (|mkDocLink| |fs| |y|)) (|mkTabularItem| @@ -22718,9 +22618,9 @@ $dbKindAlist := (PROGN (SPADLET |secondPart| (COND - ((ATOM |s|) (CONS |s| (CONS (MAKESTRING "}") NIL))) - ('T (APPEND |s| (CONS (MAKESTRING "}") NIL))))) - (CONS (MAKESTRING "{\\bf ") |secondPart|))))) + ((ATOM |s|) (CONS |s| (CONS "}" NIL))) + ('T (APPEND |s| (CONS "}" NIL))))) + (CONS "{\\bf " |secondPart|))))) ;mkMenuButton() == [menuButton()] @@ -22728,7 +22628,7 @@ $dbKindAlist := ;menuButton() == '"\menuitemstyle{}" -(DEFUN |menuButton| () (MAKESTRING "\\menuitemstyle{}")) +(DEFUN |menuButton| () "\\menuitemstyle{}") ;-- Saturn must translate \menuitemstyle ==> {\menuButton} ;--------------------> NEW DEFINITION (override in ht-util.boot.pamphlet) @@ -22742,9 +22642,9 @@ $dbKindAlist := (RETURN (PROGN (SPADLET |func| (|mkCurryFun| (CAR |form|) (CDR |form|))) - (STRCONC (MAKESTRING "(|htDoneButton| '|") |func| - (MAKESTRING "| ") (|htpName| (|page|)) - (MAKESTRING ")")))))) + (STRCONC "(|htDoneButton| '|" |func| + "| " (|htpName| (|page|)) + ")"))))) ;mkDocLink(code,s) == ; if atom code then code := [code] @@ -22755,10 +22655,10 @@ $dbKindAlist := (PROGN (COND ((ATOM |code|) (SPADLET |code| (CONS |code| NIL)))) (COND ((ATOM |s|) (SPADLET |s| (CONS |s| NIL)))) - (CONS (MAKESTRING "\\lispLink[d]{\\verb!") + (CONS "\\lispLink[d]{\\verb!" (APPEND |code| - (CONS (MAKESTRING "!}{") - (APPEND |s| (CONS (MAKESTRING "}") NIL))))))) + (CONS "!}{" + (APPEND |s| (CONS "}" NIL))))))) ;saturnTranText x == ; STRINGP x => [unTab x] @@ -22779,9 +22679,9 @@ $dbKindAlist := (SPADLET |ISTMP#1| (QCDR |r|)) (AND (PAIRP |ISTMP#1|) (PROGN (SPADLET |fn| (QCAR |ISTMP#1|)) 'T))) - (BOOT-EQUAL |s| (MAKESTRING "\\unixcommand{"))) - (CONS (MAKESTRING "{\\it ") - (CONS |s| (CONS (MAKESTRING ".spad}") NIL)))) + (BOOT-EQUAL |s| "\\unixcommand{")) + (CONS "{\\it " + (CONS |s| (CONS ".spad}" NIL)))) ((AND (PAIRP |x|) (PROGN (SPADLET |ISTMP#1| (QCAR |x|)) @@ -22797,7 +22697,7 @@ $dbKindAlist := (DEFUN |isMenuItemStyle?| (|s|) (COND - ((EQL 15 (STRING< (MAKESTRING "\\menuitemstyle{") |s|)) + ((EQL 15 (STRING< "\\menuitemstyle{" |s|)) (SUBSTRING |s| 15 (SPADDIFFERENCE (MAXINDEX |s|) 15))) ('T NIL))) @@ -22841,8 +22741,8 @@ $dbKindAlist := (DEFUN |htSayHrule| () (declare (special |$saturn|)) (|bcHt| (COND - (|$saturn| (MAKESTRING "\\hrule{}\\newline{}")) - ('T (MAKESTRING "\\horizontalline{}\\newline{}"))))) + (|$saturn| "\\hrule{}\\newline{}") + ('T "\\horizontalline{}\\newline{}")))) ;--------------------> NEW DEFINITION (override in ht-util.boot.pamphlet) ;htpAddInputAreaProp(htPage, label, prop) == @@ -22894,7 +22794,7 @@ $dbKindAlist := ((|typeCheckInputAreas| |htPage|) (|htMakeErrorPage| |htPage|)) ((NULL (FBOUNDP |func|)) (|systemError| - (CONS (MAKESTRING "unknown function") (CONS |func| NIL)))) + (CONS "unknown function" (CONS |func| NIL)))) ('T (FUNCALL (SYMBOL-FUNCTION |func|) |htPage|))))) ;--------------------> NEW DEFINITION (override in ht-util.boot.pamphlet) @@ -22936,9 +22836,9 @@ $dbKindAlist := (SPADLET |link| (COND (|$saturn| - (MAKESTRING "\\lispLink[d]")) + "\\lispLink[d]") ('T - (MAKESTRING "\\lispdownlink")))) + "\\lispdownlink"))) (|htMakeButton| |link| |message| (|mkCurryFun| |func| |value|) |skipStateInfo?|) @@ -22978,8 +22878,8 @@ $dbKindAlist := (SPADLET |link| (COND (|$saturn| - (MAKESTRING "\\lispLink[n]")) - ('T (MAKESTRING "\\lisplink")))) + "\\lispLink[n]") + ('T "\\lisplink"))) (|htMakeButton| |link| |message| (|mkCurryFun| |func| |value|)) (|bcIssueHt| |info|)))))))))) @@ -23012,19 +22912,19 @@ $dbKindAlist := (|htMakeButtonSaturn| |htCommand| |message| |func| |options|)) ('T (SPADLET |skipStateInfo?| (IFCAR |options|)) - (|iht| (CONS |htCommand| (CONS (MAKESTRING "{") NIL))) + (|iht| (CONS |htCommand| (CONS "{" NIL))) (|bcIssueHt| |message|) (COND (|skipStateInfo?| - (|iht| (CONS (MAKESTRING "}{(|htDoneButton| '|") + (|iht| (CONS "}{(|htDoneButton| '|" (CONS |func| - (CONS (MAKESTRING "| ") + (CONS "| " (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING ")}") NIL))))))) + (CONS ")}" NIL))))))) ('T - (|iht| (CONS (MAKESTRING "}{(|htDoneButton| '|") + (|iht| (CONS "}{(|htDoneButton| '|" (CONS |func| - (CONS (MAKESTRING "| (PROGN ") NIL)))) + (CONS "| (PROGN " NIL)))) (DO ((G178686 (|htpInputAreaAlist| |$curPage|) (CDR G178686)) (G178674 NIL)) @@ -23039,27 +22939,26 @@ $dbKindAlist := NIL) (SEQ (EXIT (PROGN (|iht| (CONS - (MAKESTRING - "(|htpSetLabelInputString| ") + "(|htpSetLabelInputString| " (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING "'|") + (CONS "'|" (CONS |id| - (CONS (MAKESTRING "| ") NIL)))))) + (CONS "| " NIL)))))) (COND ((BOOT-EQUAL |type| '|string|) (|iht| (CONS - (MAKESTRING "\"\\stringvalue{") + "\"\\stringvalue{" (CONS |id| - (CONS (MAKESTRING "}\"") NIL))))) + (CONS "}\"" NIL))))) ('T (|iht| - (CONS (MAKESTRING "\"\\boxvalue{") + (CONS "\"\\boxvalue{" (CONS |id| - (CONS (MAKESTRING "}\"") NIL)))))) - (|iht| (MAKESTRING ") ")))))) + (CONS "}\"" NIL)))))) + (|iht| ") "))))) (|iht| (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING "))}") NIL))))))))))) + (CONS "))}" NIL))))))))))) ;htMakeButtonSaturn(htCommand, message, func,options) == ; skipStateInfo? := IFCAR options @@ -23093,19 +22992,18 @@ $dbKindAlist := (|iht| |htCommand|) (COND (|skipStateInfo?| - (|iht| (CONS (MAKESTRING - "{\\verb!(|htDoneButton| '|") + (|iht| (CONS "{\\verb!(|htDoneButton| '|" (CONS |func| - (CONS (MAKESTRING "| ") + (CONS "| " (CONS (|htpName| (|page|)) - (CONS (MAKESTRING ")!}{") NIL)))))) - (|bcIssueHt| |message|) (|iht| (MAKESTRING "}"))) + (CONS ")!}{" NIL)))))) + (|bcIssueHt| |message|) (|iht| "}")) ('T - (|iht| (CONS (MAKESTRING "{\\verb!(|htDoneButton| '|") - (CONS |func| (CONS (MAKESTRING "| ") NIL)))) + (|iht| (CONS "{\\verb!(|htDoneButton| '|" + (CONS |func| (CONS "| " NIL)))) (COND (|$kPageSaturnArguments| - (|iht| (MAKESTRING "(PROGN ")) + (|iht| "(PROGN ") (DO ((G178711 |$kPageSaturnArguments| (CDR G178711)) (|id| NIL) @@ -23122,23 +23020,22 @@ $dbKindAlist := (SEQ (EXIT (PROGN (|iht| (CONS - (MAKESTRING - "(|htpSetLabelInputString| ") + "(|htpSetLabelInputString| " (CONS (|htpName| (|page|)) - (CONS (MAKESTRING "'|") + (CONS "'|" (CONS |var| - (CONS (MAKESTRING "| ") NIL)))))) + (CONS "| " NIL)))))) (|iht| (CONS '|'\|!\\| (CONS |id| - (CONS (MAKESTRING "\\verb!|") + (CONS "\\verb!|" NIL)))) - (|iht| (MAKESTRING ")")))))) + (|iht| ")"))))) (|iht| (|htpName| |$saturnPage|)) - (|iht| (MAKESTRING ")"))) + (|iht| ")")) ('T (|iht| (|htpName| |$saturnPage|)))) - (|iht| (MAKESTRING ")!}{")) (|bcIssueHt| |message|) - (|iht| (MAKESTRING "}"))))))))) + (|iht| ")!}{") (|bcIssueHt| |message|) + (|iht| "}")))))))) ;htpAddToPageDescription(htPage, pageDescrip) == ; newDescript := @@ -23189,7 +23086,7 @@ $dbKindAlist := NIL)) NIL) (SEQ (EXIT (PROGN - (SPADLET |mess2| (MAKESTRING "")) + (SPADLET |mess2| "") (COND ((NULL (LASSOC |stringName| (|htpInputAreaAlist| (|page|)))) @@ -23201,24 +23098,24 @@ $dbKindAlist := (COND ((|htpLabelErrorMsg| (|page|) |stringName|) (|iht| (CONS - (MAKESTRING "\\centerline{{\\em ") + "\\centerline{{\\em " (CONS (|htpLabelErrorMsg| (|page|) |stringName|) - (CONS (MAKESTRING "}}") NIL)))) + (CONS "}}" NIL)))) (SPADLET |mess2| (CONCAT |mess2| (|bcSadFaces|))) (|htpSetLabelErrorMsg| (|page|) |stringName| NIL))) - (|iht| (CONS (MAKESTRING "\\inputstring{") + (|iht| (CONS "\\inputstring{" (CONS |stringName| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS |numChars| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS (|htpLabelDefault| (|page|) |stringName|) - (CONS (MAKESTRING "} ") + (CONS "} " (CONS |mess2| NIL))))))))))))))))) ;--------------------> NEW DEFINITION (override in ht-util.boot.pamphlet) @@ -23238,7 +23135,7 @@ $dbKindAlist := (DEFUN |htInitPage| (|title| |propList|) (PROGN (|htInitPageNoScroll| |propList| |title|) - (|htSayStandard| (MAKESTRING "\\beginscroll ")) + (|htSayStandard| "\\beginscroll ") (|page|))) ;--------------------> NEW DEFINITION <-------------------------- @@ -23285,12 +23182,12 @@ $dbKindAlist := (|title| (COND (|$standard| (|htSayStandard| - (CONS (MAKESTRING "\\begin{page}{") + (CONS "\\begin{page}{" (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING "}{") NIL)))))) - (|htSaySaturn| (MAKESTRING "\\browseTitle{")) - (|htSay| |title|) (|htSaySaturn| (MAKESTRING "}")) - (|htSayStandard| (MAKESTRING "} ")))) + (CONS "}{" NIL)))))) + (|htSaySaturn| "\\browseTitle{") + (|htSay| |title|) (|htSaySaturn| "}") + (|htSayStandard| "} "))) (|page|))))) ;--------------------> NEW DEFINITION <-------------------------- @@ -23404,7 +23301,7 @@ $dbKindAlist := (SPADLET |comments| (CADDDR (CDDDDR |parts|))) (SPADLET |form| (IFCAR |options|)) (SPADLET |isFile| (NULL |kind|)) - (SPADLET |kind| (OR |kind| (MAKESTRING "package"))) + (SPADLET |kind| (OR |kind| "package")) (RPLACA |parts| |kind|) (SPADLET |conform| (|mkConform| |kind| |name| |args|)) (SPADLET |$kPageSaturnArguments| (CDR |conform|)) @@ -23417,16 +23314,16 @@ $dbKindAlist := ((KDR |form|) (|dbConformGenUnder| |form|)) ('T (CONS (STRCONC |name| |args|) NIL)))) (SPADLET |emString| - (CONS (MAKESTRING "{\\sf ") + (CONS "{\\sf " (APPEND |constrings| - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) (SPADLET |heading| (CONS |capitalKind| - (CONS (MAKESTRING " ") |emString|))) + (CONS " " |emString|))) (COND ((NULL (|isExposedConstructor| |conname|)) (SPADLET |heading| - (CONS (MAKESTRING "Unexposed ") |heading|)))) + (CONS "Unexposed " |heading|)))) (COND ((BOOT-EQUAL |name| |abbrev|) (SPADLET |abbrev| (|asyAbbreviation| |conname| |nargs|)))) @@ -23451,7 +23348,7 @@ $dbKindAlist := (|addParameterTemplates| |page| |conform|))) (COND (|$atLeastOneUnexposed| - (|htSay| (MAKESTRING "\\newline{}{\\em *} = unexposed")))) + (|htSay| "\\newline{}{\\em *} = unexposed"))) (|htSayStandard| '|\\endscroll |) (|kPageContextMenu| |page|) (|htShowPageNoScroll|))))) @@ -23521,146 +23418,146 @@ $dbKindAlist := (SPADLET |comments| (CADDDR (CDDDDR |LETTMP#1|))) (SPADLET |conform| (|htpProperty| |page| '|conform|)) (SPADLET |conname| (|opOf| |conform|)) (|htBeginTable|) - (|htSay| (MAKESTRING "{")) + (|htSay| "{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Ancestors| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kcaPage| (CONS NIL NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Attributes| - (CONS (MAKESTRING "") + (CONS "" (CONS '|koPage| - (CONS (MAKESTRING "attribute") + (CONS "attribute" NIL)))) NIL)) NIL)) (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) - (|htSay| (MAKESTRING "}{")) + ((BOOT-EQUAL |kind| "category") + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Children| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kccPage| (CONS NIL NIL)))) NIL)) NIL)))) (COND ((NULL (|asharpConstructorName?| |conname|)) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Dependents| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kcdePage| (CONS NIL NIL)))) NIL)) NIL)))) (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) - (|htSay| (MAKESTRING "}{")) + ((BOOT-EQUAL |kind| "category") + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Descendents| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kcdPage| (CONS NIL NIL)))) NIL)) NIL)))) (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) - (|htSay| (MAKESTRING "}{")) + ((BOOT-EQUAL |kind| "category") + (|htSay| "}{") (COND ((NULL (|asharpConstructorName?| |conname|)) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Domains| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kcdoPage| (CONS NIL NIL)))) NIL)) NIL))) - ('T (|htSay| (MAKESTRING "{\\em Domains}")))))) - (|htSay| (MAKESTRING "}{")) + ('T (|htSay| "{\\em Domains}"))))) + (|htSay| "}{") (COND - ((AND (NEQUAL |kind| (MAKESTRING "category")) + ((AND (NEQUAL |kind| "category") (SPADLET |pathname| (|dbHasExamplePage| |conname|))) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Examples| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kxPage| (CONS |pathname| NIL)))) NIL)) NIL))) - ('T (|htSay| (MAKESTRING "{\\em Examples}")))) - (|htSay| (MAKESTRING "}{")) + ('T (|htSay| "{\\em Examples}"))) + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Exports| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kePage| (CONS NIL NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Operations| - (CONS (MAKESTRING "") + (CONS "" (CONS '|koPage| - (CONS (MAKESTRING "operation") + (CONS "operation" NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Parents| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kcpPage| - (CONS (MAKESTRING "operation") + (CONS "operation" NIL)))) NIL)) NIL)) (COND - ((NEQUAL |kind| (MAKESTRING "category")) - (|htSay| (MAKESTRING "}{")) + ((NEQUAL |kind| "category") + (|htSay| "}{") (COND ((NULL (|asharpConstructorName?| |conname|)) (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Search Path| - (CONS (MAKESTRING "") + (CONS "" (CONS '|ksPage| (CONS NIL NIL)))) NIL)) NIL))) - ('T (|htSay| (MAKESTRING "{\\em Search Path}")))))) + ('T (|htSay| "{\\em Search Path}"))))) (COND - ((NEQUAL |kind| (MAKESTRING "category")) - (|htSay| (MAKESTRING "}{")) + ((NEQUAL |kind| "category") + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Users| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kcuPage| (CONS NIL NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS '|Uses| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kcnPage| (CONS NIL NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}")) + (|htSay| "}") (COND (|$standard| (|htEndTable|)) ('T NIL))))))) ;kPageContextMenuSaturn page == @@ -23722,26 +23619,26 @@ $dbKindAlist := (SPADLET |conname| (|opOf| |conform|)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "\\&Ancestors") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Ancestors" + (CONS "" (CONS '|kcaPage| (CONS NIL NIL)))) NIL)) NIL)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Attri\\&butes") - (CONS (MAKESTRING "") + (CONS (CONS "Attri\\&butes" + (CONS "" (CONS '|koPage| - (CONS (MAKESTRING "attribute") + (CONS "attribute" NIL)))) NIL)) NIL)) (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) + ((BOOT-EQUAL |kind| "category") (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "\\&Children") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Children" + (CONS "" (CONS '|kccPage| (CONS NIL NIL)))) NIL)) @@ -23750,61 +23647,61 @@ $dbKindAlist := ((NULL (|asharpConstructorName?| |conname|)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "\\&Dependents") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Dependents" + (CONS "" (CONS '|kcdePage| (CONS NIL NIL)))) NIL)) NIL)))) (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) + ((BOOT-EQUAL |kind| "category") (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Desce\\&ndents") - (CONS (MAKESTRING "") + (CONS (CONS "Desce\\&ndents" + (CONS "" (CONS '|kcdPage| (CONS NIL NIL)))) NIL)) NIL)))) (COND - ((BOOT-EQUAL |kind| (MAKESTRING "category")) + ((BOOT-EQUAL |kind| "category") (COND ((NULL (|asharpConstructorName?| |conname|)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Do\\&mains") - (CONS (MAKESTRING "") + (CONS (CONS "Do\\&mains" + (CONS "" (CONS '|kcdoPage| (CONS NIL NIL)))) NIL)) NIL))) - ('T (|htSayCold| (MAKESTRING "Do\\&mains")))))) + ('T (|htSayCold| "Do\\&mains"))))) (COND - ((AND (NEQUAL |kind| (MAKESTRING "category")) + ((AND (NEQUAL |kind| "category") (SPADLET |name| (|saturnHasExamplePage| |conname|))) (|saturnExampleLink| |name|)) - ('T (|htSayCold| (MAKESTRING "E\\&xamples")))) + ('T (|htSayCold| "E\\&xamples"))) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "\\&Exports") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Exports" + (CONS "" (CONS '|kePage| (CONS NIL NIL)))) NIL)) NIL)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "\\&Operations") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Operations" + (CONS "" (CONS '|koPage| - (CONS (MAKESTRING "operation") + (CONS "operation" NIL)))) NIL)) NIL)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "\\&Parents") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Parents" + (CONS "" (CONS '|kcpPage| - (CONS (MAKESTRING "operation") + (CONS "operation" NIL)))) NIL)) NIL)) @@ -23812,33 +23709,33 @@ $dbKindAlist := ((NULL (|asharpConstructorName?| |conname|)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Search O\\&rder") - (CONS (MAKESTRING "") + (CONS (CONS "Search O\\&rder" + (CONS "" (CONS '|ksPage| (CONS NIL NIL)))) NIL)) NIL))) - ('T (|htSayCold| (MAKESTRING "Search Order")))) + ('T (|htSayCold| "Search Order"))) (COND - ((OR (NEQUAL |kind| (MAKESTRING "category")) + ((OR (NEQUAL |kind| "category") (|dbpHasDefaultCategory?| |xpart|)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "\\&Users") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Users" + (CONS "" (CONS '|kcuPage| (CONS NIL NIL)))) NIL)) NIL)) (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "U\\&ses") - (CONS (MAKESTRING "") + (CONS (CONS "U\\&ses" + (CONS "" (CONS '|kcnPage| (CONS NIL NIL)))) NIL)) NIL))) - ('T (|htSayCold| (MAKESTRING "\\&Users")) - (|htSayCold| (MAKESTRING "U\\&ses")))) + ('T (|htSayCold| "\\&Users") + (|htSayCold| "U\\&ses"))) (SPADLET |$saturnContextMenuLines| |$htLineList|))))) ;saturnExampleLink lname == @@ -23847,9 +23744,9 @@ $dbKindAlist := (DEFUN |saturnExampleLink| (|lname|) (PROGN - (|htSay| (MAKESTRING "\\docLink{\\csname ")) + (|htSay| "\\docLink{\\csname ") (|htSay| (STRCONC (CAR (CDR |lname|)) - (MAKESTRING "\\endcsname}{E&xamples}"))))) + "\\endcsname}{E&xamples}")))) ;$exampleConstructors := nil @@ -23881,7 +23778,7 @@ $dbKindAlist := (RETURN (PROGN (SPADLET |file| - (STRCONC (|getEnv| (MAKESTRING "AXIOM")) + (STRCONC (|getEnv| "AXIOM") '|/doc/axug/examples.lsp|)) (COND ((NULL (PROBE-FILE |file|)) NIL) @@ -23961,21 +23858,21 @@ $dbKindAlist := (SPADLET |exposedUnexposedFlag| |$includeUnexposed?|) (SPADLET |star?| 'T) (COND (|$standard| (|htBeginTable|))) - (|htSay| (MAKESTRING "{")) + (|htSay| "{") (COND ((OR |one?| (|member| '|abbrs| |exclusions|)) - (|htSay| (MAKESTRING "{\\em Abbreviations}"))) + (|htSay| "{\\em Abbreviations}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| (CONS (CONS - (MAKESTRING "Abbreviations") - (CONS (MAKESTRING "") + "Abbreviations" + (CONS "" (CONS '|dbShowCons| (CONS '|abbrs| NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |one?| (|member| '|conditions| |exclusions|) (PROG (G178946) @@ -23992,39 +23889,39 @@ $dbKindAlist := (SEQ (EXIT (SETQ G178946 (AND G178946 (BOOT-EQUAL (CDR |x|) 'T))))))))) - (|htSay| (MAKESTRING "{\\em Conditions}"))) + (|htSay| "{\\em Conditions}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Conditions") - (CONS (MAKESTRING "") + (CONS (CONS "Conditions" + (CONS "" (CONS '|dbShowCons| (CONS '|conditions| NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |empty?| (|member| '|documentation| |exclusions|)) - (|htSay| (MAKESTRING "{\\em Descriptions}"))) + (|htSay| "{\\em Descriptions}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| (CONS (CONS - (MAKESTRING "Descriptions") - (CONS (MAKESTRING "") + "Descriptions" + (CONS "" (CONS '|dbShowCons| (CONS '|documentation| NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |one?| (NULL (CDR |cAlist|))) - (|htSay| (MAKESTRING "{\\em Filter}"))) + (|htSay| "{\\em Filter}")) ('T (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Filter") - (CONS (MAKESTRING "") + (CONS (CONS "Filter" + (CONS "" (CONS '|htFilterPage| (CONS (CONS '|dbShowCons| @@ -24032,34 +23929,34 @@ $dbKindAlist := NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |one?| (|member| '|kinds| |exclusions|) (NEQUAL |kind| '|constructor|)) - (|htSay| (MAKESTRING "{\\em Kinds}"))) + (|htSay| "{\\em Kinds}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Kinds") - (CONS (MAKESTRING "") + (CONS (CONS "Kinds" + (CONS "" (CONS '|dbShowCons| (CONS '|kinds| NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |one?| (|member| '|names| |exclusions|)) - (|htSay| (MAKESTRING "{\\em Names}"))) + (|htSay| "{\\em Names}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Names") - (CONS (MAKESTRING "") + (CONS (CONS "Names" + (CONS "" (CONS '|dbShowCons| (CONS '|names| NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |one?| (|member| '|parameters| |exclusions|) (NULL (PROG (G178960) @@ -24077,45 +23974,44 @@ $dbKindAlist := (SEQ (EXIT (SETQ G178960 (OR G178960 (CDAR |x|)))))))))) - (|htSay| (MAKESTRING "{\\em Parameters}"))) + (|htSay| "{\\em Parameters}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Parameters") - (CONS (MAKESTRING "") + (CONS (CONS "Parameters" + (CONS "" (CONS '|dbShowCons| (CONS '|parameters| NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND (|$exposedOnlyIfTrue| (COND - (|one?| (|htSay| (MAKESTRING - "{\\em Unexposed Also}"))) + (|one?| (|htSay| "{\\em Unexposed Also}")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING "Unexposed Also") - (CONS (MAKESTRING "") + "Unexposed Also" + (CONS "" (CONS '|dbShowCons| (CONS '|exposureOff| NIL)))) NIL)) NIL))))) - (|one?| (|htSay| (MAKESTRING "{\\em Exposed Only}"))) + (|one?| (|htSay| "{\\em Exposed Only}")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING "Exposed Only") - (CONS (MAKESTRING "") + "Exposed Only" + (CONS "" (CONS '|dbShowCons| (CONS '|exposureOn| NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}")) + (|htSay| "}") (COND (|$standard| (|htEndTable|)) ('T NIL)))))))) ;dbPresentConsSaturn(htPage,kind,exclusions) == @@ -24182,13 +24078,13 @@ $dbKindAlist := (COND (|$standard| (|htBeginTable|))) (COND ((OR |one?| (|member| '|abbrs| |exclusions|)) - (|htSayCold| (MAKESTRING "\\&Abbreviations"))) + (|htSayCold| "\\&Abbreviations")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| (CONS (CONS - (MAKESTRING "\\&Abbreviations") - (CONS (MAKESTRING "") + "\\&Abbreviations" + (CONS "" (CONS '|dbShowCons| (CONS '|abbrs| NIL)))) NIL)) @@ -24209,57 +24105,57 @@ $dbKindAlist := (SEQ (EXIT (SETQ G178987 (AND G178987 (BOOT-EQUAL (CDR |x|) 'T))))))))) - (|htSayCold| (MAKESTRING "\\&Conditions"))) + (|htSayCold| "\\&Conditions")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| (CONS (CONS - (MAKESTRING "\\&Conditions") - (CONS (MAKESTRING "") + "\\&Conditions" + (CONS "" (CONS '|dbShowCons| (CONS '|conditions| NIL)))) NIL)) NIL)))) (COND ((OR |empty?| (|member| '|documentation| |exclusions|)) - (|htSayCold| (MAKESTRING "\\&Descriptions"))) + (|htSayCold| "\\&Descriptions")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| (CONS (CONS - (MAKESTRING "\\&Descriptions") - (CONS (MAKESTRING "") + "\\&Descriptions" + (CONS "" (CONS '|dbShowCons| (CONS '|documentation| NIL)))) NIL)) NIL)))) (COND ((OR |one?| (NULL (CDR |cAlist|))) - (|htSayCold| (MAKESTRING "\\&Filter"))) + (|htSayCold| "\\&Filter")) ('T (|htMakeSaturnFilterPage| (CONS '|dbShowCons| (CONS '|filter| NIL))))) (COND ((OR |one?| (|member| '|kinds| |exclusions|) (NEQUAL |kind| '|constructor|)) - (|htSayCold| (MAKESTRING "\\&Kinds"))) + (|htSayCold| "\\&Kinds")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\&Kinds") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Kinds" + (CONS "" (CONS '|dbShowCons| (CONS '|kinds| NIL)))) NIL)) NIL)))) (COND ((OR |one?| (|member| '|names| |exclusions|)) - (|htSayCold| (MAKESTRING "\\&Names"))) + (|htSayCold| "\\&Names")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\&Names") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Names" + (CONS "" (CONS '|dbShowCons| (CONS '|names| NIL)))) NIL)) @@ -24280,42 +24176,41 @@ $dbKindAlist := (SEQ (EXIT (SETQ G179001 (OR G179001 (CDAR |x|)))))))))) - (|htSayCold| (MAKESTRING "\\&Parameters"))) + (|htSayCold| "\\&Parameters")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| (CONS (CONS - (MAKESTRING "\\&Parameters") - (CONS (MAKESTRING "") + "\\&Parameters" + (CONS "" (CONS '|dbShowCons| (CONS '|parameters| NIL)))) NIL)) NIL)))) - (|htSaySaturn| (MAKESTRING "\\hrule")) + (|htSaySaturn| "\\hrule") (COND (|$exposedOnlyIfTrue| (COND (|one?| (|htSayCold| - (MAKESTRING "\\&Unexposed Also"))) + "\\&Unexposed Also")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\&Unexposed Also") - (CONS (MAKESTRING "") + "\\&Unexposed Also" + (CONS "" (CONS '|dbShowCons| (CONS '|exposureOff| NIL)))) NIL)) NIL))))) - (|one?| (|htSayCold| (MAKESTRING "\\Exposed Only\\&y"))) + (|one?| (|htSayCold| "\\Exposed Only\\&y")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING "Exposed Onl\\&y") - (CONS (MAKESTRING "") + "Exposed Onl\\&y" + (CONS "" (CONS '|dbShowCons| (CONS '|exposureOn| NIL)))) NIL)) @@ -24337,22 +24232,22 @@ $dbKindAlist := (PROGN (|htInitPage| '|Filter String| (|htCopyProplist| |htPage|)) (|htSay| '|\\centerline{Enter filter string (use {\\em *} for wild card):}|) - (|htSay| (MAKESTRING "\\centerline{")) + (|htSay| "\\centerline{") (|htMakePage| (CONS (CONS '|bcStrings| (CONS (CONS 50 - (CONS (MAKESTRING "") + (CONS "" (CONS '|filter| (CONS 'EM NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING "}\\vspace{1}\\centerline{")) + (|htSay| "}\\vspace{1}\\centerline{") (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\fbox{Filter}") - (CONS (MAKESTRING "") |args|)) + (CONS (CONS "\\fbox{Filter}" + (CONS "" |args|)) NIL)) NIL)) - (|htSay| (MAKESTRING "}")) + (|htSay| "}") (|htShowPage|))) ;htMakeSaturnFilterPage [fn2Call,:args] == @@ -24375,24 +24270,21 @@ $dbKindAlist := (SEQ (PROGN (SPADLET |fn2Call| (CAR G179039)) (SPADLET |args| (CDR G179039)) - (|htSay| (MAKESTRING - "\\inputboxLink[\\lispLink[d]{\\verb+(|")) + (|htSay| "\\inputboxLink[\\lispLink[d]{\\verb+(|") (|htSay| |fn2Call|) - (|htSay| (MAKESTRING "| ")) + (|htSay| "| ") (|htSay| (|htpName| |$saturnPage|)) (DO ((G179054 |args| (CDR G179054)) (|x| NIL)) ((OR (ATOM G179054) (PROGN (SETQ |x| (CAR G179054)) NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING " '|")) + (|htSay| " '|") (|htSay| |x|) - (|htSay| (MAKESTRING "|")))))) - (|htSay| (MAKESTRING - " \"+\\FILTERSTRING\\verb+\")+}{}]{\\FILTERSTRING}{*}")) - (|htSay| (MAKESTRING - "{\\centerline{Enter filter string (use {\\em *} for wild card):}}")) - (|htSay| (MAKESTRING "{Filter Page}{\\&Filter}"))))))) + (|htSay| "|"))))) + (|htSay| " \"+\\FILTERSTRING\\verb+\")+}{}]{\\FILTERSTRING}{*}") + (|htSay| "{\\centerline{Enter filter string (use {\\em *} for wild card):}}") + (|htSay| "{Filter Page}{\\&Filter}")))))) ;dbShowConsKinds cAlist == ; cats := doms := paks := defs := nil @@ -24456,7 +24348,7 @@ $dbKindAlist := (CONS (NREVERSE |paks|) (CONS (NREVERSE |defs|) NIL))))) (|htBeginMenu| '|description|) - (|htSayStandard| (MAKESTRING "\\indent{1}")) + (|htSayStandard| "\\indent{1}") (SPADLET |kinds| (PROG (G179081) (SPADLET G179081 0) @@ -24491,9 +24383,9 @@ $dbKindAlist := (|firstTime| (SPADLET |firstTime| NIL)) ('T - (|htSaySaturn| (MAKESTRING "\\\\")))) - (|htSaySaturn| (MAKESTRING "\\item[")) - (|htSayStandard| (MAKESTRING "\\item")) + (|htSaySaturn| "\\\\"))) + (|htSaySaturn| "\\item[") + (|htSayStandard| "\\item") (COND ((EQL |kinds| 1) (|htSay| (|menuButton|))) @@ -24503,7 +24395,7 @@ $dbKindAlist := (CONS '|bcLinks| (CONS (CONS (|menuButton|) - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbShowConsKindsFilter| (CONS @@ -24512,18 +24404,18 @@ $dbKindAlist := NIL)))) NIL)) NIL)))) - (|htSaySaturn| (MAKESTRING "]")) + (|htSaySaturn| "]") (|htSayStandard| - (MAKESTRING "\\tab{1}")) - (|htSay| (MAKESTRING "{\\em ") + "\\tab{1}") + (|htSay| "{\\em " (SPADLET |c| (|#| |x|)) - (MAKESTRING " ")) + " ") (|htSay| (COND ((> |c| 1) (|pluralize| |kind|)) ('T |kind|))) - (|htSay| (MAKESTRING ":}")) - (|htSaySaturn| (MAKESTRING "\\\\")) + (|htSay| ":}") + (|htSaySaturn| "\\\\") (|bcConTable| (REMDUP (PROG (G179123) @@ -24544,7 +24436,7 @@ $dbKindAlist := (CONS (CAAR |y|) G179123))))))))))))))) (|htEndMenu| '|description|) - (|htSayStandard| (MAKESTRING "\\indent{0}"))))))) + (|htSayStandard| "\\indent{0}")))))) ;addParameterTemplates(page, conform) == ;---------------> from kPage <----------------------- @@ -24623,16 +24515,16 @@ $dbKindAlist := 10)) (SPADLET |w| (COND (|manuelsCode?| 55) ('T 23))) (|htSaySaturn| - (MAKESTRING "\\colorbuttonbox{lightgray}{")) - (|htSay| (MAKESTRING "Optional argument value")) + "\\colorbuttonbox{lightgray}{") + (|htSay| "Optional argument value") (|htSay| (COND - ((CDR |parlist|) (MAKESTRING "s:")) - ('T (MAKESTRING ":")))) - (|htSaySaturn| (MAKESTRING "}")) + ((CDR |parlist|) "s:") + ('T ":"))) + (|htSaySaturn| "}") (COND ((CDR |conform|) - (|htSaySaturn| (MAKESTRING "\\newline{}")))) - (|htSaySaturn| (MAKESTRING "\\begin{tabular}{p{.25in}l}")) + (|htSaySaturn| "\\newline{}"))) + (|htSaySaturn| "\\begin{tabular}{p{.25in}l}") (SPADLET |firstTime| 'T) (SPADLET |odd| NIL) (SPADLET |argSublis| (|htpProperty| |page| '|argSublis|)) @@ -24653,7 +24545,7 @@ $dbKindAlist := ('T '|\\tab{29}|))) (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "\\\\")))) + ('T (|htSaySaturn| "\\\\"))) (SPADLET |odd| (NULL |odd|)) (SPADLET |argstring| (COND @@ -24666,12 +24558,12 @@ $dbKindAlist := 'T)) (SPADLET |$conArgstrings| |r|) |a|) - ('T (MAKESTRING "")))) + ('T ""))) (|htMakePageStandard| (CONS (CONS '|text| - (CONS (MAKESTRING "{\\em ") + (CONS "{\\em " (CONS |par| - (CONS (MAKESTRING "} = ") NIL)))) + (CONS "} = " NIL)))) (CONS (CONS '|bcStrings| (CONS @@ -24687,19 +24579,18 @@ $dbKindAlist := (|$saturn| (|setUpDefault| |parname| (CONS '|string| - (CONS (MAKESTRING "") + (CONS "" (CONS 'EM (CONS NIL NIL))))))) - (|htSaySaturn| (MAKESTRING "{\\em ")) + (|htSaySaturn| "{\\em ") (|htSaySaturn| |par|) - (|htSaySaturn| (MAKESTRING " = }")) + (|htSaySaturn| " = }") (|htSaySaturnAmpersand|) (|htSaySaturn| - (MAKESTRING - "\\colorbuttonbox{lightgray}{\\inputbox[2.5in]{\\")) + "\\colorbuttonbox{lightgray}{\\inputbox[2.5in]{\\") (|htSaySaturn| (SUBLIS |argSublis| |par|)) - (|htSaySaturn| (MAKESTRING "}{")) + (|htSaySaturn| "}{") (|htSaySaturn| |argstring|) - (|htSaySaturn| (MAKESTRING "}}")))))) + (|htSaySaturn| "}}"))))) (|htEndTabular|)))))) ;kPageArgs([op,:args],[.,.,:source]) == @@ -24734,7 +24625,7 @@ $dbKindAlist := (SPADLET |op| (CAR G179254)) (SPADLET |args| (CDR G179254)) (|htSaySaturn| - (MAKESTRING "\\begin{tabular}{p{.25in}lp{0in}}")) + "\\begin{tabular}{p{.25in}lp{0in}}") (SPADLET |firstTime| 'T) (SPADLET |coSig| (CDR (GETDATABASE |op| 'COSIG))) (DO ((G179306 |args| (CDR G179306)) (|x| NIL) @@ -24750,9 +24641,9 @@ $dbKindAlist := (SEQ (EXIT (PROGN (COND (|firstTime| (SPADLET |firstTime| NIL)) - ('T (|htSaySaturn| (MAKESTRING "\\\\")) - (|htSayStandard| (MAKESTRING ", and")))) - (|htSayStandard| (MAKESTRING "\\newline ")) + ('T (|htSaySaturn| "\\\\") + (|htSayStandard| ", and"))) + (|htSayStandard| "\\newline ") (|htSaySaturnAmpersand|) (SPADLET |typeForm| (COND @@ -24781,25 +24672,23 @@ $dbKindAlist := (CONS '|bcLinks| (CONS (CONS |x| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kArgPage| (CONS |x| NIL)))) NIL)) NIL))) ('T - (|htSay| (MAKESTRING "{\\em ") |x| - (MAKESTRING "}")))) - (|htSayStandard| (MAKESTRING "\\tab{") + (|htSay| "{\\em " |x| + "}"))) + (|htSayStandard| "\\tab{" (STRINGIMAGE (|#| (PNAME |x|))) - (MAKESTRING "}, ")) + "}, ") (|htSaySaturnAmpersand|) (|htSay| (COND (|pred| - (MAKESTRING - "a domain of category ")) + "a domain of category ") ('T - (MAKESTRING - "an element of the domain ")))) + "an element of the domain "))) (|bcConform| |typeForm| 'T))))) (|htEndTabular|)))))) @@ -24819,15 +24708,15 @@ $dbKindAlist := (|$saturn| (CONS '|\\lispLink[d]{\\verb!(\|conPage\| '| (APPEND (|form2Fence| (|dbOuttran| |form|)) - (CONS (MAKESTRING ")!}{") + (CONS ")!}{" (APPEND (|form2StringList| (|opOf| |form|)) (CONS '} NIL)))))) ('T (CONS '|\\conf{| (APPEND (|form2StringList| (|opOf| |form|)) - (CONS (MAKESTRING "}{") + (CONS "}{" (APPEND (|form2Fence| (|dbOuttran| |form|)) - (CONS (MAKESTRING "}") NIL)))))))) + (CONS "}" NIL)))))))) ;--------------------> NEW DEFINITION (see br-op1.boot.pamphlet) ;htTab s == if $standard then htSayStandard ('"\tab{",s,'"}") @@ -24836,7 +24725,7 @@ $dbKindAlist := (declare (special |$standard|)) (COND (|$standard| - (|htSayStandard| (MAKESTRING "\\tab{") |s| (MAKESTRING "}"))) + (|htSayStandard| "\\tab{" |s| "}")) ('T NIL))) ;--------------------> NEW DEFINITION (see br-op1.boot.pamphlet) @@ -24898,8 +24787,8 @@ $dbKindAlist := NIL)) NIL) (SEQ (EXIT (PROGN - (|htSaySaturn| (MAKESTRING "\\item[")) - (|htSayStandard| (MAKESTRING "\\item")) + (|htSaySaturn| "\\item[") + (|htSayStandard| "\\item") (COND (|single?| (|htSay| (|menuButton|))) ('T @@ -24908,7 +24797,7 @@ $dbKindAlist := (CONS '|bcLinks| (CONS (CONS (|menuButton|) - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS |bincount| NIL))))) @@ -24922,46 +24811,44 @@ $dbKindAlist := (CONS '|bcLinks| (CONS (CONS |button| - (CONS (MAKESTRING "") + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS |bincount| NIL))))) NIL)) NIL)))) - (|htSaySaturn| (MAKESTRING "]")) - (|htSay| (MAKESTRING "{\\em ")) + (|htSaySaturn| "]") + (|htSay| "{\\em ") (|htSay| (COND ((BOOT-EQUAL |thing| '|nowhere|) - (MAKESTRING - "implemented nowhere")) + "implemented nowhere") ((BOOT-EQUAL |thing| '|constant|) - (MAKESTRING "constant")) + "constant") ((BOOT-EQUAL |thing| '$) - (MAKESTRING "by the domain")) + "by the domain") ((INTEGERP |thing|) - (MAKESTRING "unexported")) + "unexported") (|constructorIfTrue| (|htSay| |word|) (COND ((ATOM |thing|) - (MAKESTRING - " an unknown constructor")) - ('T (MAKESTRING "")))) + " an unknown constructor") + ('T ""))) ((ATOM |thing|) - (MAKESTRING "unconditional")) - ('T (MAKESTRING "")))) - (|htSay| (MAKESTRING "}")) + "unconditional") + ('T ""))) + (|htSay| "}") (COND ((NULL (ATOM |thing|)) (COND (|constructorIfTrue| - (|htSay| (MAKESTRING " {\\em ") + (|htSay| " {\\em " (|dbShowKind| |thing|) - (MAKESTRING "}")))) - (|htSay| (MAKESTRING " ")) + "}"))) + (|htSay| " ") (FUNCALL |fn| |thing|))) - (|htSay| (MAKESTRING ":\\newline ")) + (|htSay| ":\\newline ") (|dbShowOpSigList| |which| |items| (TIMES (PLUS 1 |bincount|) 8192)) (SPADLET |bincount| (PLUS |bincount| 1)))))) @@ -25064,7 +24951,7 @@ $dbKindAlist := (SPADLET |star?| (OR (NULL |fromConPage?|) (BOOT-EQUAL |which| - (MAKESTRING "package operation")))) + "package operation"))) (SPADLET |implementation?| (AND (NULL |asharp?|) (BOOT-EQUAL |$UserLevel| '|development|) @@ -25079,7 +24966,7 @@ $dbKindAlist := (|htpSetProperty| |htPage| '|exclusion| (CAR |exclusions|)) (SPADLET |opAlist| (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpProperty| |htPage| '|opAlist|)) ('T (|htpProperty| |htPage| '|attrAlist|)))) (SPADLET |empty?| (NULL |opAlist|)) @@ -25088,45 +24975,45 @@ $dbKindAlist := (PROGN (SPADLET |entry| (QCAR |opAlist|)) 'T) (EQL 2 (|#| |entry|)))) (SPADLET |one?| (OR |empty?| |one?|)) (|htBeginTable|) - (|htSay| (MAKESTRING "{")) + (|htSay| "{") (COND ((OR |one?| (|member| '|conditions| |exclusions|) (BOOT-EQUAL (|htpProperty| |htPage| '|condition?|) '|no|)) - (|htSay| (MAKESTRING "{\\em Conditions}"))) + (|htSay| "{\\em Conditions}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Conditions") - (CONS (MAKESTRING "") + (CONS (CONS "Conditions" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|conditions| NIL))))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |empty?| (|member| '|documentation| |exclusions|)) - (|htSay| (MAKESTRING "{\\em Descriptions}"))) + (|htSay| "{\\em Descriptions}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Descriptions") - (CONS (MAKESTRING "") + (CONS (CONS "Descriptions" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|documentation| NIL))))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((NULL (IFCDR |opAlist|)) - (|htSay| (MAKESTRING "{\\em Filter}"))) + (|htSay| "{\\em Filter}")) ('T (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Filter ") - (CONS (MAKESTRING "") + (CONS (CONS "Filter " + (CONS "" (CONS '|htFilterPage| (CONS (CONS '|dbShowOps| @@ -25135,126 +25022,124 @@ $dbKindAlist := NIL)))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |one?| (|member| '|names| |exclusions|) (NULL (KDR |opAlist|))) - (|htSay| (MAKESTRING "{\\em Names}"))) + (|htSay| "{\\em Names}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Names") - (CONS (MAKESTRING "") + (CONS (CONS "Names" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|names| NIL))))) NIL)) NIL)))) (COND - ((NULL |star?|) (|htSay| (MAKESTRING "}{")) + ((NULL |star?|) (|htSay| "}{") (COND ((OR (NULL |implementation?|) (|member| '|implementation| |exclusions|) - (BOOT-EQUAL |which| (MAKESTRING "attribute")) + (BOOT-EQUAL |which| "attribute") (AND (SPADLET |conname| (|opOf| (|htpProperty| |htPage| '|conform|))) (BOOT-EQUAL (GETDATABASE |conname| 'CONSTRUCTORKIND) '|category|))) - (|htSay| (MAKESTRING "{\\em Implementations}"))) + (|htSay| "{\\em Implementations}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| (CONS (CONS - (MAKESTRING "Implementations") - (CONS (MAKESTRING "") + "Implementations" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|implementation| NIL))))) NIL)) NIL)))))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |one?| (|member| '|origins| |exclusions|)) - (|htSay| (MAKESTRING "{\\em Origins}"))) + (|htSay| "{\\em Origins}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Origins") - (CONS (MAKESTRING "") + (CONS (CONS "Origins" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|origins| NIL))))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND ((OR |one?| (|member| '|parameters| |exclusions|) (NULL (|dbDoesOneOpHaveParameters?| |opAlist|))) - (|htSay| (MAKESTRING "{\\em Parameters}"))) + (|htSay| "{\\em Parameters}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Parameters") - (CONS (MAKESTRING "") + (CONS (CONS "Parameters" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|parameters| NIL))))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}{")) + (|htSay| "}{") (COND - ((NEQUAL |which| (MAKESTRING "attribute")) + ((NEQUAL |which| "attribute") (COND ((OR |one?| (|member| '|signatures| |exclusions|)) - (|htSay| (MAKESTRING "{\\em Signatures}"))) + (|htSay| "{\\em Signatures}")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "Signatures") - (CONS (MAKESTRING "") + (CONS (CONS "Signatures" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|signatures| NIL))))) NIL)) NIL)))))) - (|htSay| (MAKESTRING "}")) + (|htSay| "}") (COND - (|star?| (|htSay| (MAKESTRING "{")) + (|star?| (|htSay| "{") (COND (|$exposedOnlyIfTrue| (COND (|one?| (|htSay| - (MAKESTRING - "{\\em Unexposed Also}"))) + "{\\em Unexposed Also}")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING "Unexposed Also") - (CONS (MAKESTRING "") + "Unexposed Also" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|exposureOff| NIL))))) NIL)) NIL))))) - (|one?| (|htSay| (MAKESTRING - "{\\em Exposed Only}"))) + (|one?| (|htSay| "{\\em Exposed Only}")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING "Exposed Only") - (CONS (MAKESTRING "") + "Exposed Only" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|exposureOn| NIL))))) NIL)) NIL)))) - (|htSay| (MAKESTRING "}")))) + (|htSay| "}"))) (|htEndTable|)))))) ;dbPresentOpsSaturn(htPage,which,exclusions) == @@ -25341,7 +25226,7 @@ $dbKindAlist := (SPADLET |star?| (OR (NULL |fromConPage?|) (BOOT-EQUAL |which| - (MAKESTRING "package operation")))) + "package operation"))) (SPADLET |implementation?| (AND (NULL |asharp?|) (BOOT-EQUAL |$UserLevel| '|development|) @@ -25356,7 +25241,7 @@ $dbKindAlist := (|htpSetProperty| |htPage| '|exclusion| (CAR |exclusions|)) (SPADLET |opAlist| (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (|htpProperty| |htPage| '|opAlist|)) ('T (|htpProperty| |htPage| '|attrAlist|)))) (SPADLET |empty?| (NULL |opAlist|)) @@ -25369,12 +25254,12 @@ $dbKindAlist := ((OR |one?| (|member| '|conditions| |exclusions|) (BOOT-EQUAL (|htpProperty| |htPage| '|condition?|) '|no|)) - (|htSayCold| (MAKESTRING "\\&Conditions"))) + (|htSayCold| "\\&Conditions")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\&Conditions") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Conditions" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|conditions| NIL))))) @@ -25382,12 +25267,12 @@ $dbKindAlist := NIL)))) (COND ((OR |empty?| (|member| '|documentation| |exclusions|)) - (|htSayCold| (MAKESTRING "\\&Descriptions"))) + (|htSayCold| "\\&Descriptions")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\&Descriptions") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Descriptions" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|documentation| NIL))))) @@ -25395,27 +25280,26 @@ $dbKindAlist := NIL)))) (COND ((NULL (IFCDR |opAlist|)) - (|htSayCold| (MAKESTRING "\\&Filter"))) + (|htSayCold| "\\&Filter")) ('T (|htMakeSaturnFilterPage| (CONS '|dbShowOps| (CONS |which| (CONS '|filter| NIL)))))) (COND ((OR (NULL |implementation?|) (|member| '|implementation| |exclusions|) - (BOOT-EQUAL |which| (MAKESTRING "attribute")) + (BOOT-EQUAL |which| "attribute") (AND (SPADLET |conname| (|opOf| (|htpProperty| |htPage| '|conform|))) (BOOT-EQUAL (GETDATABASE |conname| 'CONSTRUCTORKIND) '|category|))) - (|htSayCold| (MAKESTRING "\\&Implementations"))) + (|htSayCold| "\\&Implementations")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING - "\\&Implementations") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Implementations" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|implementation| NIL))))) @@ -25424,12 +25308,12 @@ $dbKindAlist := (COND ((OR |one?| (|member| '|names| |exclusions|) (NULL (KDR |opAlist|))) - (|htSayCold| (MAKESTRING "\\&Names"))) + (|htSayCold| "\\&Names")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\&Names") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Names" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|names| NIL))))) @@ -25437,12 +25321,12 @@ $dbKindAlist := NIL)))) (COND ((OR |one?| (|member| '|origins| |exclusions|)) - (|htSayCold| (MAKESTRING "\\&Origins"))) + (|htSayCold| "\\&Origins")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\&Origins") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Origins" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|origins| NIL))))) @@ -25451,61 +25335,60 @@ $dbKindAlist := (COND ((OR |one?| (|member| '|parameters| |exclusions|) (NULL (|dbDoesOneOpHaveParameters?| |opAlist|))) - (|htSayCold| (MAKESTRING "\\&Parameters"))) + (|htSayCold| "\\&Parameters")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\&Parameters") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Parameters" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|parameters| NIL))))) NIL)) NIL)))) (COND - ((NEQUAL |which| (MAKESTRING "attribute")) + ((NEQUAL |which| "attribute") (COND ((OR |one?| (|member| '|signatures| |exclusions|)) - (|htSayCold| (MAKESTRING "\\&Signatures"))) + (|htSayCold| "\\&Signatures")) ('T (|htMakePage| (CONS (CONS '|bcLispLinks| - (CONS (CONS (MAKESTRING "\\&Signatures") - (CONS (MAKESTRING "") + (CONS (CONS "\\&Signatures" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|signatures| NIL))))) NIL)) NIL)))))) (COND - (|star?| (|htSay| (MAKESTRING "\\hrule")) + (|star?| (|htSay| "\\hrule") (COND (|$exposedOnlyIfTrue| (COND (|one?| (|htSayCold| - (MAKESTRING "\\&Unexposed Also"))) + "\\&Unexposed Also")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING - "\\&Unexposed Also") - (CONS (MAKESTRING "") + "\\&Unexposed Also" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|exposureOff| NIL))))) NIL)) NIL))))) (|one?| (|htSayCold| - (MAKESTRING "Exposed Onl\\&y"))) + "Exposed Onl\\&y")) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS - (MAKESTRING "Exposed Onl\\&y") - (CONS (MAKESTRING "") + "Exposed Onl\\&y" + (CONS "" (CONS '|dbShowOps| (CONS |which| (CONS '|exposureOn| NIL))))) @@ -25530,13 +25413,13 @@ $dbKindAlist := (declare (special |$saturn| |$exposedOnlyIfTrue|)) (COND (|$saturn| (|htShowPageStarSaturn|)) - ('T (|htSayStandard| (MAKESTRING "\\endscroll ")) + ('T (|htSayStandard| "\\endscroll ") (COND (|$exposedOnlyIfTrue| (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Unexposed Also") - (CONS (MAKESTRING "") + (CONS (CONS "Unexposed Also" + (CONS "" (CONS '|repeatSearch| (CONS NIL NIL)))) NIL)) @@ -25544,8 +25427,8 @@ $dbKindAlist := ('T (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Exposed Only") - (CONS (MAKESTRING "") + (CONS (CONS "Exposed Only" + (CONS "" (CONS '|repeatSearch| (CONS 'T NIL)))) NIL)) @@ -25574,8 +25457,8 @@ $dbKindAlist := (|$exposedOnlyIfTrue| (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Unexposed Also") - (CONS (MAKESTRING "") + (CONS (CONS "Unexposed Also" + (CONS "" (CONS '|repeatSearch| (CONS NIL NIL)))) NIL)) @@ -25583,8 +25466,8 @@ $dbKindAlist := ('T (|htMakePage| (CONS (CONS '|bcLinks| - (CONS (CONS (MAKESTRING "Exposed Only") - (CONS (MAKESTRING "") + (CONS (CONS "Exposed Only" + (CONS "" (CONS '|repeatSearch| (CONS 'T NIL)))) NIL)) @@ -25846,47 +25729,47 @@ $dbKindAlist := (SPADLET |$DomainList| (CDR |$DomainList|)))) (SPADLET |opform| (COND - ((BOOT-EQUAL |which| (MAKESTRING "attribute")) + ((BOOT-EQUAL |which| "attribute") (COND ((NULL |sig|) (CONS |op| NIL)) ('T (CONS |op| (CONS |sig| NIL))))) ((BOOT-EQUAL |which| - (MAKESTRING "constructor")) + "constructor") |origin|) ('T (|dbGetDisplayFormForOp| |op| |sig| |doc|)))) - (|htSayStandard| (MAKESTRING "\\newline")) - (|htSaySaturn| (MAKESTRING "\\item[")) + (|htSayStandard| "\\newline") + (|htSaySaturn| "\\item[") (COND (|exactlyOneOpSig| (|htSay| (|menuButton|))) ('T (|htMakePage| (CONS (CONS '|bcLinks| (CONS (CONS (|menuButton|) - (CONS (MAKESTRING "") + (CONS "" (CONS |chooseFn| (CONS |which| (CONS |index| NIL))))) NIL)) NIL)))) - (|htSaySaturn| (MAKESTRING "]")) - (|htSayStandard| (MAKESTRING "\\tab{2}")) + (|htSaySaturn| "]") + (|htSayStandard| "\\tab{2}") (SPADLET |op| (IFCAR |opform|)) (SPADLET |args| (IFCDR |opform|)) (SPADLET |ops| (|escapeSpecialChars| (STRINGIMAGE |op|))) (SPADLET |n| (|#| |sig|)) (|do| (COND ((AND (EQL |n| 2) (LASSOC '|Nud| (PROPLIST |op|))) - (|htSay| |ops| (MAKESTRING " {\\em ") + (|htSay| |ops| " {\\em " (|quickForm2HtString| (KAR |args|)) - (MAKESTRING "}"))) + "}")) ((AND (EQL |n| 3) (LASSOC '|Led| (PROPLIST |op|))) - (|htSay| (MAKESTRING "{\\em ") + (|htSay| "{\\em " (|quickForm2HtString| (KAR |args|)) - (MAKESTRING "} ") |ops| - (MAKESTRING " {\\em ") + "} " |ops| + " {\\em " (|quickForm2HtString| (KAR (KDR |args|))) - (MAKESTRING "}"))) + "}")) ('T (COND ((AND |unexposed?| |$includeUnexposed?|) @@ -25898,16 +25781,16 @@ $dbKindAlist := (|member| |op| '(0 1))) '|skip|) ((AND (BOOT-EQUAL |which| - (MAKESTRING "attribute")) + "attribute") (NULL |args|)) '|skip|) - ('T (|htSay| (MAKESTRING "(")) + ('T (|htSay| "(") (COND ((IFCAR |args|) - (|htSay| (MAKESTRING "{\\em ") + (|htSay| "{\\em " (|quickForm2HtString| (IFCAR |args|)) - (MAKESTRING "}")))) + "}"))) (DO ((G179480 (IFCDR |args|) (CDR G179480)) (|x| NIL)) @@ -25916,10 +25799,10 @@ $dbKindAlist := (SETQ |x| (CAR G179480)) NIL)) NIL) - (SEQ (EXIT (|htSay| (MAKESTRING ",{\\em ") + (SEQ (EXIT (|htSay| ",{\\em " (|quickForm2HtString| |x|) - (MAKESTRING "}"))))) - (|htSay| (MAKESTRING ")"))))))) + "}")))) + (|htSay| ")")))))) (SPADLET |constring| (|form2HtString| |conform|)) (SPADLET |conname| (CAR |conform|)) (SPADLET |$conkind| @@ -25930,7 +25813,7 @@ $dbKindAlist := (SPADLET |$conform| |conform|) (SPADLET |$conargs| (CDR |conform|)) (COND - ((BOOT-EQUAL |which| (MAKESTRING "operation")) + ((BOOT-EQUAL |which| "operation") (SPADLET |$signature| (COND ((MEMQ |conname| |$Primitives|) NIL) @@ -25945,11 +25828,11 @@ $dbKindAlist := (SPADLET |$sig| (COND ((OR (BOOT-EQUAL |which| - (MAKESTRING "attribute")) + "attribute") (BOOT-EQUAL |which| - (MAKESTRING "constructor"))) + "constructor")) |sig|) - ((NEQUAL |$conkind| (MAKESTRING "package")) + ((NEQUAL |$conkind| "package") |sig|) ('T (SPADLET |symbolsUsed| @@ -25975,16 +25858,15 @@ $dbKindAlist := (SETDIFFERENCE |$DomainList| |symbolsUsed|)) (|getSubstSigIfPossible| |sig|)))) - (|htSaySaturn| (MAKESTRING "\\begin{tabular}{lp{0in}}")) + (|htSaySaturn| "\\begin{tabular}{lp{0in}}") (COND ((|member| |which| '("operation" "constructor")) (SPADLET |$displayReturnValue| NIL) (COND (|args| (|htSayStandard| - (MAKESTRING - "\\newline\\tab{2}{\\em Arguments:}")) + "\\newline\\tab{2}{\\em Arguments:}") (|htSaySaturn| - (MAKESTRING "{\\em Arguments:}")) + "{\\em Arguments:}") (|htSaySaturnAmpersand|) (SPADLET |firstTime| 'T) (SPADLET |coSig| @@ -26006,7 +25888,7 @@ $dbKindAlist := (COND ((NULL |firstTime|) (|htSaySaturn| - (MAKESTRING "\\\\ ")) + "\\\\ ") (|htSaySaturnAmpersand|))) (SPADLET |firstTime| NIL) (|htSayIndentRel| 15 'T) @@ -26022,16 +25904,16 @@ $dbKindAlist := (CONS '|bcLinks| (CONS (CONS |a| - (CONS (MAKESTRING "") + (CONS "" (CONS '|kArgPage| (CONS |a| NIL)))) NIL)) NIL))) ('T (|htSay| - (MAKESTRING "{\\em ") + "{\\em " (|form2HtString| |a|) - (MAKESTRING "}")))) + "}"))) (|htSay| '|, |) (SPADLET |coSig| (KDR |coSig|)) @@ -26039,25 +25921,25 @@ $dbKindAlist := (|htSayIndentRel| (SPADDIFFERENCE 15) 'T) (|htSayStandard| - (MAKESTRING "\\newline ")))))) - (|htSaySaturn| (MAKESTRING "\\\\")))) + "\\newline "))))) + (|htSaySaturn| "\\\\"))) (COND ((CAR |$sig|) (SPADLET |$displayReturnValue| 'T) - (|htSayStandard| (MAKESTRING "\\newline\\tab{2}")) - (|htSay| (MAKESTRING "{\\em Returns:}")) + (|htSayStandard| "\\newline\\tab{2}") + (|htSay| "{\\em Returns:}") (|htSaySaturnAmpersand|) (|htSayIndentRel| 15 'T) (|htSayValue| (CAR |$sig|)) (|htSayIndentRel| (SPADDIFFERENCE 15) 'T) - (|htSaySaturn| (MAKESTRING "\\\\"))) + (|htSaySaturn| "\\\\")) ('T NIL)))) (COND ((AND |origin| (OR |$generalSearch?| (NEQUAL |origin| |conform|)) (NEQUAL |op| (|opOf| |origin|))) - (|htSaySaturn| (MAKESTRING "{\\em Origin:}")) + (|htSaySaturn| "{\\em Origin:}") (|htSaySaturnAmpersand|) (|htSayStandard| - (MAKESTRING "\\newline\\tab{2}{\\em Origin:}")) + "\\newline\\tab{2}{\\em Origin:}") (|htSayIndentRel| 15) (COND ((AND (NULL (|isExposedConstructor| @@ -26066,15 +25948,15 @@ $dbKindAlist := (|htSayUnexposed|))) (|bcConform| |origin| 'T) (|htSayIndentRel| (SPADDIFFERENCE 15)) - (|htSaySaturn| (MAKESTRING "\\\\")))) + (|htSaySaturn| "\\\\"))) (COND ((NULL (MEMQ |predicate| '(T ASCONST))) (SPADLET |pred| (|sublisFormal| (KDR |conform|) |predicate|)) (SPADLET |count| (|#| |pred|)) - (|htSaySaturn| (MAKESTRING "{\\em Conditions:}")) + (|htSaySaturn| "{\\em Conditions:}") (|htSayStandard| - (MAKESTRING "\\newline\\tab{2}{\\em Conditions:}")) + "\\newline\\tab{2}{\\em Conditions:}") (SPADLET |firstTime| 'T) (DO ((G179538 (|displayBreakIntoAnds| @@ -26087,7 +25969,7 @@ $dbKindAlist := (SEQ (EXIT (PROGN (COND ((NULL |firstTime|) - (|htSaySaturn| (MAKESTRING "\\\\")))) + (|htSaySaturn| "\\\\"))) (|htSayIndentRel| 15 (> |count| 1)) (SPADLET |firstTime| NIL) (|htSaySaturnAmpersand|) @@ -26095,24 +25977,24 @@ $dbKindAlist := (|htSayIndentRel| (SPADDIFFERENCE 15) (> |count| 1)) (|htSayStandard| - (MAKESTRING "\\newline ")))))) - (|htSaySaturn| (MAKESTRING "\\\\")))) + "\\newline "))))) + (|htSaySaturn| "\\\\"))) (COND (|$whereList| (SPADLET |count| (|#| |$whereList|)) - (|htSaySaturn| (MAKESTRING "{\\em Where:}")) + (|htSaySaturn| "{\\em Where:}") (|htSayStandard| - (MAKESTRING "\\newline\\tab{2}{\\em Where:}")) + "\\newline\\tab{2}{\\em Where:}") (SPADLET |firstTime| 'T) (COND ((|assoc| '$ |$whereList|) (|htSayIndentRel| 15 'T) (|htSaySaturnAmpersand|) - (|htSayStandard| (MAKESTRING "{\\em \\$} is ")) - (|htSaySaturn| (MAKESTRING "{\\em \\%} is ")) + (|htSayStandard| "{\\em \\$} is ") + (|htSaySaturn| "{\\em \\%} is ") (|htSay| (COND ((BOOT-EQUAL |$conkind| - (MAKESTRING "category")) - (MAKESTRING "of category ")) - ('T (MAKESTRING "the domain ")))) + "category") + "of category ") + ('T "the domain "))) (|bcConform| |conform| 'T 'T) (SPADLET |firstTime| NIL) (|htSayIndentRel| (SPADDIFFERENCE 15) 'T))) @@ -26138,7 +26020,7 @@ $dbKindAlist := (COND ((NULL |firstTime|) (|htSaySaturn| - (MAKESTRING "\\\\ ")))) + "\\\\ "))) (|htSaySaturnAmpersand|) (SPADLET |firstTime| NIL) (|htSay| '|{\\em | |d| '|} is |) @@ -26148,18 +26030,18 @@ $dbKindAlist := (|htSayIndentRel| (SPADDIFFERENCE 15) (> |count| 1)))))))) - (|htSaySaturn| (MAKESTRING "\\\\")))) + (|htSaySaturn| "\\\\"))) (COND - ((AND |doc| (NEQUAL |doc| (MAKESTRING "")) + ((AND |doc| (NEQUAL |doc| "") (OR (NULL (AND (PAIRP |doc|) (EQ (QCDR |doc|) NIL) (PROGN (SPADLET |d| (QCAR |doc|)) 'T))) - (NEQUAL |d| (MAKESTRING "")))) - (|htSaySaturn| (MAKESTRING "{\\em Description:}")) + (NEQUAL |d| ""))) + (|htSaySaturn| "{\\em Description:}") (|htSaySaturnAmpersand|) (|htSayStandard| - (MAKESTRING "\\newline\\tab{2}{\\em Description:}")) + "\\newline\\tab{2}{\\em Description:}") (|htSayIndentRel| 15) (COND ((BOOT-EQUAL |doc| |$charFauxNewline|) @@ -26192,35 +26074,35 @@ $dbKindAlist := (|htSay| |ndoc|))) (|htSayIndentRel| (SPADDIFFERENCE 15)))) (COND - ((BOOT-EQUAL |which| (MAKESTRING "constructor")) + ((BOOT-EQUAL |which| "constructor") (COND ((SPADLET |abbr| (GETDATABASE |conname| 'ABBREVIATION)) - (|htSaySaturn| (MAKESTRING "\\\\")) - (|htSaySaturn| (MAKESTRING "{\\em Abbreviation:}")) + (|htSaySaturn| "\\\\") + (|htSaySaturn| "{\\em Abbreviation:}") (|htSaySaturnAmpersand|) (|htSayStandard| - (MAKESTRING "\\tab{2}{\\em Abbreviation:}")) + "\\tab{2}{\\em Abbreviation:}") (|htSayIndentRel| 15) (|htSay| |abbr|) (|htSayIndentRel| (SPADDIFFERENCE 15)) - (|htSayStandard| (MAKESTRING "\\newline{}")))) + (|htSayStandard| "\\newline{}"))) (COND ((AND |$saturn| (SPADLET |link| (|saturnHasExamplePage| |conname|))) - (|htSaySaturn| (MAKESTRING "\\\\")) - (|htSaySaturn| (MAKESTRING "{\\em Examples:}")) + (|htSaySaturn| "\\\\") + (|htSaySaturn| "{\\em Examples:}") (|htSaySaturnAmpersand|) (|htSayIndentRel| 15) - (|htSay| (MAKESTRING "\\spadref{")) + (|htSay| "\\spadref{") (|htSay| (CAR (CDR |link|))) - (|htSay| (MAKESTRING "}")) + (|htSay| "}") (|htSayIndentRel| (SPADDIFFERENCE 15)) - (|htSayStandard| (MAKESTRING "\\newline{}")))) - (|htSaySaturn| (MAKESTRING "\\\\")) - (|htSaySaturn| (MAKESTRING "{\\em Source File:}")) + (|htSayStandard| "\\newline{}"))) + (|htSaySaturn| "\\\\") + (|htSaySaturn| "{\\em Source File:}") (|htSaySaturnAmpersand|) (|htSayStandard| - (MAKESTRING "\\tab{2}{\\em Source File:}")) + "\\tab{2}{\\em Source File:}") (|htSayIndentRel| 15) (|htSaySourceFile| |conname|) (|htSayIndentRel| (SPADDIFFERENCE 15)))) (COND @@ -26228,7 +26110,7 @@ $dbKindAlist := (SPADLET |infoAlist| (|htpProperty| |htPage| '|infoAlist|))) (|displayInfoOp| |htPage| |infoAlist| |op| |sig|))) - (|htSaySaturn| (MAKESTRING "\\end{tabular}"))))))) + (|htSaySaturn| "\\end{tabular}")))))) ;htSaySourceFile conname == ; sourceFileName := (GETDATABASE(conname,'SOURCEFILE) or '"none") @@ -26242,20 +26124,19 @@ $dbKindAlist := (PROGN (SPADLET |sourceFileName| (OR (GETDATABASE |conname| 'SOURCEFILE) - (MAKESTRING "none"))) + "none")) (SPADLET |filename| (|extractFileNameFromPath| |sourceFileName|)) (|htMakePage| (CONS (CONS '|text| - (CONS (MAKESTRING "\\unixcommand{") + (CONS "\\unixcommand{" (CONS |filename| (CONS - (MAKESTRING - "}{\\$AXIOM/lib/SPADEDIT ") + "}{\\$AXIOM/lib/SPADEDIT " (CONS |sourceFileName| - (CONS (MAKESTRING " ") + (CONS " " (CONS |conname| - (CONS (MAKESTRING "}") NIL)))))))) + (CONS "}" NIL)))))))) NIL)))))) ;--------------------> NEW DEFINITION (see br-op2.boot.pamphlet) @@ -26284,16 +26165,16 @@ $dbKindAlist := (COND ((> |n| 0) (COND - (|flag| (CONS (MAKESTRING "\\indent{") + (|flag| (CONS "\\indent{" (CONS (STRINGIMAGE |m|) - (CONS (MAKESTRING "}\\tab{-2}") + (CONS "}\\tab{-2}" NIL)))) ('T - (CONS (MAKESTRING "\\indent{") + (CONS "\\indent{" (CONS (STRINGIMAGE |m|) - (CONS (MAKESTRING "}\\tab{0}") NIL)))))) + (CONS "}\\tab{0}" NIL)))))) ((MINUSP |n|) - (CONS (MAKESTRING "\\indent{0}\\newline ") NIL))))) + (CONS "\\indent{0}\\newline " NIL))))) ('T NIL)))))) ;htSayUnexposed() == @@ -26303,7 +26184,7 @@ $dbKindAlist := (DEFUN |htSayUnexposed| () (declare (special |$atLeastOneUnexposed|)) (PROGN - (|htSay| (MAKESTRING "{\\em *}")) + (|htSay| "{\\em *}") (SPADLET |$atLeastOneUnexposed| 'T))) ;--======================================================================= @@ -26313,7 +26194,7 @@ $dbKindAlist := ; htSaySaturn '"\end{tabular}" (DEFUN |htEndTabular| () - (|htSaySaturn| (MAKESTRING "\\end{tabular}"))) + (|htSaySaturn| "\\end{tabular}")) ;htPopSaturn s == ; pageDescription := ELT($saturnPage, 7) @@ -26339,8 +26220,8 @@ $dbKindAlist := (DEFUN |htBeginTable| () (PROGN - (|htSaySaturn| (MAKESTRING "\\begin{dirlist}[lv]")) - (|htSayStandard| (MAKESTRING "\\table{")))) + (|htSaySaturn| "\\begin{dirlist}[lv]") + (|htSayStandard| "\\table{"))) ;htEndTable() == ; htSaySaturn '"\end{dirlist}" @@ -26348,8 +26229,8 @@ $dbKindAlist := (DEFUN |htEndTable| () (PROGN - (|htSaySaturn| (MAKESTRING "\\end{dirlist}")) - (|htSayStandard| (MAKESTRING "}")))) + (|htSaySaturn| "\\end{dirlist}") + (|htSayStandard| "}"))) ;htBeginMenu(kind,:options) == ; skip := IFCAR options @@ -26374,15 +26255,15 @@ $dbKindAlist := (|$saturn| (COND ((BOOT-EQUAL |kind| '|description|) - (|htSaySaturn| (MAKESTRING "\\begin{description}"))) - ('T (|htSaySaturn| (MAKESTRING "\\begin{tabular}")) + (|htSaySaturn| "\\begin{description}")) + ('T (|htSaySaturn| "\\begin{tabular}") (|htSaySaturn| (COND - ((EQL |kind| 3) (MAKESTRING "{llp{0in}}")) - ((EQL |kind| 2) (MAKESTRING "{lp{0in}}")) + ((EQL |kind| 3) "{llp{0in}}") + ((EQL |kind| 2) "{lp{0in}}") ('T (|error| NIL)))))))) (COND - ((NULL |skip|) (|htSayStandard| (MAKESTRING "\\beginmenu "))) + ((NULL |skip|) (|htSayStandard| "\\beginmenu ")) ('T NIL)))))) ;htEndMenu(kind) == @@ -26399,10 +26280,10 @@ $dbKindAlist := (|$saturn| (COND ((BOOT-EQUAL |kind| '|description|) - (|htSaySaturn| (MAKESTRING "\\end{description}"))) - ('T (|htPopSaturn| (MAKESTRING "\\\\")) - (|htSaySaturn| (MAKESTRING "\\end{tabular}")))))) - (|htSayStandard| (MAKESTRING "\\endmenu ")))) + (|htSaySaturn| "\\end{description}")) + ('T (|htPopSaturn| "\\\\") + (|htSaySaturn| "\\end{tabular}"))))) + (|htSayStandard| "\\endmenu "))) ;htSayConstructorName(nameShown, name) == ; if $saturn then @@ -26419,17 +26300,17 @@ $dbKindAlist := (COND (|$saturn| (SPADLET |code| - (CONS (MAKESTRING "(|conPage| '|") - (CONS |name| (CONS (MAKESTRING "|)") NIL)))) + (CONS "(|conPage| '|" + (CONS |name| (CONS "|)" NIL)))) (|htSaySaturn| (|mkDocLink| |code| |nameShown|)))) (COND (|$standard| (|htSayStandard| (CONS '|\\lispdownlink{| (CONS |nameShown| - (CONS (MAKESTRING "}{(|conPage| '|") + (CONS "}{(|conPage| '|" (CONS |name| - (CONS (MAKESTRING "|)}") NIL))))))) + (CONS "|)}" NIL))))))) ('T NIL)))))) ;--------------------> NEW DEFINITION (see ht-util.boot.pamphlet) @@ -26454,14 +26335,14 @@ $dbKindAlist := (declare (special |$saturn| |$curPage| |$standard|)) (PROGN (COND - (|$saturn| (|htSaySaturn| (MAKESTRING "\\browseTitle{")) - (|htSaySaturn| |title|) (|htSaySaturn| (MAKESTRING "}")))) + (|$saturn| (|htSaySaturn| "\\browseTitle{") + (|htSaySaturn| |title|) (|htSaySaturn| "}"))) (COND (|$standard| - (|htSayStandard| (MAKESTRING "\\begin{page}{") - (|htpName| |$curPage|) (MAKESTRING "}{")))) + (|htSayStandard| "\\begin{page}{" + (|htpName| |$curPage|) "}{"))) (|htSayStandard| |title|) - (|htSayStandard| (MAKESTRING "}")))) + (|htSayStandard| "}"))) ;--======================================================================= ;-- Utilities @@ -26507,12 +26388,12 @@ $dbKindAlist := ((QSGREATERP |i| |n|) G179737) (SEQ (EXIT (SETQ G179737 (STRCONC G179737 - (MAKESTRING "\\phantom{*}"))))))))) + "\\phantom{*}")))))))) (|htSayStandard| - (STRCONC (MAKESTRING "\\space{") (STRINGIMAGE |n|) - (MAKESTRING "}")))) - ('T (|htSaySaturn| (MAKESTRING "\\phantom{*}")) - (|htSayStandard| (MAKESTRING "\\space{1}")))))))) + (STRCONC "\\space{" (STRINGIMAGE |n|) + "}"))) + ('T (|htSaySaturn| "\\phantom{*}") + (|htSayStandard| "\\space{1}"))))))) ;unTab s == ; STRINGP s => unTab1 s @@ -26534,7 +26415,7 @@ $dbKindAlist := (PROG (|k|) (RETURN (COND - ((AND (EQL (STRING< (MAKESTRING "\\tab{") |s|) 5) + ((AND (EQL (STRING< "\\tab{" |s|) 5) (SPADLET |k| (|charPosition| (|char| '}) |s| 4))) (SUBSTRING |s| (PLUS |k| 1) NIL)) ('T |s|))))) @@ -26545,8 +26426,8 @@ $dbKindAlist := (DEFUN |satBreak| () (PROGN - (|htSaySaturn| (MAKESTRING "\\\\ ")) - (|htSayStandard| (MAKESTRING "\\item ")))) + (|htSaySaturn| "\\\\ ") + (|htSayStandard| "\\item "))) ;htBigSkip() == ; htSaySaturn '"\bigskip{}" @@ -26554,12 +26435,12 @@ $dbKindAlist := (DEFUN |htBigSkip| () (PROGN - (|htSaySaturn| (MAKESTRING "\\bigskip{}")) - (|htSayStandard| (MAKESTRING "\\vspace{1}\\newline ")))) + (|htSaySaturn| "\\bigskip{}") + (|htSayStandard| "\\vspace{1}\\newline "))) ;htSaturnBreak() == htSaySaturn '"\!" -(DEFUN |htSaturnBreak| () (|htSaySaturn| (MAKESTRING "\\!"))) +(DEFUN |htSaturnBreak| () (|htSaySaturn| "\\!")) ;satDownLink(s,code) == ; htSaySaturn '"\lispFunctionLink{\verb!" @@ -26576,16 +26457,16 @@ $dbKindAlist := (DEFUN |satDownLink| (|s| |code|) (PROGN - (|htSaySaturn| (MAKESTRING "\\lispFunctionLink{\\verb!")) + (|htSaySaturn| "\\lispFunctionLink{\\verb!") (|htSaySaturn| |code|) - (|htSaySaturn| (MAKESTRING "!}{")) + (|htSaySaturn| "!}{") (|htSaySaturn| |s|) - (|htSaySaturn| (MAKESTRING "}")) - (|htSayStandard| (MAKESTRING "\\lispdownlink{")) + (|htSaySaturn| "}") + (|htSayStandard| "\\lispdownlink{") (|htSayStandard| |s|) - (|htSayStandard| (MAKESTRING "}{")) + (|htSayStandard| "}{") (|htSayStandard| |code|) - (|htSayStandard| (MAKESTRING "}")))) + (|htSayStandard| "}"))) ;satTypeDownLink(s,code) == ; htSaySaturn '"\lispLink[d]{\verb!" @@ -26602,22 +26483,22 @@ $dbKindAlist := (DEFUN |satTypeDownLink| (|s| |code|) (PROGN - (|htSaySaturn| (MAKESTRING "\\lispLink[d]{\\verb!")) + (|htSaySaturn| "\\lispLink[d]{\\verb!") (|htSaySaturn| |code|) - (|htSaySaturn| (MAKESTRING "!}{")) + (|htSaySaturn| "!}{") (|htSaySaturn| |s|) - (|htSaySaturn| (MAKESTRING "}")) - (|htSayStandard| (MAKESTRING "\\lispdownlink{")) + (|htSaySaturn| "}") + (|htSayStandard| "\\lispdownlink{") (|htSayStandard| |s|) - (|htSayStandard| (MAKESTRING "}{")) + (|htSayStandard| "}{") (|htSayStandard| |code|) - (|htSayStandard| (MAKESTRING "}")))) + (|htSayStandard| "}"))) ;mkButtonBox n == STRCONC('"\buttonbox{", STRINGIMAGE n, '"}") (DEFUN |mkButtonBox| (|n|) - (STRCONC (MAKESTRING "\\buttonbox{") (STRINGIMAGE |n|) - (MAKESTRING "}"))) + (STRCONC "\\buttonbox{" (STRINGIMAGE |n|) + "}")) ;--======================================================================= ;-- Create separate databases for operations, constructors @@ -26703,10 +26584,10 @@ $dbKindAlist := (PROGN (SPADLET |sin| (STRINGIMAGE |x|)) (SPADLET |sout| (STRINGIMAGE |y|)) - (OBEY (STRCONC (MAKESTRING "sort -f \"") |sin| - (MAKESTRING ".text\" > \"") |sout| - (MAKESTRING ".text\""))) - (OBEY (STRCONC (MAKESTRING "rm ") |sin| (MAKESTRING ".text"))))))) + (OBEY (STRCONC "sort -f \"" |sin| + ".text\" > \"" |sout| + ".text\"")) + (OBEY (STRCONC "rm " |sin| ".text")))))) ;--======================================================================= ;-- from define.boot @@ -26951,17 +26832,17 @@ $dbKindAlist := ((AND |$compileOnlyCertainItems| (NULL (|member| |$op| |$compileOnlyCertainItems|))) (|sayBrightly| - (CONS (MAKESTRING " skipping ") + (CONS " skipping " (CONS |localOrExported| (|bright| |$op|)))) (CONS NIL (CONS (CONS '|Mapping| |signature'|) (CONS |oldE| NIL)))) ('T (|sayBrightly| - (CONS (MAKESTRING " compiling ") + (CONS " compiling " (CONS |localOrExported| (APPEND (|bright| |$op|) - (CONS (MAKESTRING ": ") + (CONS ": " |formattedSig|))))) (COND ((BOOT-EQUAL |$newComp| 'T) @@ -26989,9 +26870,9 @@ $dbKindAlist := |e|)) (CONS (INTERN " " "BOOT") (CONS |rettype| (CONS |e| NIL))))) - (SAY (MAKESTRING "The old compiler generates:")) + (SAY "The old compiler generates:") (|prTriple| |oldT|) - (SAY (MAKESTRING "The new compiler generates:")) + (SAY "The new compiler generates:") (|prTriple| T$)) ('T NIL))) ('T @@ -27003,7 +26884,7 @@ $dbKindAlist := (|NRTassignCapsuleFunctionSlot| |$op| |signature'|) (COND ((BOOT-EQUAL |$newCompCompare| 'T) - (SAY (MAKESTRING "The old compiler generates:")) + (SAY "The old compiler generates:") (|prTriple| T$)) ('T NIL)))) (SPADLET |catchTag| (MKQ (GENSYM))) @@ -27167,35 +27048,35 @@ $dbKindAlist := (DEFUN |bcConform1,say| (|x|) (declare (special |$italics?|)) - (SEQ (IF |$italics?| (|bcHt| (MAKESTRING "{\\em ")) NIL) - (IF (BOOT-EQUAL |x| '|etc|) (SPADLET |x| (MAKESTRING "...")) + (SEQ (IF |$italics?| (|bcHt| "{\\em ") NIL) + (IF (BOOT-EQUAL |x| '|etc|) (SPADLET |x| "...") NIL) (|bcHt| (|escapeSpecialIds| (STRINGIMAGE |x|))) - (EXIT (IF |$italics?| (|bcHt| (MAKESTRING "}")) NIL)))) + (EXIT (IF |$italics?| (|bcHt| "}") NIL)))) (DEFUN |bcConform1,tl| (|u|) (PROG (|firstTime|) (RETURN - (SEQ (|bcHt| (MAKESTRING "(")) (SPADLET |firstTime| 'T) + (SEQ (|bcHt| "(") (SPADLET |firstTime| 'T) (DO ((G180021 |u| (CDR G180021)) (|x| NIL)) ((OR (ATOM G180021) (PROGN (SETQ |x| (CAR G180021)) NIL)) NIL) - (SEQ (IF (NULL |firstTime|) (|bcHt| (MAKESTRING ",")) NIL) + (SEQ (IF (NULL |firstTime|) (|bcHt| ",") NIL) (SPADLET |firstTime| NIL) (EXIT (|bcConform1,hd| |x|)))) - (EXIT (|bcHt| (MAKESTRING ")"))))))) + (EXIT (|bcHt| ")")))))) (DEFUN |bcConform1,tuple| (|u|) - (SEQ (IF (NULL |u|) (EXIT (|bcHt| (MAKESTRING "()")))) + (SEQ (IF (NULL |u|) (EXIT (|bcHt| "()"))) (IF (NULL (CDR |u|)) (EXIT (|bcConform1,hd| |u|))) - (|bcHt| (MAKESTRING "(")) (|bcConform1,hd| (CAR |u|)) + (|bcHt| "(") (|bcConform1,hd| (CAR |u|)) (DO ((G180035 (CDR |u|) (CDR G180035)) (|x| NIL)) ((OR (ATOM G180035) (PROGN (SETQ |x| (CAR G180035)) NIL)) NIL) - (SEQ (|bcHt| (MAKESTRING ",")) (EXIT (|bcConform1,hd| |x|)))) - (EXIT (|bcHt| (MAKESTRING ")"))))) + (SEQ (|bcHt| ",") (EXIT (|bcConform1,hd| |x|)))) + (EXIT (|bcHt| ")")))) (DEFUN |bcConform1,mapping| (G180044) (PROG (|target| |source|) @@ -27207,8 +27088,8 @@ $dbKindAlist := G180044 (SEQ (|bcConform1,tuple| |source|) (|bcHt| (SEQ (IF |$saturn| - (EXIT (MAKESTRING " {\\ttrarrow} "))) - (EXIT (MAKESTRING " -> ")))) + (EXIT " {\\ttrarrow} ")) + (EXIT " -> "))) (EXIT (|bcConform1,hd| |target|)))))))) (DEFUN |bcConform1,hd| (|form|) @@ -27237,7 +27118,7 @@ $dbKindAlist := (ELT |$FormalMapVariableList| |n|))))) - (|htSay| (MAKESTRING "\\")) + (|htSay| "\\") (EXIT (|htSay| |form|))))) (EXIT (|htSay| @@ -27249,26 +27130,25 @@ $dbKindAlist := (IF |$bcMultipleNames| (EXIT (|satTypeDownLink| |s| (CONS - (MAKESTRING - "(|conPageChoose| '|") + "(|conPageChoose| '|" (CONS |s| - (CONS (MAKESTRING "|)") NIL)))))) + (CONS "|)" NIL)))))) (EXIT (|satTypeDownLink| |s| (CONS '|(\|conPage\| '\|| (CONS |s| - (CONS (MAKESTRING "|)") NIL)))))))) + (CONS "|)" NIL)))))))) (IF (BOOT-EQUAL (SPADLET |head| (QCAR |form|)) 'QUOTE) - (EXIT (SEQ (|htSay| (MAKESTRING "'")) + (EXIT (SEQ (|htSay| "'") (EXIT (|bcConform1,hd| (CADR |form|)))))) (IF (BOOT-EQUAL |head| 'SIGNATURE) - (EXIT (SEQ (|htSay| (CADR |form|) (MAKESTRING ": ")) + (EXIT (SEQ (|htSay| (CADR |form|) ": ") (EXIT (|bcConform1,mapping| (CADDR |form|)))))) (IF (AND (BOOT-EQUAL |head| '|Mapping|) (CDR |form|)) (EXIT (IF (CDR |form|) (EXIT (|bcConform1,mapping| (CDR |form|)))))) (IF (BOOT-EQUAL |head| '|:|) (EXIT (SEQ (|bcConform1,hd| (CADR |form|)) - (|htSay| (MAKESTRING ": ")) + (|htSay| ": ") (EXIT (|bcConform1,hd| (CADDR |form|)))))) (IF (AND (QCDR |form|) (|dbEvalableConstructor?| |form|)) (EXIT (|bcConstructor| |form| |head|))) @@ -27379,7 +27259,7 @@ $dbKindAlist := (declare (special |$newConstructorList|)) (PROGN (SPADLET |$newConstructorList| NIL) - (|deleteFile| (MAKESTRING "libdb.text")))) + (|deleteFile| "libdb.text"))) @ \eject diff --git a/src/interp/c-doc.lisp.pamphlet b/src/interp/c-doc.lisp.pamphlet index d3283b0..3d70425 100644 --- a/src/interp/c-doc.lisp.pamphlet +++ b/src/interp/c-doc.lisp.pamphlet @@ -556,24 +556,24 @@ ((OR |noHeading| |signatures| |attributes|) (|sayKeyedMsg| 'S2CD0002 (CONS (STRCONC (STRINGIMAGE |bigcnt|) - (MAKESTRING ".")) + ".") (CONS |name| NIL))) (SPADLET |bigcnt| (PLUS |bigcnt| 1)) (SPADLET |litcnt| 1) (COND (|noHeading| (|sayKeyedMsg| 'S2CD0003 - (CONS (STRCONC (MAKESTRING "(") + (CONS (STRCONC "(" (STRINGIMAGE |litcnt|) - (MAKESTRING ")")) + ")") (CONS |name| NIL))) (SPADLET |litcnt| (PLUS |litcnt| 1)))) (COND (|signatures| (|sayKeyedMsg| 'S2CD0004 - (CONS (STRCONC (MAKESTRING "(") + (CONS (STRCONC "(" (STRINGIMAGE |litcnt|) - (MAKESTRING ")")) + ")") NIL)) (SPADLET |litcnt| (PLUS |litcnt| 1)) (DO ((G166479 |signatures| @@ -603,9 +603,9 @@ (COND (|attributes| (|sayKeyedMsg| 'S2CD0005 - (CONS (STRCONC (MAKESTRING "(") + (CONS (STRCONC "(" (STRINGIMAGE |litcnt|) - (MAKESTRING ")")) + ")") NIL)) (SPADLET |litcnt| (PLUS |litcnt| 1)) (DO ((G166491 |attributes| @@ -629,7 +629,7 @@ (|unusedCommentLineNumbers| (|sayKeyedMsg| 'S2CD0006 (CONS (STRCONC (STRINGIMAGE |bigcnt|) - (MAKESTRING ".")) + ".") (CONS |name| NIL))) (DO ((G166501 |unusedCommentLineNumbers| (CDR G166501)) @@ -646,9 +646,9 @@ NIL)) NIL) (SEQ (EXIT (|sayMSG| - (CONS (MAKESTRING " ") + (CONS " " (APPEND (|bright| |n|) - (CONS (MAKESTRING " ") + (CONS " " (CONS |r| NIL))))))))) ('T NIL))) ('T NIL)))) @@ -701,10 +701,9 @@ (RETURN (SEQ (PROGN (|sayBrightly| - (CONS (MAKESTRING " Processing ") + (CONS " Processing " (CONS |$constructorName| - (CONS (MAKESTRING - " for Browser database:") + (CONS " for Browser database:" NIL)))) (SPADLET |commentList| (|transDoc| |$constructorName| |doclist|)) @@ -728,7 +727,7 @@ (|conEntry| (|checkDocError| (CONS - (MAKESTRING "Spurious comments: ") + "Spurious comments: " (CONS |x| NIL)))) ('T (SPADLET |conEntry| |entry|)))) ('T (SPADLET |acc| (CONS |entry| |acc|))))))) @@ -736,7 +735,7 @@ (|conEntry| (CONS |conEntry| |acc|)) ('T (|checkDocError1| - (CONS (MAKESTRING "Missing Description") NIL)) + (CONS "Missing Description" NIL)) |acc|))))))) ;transDoc(conname,doclist) == @@ -825,8 +824,7 @@ ('T (|checkDocError1| (CONS - (MAKESTRING - "Not documented!!!!") + "Not documented!!!!" NIL))))) ('T (SPADLET |u| @@ -846,17 +844,14 @@ (SPADLET |v| (OR (|checkExtract| - (MAKESTRING - "Description:") + "Description:" |u|) (AND |u| (|checkExtract| - (MAKESTRING - "Description:") + "Description:" (CONS (STRCONC - (MAKESTRING - "Description: ") + "Description: " (CAR |u|)) (CDR |u|)))))) (|transformAndRecheckComments| @@ -945,9 +940,9 @@ (SPADLET |$origin| '|gloss|) (SPADLET |$recheckingFlag| NIL) (SPADLET |$exposeFlagHeading| - (CONS (MAKESTRING "--------") + (CONS "--------" (CONS |name| - (CONS (MAKESTRING "---------") NIL)))) + (CONS "---------" NIL)))) (COND ((NULL |$exposeFlag|) (|sayBrightly| |$exposeFlagHeading|))) (SPADLET |u| (|checkComments| |name| |lines|)) @@ -1033,7 +1028,7 @@ (COND ((AND |w| (BOOT-EQUAL (CAR |w|) - (MAKESTRING "\\end{verbatim}"))) + "\\end{verbatim}")) (SPADLET |verbatim| NIL) (SPADLET |u2| (APPEND |u2| |w|))) ('T @@ -1041,7 +1036,7 @@ (APPEND |u2| (CONS |x| NIL)))))) ((AND |w| (BOOT-EQUAL (CAR |w|) - (MAKESTRING "\\begin{verbatim}"))) + "\\begin{verbatim}")) (SPADLET |verbatim| 'T) (SPADLET |u2| (APPEND |u2| |w|))) ('T (SPADLET |u2| (APPEND |u2| |w|)))))))) @@ -1094,14 +1089,13 @@ (SPADLET |x| (CAR |u|)) (COND ((AND (BOOT-EQUAL |x| - (MAKESTRING "\\texht")) + "\\texht") (SPADLET |u| (IFCDR |u|))) (COND ((NULL (BOOT-EQUAL (IFCAR |u|) |$charLbrace|)) (|checkDocError| - (MAKESTRING - "First left brace after \\texht missing")))) + "First left brace after \\texht missing"))) (SPADLET |count| 1) (DO () ((NULL @@ -1129,7 +1123,7 @@ (IFCAR (SPADLET |u| (CDR |u|)))))) (COND ((AND (BOOT-EQUAL |x| - (MAKESTRING "\\httex")) + "\\httex") (SPADLET |u| (IFCDR |u|)) (BOOT-EQUAL (IFCAR |u|) |$charLbrace|)) @@ -1310,7 +1304,7 @@ (CONS (CONS |$name| |$origin|) (CDR |entry|))))) ((AND (BOOT-EQUAL |x| - (MAKESTRING "\\spadsys")) + "\\spadsys") (SPADLET |u| (|checkLookForLeftBrace| (IFCDR |u|))) @@ -1329,16 +1323,14 @@ ((NULL |parse|) (|checkDocError| (CONS - (MAKESTRING - "Unparseable \\spadtype: ") + "Unparseable \\spadtype: " (CONS |s| NIL)))) ((NULL (|member| (|opOf| |parse|) |$currentSysList|)) (|checkDocError| (CONS - (MAKESTRING - "Bad system command: ") + "Bad system command: " (CONS |s| NIL)))) ((OR (ATOM |parse|) (NULL @@ -1360,8 +1352,7 @@ (PROGN (|checkDocError| (CONS - (MAKESTRING - "Incorrect \\spadsys: ") + "Incorrect \\spadsys: " (CONS |s| NIL))) (SPADLET |entry| (OR (HGET |$sysHash| |htname|) @@ -1371,7 +1362,7 @@ (CONS (CONS |$name| |$origin|) (CDR |entry|)))))))) ((AND (BOOT-EQUAL |x| - (MAKESTRING "\\spadtype")) + "\\spadtype") (SPADLET |u| (|checkLookForLeftBrace| (IFCDR |u|))) @@ -1385,8 +1376,7 @@ ((NULL |parse|) (|checkDocError| (CONS - (MAKESTRING - "Unparseable \\spadtype: ") + "Unparseable \\spadtype: " (CONS |s| NIL)))) ('T (SPADLET |n| @@ -1395,8 +1385,7 @@ ((NULL |n|) (|checkDocError| (CONS - (MAKESTRING - "Unknown \\spadtype: ") + "Unknown \\spadtype: " (CONS |s| NIL)))) ((AND (ATOM |parse|) (> |n| 0)) '|skip|) @@ -1405,15 +1394,13 @@ (|checkIsValidType| |parse|))) (|checkDocError| (CONS - (MAKESTRING - "Unknown \\spadtype: ") + "Unknown \\spadtype: " (CONS |s| NIL)))) ((ATOM |key|) '|ok|) ('T (|checkDocError| (CONS - (MAKESTRING - "Wrong number of arguments: ") + "Wrong number of arguments: " (CONS (|form2HtString| |key|) NIL)))))))) ((AND (|member| |x| @@ -1432,8 +1419,7 @@ (GETL |x| '|Nud|))) (|checkDocError| (CONS - (MAKESTRING - "Unknown \\spadop: ") + "Unknown \\spadop: " (CONS |x| NIL)))))) ('T NIL)))) (SPADLET |u| (CDR |u|)))))) @@ -1456,7 +1442,7 @@ (declare (special |$charBack|)) (RETURN (COND - ((BOOT-EQUAL |s| (MAKESTRING "")) (MAKESTRING "")) + ((BOOT-EQUAL |s| "") "") ((> (|#| |s|) (SPADLET |k| (|charPosition| |$charBack| |s| 0))) (COND ((EQL |k| 0) (|removeBackslashes| (SUBSTRING |s| 1 NIL))) @@ -1561,7 +1547,7 @@ (SPADDIFFERENCE (SPADDIFFERENCE |j| |k|) 1))) ('T (|checkDocError| - (CONS (MAKESTRING "Ill-formed lisp expression : ") + (CONS "Ill-formed lisp expression : " (CONS |s| NIL))) '|illformed|)))))) @@ -1727,7 +1713,7 @@ (SPADLET |n| (|#| |line|)) (SPADLET |k| (|htcharPosition| (|char| '%) |line| 0)) (COND - ((EQL |k| 0) (MAKESTRING "")) + ((EQL |k| 0) "") ((OR (>= |k| (SPADDIFFERENCE |n| 1)) (NEQUAL (ELT |line| (PLUS |k| 1)) (|char| '%))) |line|) @@ -1790,13 +1776,12 @@ (SPADLET |acc| (COND ((BOOT-EQUAL |x| - (MAKESTRING "\\end{verbatim}")) + "\\end{verbatim}") (SPADLET |verbatim| NIL) (CONS |x| |acc|)) (|verbatim| (CONS |x| |acc|)) ((BOOT-EQUAL |x| - (MAKESTRING - "\\begin{verbatim}")) + "\\begin{verbatim}") (SPADLET |verbatim| 'T) (CONS |x| |acc|)) ((SPADLET |y| @@ -1873,7 +1858,7 @@ (COND ((AND |w| (BOOT-EQUAL (CAR |w|) - (MAKESTRING "\\end{verbatim}"))) + "\\end{verbatim}")) (SPADLET |verbatim| NIL) (SPADLET |u2| (APPEND |u2| |w|))) ('T @@ -1881,7 +1866,7 @@ (APPEND |u2| (CONS |x| NIL)))))) ((AND |w| (BOOT-EQUAL (CAR |w|) - (MAKESTRING "\\begin{verbatim}"))) + "\\begin{verbatim}")) (SPADLET |verbatim| 'T) (SPADLET |u2| (APPEND |u2| |w|))) ('T (SPADLET |u2| (APPEND |u2| |w|)))))))) @@ -1957,18 +1942,17 @@ (SPADLET |u2| (APPEND |u2| (CONS - (MAKESTRING - "\\blankline ") + "\\blankline " NIL)))))) ('T (SPADLET |s| (SUBSTRING |x| |k| NIL)) (COND ((BOOT-EQUAL |s| - (MAKESTRING "\\begin{verbatim}")) + "\\begin{verbatim}") (SPADLET |verbatim| 'T) (SPADLET |u2| (APPEND |u2| (CONS |s| NIL)))) ((BOOT-EQUAL |s| - (MAKESTRING "\\end{verbatim}")) + "\\end{verbatim}") (SPADLET |verbatim| NIL) (SPADLET |u2| (APPEND |u2| (CONS |s| NIL)))) @@ -1986,15 +1970,14 @@ (APPEND |u2| (CONS (STRCONC - (MAKESTRING - "\\indented{") + "\\indented{" (STRINGIMAGE (SPADDIFFERENCE |k| |margin|)) - (MAKESTRING "}{") + "}{" (|checkAddSpaceSegments| |s| 0) - (MAKESTRING "}")) + "}") NIL))))))))))) |u2|))))) @@ -2061,7 +2044,7 @@ (SEQ (EXIT (SPADLET |i| (PLUS |i| 1))))) (COND ((> |i| |m|) NIL) - ('T (SPADLET |buf| (MAKESTRING "")) + ('T (SPADLET |buf| "") (SPADLET |ch| (ELT |l| |i|)) (COND ((BOOT-EQUAL |ch| |$charFauxNewline|) @@ -2131,7 +2114,7 @@ (SPADLET |k| (|firstNonBlankPosition| |u|)) (COND ((> |k| 0) (|checkGetArgs| (SUBSTRING |u| |k| NIL))) - ((|stringPrefix?| (MAKESTRING "\\spad{") |u|) + ((|stringPrefix?| "\\spad{" |u|) (SPADLET |k| (OR (|getMatchingRightPren| |u| 6 (|char| '{) (|char| '})) @@ -2233,14 +2216,14 @@ (SPADLET |k| (|firstNonBlankPosition| |x|)) (COND ((BOOT-EQUAL |k| (SPADDIFFERENCE 1)) - (MAKESTRING "\\blankline ")) + "\\blankline ") ((BOOT-EQUAL |margin| |k|) |x|) ('T - (STRCONC (MAKESTRING "\\indented{") + (STRCONC "\\indented{" (STRINGIMAGE (SPADDIFFERENCE |k| |margin|)) - (MAKESTRING "}{") + "}{" (|checkAddSpaceSegments| (SUBSTRING |x| |k| NIL) 0) - (MAKESTRING "}")))))))) + "}"))))))) ;checkAddSpaceSegments(u,k) == ; m := MAXINDEX u @@ -2273,8 +2256,8 @@ (COND ((> |n| 1) (STRCONC (SUBSTRING |u| 0 |i|) - (MAKESTRING "\\space{") (STRINGIMAGE |n|) - (MAKESTRING "}") + "\\space{" (STRINGIMAGE |n|) + "}" (|checkAddSpaceSegments| (SUBSTRING |u| (PLUS |i| |n|) NIL) 0))) ('T (|checkAddSpaceSegments| |u| |j|)))))))))) @@ -2325,7 +2308,7 @@ (PLUS |k| 1)) (PLUS |k| 1))) (EXIT (|systemError| - (MAKESTRING " Improper comment found")))) + " Improper comment found"))) (EXIT |k|))))) (DEFUN |checkTrim| (|$x| |lines|) @@ -2346,8 +2329,7 @@ (|checkDocError| (CONS |$x| (CONS - (MAKESTRING - " has varying indentation levels") + " has varying indentation levels" NIL))) (SPADLET |s| (CONS |j| |s|))) ('T NIL)))))) @@ -2484,10 +2466,10 @@ (NEQUAL (IFCAR (IFCDR (CDR |u|))) |$charLbrace|)) (|checkDocError| - (CONS (MAKESTRING "Reversing ") + (CONS "Reversing " (CONS |next| (CONS - (MAKESTRING " and left brace") + " and left brace" NIL)))) (SPADLET |acc| (CONS |$charLbrace| @@ -2580,7 +2562,7 @@ (COND ((NULL |verbatim|) (COND - ((BOOT-EQUAL |x| (MAKESTRING "\\em")) + ((BOOT-EQUAL |x| "\\em") (COND ((> |count| 0) (SPADLET |mathSymbolsOk| @@ -2590,8 +2572,7 @@ ('T (|checkDocError| (CONS - (MAKESTRING - "\\em must be enclosed in braces") + "\\em must be enclosed in braces" NIL)))))) (COND ((|member| |x| @@ -2628,26 +2609,24 @@ (CONS '|Symbol | (CONS |x| (CONS - (MAKESTRING - " appearing outside \\spad{}") + " appearing outside \\spad{}" NIL))))) ('T NIL))) ('T NIL)))) (SPADLET |acc| (COND ((BOOT-EQUAL |x| - (MAKESTRING "\\end{verbatim}")) + "\\end{verbatim}") (SPADLET |verbatim| NIL) (CONS |x| |acc|)) (|verbatim| (CONS |x| |acc|)) ((BOOT-EQUAL |x| - (MAKESTRING - "\\begin{verbatim}")) + "\\begin{verbatim}") (SPADLET |verbatim| 'T) (CONS |x| |acc|)) ((AND (BOOT-EQUAL |x| - (MAKESTRING "\\begin")) + "\\begin") (BOOT-EQUAL (CAR (SPADLET |v| (IFCDR |u|))) @@ -2655,18 +2634,18 @@ (BOOT-EQUAL (CAR (SPADLET |v| (IFCDR |v|))) - (MAKESTRING "detail")) + "detail") (BOOT-EQUAL (CAR (SPADLET |v| (IFCDR |v|))) |$charRbrace|)) (SPADLET |u| |v|) (CONS - (MAKESTRING "\\blankline ") + "\\blankline " |acc|)) ((AND (BOOT-EQUAL |x| - (MAKESTRING "\\end")) + "\\end") (BOOT-EQUAL (CAR (SPADLET |v| (IFCDR |u|))) @@ -2674,7 +2653,7 @@ (BOOT-EQUAL (CAR (SPADLET |v| (IFCDR |v|))) - (MAKESTRING "detail")) + "detail") (BOOT-EQUAL (CAR (SPADLET |v| (IFCDR |v|))) @@ -2683,21 +2662,21 @@ ((OR (BOOT-EQUAL |x| (|char| '$)) (BOOT-EQUAL |x| - (MAKESTRING "$"))) - (CONS (MAKESTRING "\\$") |acc|)) + "$")) + (CONS "\\$" |acc|)) ((OR (BOOT-EQUAL |x| (|char| '%)) (BOOT-EQUAL |x| - (MAKESTRING "%"))) - (CONS (MAKESTRING "\\%") |acc|)) + "%")) + (CONS "\\%" |acc|)) ((OR (BOOT-EQUAL |x| (|char| '|,|)) (BOOT-EQUAL |x| - (MAKESTRING ","))) - (CONS (MAKESTRING ",{}") |acc|)) + ",")) + (CONS ",{}" |acc|)) ((BOOT-EQUAL |x| - (MAKESTRING "\\spad")) - (CONS (MAKESTRING "\\spad") + "\\spad") + (CONS "\\spad" |acc|)) ((AND (STRINGP |x|) (DIGITP (ELT |x| 0))) @@ -2713,7 +2692,7 @@ (CONS |$charRbrace| (CONS |x| (CONS |$charLbrace| - (CONS (MAKESTRING "\\spad") + (CONS "\\spad" |acc|))))) ((AND (NULL |spadflag|) (OR @@ -2728,7 +2707,7 @@ (CONS |$charRbrace| (CONS |x| (CONS |$charLbrace| - (CONS (MAKESTRING "\\spad") + (CONS "\\spad" |acc|))))) ('T (SPADLET |xcount| (|#| |x|)) (COND @@ -2737,12 +2716,12 @@ (|char| '|t|)) (BOOT-EQUAL (ELT |x| 2) (|char| '|h|))) - (CONS (MAKESTRING "th") + (CONS "th" (CONS |$charRbrace| (CONS (ELT |x| 0) (CONS |$charLbrace| (CONS - (MAKESTRING "\\spad") + "\\spad" |acc|)))))) ((AND (EQL |xcount| 4) (BOOT-EQUAL (ELT |x| 1) @@ -2751,12 +2730,12 @@ (|char| '|t|)) (BOOT-EQUAL (ELT |x| 3) (|char| '|h|))) - (CONS (MAKESTRING "-th") + (CONS "-th" (CONS |$charRbrace| (CONS (ELT |x| 0) (CONS |$charLbrace| (CONS - (MAKESTRING "\\spad") + "\\spad" |acc|)))))) ((OR (AND (EQL |xcount| 2) @@ -2773,7 +2752,7 @@ (CONS |x| (CONS |$charLbrace| (CONS - (MAKESTRING "\\spad") + "\\spad" |acc|))))) ('T (CONS @@ -2902,7 +2881,7 @@ (SEQ (EXIT (PROGN (COND ((BOOT-EQUAL |f| - (MAKESTRING "\\begin{verbatim}")) + "\\begin{verbatim}") (SPADLET |space| |$charFauxNewline|) (COND ((NULL |u2|) @@ -2918,7 +2897,7 @@ (APPEND |u2| (CONS |f| NIL))))) (COND ((BOOT-EQUAL |f| - (MAKESTRING "\\end{verbatim}")) + "\\end{verbatim}") (SPADLET |u2| (APPEND |u2| (CONS |space| NIL))) @@ -2956,13 +2935,12 @@ (SPADLET |acc| (COND ((BOOT-EQUAL |x| - (MAKESTRING "\\end{verbatim}")) + "\\end{verbatim}") (SPADLET |verbatim| NIL) (CONS |x| |acc|)) (|verbatim| (CONS |x| |acc|)) ((BOOT-EQUAL |x| - (MAKESTRING - "\\begin{verbatim}")) + "\\begin{verbatim}") (SPADLET |verbatim| 'T) (CONS |x| |acc|)) ((SPADLET |z| @@ -2991,7 +2969,7 @@ (RETURN (SEQ (COND ((CHARP |x|) NIL) - ((BOOT-EQUAL |x| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |x| "") NIL) ('T (SPADLET |m| (MAXINDEX |x|)) (SEQ (DO ((G167607 (SPADDIFFERENCE |m| 3)) (|k| 0 (QSADD1 |k|))) @@ -3010,7 +2988,7 @@ (ELT |x| (PLUS |k| 2)) (|char| '|e|)) (SPADLET |key| - (MAKESTRING "that is"))) + "that is")) (AND (BOOT-EQUAL (ELT |x| |k|) (|char| '|e|)) @@ -3018,7 +2996,7 @@ (ELT |x| (PLUS |k| 2)) (|char| '|g|)) (SPADLET |key| - (MAKESTRING "for example"))))) + "for example")))) (EXIT (PROGN (SPADLET |firstPart| @@ -3030,9 +3008,9 @@ (SPADLET |result| (APPEND |firstPart| (CONS - (MAKESTRING "\\spadignore{") + "\\spadignore{" (CONS (SUBSTRING |x| |k| 4) - (CONS (MAKESTRING "}") + (CONS "}" (|checkIeEgfun| (SUBSTRING |x| (PLUS |k| 4) NIL)))))))))))))) @@ -3066,13 +3044,12 @@ (SPADLET |acc| (COND ((BOOT-EQUAL |x| - (MAKESTRING "\\end{verbatim}")) + "\\end{verbatim}") (SPADLET |verbatim| NIL) (CONS |x| |acc|)) (|verbatim| (CONS |x| |acc|)) ((BOOT-EQUAL |x| - (MAKESTRING - "\\begin{verbatim}")) + "\\begin{verbatim}") (SPADLET |verbatim| 'T) (CONS |x| |acc|)) ((SPADLET |z| @@ -3235,11 +3212,11 @@ |$charPeriod|)) (APPEND (|checkSplitPunctuation| (SUBSTRING |x| 0 (SPADDIFFERENCE |m| 2))) - (CONS (MAKESTRING "...") NIL))) + (CONS "..." NIL))) ('T (APPEND (|checkSplitPunctuation| (SUBSTRING |x| 0 (SPADDIFFERENCE |m| 1))) - (CONS (MAKESTRING "..") NIL))))) + (CONS ".." NIL))))) ((OR (BOOT-EQUAL |lastchar| |$charPeriod|) (BOOT-EQUAL |lastchar| |$charSemiColon|) (BOOT-EQUAL |lastchar| |$charComma|)) @@ -3383,14 +3360,12 @@ ((NEQUAL |open| |top|) (|checkDocError| (CONS - (MAKESTRING - "Mismatch: left ") + "Mismatch: left " (CONS (|checkSayBracket| |top|) (CONS - (MAKESTRING - " matches right ") + " matches right " (CONS (|checkSayBracket| |open|) @@ -3399,8 +3374,7 @@ ('T (|checkDocError| (CONS - (MAKESTRING - "Missing left ") + "Missing left " (CONS (|checkSayBracket| |open|) NIL))))))))) @@ -3416,7 +3390,7 @@ NIL) (SEQ (EXIT (|checkDocError| (CONS - (MAKESTRING "Missing right ") + "Missing right " (CONS (|checkSayBracket| |x|) NIL)))))))) |u|))))) @@ -3429,10 +3403,10 @@ (DEFUN |checkSayBracket| (|x|) (COND ((OR (BOOT-EQUAL |x| (|char| '|(|)) (BOOT-EQUAL |x| (|char| '|)|))) - (MAKESTRING "pren")) + "pren") ((OR (BOOT-EQUAL |x| (|char| '{)) (BOOT-EQUAL |x| (|char| '}))) - (MAKESTRING "brace")) - ('T (MAKESTRING "bracket")))) + "brace") + ('T "bracket"))) ;checkBeginEnd u == ; beginEndStack := nil @@ -3490,26 +3464,26 @@ (NULL (HGET |$htMacroTable| |x|)) (NULL (BOOT-EQUAL |x| - (MAKESTRING "\\spadignore"))) + "\\spadignore")) (BOOT-EQUAL (IFCAR (IFCDR |u|)) |$charLbrace|) (NULL (OR (|substring?| - (MAKESTRING "\\radiobox") |x| + "\\radiobox" |x| 0) (|substring?| - (MAKESTRING "\\inputbox") |x| + "\\inputbox" |x| 0)))) (|checkDocError| (CONS '|Unexpected HT command: | (CONS |x| NIL)))) ((BOOT-EQUAL |x| - (MAKESTRING "\\beginitems")) + "\\beginitems") (SPADLET |beginEndStack| (CONS '|items| |beginEndStack|))) ((BOOT-EQUAL |x| - (MAKESTRING "\\begin")) + "\\begin") (COND ((AND (PAIRP |u|) (PROGN @@ -3536,10 +3510,9 @@ |$beginEndList|)) (|checkDocError| (CONS - (MAKESTRING - "Unknown begin type: \\begin{") + "Unknown begin type: \\begin{" (CONS |y| - (CONS (MAKESTRING "}") + (CONS "}" NIL)))))) (SPADLET |beginEndStack| (CONS |y| |beginEndStack|)) @@ -3547,11 +3520,10 @@ ('T (|checkDocError| (CONS - (MAKESTRING - "Improper \\begin command") + "Improper \\begin command" NIL))))) ((BOOT-EQUAL |x| - (MAKESTRING "\\item")) + "\\item") (COND ((|member| (IFCAR |beginEndStack|) @@ -3560,19 +3532,17 @@ ((NULL |beginEndStack|) (|checkDocError| (CONS - (MAKESTRING - "\\item appears outside a \\begin-\\end") + "\\item appears outside a \\begin-\\end" NIL))) ('T (|checkDocError| (CONS - (MAKESTRING - "\\item appears within a \\begin{") + "\\item appears within a \\begin{" (CONS (IFCAR |beginEndStack|) - (CONS (MAKESTRING "}..") + (CONS "}.." NIL))))))) ((BOOT-EQUAL |x| - (MAKESTRING "\\end")) + "\\end") (COND ((AND (PAIRP |u|) (PROGN @@ -3602,27 +3572,24 @@ ('T (|checkDocError| (CONS - (MAKESTRING - "Trying to match \\begin{") + "Trying to match \\begin{" (CONS (IFCAR |beginEndStack|) (CONS - (MAKESTRING - "} with \\end{") + "} with \\end{" (CONS |y| (CONS '} NIL))))))))) ('T (|checkDocError| (CONS - (MAKESTRING - "Improper \\end command") + "Improper \\end command" NIL)))))))) (SPADLET |u| (CDR |u|)))))) (COND (|beginEndStack| (|checkDocError| - (CONS (MAKESTRING "Missing \\end{") + (CONS "Missing \\end{" (CONS (CAR |beginEndStack|) - (CONS (MAKESTRING "}") NIL))))) + (CONS "}" NIL))))) ('T '|ok|))))))) ;checkArguments u == @@ -3679,13 +3646,13 @@ ((NULL (SPADLET |u| (|checkLookForLeftBrace| |u|))) (RETURN (|checkDocError| - (CONS (MAKESTRING "Missing argument for ") + (CONS "Missing argument for " (CONS |keyword| NIL)))))) (COND ((NULL (SPADLET |u| (|checkLookForRightBrace| (IFCDR |u|)))) (RETURN (|checkDocError| - (CONS (MAKESTRING "Missing right brace for ") + (CONS "Missing right brace for " (CONS |keyword| NIL)))))) (|checkHTargs| |keyword| (CDR |u|) (SPADDIFFERENCE |nargs| 1) |integerValue?|)))))) @@ -3758,7 +3725,7 @@ (RETURN (SEQ (COND ((CHARP |s|) NIL) - ((BOOT-EQUAL |s| (MAKESTRING "")) NIL) + ((BOOT-EQUAL |s| "") NIL) ('T (PROG (G167927) (SPADLET G167927 'T) @@ -3847,10 +3814,10 @@ (PROGN (SPADLET |namestring| (PNAME |opname|)) (COND - ((BOOT-EQUAL |namestring| (MAKESTRING "Zero")) - (SPADLET |namestring| (MAKESTRING "0"))) - ((BOOT-EQUAL |namestring| (MAKESTRING "One")) - (SPADLET |namestring| (MAKESTRING "1"))) + ((BOOT-EQUAL |namestring| "Zero") + (SPADLET |namestring| "0")) + ((BOOT-EQUAL |namestring| "One") + (SPADLET |namestring| "1")) ('T NIL)) (COND ((> |margin| 0) (SPADLET |s| (|leftTrim| |u|)) @@ -3879,27 +3846,24 @@ ((NEQUAL |namestring| (SPADLET |firstWord| (SUBSTRING |u| 0 |i|))) (|checkDocError| - (CONS (MAKESTRING - "Improper first word in comments: ") + (CONS "Improper first word in comments: " (CONS |firstWord| NIL))) |u|) ((NULL |k|) (COND ((BOOT-EQUAL |open| (|char| '[)) (|checkDocError| - (CONS (MAKESTRING - "Missing close bracket on first line: ") + (CONS "Missing close bracket on first line: " (CONS |u| NIL)))) ('T (|checkDocError| - (CONS (MAKESTRING - "Missing close parenthesis on first line: ") + (CONS "Missing close parenthesis on first line: " (CONS |u| NIL))))) |u|) ('T - (STRCONC (MAKESTRING "\\spad{") + (STRCONC "\\spad{" (SUBSTRING |u| 0 (PLUS |k| 1)) - (MAKESTRING "}") + "}" (SUBSTRING |u| (PLUS |k| 1) NIL))))) ('T (SPADLET |k| @@ -3915,8 +3879,7 @@ (SPADLET |firstWord| (SUBSTRING |u| 0 |i|))) (|checkDocError| - (CONS (MAKESTRING - "Improper first word in comments: ") + (CONS "Improper first word in comments: " (CONS |firstWord| NIL))) |u|) ((AND (EQL (|#| (SPADLET |p| (PNAME |infixOp|))) @@ -3930,13 +3893,13 @@ (COND ((> |l| (MAXINDEX |u|)) (SPADLET |l| (SPADDIFFERENCE |k| 1)))) - (STRCONC (MAKESTRING "\\spad{") + (STRCONC "\\spad{" (SUBSTRING |u| 0 (PLUS |l| 1)) - (MAKESTRING "}") + "}" (SUBSTRING |u| (PLUS |l| 1) NIL))) ('T - (STRCONC (MAKESTRING "\\spad{") - (SUBSTRING |u| 0 |k|) (MAKESTRING "}") + (STRCONC "\\spad{" + (SUBSTRING |u| 0 |k|) "}" (SUBSTRING |u| |k| NIL))))) ('T (SPADLET |l| @@ -3948,13 +3911,12 @@ (COND ((NEQUAL |namestring| (PNAME |infixOp|)) (|checkDocError| - (CONS (MAKESTRING - "Improper initial operator in comments: ") + (CONS "Improper initial operator in comments: " (CONS |infixOp| NIL))) |u|) ('T - (STRCONC (MAKESTRING "\\spad{") - (SUBSTRING |u| 0 |n|) (MAKESTRING "}") + (STRCONC "\\spad{" + (SUBSTRING |u| 0 |n|) "}" (SUBSTRING |u| |n| NIL))))))))) ('T (SPADLET |i| @@ -3963,8 +3925,7 @@ ((NEQUAL |namestring| (SPADLET |firstWord| (SUBSTRING |u| 0 |i|))) (|checkDocError| - (CONS (MAKESTRING - "Improper first word in comments: ") + (CONS "Improper first word in comments: " (CONS |firstWord| NIL))) |u|) ('T (SPADLET |prefixOp| (INTERN (SUBSTRING |u| 0 |i|))) @@ -3983,9 +3944,9 @@ (COND ((> |j| |m|) |u|) ('T - (STRCONC (MAKESTRING "\\spad{") + (STRCONC "\\spad{" (SUBSTRING |u| 0 (PLUS |j| 1)) - (MAKESTRING "}") + "}" (SUBSTRING |u| (PLUS |j| 1) NIL))))) ('T (SPADLET |k| @@ -3996,14 +3957,13 @@ (SPADLET |firstWord| (SUBSTRING |u| 0 |i|))) (|checkDocError| - (CONS (MAKESTRING - "Improper first word in comments: ") + (CONS "Improper first word in comments: " (CONS |firstWord| NIL))) |u|) ('T - (STRCONC (MAKESTRING "\\spad{") + (STRCONC "\\spad{" (SUBSTRING |u| 0 |k|) - (MAKESTRING "}") + "}" (SUBSTRING |u| |k| NIL)))))))))))))))))) ;getMatchingRightPren(u,j,open,close) == @@ -4122,20 +4082,17 @@ (DEFUN |docreport| (|nam|) (PROGN - (OBEY (MAKESTRING "rm docreport.input")) - (OBEY (STRCONC (MAKESTRING "echo \")bo setOutStream('") - (STRINGIMAGE |nam|) (MAKESTRING ")\" > temp.input"))) - (OBEY (MAKESTRING - "cat docreport.header temp.input > docreport.input")) - (OBEY (STRCONC (MAKESTRING "awk '/") (STRINGIMAGE |nam|) - (MAKESTRING - "/ {printf(\")co %s.spad\\n\",$2)}' whofiles > temp.input"))) - (OBEY (MAKESTRING "cat docreport.input temp.input > temp1.input")) - (OBEY (MAKESTRING - "cat temp1.input docreport.trailer > docreport.input")) - (OBEY (MAKESTRING "rm temp.input")) - (OBEY (MAKESTRING "rm temp1.input")) - (SETQ /EDITFILE (MAKESTRING "docreport.input")) + (OBEY "rm docreport.input") + (OBEY (STRCONC "echo \")bo setOutStream('" + (STRINGIMAGE |nam|) ")\" > temp.input")) + (OBEY "cat docreport.header temp.input > docreport.input") + (OBEY (STRCONC "awk '/" (STRINGIMAGE |nam|) + "/ {printf(\")co %s.spad\\n\",$2)}' whofiles > temp.input")) + (OBEY "cat docreport.input temp.input > temp1.input") + (OBEY "cat temp1.input docreport.trailer > docreport.input") + (OBEY "rm temp.input") + (OBEY "rm temp1.input") + (SETQ /EDITFILE "docreport.input") (/RQ))) ;setOutStream nam == @@ -4148,7 +4105,7 @@ (RETURN (PROGN (SPADLET |filename| - (STRCONC (MAKESTRING "/tmp/") (STRINGIMAGE |nam|) + (STRCONC "/tmp/" (STRINGIMAGE |nam|) (INTERN ".docreport" "BOOT"))) (SPADLET |$outStream| (MAKE-OUTSTREAM |filename|)))))) @@ -4173,11 +4130,10 @@ ((NULL |$exposeFlag|) NIL) ('T (SPADLET |filename| (GETDATABASE |con| 'SOURCEFILE)) (SPADLET |quoteChar| (|char| '|"|)) - (OBEY (STRCONC (MAKESTRING "awk '$2 == ") |quoteChar| + (OBEY (STRCONC "awk '$2 == " |quoteChar| |filename| |quoteChar| - (MAKESTRING - " {print $1}' whofiles > /tmp/temp"))) - (SPADLET |instream| (MAKE-INSTREAM (MAKESTRING "/tmp/temp"))) + " {print $1}' whofiles > /tmp/temp")) + (SPADLET |instream| (MAKE-INSTREAM "/tmp/temp")) (SPADLET |value| (COND ((EOFP |instream|) NIL) @@ -4226,7 +4182,7 @@ (|$recheckingFlag| (COND (|$constructorName| (|checkDocMessage| |u|)) - ('T (|concat| (MAKESTRING "> ") |u|)))) + ('T (|concat| "> " |u|)))) (|$constructorName| (|checkDocMessage| |u|)) ('T |u|))) (COND @@ -4256,15 +4212,15 @@ (SPADLET |sourcefile| (GETDATABASE |$constructorName| 'SOURCEFILE)) (SPADLET |person| - (OR (|whoOwns| |$constructorName|) (MAKESTRING "---"))) + (OR (|whoOwns| |$constructorName|) "---")) (SPADLET |middle| (COND ((BOUNDP '|$x|) - (CONS (MAKESTRING "(") - (CONS |$x| (CONS (MAKESTRING "): ") NIL)))) - ('T (CONS (MAKESTRING ": ") NIL)))) - (|concat| |person| (MAKESTRING ">") |sourcefile| - (MAKESTRING "-->") |$constructorName| |middle| |u|))))) + (CONS "(" + (CONS |$x| (CONS "): " NIL)))) + ('T (CONS ": " NIL)))) + (|concat| |person| ">" |sourcefile| + "-->" |$constructorName| |middle| |u|))))) ;checkDecorateForHt u == ; count := 0 @@ -4305,7 +4261,7 @@ (|do| (PROGN (COND ((BOOT-EQUAL |x| - (MAKESTRING "\\em")) + "\\em") (COND ((> |count| 0) (SPADLET |spadflag| @@ -4313,8 +4269,7 @@ ('T (|checkDocError| (CONS - (MAKESTRING - "\\em must be enclosed in braces") + "\\em must be enclosed in braces" NIL)))))) (COND ((|member| |x| @@ -4342,19 +4297,18 @@ (CONS '|Symbol | (CONS |x| (CONS - (MAKESTRING - " appearing outside \\spad{}") + " appearing outside \\spad{}" NIL))))) ('T NIL))) ('T NIL)) (COND ((OR (BOOT-EQUAL |x| - (MAKESTRING "$")) + "$") (BOOT-EQUAL |x| - (MAKESTRING "%"))) + "%")) (|checkDocError| - (CONS (MAKESTRING "Unescaped ") + (CONS "Unescaped " (CONS |x| NIL))))))) (SPADLET |u| (CDR |u|)))))) |u|))))) diff --git a/src/interp/c-util.lisp.pamphlet b/src/interp/c-util.lisp.pamphlet index 0e6c45b..2dfcb9e 100644 --- a/src/interp/c-util.lisp.pamphlet +++ b/src/interp/c-util.lisp.pamphlet @@ -57,9 +57,7 @@ (PROGN (SPADLET |n| (QCAR |l|)) 'T) (INTEGERP |n|)) (|displayComp| (SPADLET |$level| |n|))) ('T - (SAY (MAKESTRING - "Correct format: (level n) where n is the level you want to go to" - ))))))) + (SAY "Correct format: (level n) where n is the level you want to go to" ))))))) ; ;UP() == up() @@ -131,9 +129,9 @@ ((EQL |n| 0) NIL) ('T (SPADLET |l| (NREVERSE |$semanticErrorStack|)) (SPADLET |$semanticErrorStack| NIL) - (|sayBrightly| (|bright| (MAKESTRING " Semantic Errors:"))) + (|sayBrightly| (|bright| " Semantic Errors:")) (|displaySemanticError| |l| CUROUTSTREAM) - (|sayBrightly| (MAKESTRING " ")) (|displayWarnings|))))))) + (|sayBrightly| " ") (|displayWarnings|))))))) ; ;displaySemanticError(l,stream) == @@ -147,9 +145,9 @@ ((OR (ATOM G2529) (PROGN (SETQ |x| (CAR G2529)) NIL)) NIL) (SEQ (EXIT (|sayBrightly| - (CONS (MAKESTRING " [") + (CONS " [" (CONS |i| - (CONS (MAKESTRING "] ") (CAR |x|)))) + (CONS "] " (CAR |x|)))) |stream|)))))) ; @@ -174,11 +172,11 @@ (REMDUP |$warningStack|)))) (COND ((EQL |n| 0) NIL) - ('T (|sayBrightly| (|bright| (MAKESTRING " Warnings:"))) + ('T (|sayBrightly| (|bright| " Warnings:")) (SPADLET |l| (NREVERSE |$warningStack|)) (|displayWarning| |l| CUROUTSTREAM) (SPADLET |$warningStack| NIL) - (|sayBrightly| (MAKESTRING " ")))))))) + (|sayBrightly| " "))))))) ; ;displayWarning(l,stream) == @@ -192,8 +190,8 @@ ((OR (ATOM G2550) (PROGN (SETQ |x| (CAR G2550)) NIL)) NIL) (SEQ (EXIT (|sayBrightly| - (CONS (MAKESTRING " [") - (CONS |i| (CONS (MAKESTRING "] ") |x|))) + (CONS " [" + (CONS |i| (CONS "] " |x|))) |stream|)))))) ; @@ -229,16 +227,16 @@ (COND ((BOOT-EQUAL |$insideCapsuleFunctionIfTrue| 'T) (|sayBrightly| - (CONS (MAKESTRING "error in function") + (CONS "error in function" (CONS '|%b| (CONS |$op| (CONS '|%d| (CONS '|%l| NIL)))))))) (|pp| (|removeZeroOne| (|mkErrorExpr| |level|))) (|sayBrightly| - (CONS (MAKESTRING "****** level") + (CONS "****** level" (CONS '|%b| (CONS |level| (CONS '|%d| - (CONS (MAKESTRING " ******") NIL)))))) + (CONS " ******" NIL)))))) (SPADLET |LETTMP#1| (ELEM |$s| |level|)) (SPADLET |$x| (CAR |LETTMP#1|)) (SPADLET |$m| (CADR |LETTMP#1|)) @@ -247,9 +245,9 @@ (SPADLET $X |$x|) (SPADLET $M |$m|) (SPADLET $F |$f|) - (SAY (MAKESTRING "$x:= ") |$x|) - (SAY (MAKESTRING "$m:= ") |$m|) - (SAY (MAKESTRING "$f:=")) + (SAY "$x:= " |$x|) + (SAY "$m:= " |$m|) + (SAY "$f:=") (|F,PRINT-ONE| |$f|) NIL)))) @@ -343,7 +341,7 @@ (SPADLET |x| (CAR G2621)) (SPADLET |m| (CADR G2621)) (SPADLET |e| (CADDR G2621)) - (SAY (MAKESTRING "tracing comp, compFormWithModemap of: ") |x|) + (SAY "tracing comp, compFormWithModemap of: " |x|) (|TRACE,1| (CONS '|comp| (CONS '|compFormWithModemap| NIL)) NIL) (SPADLET T$ (|comp| |x| |m| |e|)) @@ -360,7 +358,7 @@ (|stackWarning| (CONS '|%b| (CONS |s| - (CONS '|%d| (CONS (MAKESTRING "has no value") NIL)))))) + (CONS '|%d| (CONS "has no value" NIL)))))) ; ;unErrorRef s == unStackWarning ['%b,s,'%d,'"has no value"] @@ -371,7 +369,7 @@ (|unStackWarning| (CONS '|%b| (CONS |s| - (CONS '|%d| (CONS (MAKESTRING "has no value") NIL)))))) + (CONS '|%d| (CONS "has no value" NIL)))))) ; ;--% ENVIRONMENT FUNCTIONS @@ -409,8 +407,7 @@ (CONS '|%b| (CONS |x| (CONS '|%d| - (CONS (MAKESTRING - "is BOTH a variable and a literal") + (CONS "is BOTH a variable and a literal" NIL)))) NIL)) @@ -496,7 +493,7 @@ (SPADLET |el| (CDR G2695)) (COND ((NULL (BOOT-EQUAL |el| |el'|)) - (|systemError| (MAKESTRING "deltaContour"))) + (|systemError| "deltaContour")) ('T (|deltaContour,eliminateDuplicatePropertyLists| (|deltaContour,contourDifference| |c| |c'|)))))))) @@ -973,9 +970,9 @@ (PROGN (SETQ |y| (CAR G3038)) NIL)) NIL) (SEQ (EXIT (PROGN - (SAY (MAKESTRING "******CONTOUR ") - |j| (MAKESTRING ", LEVEL ") |i| - (MAKESTRING ":******")) + (SAY "******CONTOUR " + |j| ", LEVEL " |i| + ":******") (DO ((G3053 |y| (CDR G3053)) (|z| NIL)) @@ -989,8 +986,7 @@ (PROGN (TERPRI) (SAY - (MAKESTRING - "Properties Of: ") + "Properties Of: " (CAR |z|)) (DO ((G3065 (CDR |z|) @@ -1045,9 +1041,9 @@ (PROGN (SETQ |y| (CAR G3112)) NIL)) NIL) (SEQ (EXIT (PROGN - (SAY (MAKESTRING "******CONTOUR ") - |j| (MAKESTRING ", LEVEL ") |i| - (MAKESTRING ":******")) + (SAY "******CONTOUR " + |j| ", LEVEL " |i| + ":******") (DO ((G3128 |y| (CDR G3128)) (|z| NIL)) @@ -1065,8 +1061,7 @@ (PROGN (TERPRI) (SAY - (MAKESTRING - "Properties Of: ") + "Properties Of: " (CAR |z|)) (DO ((G3140 (CDR |z|) @@ -1160,9 +1155,9 @@ (DEFUN |prTriple| (T$) (PROGN - (SAY (MAKESTRING "Code:")) + (SAY "Code:") (|pp| (ELT T$ 0)) - (SAY (MAKESTRING "Mode:")) + (SAY "Mode:") (|pp| (ELT T$ 1)))) ; @@ -1821,8 +1816,7 @@ ;;; *** |printDashedLine| REDEFINED (DEFUN |printDashedLine| () - (SAY (MAKESTRING - "----------------------------------------------------------------------"))) + (SAY "----------------------------------------------------------------------")) ; ;stackSemanticError(msg,expr) == @@ -2091,12 +2085,12 @@ (|normalizeStatAndStringify| |elapsedSeconds|)) (COND ((EQL |byteCount| 0) - (SAY (MAKESTRING "Time: ") |timeString| - (MAKESTRING " SEC."))) + (SAY "Time: " |timeString| + " SEC.")) ('T - (SAY (MAKESTRING "Size: ") |byteCount| - (MAKESTRING " BYTES Time: ") |timeString| - (MAKESTRING " SEC.")))) + (SAY "Size: " |byteCount| + " BYTES Time: " |timeString| + " SEC."))) (TERPRI) NIL)))) @@ -2567,7 +2561,7 @@ (declare (special |$EmptyMode| |$f| |$x|)) (RETURN (SEQ (COND - ((ATOM |$x|) (|sayBrightly| (MAKESTRING "$x is an atom"))) + ((ATOM |$x|) (|sayBrightly| "$x is an atom")) ('T (DO ((G3999 (CDR |$x|) (CDR G3999)) (|y| NIL)) ((OR (ATOM G3999) @@ -2578,7 +2572,7 @@ (|comp| |y| |$EmptyMode| |$f|)) (|sayBrightly| (CONS |y| - (CONS (MAKESTRING " ==> mode") + (CONS " ==> mode" (CONS '|%b| (CONS (CADR |u|) (CONS '|%d| NIL))))))) @@ -2586,8 +2580,7 @@ (|sayBrightly| (CONS |y| (CONS - (MAKESTRING - " does not compile") + " does not compile" NIL)))))))))))))) ; @@ -2633,7 +2626,7 @@ ((SPADLET |u| (|qModemap| |mm|)) (RETURN |u|)) ('T NIL)))))) - ('T (|sayBrightly| (MAKESTRING "no modemaps for $x")))))))) + ('T (|sayBrightly| "no modemaps for $x"))))))) ; ;qModemap mm == @@ -2651,7 +2644,7 @@ (SEQ (PROGN (|sayBrightly| (CONS '|%b| - (CONS (MAKESTRING "modemap") + (CONS "modemap" (CONS '|%d| (|formatModemap| |mm|))))) (SPADLET |dc| (CAAR |mm|)) (SPADLET |target| (CADAR |mm|)) @@ -2675,7 +2668,7 @@ ('T (|sayBrightly| (CONS '|%b| - (CONS (MAKESTRING "fails") + (CONS "fails" (CONS '|%d| (CONS '|%l| NIL)))))))))))) ; @@ -2699,7 +2692,7 @@ ('T '|no|))) (|sayBrightly| (CONS |a| - (CONS (MAKESTRING " --> ") + (CONS " --> " (CONS |m| (CONS '|%b| (CONS |yesOrNo| (CONS '|%d| NIL))))))) @@ -2715,7 +2708,7 @@ ;_?comp x == ; msg:= ; u:= comp(x,$EmptyMode,$f) => -; [MAKESTRING "compiles to mode",'%b,u.mode,'%d] +; "compiles to mode"'%b,u.mode,'%d] ; nil ; sayBrightly msg @@ -2729,7 +2722,7 @@ (SPADLET |msg| (COND ((SPADLET |u| (|comp| |x| |$EmptyMode| |$f|)) - (CONS (MAKESTRING "compiles to mode") + (CONS "compiles to mode" (CONS '|%b| (CONS (CADR |u|) (CONS '|%d| NIL))))) ('T NIL))) @@ -2825,14 +2818,14 @@ (SPADLET |val| (CONS (CAR |val|) (CONS (CADR |val|) - (CONS (MAKESTRING "...") NIL)))) + (CONS "..." NIL)))) NIL) (|sayBrightly| - (CONS (MAKESTRING " ") + (CONS " " (CONS '|%b| (CONS |prop| (CONS '|%d| - (CONS (MAKESTRING ": ") + (CONS ": " (CONS |val| NIL))))))) (EXIT (|displayProplist,fn| (|deleteAssoc| |prop| |l|)))))))))) @@ -2842,9 +2835,9 @@ (DEFUN |displayProplist| (|x| |alist|) (PROGN (|sayBrightly| - (CONS (MAKESTRING "properties of") + (CONS "properties of" (CONS '|%b| - (CONS |x| (CONS '|%d| (CONS (MAKESTRING ":") NIL)))))) + (CONS |x| (CONS '|%d| (CONS ":" NIL)))))) (|displayProplist,fn| |alist|))) ; diff --git a/src/interp/category.lisp.pamphlet b/src/interp/category.lisp.pamphlet index 983ab45..fde6d0d 100644 --- a/src/interp/category.lisp.pamphlet +++ b/src/interp/category.lisp.pamphlet @@ -48,34 +48,32 @@ Sorry to say, this hack is needed by isCategoryType (PROG (|u|) (RETURN (SEQ (PROGN - (SAY (MAKESTRING "--------------------------------------")) - (SAY (MAKESTRING "Name (and arguments) of category:")) + (SAY "--------------------------------------") + (SAY "Name (and arguments) of category:") (PRETTYPRINT (ELT D 0)) - (SAY (MAKESTRING "operations:")) + (SAY "operations:") (PRETTYPRINT (ELT D 1)) - (SAY (MAKESTRING "attributes:")) + (SAY "attributes:") (PRETTYPRINT (ELT D 2)) - (SAY (MAKESTRING "This is a sub-category of")) + (SAY "This is a sub-category of") (PRETTYPRINT (CAR (ELT D 4))) (DO ((G166065 (CADR (ELT D 4)) (CDR G166065)) (|u| NIL)) ((OR (ATOM G166065) (PROGN (SETQ |u| (CAR G166065)) NIL)) NIL) - (SEQ (EXIT (SAY (MAKESTRING - "This has an alternate view: slot ") + (SEQ (EXIT (SAY "This has an alternate view: slot " (CDR |u|) - (MAKESTRING " corresponds to ") + " corresponds to " (CAR |u|))))) (DO ((G166074 (CADDR (ELT D 4)) (CDR G166074)) (|u| NIL)) ((OR (ATOM G166074) (PROGN (SETQ |u| (CAR G166074)) NIL)) NIL) - (SEQ (EXIT (SAY (MAKESTRING - "This has a local domain: slot ") + (SEQ (EXIT (SAY "This has a local domain: slot " (CDR |u|) - (MAKESTRING " corresponds to ") + " corresponds to " (CAR |u|))))) (DO ((G166085 (MAXINDEX D)) (|j| 6 (+ |j| 1))) ((> |j| G166085) NIL) @@ -83,10 +81,9 @@ Sorry to say, this hack is needed by isCategoryType (SPADLET |u| (ELT D |j|)) (COND ((NULL |u|) - (SAY (MAKESTRING "another domain"))) + (SAY "another domain")) ((ATOM (CAR |u|)) - (SAY (MAKESTRING - "Alternate View corresponding to: ") + (SAY "Alternate View corresponding to: " |u|)) ('T (PRETTYPRINT |u|)))))))))))) @@ -580,8 +577,7 @@ Subsumption code (for operators) ((NULL (|MachineLevelSubsume| (QCAR |o|) (QCAR |x|))) - (MAKESTRING - "Source level subsumption not implemented")) + "Source level subsumption not implemented") ('T (SPADLET |extra| (|delete| |x| |extra|))))))))))) diff --git a/src/interp/cattable.lisp.pamphlet b/src/interp/cattable.lisp.pamphlet index b42bdec..4e98dea 100644 --- a/src/interp/cattable.lisp.pamphlet +++ b/src/interp/cattable.lisp.pamphlet @@ -90,7 +90,7 @@ (PROGN (|sayMSG| (APPEND (|bright| |id|) - (CONS (MAKESTRING "extends:") NIL))) + (CONS "extends:" NIL))) (PRINT (HGET |$ct| |id|))))))))))))) ;genCategoryTable() == @@ -959,7 +959,7 @@ (RPLACD |u| |p|)) ('T (|sayMSG| - (MAKESTRING "Duplicate entries:")) + "Duplicate entries:") (PRINT (CONS |newEntry| (CONS (CDR |u|) NIL)))))) @@ -1828,7 +1828,7 @@ (SEQ (EXIT (|categoryParts,build| |x| |pred|)))))) (IF (|member| |item| '(|noBranch|)) (EXIT '|ok|)) (IF (NULL |item|) (EXIT '|ok|)) - (EXIT (|systemError| (MAKESTRING "build error"))))))) + (EXIT (|systemError| "build error")))))) (DEFUN |categoryParts| (&REST G167466 &AUX |options| |category| |conform|) @@ -1886,14 +1886,14 @@ (DECLARE (SPECIAL |$found|)) (RETURN (SEQ (PROGN - (|sayBrightlyNT| (MAKESTRING "compressing hash table...")) + (|sayBrightlyNT| "compressing hash table...") (SPADLET |$found| (MAKE-HASHTABLE 'UEQUAL)) (DO ((G167471 (HKEYS |ht|) (CDR G167471)) (|x| NIL)) ((OR (ATOM G167471) (PROGN (SETQ |x| (CAR G167471)) NIL)) NIL) (SEQ (EXIT (|compressSexpr| (HGET |ht| |x|) NIL NIL)))) - (|sayBrightly| (MAKESTRING "done")) + (|sayBrightly| "done") |ht|))))) ;compressSexpr(x,left,right) == diff --git a/src/interp/clam.lisp.pamphlet b/src/interp/clam.lisp.pamphlet index 56a6993..f71c9cb 100644 --- a/src/interp/clam.lisp.pamphlet +++ b/src/interp/clam.lisp.pamphlet @@ -208,15 +208,15 @@ (SPADLET |phrase| (COND ((EQL |cacheCount| 1) - (CONS (MAKESTRING "computed value only") NIL)) + (CONS "computed value only" NIL)) ('T (APPEND (|bright| |cacheCount|) - (CONS (MAKESTRING "computed values") + (CONS "computed values" NIL))))) (|sayBrightly| (APPEND (|bright| |op|) - (CONS (MAKESTRING "will save last") |phrase|))) - (SPADLET |auxfn| (INTERNL |op| (MAKESTRING ";"))) + (CONS "will save last" |phrase|))) + (SPADLET |auxfn| (INTERNL |op| ";")) (SPADLET |g1| (GENSYM)) (SPADLET |LETTMP#1| (COND @@ -233,12 +233,12 @@ NIL))))) (SPADLET |arg| (CAR |LETTMP#1|)) (SPADLET |computeValue| (CADR |LETTMP#1|)) - (SPADLET |cacheName| (INTERNL |op| (MAKESTRING ";AL"))) + (SPADLET |cacheName| (INTERNL |op| ";AL")) (COND ((BOOT-EQUAL |$reportCounts| 'T) - (SPADLET |hitCounter| (INTERNL |op| (MAKESTRING ";hit"))) + (SPADLET |hitCounter| (INTERNL |op| ";hit")) (SPADLET |callCounter| - (INTERNL |op| (MAKESTRING ";calls"))) + (INTERNL |op| ";calls")) (SET |hitCounter| 0) (SET |callCounter| 0) (SPADLET |callCountCode| (CONS (CONS 'SETQ @@ -330,9 +330,7 @@ (COND (|$reportCompilation| (|sayBrightlyI| - (|bright| - (MAKESTRING - "Generated LISP code for function:"))) + (|bright| "Generated LISP code for function:")) (|pp| |computeFunction|))) (|compileQuietly| (CONS |computeFunction| NIL)) (SPADLET |cacheType| '|function|) @@ -498,7 +496,7 @@ ((AND (NULL |cacheNameOrNil|) (NULL (MEMQ |eqEtc| '(EQ CVEC UEQUAL)))) (|keyedSystemError| 'S2GE0012 (CONS |op| NIL))) - ('T (SPADLET |auxfn| (INTERNL |op| (MAKESTRING ";"))) + ('T (SPADLET |auxfn| (INTERNL |op| ";")) (SPADLET |g1| (GENSYM)) (SPADLET |LETTMP#1| (COND @@ -537,12 +535,12 @@ (SPADLET |computeValue| (CADDR |LETTMP#1|)) (SPADLET |cacheName| (OR |cacheNameOrNil| - (INTERNL |op| (MAKESTRING ";AL")))) + (INTERNL |op| ";AL"))) (COND ((BOOT-EQUAL |$reportCounts| 'T) - (SPADLET |hitCounter| (INTERNL |op| (MAKESTRING ";hit"))) + (SPADLET |hitCounter| (INTERNL |op| ";hit")) (SPADLET |callCounter| - (INTERNL |op| (MAKESTRING ";calls"))) + (INTERNL |op| ";calls")) (SET |hitCounter| 0) (SET |callCounter| 0) (SPADLET |callCountCode| (CONS (CONS 'SETQ @@ -640,7 +638,7 @@ (CONS |computeValue| NIL))) NIL)) NIL))))))) - ('T (|systemError| (MAKESTRING "unexpected"))))) + ('T (|systemError| "unexpected")))) (|cacheNameOrNil| |computeValue|) (|countFl| (CONS 'CDR @@ -704,9 +702,7 @@ (COND (|$reportCompilation| (|sayBrightlyI| - (|bright| - (MAKESTRING - "Generated LISP code for function:"))) + (|bright| "Generated LISP code for function:")) (|pp| |computeFunction|))) (|compileQuietly| (CONS |computeFunction| NIL)) (COND @@ -785,9 +781,8 @@ (COND ((NULL (MEMQ |eqEtc| '(UEQUAL))) (|sayBrightly| - (MAKESTRING - "for hash option, only EQ, CVEC, and UEQUAL are allowed")))) - (SPADLET |auxfn| (INTERNL |op| (MAKESTRING ";"))) + "for hash option, only EQ, CVEC, and UEQUAL are allowed"))) + (SPADLET |auxfn| (INTERNL |op| ";")) (SPADLET |g1| (GENSYM)) (SPADLET |LETTMP#1| (PROGN @@ -1011,14 +1006,14 @@ ((BOUNDP (SPADLET |cacheName| (INTERNL (STRCONC (PNAME |name|) - (MAKESTRING ";AL"))))) + ";AL")))) (SET |cacheName| NIL)) ('T NIL)))) (COND ((BOUNDP (SPADLET |cacheName| (INTERNL (STRCONC (PNAME |name|) - (MAKESTRING ";CAT"))))) + ";CAT")))) (SET |cacheName| NIL)) ('T NIL)))))))))) @@ -1034,7 +1029,7 @@ (PROGN (SPADLET |cacheName| (INTERNL (STRCONC (PNAME |catName|) - (MAKESTRING ";AL")))) + ";AL"))) (SET |cacheName| NIL))))) ;displayHashtable x == @@ -1116,12 +1111,10 @@ (SEQ (EXIT (COND ((NULL (MEMQ '|count| |u|)) (|sayBrightly| - (CONS (MAKESTRING "%b") + (CONS "%b" (CONS |fn| - (CONS (MAKESTRING "%d") - (CONS - (MAKESTRING - "does not keep reference counts") + (CONS "%d" + (CONS "does not keep reference counts" NIL)))))) ((INTEGERP |kind|) (|reportCircularCacheStats| |fn| |kind|)) @@ -1129,11 +1122,10 @@ (|reportHashCacheStats| |fn|)) ('T (|sayBrightly| - (CONS (MAKESTRING - "Unknown cache type for") - (CONS (MAKESTRING "%b") + (CONS "Unknown cache type for" + (CONS "%b" (CONS |fn| - (CONS (MAKESTRING "%d") NIL)))))))))))))) + (CONS "%d" NIL)))))))))))))) ;reportCircularCacheStats(fn,n) == ; infovec:= GET(fn,'cacheInfo) @@ -1171,17 +1163,17 @@ G2595) (SEQ (EXIT (SETQ G2595 (PLUS G2595 1)))))))) (|sayBrightly| - (CONS (MAKESTRING "%b") + (CONS "%b" (CONS |fn| - (CONS (MAKESTRING "%d") - (CONS (MAKESTRING "has") - (CONS (MAKESTRING "%b") + (CONS "%d" + (CONS "has" + (CONS "%b" (CONS |numberUsed| - (CONS (MAKESTRING "%d") - (CONS (MAKESTRING "/ ") + (CONS "%d" + (CONS "/ " (CONS |n| (CONS - (MAKESTRING " values cached") + " values cached" NIL))))))))))) (|displayCacheFrequency| (|mkCircularCountAlist| |circList| |n|)) @@ -1296,10 +1288,10 @@ G2673)))))))) (|sayBrightly| (APPEND (|bright| |fn|) - (CONS (MAKESTRING "has") + (CONS "has" (APPEND (|bright| (|#| |hashValues|)) (CONS - (MAKESTRING "values cached.") + "values cached." NIL))))) (|displayCacheFrequency| (|mkHashCountAlist| |hashValues|)) @@ -1588,10 +1580,10 @@ ('T (SPADLET |hitCounter| (INTERNL |op| - (MAKESTRING ";hit"))) + ";hit")) (SPADLET |callCounter| (INTERNL |op| - (MAKESTRING ";calls"))) + ";calls")) (SPADLET |res| (CONS '|%b| (CONS (|eval| |hitCounter|) @@ -1815,8 +1807,8 @@ ((BOOT-EQUAL |$reportEachInstantiation| 'T) (SPADLET |trailer| (COND - (|dropIfTrue| (MAKESTRING " dropped")) - ('T (MAKESTRING " instantiated")))) + (|dropIfTrue| " dropped") + ('T " instantiated"))) (COND ((BOOT-EQUAL |$insideCoerceInteractive| 'T) (SPADLET |$instantCoerceCount| @@ -1832,9 +1824,9 @@ (SPADLET |$instantCanCoerceCount| (PLUS 1 |$instantCanCoerceCount|)) (SPADLET |xtra| - (CONS (MAKESTRING " for ") + (CONS " for " (CONS (|outputDomainConstructor| |m1|) - (CONS (MAKESTRING "-->") + (CONS "-->" (CONS (|outputDomainConstructor| |m2|) NIL))))))) @@ -1948,11 +1940,9 @@ NIL))) G2984))))))))))))))) (|sayBrightly| - (CONS (MAKESTRING - "# instantiated/# dropped/domain name") - (CONS (MAKESTRING "%l") - (CONS (MAKESTRING - "------------------------------------") + (CONS "# instantiated/# dropped/domain name" + (CONS "%l" + (CONS "------------------------------------" NIL)))) (SPADLET |nTotal| (SPADLET |mTotal| @@ -1988,62 +1978,36 @@ |form|) NIL))))))))) (|sayBrightly| - (CONS (MAKESTRING "%b") - (CONS (MAKESTRING "Totals:") - (CONS (MAKESTRING "%d") + (CONS "%b" + (CONS "Totals:" + (CONS "%d" (CONS |nTotal| - (CONS (MAKESTRING " instantiated") - (CONS (MAKESTRING "%l") - (CONS (MAKESTRING " ") + (CONS " instantiated" + (CONS "%l" + (CONS " " (CONS |$instantCoerceCount| - (CONS - (MAKESTRING - " inside coerceInteractive") - (CONS (MAKESTRING "%l") - (CONS - (MAKESTRING " ") - (CONS - |$instantCanCoerceCount| - (CONS - (MAKESTRING - " inside canCoerceFrom") - (CONS (MAKESTRING "%l") - (CONS - (MAKESTRING " ") - (CONS - |$instantMmCondCount| - (CONS - (MAKESTRING - " inside evalMmCond") - (CONS - (MAKESTRING "%l") - (CONS - (MAKESTRING - " ") + (CONS " inside coerceInteractive" + (CONS "%l" + (CONS " " + (CONS |$instantCanCoerceCount| + (CONS " inside canCoerceFrom" + (CONS "%l" + (CONS " " + (CONS |$instantMmCondCount| + (CONS " inside evalMmCond" + (CONS "%l" + (CONS " " (CONS |rTotal| - (CONS - (MAKESTRING - " reinstantiated") - (CONS - (MAKESTRING "%l") - (CONS - (MAKESTRING - " ") + (CONS " reinstantiated" + (CONS "%l" + (CONS " " (CONS |mTotal| - (CONS - (MAKESTRING - " dropped") - (CONS - (MAKESTRING - "%l") - (CONS - (MAKESTRING - " ") + (CONS " dropped" + (CONS "%l" + (CONS " " (CONS |nForms| - (CONS - (MAKESTRING - " distinct domains instantiated/dropped") + (CONS " distinct domains instantiated/dropped" NIL))))))))))))))))))))))))))))))))))) ;hputNewProp(ht,op,argList,val) == @@ -2298,9 +2262,9 @@ (CONS |argList1| NIL))) |reportList|))))))))))) (|sayBrightly| - (CONS (MAKESTRING "%b") - (CONS (MAKESTRING " USE NAME ARGS") - (CONS (MAKESTRING "%d") NIL)))) + (CONS "%b" + (CONS " USE NAME ARGS" + (CONS "%d" NIL)))) (DO ((G3179 (NREVERSE (SORTBY |sortFn| |reportList|)) (CDR G3179)) (G3127 NIL)) @@ -2404,13 +2368,13 @@ NIL) (SEQ (EXIT (PROGN (|sayBrightly| - (CONS (MAKESTRING "Un-clamming function") + (CONS "Un-clamming function" (CONS '|%b| (CONS |fun| (CONS '|%d| NIL))))) (SET |fun| (|eval| (INTERN (STRCONC (STRINGIMAGE |fun|) - (MAKESTRING ";"))))))))))))) + ";")))))))))))) @ diff --git a/src/interp/compiler.lisp.pamphlet b/src/interp/compiler.lisp.pamphlet index 8d3cb4c..a939292 100644 --- a/src/interp/compiler.lisp.pamphlet +++ b/src/interp/compiler.lisp.pamphlet @@ -265,8 +265,8 @@ from the compiler stack {\tt \$compStack} and (EXIT (CONS '|failedCompilation| (CONS |m| (CONS |e| NIL))))))) (|displaySemanticErrors|) - (SAY (MAKESTRING "****** comp fails at level ") |$level| - (MAKESTRING " with expression: ******")) + (SAY "****** comp fails at level " |$level| + " with expression: ******") (|displayComp| |$level|) (EXIT (|userError| |errorMessage|)))))) @@ -475,7 +475,7 @@ from the compiler stack {\tt \$compStack} and ((BOOT-EQUAL |op| '|:|) (|compColon| |x| |m| |e|)) ((BOOT-EQUAL |op| '|::|) (|compCoerce| |x| |m| |e|)) ((AND (NULL (BOOT-EQUAL |$insideCompTypeOf| 'T)) - (|stringPrefix?| (MAKESTRING "TypeOf") (PNAME |op|))) + (|stringPrefix?| "TypeOf" (PNAME |op|))) (|compTypeOf| |x| |m| |e|)) ('T (SPADLET |t| (|compExpression| |x| |m| |e|)) (COND @@ -2659,8 +2659,8 @@ from the compiler stack {\tt \$compStack} and (COND ((NEQUAL (|#| |dc|) (|#| |sig|)) (|keyedSystemError| 'S2GE0016 - (CONS (MAKESTRING "substituteIntoFunctorModemap") - (CONS (MAKESTRING "Incompatible maps") NIL)))) + (CONS "substituteIntoFunctorModemap" + (CONS "Incompatible maps" NIL)))) ((BOOT-EQUAL (|#| |argl|) (|#| (CDR |sig|))) (SPADLET |sig| (EQSUBSTLIST |argl| (CDR |dc|) |sig|)) (SPADLET |Tl| @@ -3890,23 +3890,23 @@ the left hand side of the macro. (SPADLET |prhs| (COND ((AND (PAIRP |rhs|) (EQ (QCAR |rhs|) 'CATEGORY)) - (CONS (MAKESTRING "-- the constructor category") + (CONS "-- the constructor category" NIL)) ((AND (PAIRP |rhs|) (EQ (QCAR |rhs|) '|Join|)) - (CONS (MAKESTRING "-- the constructor category") + (CONS "-- the constructor category" NIL)) ((AND (PAIRP |rhs|) (EQ (QCAR |rhs|) 'CAPSULE)) - (CONS (MAKESTRING "-- the constructor capsule") + (CONS "-- the constructor capsule" NIL)) ((AND (PAIRP |rhs|) (EQ (QCAR |rhs|) '|add|)) - (CONS (MAKESTRING "-- the constructor capsule") + (CONS "-- the constructor capsule" NIL)) ('T (|formatUnabbreviated| |rhs|)))) (|sayBrightly| - (CONS (MAKESTRING " processing macro definition") + (CONS " processing macro definition" (CONS '|%b| (APPEND (|formatUnabbreviated| |lhs|) - (CONS (MAKESTRING " ==> ") + (CONS " ==> " (APPEND |prhs| (CONS '|%d| NIL))))))) (COND ((OR (BOOT-EQUAL |m| |$EmptyMode|) @@ -4172,8 +4172,8 @@ Compile exit (declare (special |$exitModeStack| |$reportExitModeStack|)) (COND (|$reportExitModeStack| - (SAY (MAKESTRING "exitModeStack: ") (COPY |$exitModeStack|) - (MAKESTRING " ====> ") + (SAY "exitModeStack: " (COPY |$exitModeStack|) + " ====> " (PROGN (SETELT |$exitModeStack| |index| (|resolve| |m| (ELT |$exitModeStack| |index|))) @@ -4252,7 +4252,7 @@ Compile return NIL) ((NEQUAL |level| 1) (|userError| - (MAKESTRING "multi-level returns not supported"))) + "multi-level returns not supported")) ('T (SPADLET |index| (MAX 0 (SPADDIFFERENCE (|#| |$exitModeStack|) 1))) @@ -4338,22 +4338,20 @@ Compile Elt ((EQL 0 |n|) (RETURN (|stackMessage| - (CONS (MAKESTRING "Operation ") + (CONS "Operation " (CONS '|%b| (CONS |anOp| (CONS '|%d| (CONS - (MAKESTRING - "missing from domain: ") + "missing from domain: " (CONS |aDomain| NIL))))))))) ('T (|stackWarning| - (CONS (MAKESTRING - "more than 1 modemap for: ") + (CONS "more than 1 modemap for: " (CONS |anOp| - (CONS (MAKESTRING " with dc=") + (CONS " with dc=" (CONS |aDomain| - (CONS (MAKESTRING " ===>") + (CONS " ===>" (CONS |mmList| NIL))))))) (ELT |mmList| 0))))) (SPADLET |sig| (CAR |modemap|)) @@ -4764,8 +4762,7 @@ Compile if 'T)))))))) (COND ((NULL (|canReturn| |a| 0 0 'T)) - (SAY (MAKESTRING - "IF statement can not cause consequents to be executed")) + (SAY "IF statement can not cause consequents to be executed") (|pp| |expr|))) (OR (|canReturn| |a| |level| |exitCount| NIL) (|canReturn| |b| |level| |exitCount| |ValueFlag|) @@ -4807,7 +4804,7 @@ Compile if (AND G169533 (|canReturn| |u| |level| |exitCount| |ValueFlag|))))))))) - ('T (|systemErrorHere| (MAKESTRING "canReturn")))))))) + ('T (|systemErrorHere| "canReturn"))))))) @ \subsection{compBoolean} @@ -5469,8 +5466,7 @@ An angry JHD - August 15th., 1984 (|getmode| |x| |e|) (|systemErrorHere| - (MAKESTRING - "compColonOld"))))) + "compColonOld")))) G170104)))))))))) (|put| |op| '|mode| |signature| |e|)) ('T (|put| |f| '|mode| |t| |e|)))) @@ -5713,9 +5709,8 @@ of basic objects may not be the same. (COND (|$InteractiveMode| (|keyedSystemError| 'S2GE0016 - (CONS (MAKESTRING "coerce") - (CONS (MAKESTRING - "function coerce called from the interpreter.") + (CONS "coerce" + (CONS "function coerce called from the interpreter." NIL)))) ('T (|rplac| (CADR T$) (MSUBST '$ |$Rep| (CADR T$))) (COND @@ -5754,7 +5749,7 @@ of basic objects may not be the same. (CONS (CAR T$) (CONS (CONS '|userError| (CONS - (MAKESTRING "Did not really exit.") + "Did not really exit." NIL)) NIL))) (CONS |m| (CONS (CADDR T$) NIL)))) @@ -6520,14 +6515,14 @@ should only be used in the old (preWATT) compiler (SETQ HT (MAKE-HASHTABLE 'UEQUAL)) (SPADLET |newName| (|fnameMake| (|pathnameDirectory| |path|) - (|pathnameName| |path|) (MAKESTRING "as"))) + (|pathnameName| |path|) "as")) (SPADLET |canDoIt| 'T) (COND ((NULL (|fnameWritable?| |newName|)) (|sayKeyedMsg| 'S2IZ0086 (CONS (NAMESTRING |newName|) NIL)) (SPADLET |newName| - (|fnameMake| (MAKESTRING ".") - (|pathnameName| |path|) (MAKESTRING "as"))) + (|fnameMake| "." + (|pathnameName| |path|) "as")) (COND ((NULL (|fnameWritable?| |newName|)) (|sayKeyedMsg| 'S2IZ0087 @@ -6539,7 +6534,7 @@ should only be used in the old (preWATT) compiler ('T (|sayKeyedMsg| 'S2IZ0088 (CONS (NAMESTRING |newName|) NIL)) (SPADLET |$outStream| (MAKE-OUTSTREAM |newName|)) - (|markSay| (MAKESTRING "#include \"axiom.as\"")) + (|markSay| "#include \"axiom.as\"") (|markTerpri|) (CATCH 'SPAD_READER (|compiler| (CONS |path| NIL))) (SHUT |$outStream|) (|mkCheck|) '|done|)))))) @@ -6610,13 +6605,11 @@ should only be used in the old (preWATT) compiler (EXIT (|sayBrightly| (CONS - (MAKESTRING ">>> Warning ") + ">>> Warning " (CONS '|%b| (CONS |ii| (CONS '|%d| - (CONS - (MAKESTRING - " was not found") + (CONS " was not found" NIL))))))))))))))))))))) @ diff --git a/src/interp/database.lisp.pamphlet b/src/interp/database.lisp.pamphlet index f9b9756..a2b37a5 100644 --- a/src/interp/database.lisp.pamphlet +++ b/src/interp/database.lisp.pamphlet @@ -397,27 +397,27 @@ (SPADLET |$InteractiveMode| 'T) (SPADLET |$constructorList| NIL) (SPADLET |$ConstructorCache| (MAKE-HASHTABLE 'ID)) - (SAY (MAKESTRING "Making constructor autoload")) + (SAY "Making constructor autoload") (|makeConstructorsAutoLoad|) - (SAY (MAKESTRING "Building category table")) + (SAY "Building category table") (|genCategoryTable|) - (SAY (MAKESTRING "Building libdb.text")) + (SAY "Building libdb.text") (|buildLibdb|) - (SAY (MAKESTRING "splitting libdb.text")) + (SAY "splitting libdb.text") (|dbSplitLibdb|) - (SAY (MAKESTRING "creating browse constructor index")) + (SAY "creating browse constructor index") (|dbAugmentConstructorDataTable|) - (SAY (MAKESTRING "Building browse.lisp")) + (SAY "Building browse.lisp") (|buildBrowsedb|) - (SAY (MAKESTRING "Building constructor users database")) + (SAY "Building constructor users database") (|mkUsersHashTable|) - (SAY (MAKESTRING "Saving constructor users database")) + (SAY "Saving constructor users database") (|saveUsersHashTable|) - (SAY (MAKESTRING "Building constructor dependents database")) + (SAY "Building constructor dependents database") (|mkDependentsHashTable|) - (SAY (MAKESTRING "Saving constructor dependents database")) + (SAY "Saving constructor dependents database") (|saveDependentsHashTable|) - (SAY (MAKESTRING "Building glossary files")) + (SAY "Building glossary files") (|buildGloss|))))) ;saveUsersHashTable() == @@ -1212,7 +1212,7 @@ (QCAR |ISTMP#2|)) 'T))))) (BOOT-EQUAL |tag| - (MAKESTRING "failed")) + "failed") (BOOT-EQUAL |xTails| |sig|)) (SPADLET |x| |dom|) (SPADLET |partial| 'T))) diff --git a/src/interp/define.lisp.pamphlet b/src/interp/define.lisp.pamphlet index 1b5362a..44eb606 100644 --- a/src/interp/define.lisp.pamphlet +++ b/src/interp/define.lisp.pamphlet @@ -165,7 +165,7 @@ |m| |e| NIL |$formalArgList|)) ((NULL |$form|) (|stackAndThrow| - (CONS (MAKESTRING "bad == form ") + (CONS "bad == form " (CONS |form| NIL)))) ('T (SPADLET |newPrefix| @@ -173,7 +173,7 @@ (|$prefix| (INTERN (STRCONC (|encodeItem| |$prefix|) - (MAKESTRING ",") + "," (|encodeItem| |$op|)))) ('T (|getAbbreviation| |$op| @@ -315,10 +315,9 @@ (COND ((AND (PAIRP |rhs|) (EQ (QCAR |rhs|) 'CAPSULE)) (|stackSemanticError| - (CONS (MAKESTRING "target category of ") + (CONS "target category of " (CONS |lhs| - (CONS (MAKESTRING - " cannot be determined from definition") + (CONS " cannot be determined from definition" NIL))) NIL)) ((AND (PAIRP |rhs|) (EQ (QCAR |rhs|) '|SubDomain|) @@ -661,10 +660,10 @@ (SPADLET |op| (CAR |form|)) (SPADLET |argl| (CDR |form|)) (SPADLET |packageName| - (INTERN (STRCONC (PNAME |op|) (MAKESTRING "&")))) + (INTERN (STRCONC (PNAME |op|) "&"))) (SPADLET |packageAbb| (INTERN (STRCONC (GETDATABASE |op| 'ABBREVIATION) - (MAKESTRING "-")))) + "-"))) (SPADLET |$options| NIL) (|abbreviationsSpad2Cmd| (CONS '|domain| @@ -1033,7 +1032,7 @@ (CONS (CONS |a| |v|) G166682)))))))) (SPADLET |parSignature| (SUBLIS |pairlis| |signature'|)) (SPADLET |parForm| (SUBLIS |pairlis| |form|)) - (|lisplibWrite| (MAKESTRING "compilerInfo") + (|lisplibWrite| "compilerInfo" (|removeZeroOne| (CONS 'SETQ (CONS '|$CategoryFrame| @@ -1522,8 +1521,7 @@ (OR (|compMakeCategoryObject| |target| |$e|) (PROGN (|sayBrightly| - (MAKESTRING - " cannot produce category object:")) + " cannot produce category object:") (|pp| |target|) (RETURN NIL)))) (SPADLET |ds| (CAR |LETTMP#1|)) @@ -1531,7 +1529,7 @@ (SPADLET |$domainShell| (COPY-SEQ |ds|)) (SPADLET |$attributesName| (INTERN (STRCONC (PNAME |$op|) - (MAKESTRING ";attributes")))) + ";attributes"))) (SPADLET |attributeList| (|disallowNilAttribute| (ELT |ds| 2))) (SPADLET |$goGetList| NIL) @@ -1766,7 +1764,7 @@ (COND (|$isOpPackageName| (|lisplibWrite| - (MAKESTRING "slot1DataBase") + "slot1DataBase" (CONS '|updateSlot1DataBase| (CONS (MKQ |$NRTslot1Info|) NIL)) |$libFile|))) @@ -1814,7 +1812,7 @@ |operationAlist|) (SPADLET |$lisplibMissingFunctions| |$CheckVectorList|))) - (|lisplibWrite| (MAKESTRING "compilerInfo") + (|lisplibWrite| "compilerInfo" (|removeZeroOne| (CONS 'SETQ (CONS '|$CategoryFrame| @@ -1966,9 +1964,9 @@ (PROGN (|displayMissingFunctions|) (COND - (|$semanticErrorStack| (|sayBrightly| (MAKESTRING " ")))) + (|$semanticErrorStack| (|sayBrightly| " "))) (|displaySemanticErrors|) - (COND (|$warningStack| (|sayBrightly| (MAKESTRING " ")))) + (COND (|$warningStack| (|sayBrightly| " "))) (|displayWarnings|) (SPADLET |$functorStats| (|addStats| |$functorStats| |$functionStats|)) @@ -1977,16 +1975,15 @@ (|sayBrightly| (CONS '|%l| (APPEND (|bright| - (MAKESTRING - " Cumulative Statistics for Constructor")) + " Cumulative Statistics for Constructor") (CONS |$op| NIL)))) (SPADLET |timeString| (|normalizeStatAndStringify| |elapsedSeconds|)) (|sayBrightly| - (CONS (MAKESTRING " Time:") + (CONS " Time:" (APPEND (|bright| |timeString|) - (CONS (MAKESTRING "seconds") NIL)))) - (|sayBrightly| (MAKESTRING " ")) + (CONS "seconds" NIL)))) + (|sayBrightly| " ") '|done|)))) ;displayMissingFunctions() == @@ -2052,8 +2049,7 @@ (|loc| (|sayBrightly| (CONS '|%l| (|bright| - (MAKESTRING - " Missing Local Functions:")))) + " Missing Local Functions:"))) (DO ((G167443 |loc| (CDR G167443)) (G167413 NIL) (|i| 1 (QSADD1 |i|))) ((OR (ATOM G167443) @@ -2068,9 +2064,9 @@ NIL)) NIL) (SEQ (EXIT (|sayBrightly| - (CONS (MAKESTRING " [") + (CONS " [" (CONS |i| - (CONS (MAKESTRING "]") + (CONS "]" (APPEND (|bright| |op|) (CONS '|: | (|formatUnabbreviatedSig| @@ -2079,8 +2075,7 @@ (|exp| (|sayBrightly| (CONS '|%l| (|bright| - (MAKESTRING - " Missing Exported Functions:")))) + " Missing Exported Functions:"))) (DO ((G167455 |exp| (CDR G167455)) (G167418 NIL) (|i| 1 (QSADD1 |i|))) ((OR (ATOM G167455) @@ -2095,9 +2090,9 @@ NIL)) NIL) (SEQ (EXIT (|sayBrightly| - (CONS (MAKESTRING " [") + (CONS " [" (CONS |i| - (CONS (MAKESTRING "]") + (CONS "]" (APPEND (|bright| |op|) (CONS '|: | (|formatUnabbreviatedSig| @@ -2845,8 +2840,8 @@ (EXIT (OR (|getmode| |a| |e|) (|userError| (|concat| - (MAKESTRING "There is no mode for argument") - |a| (MAKESTRING "of function") (CAR |form|))))))) + "There is no mode for argument" + |a| "of function" (CAR |form|))))))) (DEFUN |compDefWhereClause,removeSuchthat| (|x|) (PROG (|ISTMP#1| |y| |ISTMP#2| |p|) @@ -3065,12 +3060,12 @@ ((MEMQ |v| |d|) (PROGN (SAY |v| - (MAKESTRING " depends on itself")) + " depends on itself") (SPADLET |fatalError| 'T))))))) (COND (|fatalError| (|userError| - (MAKESTRING "Parameter specification error"))) + "Parameter specification error")) ('T (DO ((G168258 NIL (NULL |vl|))) (G168258 NIL) (SEQ (EXIT (PROGN @@ -3435,17 +3430,17 @@ ((AND |$compileOnlyCertainItems| (NULL (|member| |$op| |$compileOnlyCertainItems|))) (|sayBrightly| - (CONS (MAKESTRING " skipping ") + (CONS " skipping " (CONS |localOrExported| (|bright| |$op|)))) (CONS NIL (CONS (CONS '|Mapping| |signature'|) (CONS |oldE| NIL)))) ('T (|sayBrightly| - (CONS (MAKESTRING " compiling ") + (CONS " compiling " (CONS |localOrExported| (APPEND (|bright| |$op|) - (CONS (MAKESTRING ": ") + (CONS ": " |formattedSig|))))) (COND ((BOOT-EQUAL |$newComp| 'T) @@ -3473,9 +3468,9 @@ |e|)) (CONS (INTERN " " "BOOT") (CONS |rettype| (CONS |e| NIL))))) - (SAY (MAKESTRING "The old compiler generates:")) + (SAY "The old compiler generates:") (|prTriple| |oldT|) - (SAY (MAKESTRING "The new compiler generates:")) + (SAY "The new compiler generates:") (|prTriple| T$)) ('T NIL))) ('T @@ -3487,7 +3482,7 @@ (|NRTassignCapsuleFunctionSlot| |$op| |signature'|) (COND ((BOOT-EQUAL |$newCompCompare| 'T) - (SAY (MAKESTRING "The old compiler generates:")) + (SAY "The old compiler generates:") (|prTriple| T$)) ('T NIL)))) (SPADLET |catchTag| (MKQ (GENSYM))) @@ -3726,20 +3721,18 @@ (CONS '| | (APPEND (|bright| |a|) (CONS - (MAKESTRING - "must have type ") + "must have type " (CONS |m| - (CONS (MAKESTRING " not ") + (CONS " not " (CONS |m1| (CONS '|%l| |stack|)))))))))))) ('T (SPADLET |e| (|put| |a| '|mode| |m| |e|)))))) (COND (|stack| (|sayBrightly| - (CONS (MAKESTRING " Parameters of ") + (CONS " Parameters of " (APPEND (|bright| (CAR |form|)) (CONS - (MAKESTRING - " are of wrong type:") + " are of wrong type:" (CONS '|%l| |stack|))))))) |e|))))) @@ -3829,12 +3822,11 @@ (PROGN (SPADLET |sig| (QCDR |ISTMP#1|)) 'T))) |sig|) ('T - (SAY (MAKESTRING - "************* USER ERROR **********")) - (SAY (MAKESTRING "available signatures for ") |op| - (MAKESTRING ": ")) + (SAY "************* USER ERROR **********") + (SAY "available signatures for " |op| + ": ") (COND - ((NULL |mmList|) (SAY (MAKESTRING " NONE"))) + ((NULL |mmList|) (SAY " NONE")) ('T (DO ((G168676 |mmList| (CDR G168676)) (G168646 NIL)) @@ -4118,7 +4110,7 @@ NIL))))) (IF (NULL |clist|) (EXIT |$body|)) (EXIT (|systemErrorHere| - (MAKESTRING "addArgumentConditions"))))))) + "addArgumentConditions")))))) (DEFUN |addArgumentConditions| (|$body| |$functionName|) (DECLARE (SPECIAL |$body| |$functionName| |$argumentConditionList|)) @@ -4634,12 +4626,11 @@ (CONS |op| (CONS '|%d| (CONS - (MAKESTRING - " is local and exported") + " is local and exported" NIL))))))) (INTERN (STRCONC (|encodeItem| |$prefix|) - (MAKESTRING ";") + ";" (|encodeItem| |op|)))) ((AND (|isPackageFunction|) (NEQUAL (KAR |$functorForm|) @@ -4648,7 +4639,7 @@ ((NULL |opmodes|) (|userError| (CONS - (MAKESTRING "no modemap for ") + "no modemap for " (CONS |op| NIL))))) (COND ((AND (PAIRP |opmodes|) @@ -4717,21 +4708,20 @@ (COND ((NULL |unew|) (|sayBrightly| - (CONS (MAKESTRING - " Error: Item did not previously exist") + (CONS " Error: Item did not previously exist" NIL)) (|sayBrightly| - (CONS (MAKESTRING " Item not saved: ") + (CONS " Item not saved: " (|bright| (ELT |u| 0)))) (|sayBrightly| - (CONS (MAKESTRING " What's there is: ") + (CONS " What's there is: " (CONS |$lisplibItemsAlreadyThere| NIL))) NIL) ('T (|sayBrightly| - (CONS (MAKESTRING " Renaming ") + (CONS " Renaming " (CONS (ELT |u| 0) - (CONS (MAKESTRING " as ") + (CONS " as " (CONS |unew| NIL))))) (SPADLET |u| (CONS |unew| (CDR |u|))) (SPADLET |$savableItems| @@ -4783,9 +4773,9 @@ (COND ((CONTAINED (INTERN " " "BOOT") |body|) (|sayBrightly| - (CONS (MAKESTRING " ") + (CONS " " (APPEND (|bright| |nam|) - (CONS (MAKESTRING " not compiled") + (CONS " not compiled" NIL))))) ('T (COND @@ -4806,10 +4796,10 @@ (CONS (MKQ '|SPADreplace|) (CONS (MKQ |nam'|) NIL))))) (|sayBrightly| - (CONS (MAKESTRING " ") + (CONS " " (APPEND (|bright| |nam|) (CONS - (MAKESTRING "is replaced by") + "is replaced by" (|bright| |nam'|)))))) ((AND (OR (ATOM |body|) (PROG (G169410) @@ -4843,10 +4833,10 @@ (CONS (MKQ '|SPADreplace|) (CONS (MKQ |macform|) NIL))))) (|sayBrightly| - (CONS (MAKESTRING " ") + (CONS " " (APPEND (|bright| |nam|) (CONS - (MAKESTRING "is replaced by") + "is replaced by" (|bright| |body|)))))) ('T NIL)) (COND @@ -5047,7 +5037,7 @@ (CONS (MKQ (CAR |functorForm|)) (CONS ''|%d| - (CONS (MAKESTRING "from") + (CONS "from" (CONS ''|%b| (CONS (MKQ @@ -5055,8 +5045,7 @@ |sourceFile|)) (CONS ''|%d| (CONS - (MAKESTRING - "needs to be compiled") + "needs to be compiled" NIL))))))))) NIL)) NIL)) @@ -5127,7 +5116,7 @@ (CAR |$functorForm|)) (CONS ''|%d| (CONS - (MAKESTRING "from") + "from" (CONS ''|%b| (CONS (MKQ @@ -5135,8 +5124,7 @@ /EDITFILE)) (CONS ''|%d| (CONS - (MAKESTRING - "needs to be compiled") + "needs to be compiled" NIL))))))))) NIL)) NIL)) @@ -5742,7 +5730,7 @@ Since we can't be sure we take the least disruptive course of action. (PROGN (SETQ |dom| (CAR G170018)) NIL)) NIL) (SEQ (EXIT (|sayBrightly| - (CONS (MAKESTRING " importing ") + (CONS " importing " (|formatUnabbreviated| |dom|)))))) (SPADLET |LETTMP#1| (|compOrCroak| |item| |$EmptyMode| |$e|)) @@ -5942,7 +5930,7 @@ Since we can't be sure we take the least disruptive course of action. (SPADLET |LETTMP#1| (OR (|comp| |p| |$Boolean| |$e|) (|userError| - (CONS (MAKESTRING "not a Boolean:") + (CONS "not a Boolean:" (CONS |p| NIL))))) (SPADLET |p'| (CAR |LETTMP#1|)) (SPADLET |$e| (CADDR |LETTMP#1|)) @@ -6249,7 +6237,7 @@ Since we can't be sure we take the least disruptive course of action. (|mkExplicitCategoryFunction| |domainOrPackage| |$sigList| |$atList|)) (CONS |rep| (CONS |m| (CONS |e| NIL)))) - ('T (|systemErrorHere| (MAKESTRING "compCategory"))))))))) + ('T (|systemErrorHere| "compCategory")))))))) ;mkExplicitCategoryFunction(domainOrPackage,sigList,atList) == ; body:= diff --git a/src/interp/format.lisp.pamphlet b/src/interp/format.lisp.pamphlet index 5786184..ad17955 100644 --- a/src/interp/format.lisp.pamphlet +++ b/src/interp/format.lisp.pamphlet @@ -80,7 +80,7 @@ (CONS '|%b| (CONS |op| (CONS '|%d| - (CONS (MAKESTRING ":") NIL)))))))))) + (CONS ":" NIL)))))))))) (DO ((G166070 |modemaps| (CDR G166070)) (|modemap| NIL)) ((OR (ATOM G166070) @@ -120,7 +120,7 @@ (SPADLET |sig| (CONS (CONS '|Union| (CONS |b| - (CONS (MAKESTRING "failed") NIL))) + (CONS "failed" NIL))) |c|)) (SPADLET |mm| (CONS (CONS |x| |sig|) @@ -130,7 +130,7 @@ (SPADLET |sig| (CONS (CONS '|Union| (CONS |b| - (CONS (MAKESTRING "failed") NIL))) + (CONS "failed" NIL))) |c|)) (SPADLET |mm| (CONS (CONS |x| |sig|) (CONS |y| |z|)))) ('T NIL)) @@ -532,7 +532,7 @@ (SPADLET |fromPart| (COND ((AND (BOOT-EQUAL |dc| 'D) D) - (|concat| '|%b| (MAKESTRING "from") '|%d| + (|concat| '|%b| "from" '|%d| (|prefix2String| D))) ('T (|concat| '|%b| "from" '|%d| @@ -542,7 +542,7 @@ (COND ((> (PLUS (|sayWidth| |firstPart|) (|sayWidth| |fromPart|)) 74) - (SPADLET |fromPart| (|concat| (MAKESTRING " ") |fromPart|)) + (SPADLET |fromPart| (|concat| " " |fromPart|)) (SPADLET |secondPart| (COND ((> 75 @@ -692,11 +692,11 @@ (SPADLET |mmsU| (CONS |mm| |mmsU|)))))))) (COND (|mmsE| (|reportOpSymbol,sayMms| |op| |mmsE| - (MAKESTRING "exposed")))) + "exposed"))) (COND (|mmsU| (COND (|mmsE| (|sayNewLine|))) (|reportOpSymbol,sayMms| |op| |mmsU| - (MAKESTRING "unexposed")))) + "unexposed"))) (DO ((G166512 |domlist| (CDR G166512)) (|adom| NIL)) ((OR (ATOM G166512) @@ -825,7 +825,7 @@ (DEFUN |formatOpConstant| (|op|) (|concat| '|%b| (|formatOpSymbol| |op| '($)) '|%d| - (MAKESTRING ": constant"))) + ": constant")) ;formatOpSymbol(op,sig) == ; if op = 'Zero then op := "0" @@ -882,7 +882,7 @@ ((EQL |n| 3) (COND ((BOOT-EQUAL |op| 'SEGMENT) - (SPADLET |op| (MAKESTRING "..")))) + (SPADLET |op| ".."))) (COND ((BOOT-EQUAL |op| '|in|) (CONS |quad| @@ -941,7 +941,7 @@ (PROG (|ISTMP#1| |op| |ISTMP#2| |ISTMP#3| |sig|) (RETURN (COND - ((AND (STRINGP |x|) (BOOT-EQUAL |x| (MAKESTRING "*"))) '|"*"|) + ((AND (STRINGP |x|) (BOOT-EQUAL |x| "*")) '|"*"|) ((ATOM |x|) (|formatOpSymbol| |x| NIL)) ((AND (PAIRP |x|) (EQ (QCAR |x|) '|:|) (PROGN @@ -1007,7 +1007,7 @@ (COND ((AND (EQ |y| |y1|) (EQ |z| |z1|)) |x|) ('T (CONS |y1| |z1|)))) - ((OR (BOOT-EQUAL |x| '$) (BOOT-EQUAL |x| (MAKESTRING "$"))) + ((OR (BOOT-EQUAL |x| '$) (BOOT-EQUAL |x| "$")) '%%) ('T |x|))))) @@ -1056,7 +1056,7 @@ (RETURN (COND ((NULL |sig|) '|() -> ()|) - ((INTEGERP |sig|) (MAKESTRING "hashcode")) + ((INTEGERP |sig|) "hashcode") ('T (SPADLET |tm| (CAR |sig|)) (SPADLET |sml| (CDR |sig|)) (SPADLET |sourcePart| (|formatSignatureArgs0| |sml|)) (SPADLET |targetPart| (|prefix2String0| |tm|)) @@ -1425,9 +1425,9 @@ |u1|)) ((BOOT-EQUAL |op| '|:|) (COND - ((NULL |argl|) (CONS (MAKESTRING ":") NIL)) + ((NULL |argl|) (CONS ":" NIL)) ((NULL (CDR |argl|)) - (CONS (MAKESTRING ":") + (CONS ":" (CONS (|form2String1| (CAR |argl|)) NIL))) ('T (|formDecl2String| (ELT |argl| 0) (ELT |argl| 1))))) @@ -1473,12 +1473,12 @@ (|rbrkSch|))) ((BOOT-EQUAL |op| 'SEGMENT) (COND - ((NULL |argl|) (MAKESTRING "..")) + ((NULL |argl|) "..") ('T (SPADLET |lo| (|form2String1| (CAR |argl|))) (SPADLET |argl| (CDR |argl|)) (COND ((OR (NULL |argl|) (NULL (CAR |argl|))) - (CONS |lo| (CONS (MAKESTRING "..") NIL))) + (CONS |lo| (CONS ".." NIL))) ('T (CONS |lo| (CONS ".." @@ -1516,8 +1516,8 @@ (RETURN (COND ((EQL |$formatSigAsTeX| 1) |id|) - ((EQL |$formatSigAsTeX| 2) (SPADLET |sep| (MAKESTRING "`")) - (FORMAT NIL (MAKESTRING "\\verb~a~a~a") |sep| |id| |sep|)) + ((EQL |$formatSigAsTeX| 2) (SPADLET |sep| "`") + (FORMAT NIL "\\verb~a~a~a" |sep| |id| |sep|)) ('T (|error| '|Bad formatSigValue|)))))) ;formArguments2String(argl,ml) == [fn(x,m) for x in argl for m in ml] where @@ -1593,7 +1593,7 @@ (COND ((AND (NE |$whereList| |whereBefore|) |$permitWhere|) |ls|) ('T - (|concat| (|form2StringLocal| |ls|) (MAKESTRING ": ") |rs|))))))) + (|concat| (|form2StringLocal| |ls|) ": " |rs|))))))) ;formJoin1(op,u) == ; if op = 'Join then [:argl,last] := u else (argl := nil; last := [op,:u]) @@ -1630,19 +1630,19 @@ (|member| |id| '(|mkCategory| CATEGORY))) (COND ((BOOT-EQUAL |$abbreviateJoin| 'T) - (|concat| (|formJoin2| |argl|) '|%b| (MAKESTRING "with") - '|%d| (MAKESTRING "..."))) + (|concat| (|formJoin2| |argl|) '|%b| "with" + '|%d| "...")) ((BOOT-EQUAL |$permitWhere| 'T) (SPADLET |opList| (|formatJoinKey| |r| |id|)) (SPADLET |$whereList| (|concat| |$whereList| '|%l| |$declVar| '|: | (|formJoin2| |argl|) '|%b| - (MAKESTRING "with") '|%d| '|%i| |opList| + "with" '|%d| '|%i| |opList| '|%u|)) (|formJoin2| |argl|)) ('T (SPADLET |opList| (|formatJoinKey| |r| |id|)) (SPADLET |suffix| - (|concat| '|%b| (MAKESTRING "with") '|%d| '|%i| + (|concat| '|%b| "with" '|%d| '|%i| |opList| '|%u|)) (|concat| (|formJoin2| |argl|) |suffix|)))) ('T (|formJoin2| |u|))))))) @@ -1758,12 +1758,12 @@ (EXIT (SETQ G167130 (APPEND G167130 - (|concat| '|%l| (MAKESTRING " ") + (|concat| '|%l| " " (|form2StringLocal| |con|) (|formatIf| |pred|)))))))))) ('T NIL))) (|concat| |opString| |catString|)) - ('T (MAKESTRING "?? unknown mkCategory format ??")))) + ('T "?? unknown mkCategory format ??"))) ('T (PROG (G167143) (SPADLET G167143 NIL) @@ -1821,7 +1821,7 @@ (PROG () (RETURN (SEQ (COND - ((NULL |argl|) (MAKESTRING "")) + ((NULL |argl|) "") ((EQL 1 (|#| |argl|)) (|form2StringLocal| (ELT |argl| 0))) ('T (|application2String| '|Join| @@ -1865,7 +1865,7 @@ '|)|)) (COND ((EQL (|#| |argl|) 1) - (|concat| (CAR |argl|) (MAKESTRING " with ") + (|concat| (CAR |argl|) " with " |postString|)) ('T (|concat| (|application2String| '|Join| |argl| NIL) @@ -1939,7 +1939,7 @@ (PROGN (SPADLET |f| (QCAR |l|)) 'T)) (|form2StringLocal| |f|)) ('T NIL))) - (|concat| '|for | |y| '| in | |s| (MAKESTRING "..") |tail|)) + (|concat| '|for | |y| '| in | |s| ".." |tail|)) ((AND (PAIRP |x|) (EQ (QCAR |x|) '|tails|) (PROGN (SPADLET |ISTMP#1| (QCDR |x|)) @@ -2052,8 +2052,8 @@ '("failed" "nil" "prime" "sqfr" "irred")) (SPADLET |x| - (STRCONC (MAKESTRING "\"") |x| - (MAKESTRING "\""))))) + (STRCONC "\"" |x| + "\"")))) (SPADLET |string| (|concat| |string| (|concat| '|,| @@ -2067,7 +2067,7 @@ (DEFUN |script2String| (|s|) (COND - ((NULL |s|) (MAKESTRING "")) + ((NULL |s|) "") ('T (COND ((NULL (PAIRP |s|)) (SPADLET |s| (CONS |s| NIL)))) (|linearFormatForm| (CAR |s|) (CDR |s|))))) @@ -2346,13 +2346,13 @@ ((OR (EQL 1 (SIZE (SPADLET |op'| (PNAME |op|)))) (NEQUAL (|char| '*) (ELT |op'| 0))) NIL) - ((NULL (SPADLET |e| (STRPOS (MAKESTRING ";") |op'| 1 NIL))) + ((NULL (SPADLET |e| (STRPOS ";" |op'| 1 NIL))) NIL) ((OR (BOOT-EQUAL (|char| '| |) (SPADLET |y| (ELT |op'| 1))) (BOOT-EQUAL (|char| '*) |y|)) NIL) ('T - (SPADLET |table| (MAKETRTTABLE (MAKESTRING "0123456789") NIL)) + (SPADLET |table| (MAKETRTTABLE "0123456789" NIL)) (SPADLET |s| (STRPOSL |table| |op'| 1 'T)) (COND ((OR (NULL |s|) (> |s| |e|)) NIL) @@ -2398,12 +2398,12 @@ '| | (CAR |argl|))))) ((BOOT-EQUAL |op| 'SEGMENT) (COND - ((NULL |argl|) (MAKESTRING "..")) + ((NULL |argl|) "..") ((OR (NULL (CDR |argl|)) (NULL (CAR (CDR |argl|)))) - (|concat| (CAR |argl|) (MAKESTRING ".."))) + (|concat| (CAR |argl|) "..")) ('T (|concat| (CAR |argl|) - (|concat| (MAKESTRING "..") (CAR (CDR |argl|))))))) + (|concat| ".." (CAR (CDR |argl|))))))) ('T (|concat| (|app2StringWrap| (|formWrapId| |op|) |linkInfo|) (|concat| '|(| (|concat| (|tuple2String| |argl|) '|)|)))))))) @@ -2453,7 +2453,7 @@ ('T (|app2StringConcat0| G167632 G167633))))))))))) - (SPADLET |sep| (MAKESTRING "`")) + (SPADLET |sep| "`") (FORMAT NIL "\\lispLink{\\verb!(|conPage| '~a)!}{~a}" |str2| |string|)) ('T (|error| '|Bad value for $formatSigAsTeX|))))))) @@ -2484,7 +2484,7 @@ (|concat| |argPart| '|,| |a| '|: | (|form2StringLocal| |b|)))))) (COND - ((NULL |argPart|) (MAKESTRING "Record()")) + ((NULL |argPart|) "Record()") ('T (|concat| '|Record(| (CDR |argPart|) '|)|)))))))) ;plural(n,string) == @@ -2719,7 +2719,7 @@ (SPADLET |ISTMP#1| (QCDR |x|)) (AND (PAIRP |ISTMP#1|) (EQ (QCDR |ISTMP#1|) NIL) (PROGN (SPADLET |l| (QCAR |ISTMP#1|)) 'T)))) - (|concat| (MAKESTRING "not ") (|pred2English| |l|))) + (|concat| "not " (|pred2English| |l|))) ((AND (PAIRP |x|) (PROGN (SPADLET |op| (QCAR |x|)) @@ -2734,7 +2734,7 @@ (SPADLET |b| (QCAR |ISTMP#2|)) 'T))))) (|member| |op| '(|has| |ofCategory|))) - (|concat| (|pred2English| |a|) '|%b| (MAKESTRING "has") + (|concat| (|pred2English| |a|) '|%b| "has" '|%d| (|form2String| (|abbreviate| |b|)))) ((AND (PAIRP |x|) (PROGN @@ -2752,7 +2752,7 @@ (|member| |op| '(|HasSignature| |HasAttribute| |HasCategory|))) (|concat| (|prefix2String0| (|formatPredParts| |a|)) - '|%b| (MAKESTRING "has") '|%d| + '|%b| "has" '|%d| (|prefix2String0| (|formatPredParts| |b|)))) ((AND (PAIRP |x|) (PROGN @@ -2778,7 +2778,7 @@ (SPADLET |b'| (QCAR |ISTMP#1|)) 'T)))) (SPADLET |b| |b'|))) - (|concat| (|pred2English| |a|) (MAKESTRING ": ") + (|concat| (|pred2English| |a|) ": " (|form2String| (|abbreviate| |b|)))) ((AND (PAIRP |x|) (PROGN @@ -2794,7 +2794,7 @@ (SPADLET |b| (QCAR |ISTMP#2|)) 'T))))) (|member| |op| '(|isDomain| |domainEqual|))) - (|concat| (|pred2English| |a|) (MAKESTRING " = ") + (|concat| (|pred2English| |a|) " = " (|form2String| (|abbreviate| |b|)))) ((AND (PAIRP |x|) (PROGN (SPADLET |op| (QCAR |x|)) 'T) (SPADLET |translation| @@ -2823,7 +2823,7 @@ (COND ((STRINGP |x|) |x|) ((IDENTP |x|) (PNAME |x|)) - ((NULL |x|) (MAKESTRING "")) + ((NULL |x|) "") ((PAIRP |x|) (STRCONC (|object2String| (CAR |x|)) (|object2String| (CDR |x|)))) ('T (WRITE-TO-STRING |x|)))) @@ -2884,7 +2884,7 @@ (COND ((NULL (PAIRP |keyStuff|)) (SPADLET |keyStuff| (CONS |keyStuff| NIL)))) - (SPADLET |allMsgs| (CONS (MAKESTRING " ") NIL)) + (SPADLET |allMsgs| (CONS " " NIL)) (DO () ((NULL (NULL (NULL |keyStuff|))) NIL) (SEQ (EXIT (PROGN (SPADLET |dbN| NIL) @@ -3007,12 +3007,12 @@ 'T)) (COND ((BOOT-EQUAL |op| 'QUOTE) - (CONS (MAKESTRING "(QUOTE ") + (CONS "(QUOTE " (APPEND (|form2FenceQuote| (CAR |argl|)) - (CONS (MAKESTRING ")") NIL)))) + (CONS ")" NIL)))) ('T - (CONS (MAKESTRING "(") - (CONS (FORMAT NIL (MAKESTRING "|~a|") |op|) + (CONS "(" + (CONS (FORMAT NIL "|~a|" |op|) (APPEND (PROG (G168166) (SPADLET G168166 NIL) (RETURN @@ -3031,9 +3031,9 @@ (SETQ G168166 (APPEND G168166 (|form2Fence1| |y|)))))))) - (CONS (MAKESTRING ")") NIL))))))) - ((IDENTP |x|) (FORMAT NIL (MAKESTRING "|~a|") |x|)) - ('T (CONS (MAKESTRING " ") (CONS |x| NIL)))))))) + (CONS ")" NIL))))))) + ((IDENTP |x|) (FORMAT NIL "|~a|" |x|)) + ('T (CONS " " (CONS |x| NIL)))))))) ;form2FenceQuote x == ; NUMBERP x => [STRINGIMAGE x] @@ -3044,10 +3044,10 @@ (DEFUN |form2FenceQuote| (|x|) (COND ((NUMBERP |x|) (CONS (STRINGIMAGE |x|) NIL)) - ((SYMBOLP |x|) (CONS (FORMAT NIL (MAKESTRING "|~a|") |x|) NIL)) - ((ATOM |x|) (MAKESTRING "??")) + ((SYMBOLP |x|) (CONS (FORMAT NIL "|~a|" |x|) NIL)) + ((ATOM |x|) "??") ('T - (CONS (MAKESTRING "(") + (CONS "(" (APPEND (|form2FenceQuote| (CAR |x|)) (|form2FenceQuoteTail| (CDR |x|))))))) @@ -3058,12 +3058,12 @@ (DEFUN |form2FenceQuoteTail| (|x|) (COND - ((NULL |x|) (CONS (MAKESTRING ")") NIL)) + ((NULL |x|) (CONS ")" NIL)) ((ATOM |x|) - (CONS (MAKESTRING " . ") - (APPEND (|form2FenceQuote| |x|) (CONS (MAKESTRING ")") NIL)))) + (CONS " . " + (APPEND (|form2FenceQuote| |x|) (CONS ")" NIL)))) ('T - (CONS (MAKESTRING " ") + (CONS " " (APPEND (|form2FenceQuote| (CAR |x|)) (|form2FenceQuoteTail| (CDR |x|))))))) diff --git a/src/interp/fortcall.lisp.pamphlet b/src/interp/fortcall.lisp.pamphlet index 72cc979..9453747 100644 --- a/src/interp/fortcall.lisp.pamphlet +++ b/src/interp/fortcall.lisp.pamphlet @@ -244,7 +244,7 @@ (MAKE-OUTSTREAM (STRCONC |file| (INTERN ".c" "BOOT")))) (|writeCFile| |name| |args| |fortranArgs| |dummies| |decls| |results| |returnType| |asps| |fp|) - (COND ((NULL |dir|) (SPADLET |dir| (MAKESTRING ".")))) + (COND ((NULL |dir|) (SPADLET |dir| "."))) (COND (|asps| (SYSTEM (STRCONC '|cc -c | |file| (INTERN ".c ; mv " "BOOT") |file| @@ -318,23 +318,22 @@ (declare (special |$addUnderscoreToFortranNames|)) (RETURN (SEQ (PROGN - (WRITE-LINE (MAKESTRING "#include ") |fp|) - (WRITE-LINE (MAKESTRING "#include ") |fp|) - (WRITE-LINE (MAKESTRING "#include ") |fp|) - (WRITE-LINE (MAKESTRING "#ifndef NULL") |fp|) - (WRITE-LINE (MAKESTRING "#define NULL 0") |fp|) - (WRITE-LINE (MAKESTRING "#endif NULL") |fp|) + (WRITE-LINE "#include " |fp|) + (WRITE-LINE "#include " |fp|) + (WRITE-LINE "#include " |fp|) + (WRITE-LINE "#ifndef NULL" |fp|) + (WRITE-LINE "#define NULL 0" |fp|) + (WRITE-LINE "#endif NULL" |fp|) (WRITE-LINE - (MAKESTRING "#define MAX_ARRAY(x) (x ? x : 20000)") + "#define MAX_ARRAY(x) (x ? x : 20000)" |fp|) (WRITE-LINE - (MAKESTRING - "#define CHECK(x) if (!x) {fprintf(stderr,\"xdr failed\"); exit(1);}") + "#define CHECK(x) if (!x) {fprintf(stderr,\"xdr failed\"); exit(1);}" |fp|) - (WRITE-LINE (MAKESTRING "void main()") |fp|) - (WRITE-LINE (MAKESTRING "{") |fp|) - (WRITE-LINE (MAKESTRING " XDR xdrs;") |fp|) - (WRITE-LINE (MAKESTRING " {") |fp|) + (WRITE-LINE "void main()" |fp|) + (WRITE-LINE "{" |fp|) + (WRITE-LINE " XDR xdrs;" |fp|) + (WRITE-LINE " {" |fp|) (COND (|$addUnderscoreToFortranNames| (SPADLET |routineName| (STRCONC |name| (STRING 95)))) @@ -343,13 +342,13 @@ (|returnType| (SPADLET |returnName| (INTERN (STRCONC |name| '|_result|))) - (|wl| (CONS (MAKESTRING " ") + (|wl| (CONS " " (CONS (|getCType| |returnType|) - (CONS (MAKESTRING " ") + (CONS " " (CONS |returnName| - (CONS (MAKESTRING ",") + (CONS "," (CONS |routineName| - (CONS (MAKESTRING "();") NIL))))))) + (CONS "();" NIL))))))) |fp|))) (SPADLET |argList| NIL) (DO ((G166252 |args| (CDR G166252)) (|a| NIL)) @@ -368,9 +367,7 @@ (|printDec| (SECOND (CAR |argList|)) |a| |asps| |fp|))))) (SPADLET |argList| (NREVERSE |argList|)) - (WRITE-LINE - (MAKESTRING - " xdrstdio_create(&xdrs, stdin, XDR_DECODE);") + (WRITE-LINE" xdrstdio_create(&xdrs, stdin, XDR_DECODE);" |fp|) (DO ((G166263 |argList| (CDR G166263)) (|a| NIL)) ((OR (ATOM G166263) @@ -385,16 +382,16 @@ (COND ((NULL (MEMQ (CAR |a|) (APPEND |dummies| |asps|))) - (|writeXDR| |a| (MAKESTRING "&xdrs") + (|writeXDR| |a| "&xdrs" |fp|))))))) (COND (|returnType| - (|wt| (CONS (MAKESTRING " ") + (|wt| (CONS " " (CONS |returnName| - (CONS (MAKESTRING "=") NIL))) + (CONS "=" NIL))) |fp|)) - ('T (|wt| (CONS (MAKESTRING " ") NIL) |fp|))) - (|wt| (CONS |routineName| (CONS (MAKESTRING "(") NIL)) + ('T (|wt| (CONS " " NIL) |fp|))) + (|wt| (CONS |routineName| (CONS "(" NIL)) |fp|) (COND ((CAR |fortranArgs|) @@ -407,21 +404,19 @@ (PROGN (SETQ |a| (CAR G166274)) NIL)) NIL) (SEQ (EXIT (PROGN - (PRINC (MAKESTRING ",") |fp|) + (PRINC "," |fp|) (|printCName| |a| (|isPointer?| |a| |decls|) |asps| |fp|))))) (|writeStringLengths| |fortranArgs| |decls| |fp|) - (WRITE-LINE (MAKESTRING ");") |fp|) - (WRITE-LINE - (MAKESTRING - " xdrstdio_create(&xdrs, stdout, XDR_ENCODE);") + (WRITE-LINE ");" |fp|) + (WRITE-LINE " xdrstdio_create(&xdrs, stdout, XDR_ENCODE);" |fp|) (COND (|returnType| (|writeXDR| (CONS |returnName| (CONS (|getCType| |returnType|) NIL)) - (MAKESTRING "&xdrs") |fp|))) + "&xdrs" |fp|))) (DO ((G166283 |results| (CDR G166283)) (|r| NIL)) ((OR (ATOM G166283) (PROGN (SETQ |r| (CAR G166283)) NIL)) @@ -432,10 +427,10 @@ (|getCType| (|getFortranType| |r| |decls|)) NIL)) - (MAKESTRING "&xdrs") |fp|)))) - (WRITE-LINE (MAKESTRING " exit(0);") |fp|) - (WRITE-LINE (MAKESTRING " }") |fp|) - (WRITE-LINE (MAKESTRING "}") |fp|)))))) + "&xdrs" |fp|)))) + (WRITE-LINE " exit(0);" |fp|) + (WRITE-LINE " }" |fp|) + (WRITE-LINE "}" |fp|)))))) ;writeStringLengths(fortranArgs,decls,fp) == ; for a in fortranArgs repeat @@ -448,9 +443,9 @@ NIL) (SEQ (EXIT (COND ((|isString?| |a| |decls|) - (|wt| (CONS (MAKESTRING ",&") + (|wt| (CONS ",&" (CONS |a| - (CONS (MAKESTRING "_length") NIL))) + (CONS "_length" NIL))) |fp|)) ('T NIL))))))) @@ -493,7 +488,7 @@ (COND (|$addUnderscoreToFortranNames| (PRINC (STRING 95) |fp|)) ('T NIL))) - ('T (COND ((NULL |ispointer|) (PRINC (MAKESTRING "&") |fp|))) + ('T (COND ((NULL |ispointer|) (PRINC "&" |fp|))) (PRINC |u| |fp|)))) ;getFortranType(u,decls) == @@ -538,8 +533,7 @@ (COND (|result| |result|) ('T - (|error| (CONS (MAKESTRING - "Undeclared Fortran parameter: ") + (|error| (CONS "Undeclared Fortran parameter: " (CONS |u| NIL)))))))))) ;getCType t == @@ -565,25 +559,25 @@ ((LISTP |t|) (COND ((BOOT-EQUAL (CAR |t|) '|character|) - (CONS (MAKESTRING "char") (CDR |t|))) + (CONS "char" (CDR |t|))) ((BOOT-EQUAL (CAR |t|) '|complex|) - (CONS (MAKESTRING "float") (CONS 2 (CDR |t|)))) + (CONS "float" (CONS 2 (CDR |t|)))) ((BOOT-EQUAL (CAR |t|) '|double complex|) - (CONS (MAKESTRING "double") (CONS 2 (CDR |t|)))) + (CONS "double" (CONS 2 (CDR |t|)))) ('T (CONS (|getCType| (CAR |t|)) (CDR |t|))))) - ((BOOT-EQUAL |t| '|double|) (MAKESTRING "double")) - ((BOOT-EQUAL |t| '|double precision|) (MAKESTRING "double")) - ((BOOT-EQUAL |t| '|integer|) (MAKESTRING "int")) - ((BOOT-EQUAL |t| '|real|) (MAKESTRING "float")) - ((BOOT-EQUAL |t| '|logical|) (MAKESTRING "int")) + ((BOOT-EQUAL |t| '|double|) "double") + ((BOOT-EQUAL |t| '|double precision|) "double") + ((BOOT-EQUAL |t| '|integer|) "int") + ((BOOT-EQUAL |t| '|real|) "float") + ((BOOT-EQUAL |t| '|logical|) "int") ((BOOT-EQUAL |t| '|character|) - (CONS (MAKESTRING "char") (CONS 1 NIL))) + (CONS "char" (CONS 1 NIL))) ((BOOT-EQUAL |t| '|complex|) - (CONS (MAKESTRING "float") (CONS 2 NIL))) + (CONS "float" (CONS 2 NIL))) ((BOOT-EQUAL |t| '|double complex|) - (CONS (MAKESTRING "double") (CONS 2 NIL))) + (CONS "double" (CONS 2 NIL))) ('T - (|error| (CONS (MAKESTRING "Unrecognised Fortran type: ") + (|error| (CONS "Unrecognised Fortran type: " (CONS |t| NIL)))))) ;XDRFun t == @@ -597,9 +591,9 @@ (COND ((LISTP (SPADLET |ty| (SECOND |t|))) (COND - ((BOOT-EQUAL (CAR |ty|) (MAKESTRING "char")) - (MAKESTRING "wrapstring")) - ('T (MAKESTRING "array")))) + ((BOOT-EQUAL (CAR |ty|) "char") + "wrapstring") + ('T "array"))) ('T |ty|))))) ;printDec(type,dec,asps,fp) == @@ -619,9 +613,9 @@ (DEFUN |printDec| (|type| |dec| |asps| |fp|) (declare (special |$addUnderscoreToFortranNames|)) (PROGN - (|wt| (CONS (MAKESTRING " ") + (|wt| (CONS " " (CONS (COND ((LISTP |type|) (CAR |type|)) ('T |type|)) - (CONS (MAKESTRING " ") NIL))) + (CONS " " NIL))) |fp|) (COND ((|member| |dec| |asps|) @@ -629,21 +623,21 @@ (|$addUnderscoreToFortranNames| (|wl| (CONS |dec| (CONS (STRING 95) - (CONS (MAKESTRING "();") NIL))) + (CONS "();" NIL))) |fp|)) - ('T (|wl| (CONS |dec| (CONS (MAKESTRING "();") NIL)) |fp|)))) + ('T (|wl| (CONS |dec| (CONS "();" NIL)) |fp|)))) ((LISTP |type|) - (|wl| (CONS (MAKESTRING "*") - (CONS |dec| (CONS (MAKESTRING " = NULL;") NIL))) + (|wl| (CONS "*" + (CONS |dec| (CONS " = NULL;" NIL))) |fp|) - (|wl| (CONS (MAKESTRING " u_int ") - (CONS |dec| (CONS (MAKESTRING "_length = 0;") NIL))) + (|wl| (CONS " u_int " + (CONS |dec| (CONS "_length = 0;" NIL))) |fp|)) - ((BOOT-EQUAL |type| (MAKESTRING "char")) - (|wl| (CONS (MAKESTRING "*") - (CONS |dec| (CONS (MAKESTRING " = NULL;") NIL))) + ((BOOT-EQUAL |type| "char") + (|wl| (CONS "*" + (CONS |dec| (CONS " = NULL;" NIL))) |fp|)) - ('T (|wl| (CONS |dec| (CONS (MAKESTRING ";") NIL)) |fp|))))) + ('T (|wl| (CONS |dec| (CONS ";" NIL)) |fp|))))) ;writeXDR(v,str,fp) == ; -- Generate the calls to the filters which will read from the temp @@ -661,30 +655,30 @@ (RETURN (PROGN (SPADLET |underscore| (STRING (CHAR '|_:| 0))) - (|wt| (CONS (MAKESTRING " CHECK(xdr") + (|wt| (CONS " CHECK(xdr" (CONS |underscore| (CONS (|XDRFun| |v|) - (CONS (MAKESTRING "(") + (CONS "(" (CONS |str| - (CONS (MAKESTRING ",&") + (CONS ",&" (CONS (CAR |v|) NIL))))))) |fp|) (COND ((AND (LISTP (SPADLET |ty| (SECOND |v|))) - (NULL (BOOT-EQUAL (CAR |ty|) (MAKESTRING "char")))) - (|wt| (CONS (MAKESTRING ",&") + (NULL (BOOT-EQUAL (CAR |ty|) "char"))) + (|wt| (CONS ",&" (CONS (CAR |v|) - (CONS (MAKESTRING "_length,MAX_ARRAY(") + (CONS "_length,MAX_ARRAY(" (CONS (CAR |v|) - (CONS (MAKESTRING "_length),") NIL))))) + (CONS "_length)," NIL))))) |fp|) - (|wt| (CONS (MAKESTRING "sizeof(") + (|wt| (CONS "sizeof(" (CONS (CAR |ty|) - (CONS (MAKESTRING "),xdr") + (CONS "),xdr" (CONS |underscore| (CONS (CAR |ty|) NIL))))) |fp|))) - (|wl| (CONS (MAKESTRING "));") NIL) |fp|))))) + (|wl| (CONS "));" NIL) |fp|))))) ;prefix2Infix(l) == ; atom(l) => [l] @@ -706,8 +700,7 @@ (APPEND (|prefix2Infix| (THIRD |l|)) (CONS '|)| NIL)))))) ('T - (|error| (MAKESTRING - "Function in array dimensions with more than two arguments"))))) + (|error| "Function in array dimensions with more than two arguments")))) ;writeMalloc(name,type,dims,fp) == ; -- Write out a malloc for array arguments @@ -724,9 +717,9 @@ (PROG () (RETURN (SEQ (PROGN - (|wl| (CONS (MAKESTRING " ") + (|wl| (CONS " " (CONS |name| - (CONS (MAKESTRING "_length=") + (CONS "_length=" (CONS (|prefix2Infix| (CAR |dims|)) (APPEND @@ -749,35 +742,31 @@ (APPEND G166377 (CONS '* (|prefix2Infix| |u|))))))))) - (CONS (MAKESTRING ";") NIL)))))) + (CONS ";" NIL)))))) |fp|) (COND - ((BOOT-EQUAL |type| (MAKESTRING "char")) - (|wl| (CONS (MAKESTRING " ") + ((BOOT-EQUAL |type| "char") + (|wl| (CONS " " (CONS |name| - (CONS (MAKESTRING "=(") + (CONS "=(" (CONS |type| (CONS '| *)malloc((1+| (CONS |name| - (CONS - (MAKESTRING - "_length)*sizeof(") + (CONS "_length)*sizeof(" (CONS |type| - (CONS (MAKESTRING "));") + (CONS "));" NIL))))))))) |fp|)) ('T - (|wl| (CONS (MAKESTRING " ") + (|wl| (CONS " " (CONS |name| - (CONS (MAKESTRING "=(") + (CONS "=(" (CONS |type| (CONS '| *)malloc(| (CONS |name| - (CONS - (MAKESTRING - "_length*sizeof(") + (CONS "_length*sizeof(" (CONS |type| - (CONS (MAKESTRING "));") + (CONS "));" NIL))))))))) |fp|)))))))) @@ -854,8 +843,8 @@ (CONS '|ThreeDimensionalMatrix| (CONS (|spadTypeTTT| (CAR |u|)) NIL))) ('T - (|error| (MAKESTRING - "Can only handle one-, two- and three-dimensional matrices"))))) + (|error| + "Can only handle one-, two- and three-dimensional matrices")))) ((BOOT-EQUAL |u| '|double|) (CONS '|DoubleFloat| NIL)) ((BOOT-EQUAL |u| '|double precision|) (CONS '|DoubleFloat| NIL)) ((BOOT-EQUAL |u| '|real|) (CONS '|DoubleFloat| NIL)) @@ -867,7 +856,7 @@ ((BOOT-EQUAL |u| '|double complex|) (CONS '|Complex| (CONS (CONS '|DoubleFloat| NIL) NIL))) ('T - (|error| (CONS (MAKESTRING "Unrecognised Fortran type: ") + (|error| (CONS "Unrecognised Fortran type: " (CONS |u| NIL)))))) ;mkQuote l == @@ -1020,7 +1009,7 @@ (CONS (INTERN (STRCONC (STRINGIMAGE |u|) - (MAKESTRING "_arg"))) + "_arg")) G166484)))))))) (SPADLET |aType| (PROG (G166499) @@ -1081,7 +1070,7 @@ (CONS (INTERN (STRCONC (STRINGIMAGE |u|) - (MAKESTRING "_arg"))) + "_arg")) G166530)))))))))) (DO ((G166545 |asps| (CDR G166545)) (|u| NIL)) ((OR (ATOM G166545) @@ -1091,7 +1080,7 @@ (|delete| (INTERN (STRCONC (STRINGIMAGE |u|) - (MAKESTRING "_arg"))) + "_arg")) |fargNames|))))) (SPADLET |resPar| (CONS '|construct| @@ -1133,8 +1122,8 @@ (COND (|asps| (SPADLET |aspId| (STRCONC (|getEnv| - (MAKESTRING "SPADNUM")) - (GENTEMP (MAKESTRING "NAG")))) + "SPADNUM") + (GENTEMP "NAG"))) (SPADLET |body| (CONS 'SEQ (APPEND @@ -1320,14 +1309,14 @@ (CONS (CONS (CONS '|$elt| (CONS 'FOP (CONS '|pushFortranOutputStack| NIL))) (CONS (CONS '|filename| - (CONS (MAKESTRING "") + (CONS "" (CONS (STRCONC (STRINGIMAGE |asp|) |aspId|) - (CONS (MAKESTRING "f") NIL)))) + (CONS "f" NIL)))) NIL)) (CONS (|makeOutputAsFortran| (INTERN (STRCONC (STRINGIMAGE |asp|) - (MAKESTRING "_arg")))) + "_arg"))) (CONS (CONS (CONS '|$elt| (CONS 'FOP (CONS '|popFortranOutputStack| @@ -1380,13 +1369,13 @@ (SETQ G166652 (CONS (STRCONC (STRINGIMAGE |a|) - |aspId| (MAKESTRING ".f")) + |aspId| ".f") G166652)))))))) (CONS |$fortranCompilerName| - (CONS (STRCONC |file| (MAKESTRING ".o")) + (CONS (STRCONC |file| ".o") (CONS (STRCONC |file| - (MAKESTRING ".spadexe")) + ".spadexe") (CONS |$fortranLibraries| NIL)))))))))) ;compileAndLink(fortFileList,fortCompiler,cFile,outFile,linkerArgs) == @@ -1791,8 +1780,7 @@ |els|))))))) ('T (|error| (CONS - (MAKESTRING - "Can't cope with complex output dimensions higher than 2") + "Can't cope with complex output dimensions higher than 2" NIL)))) (SPADLET |spadForms| (CONS @@ -1887,8 +1875,7 @@ |els|))))))) ('T (|error| (CONS - (MAKESTRING - "Can't cope with logical output dimensions higher than 2") + "Can't cope with logical output dimensions higher than 2" NIL)))) (SPADLET |spadForms| (CONS @@ -2035,8 +2022,7 @@ |els|))))))) ('T (|error| (CONS - (MAKESTRING - "Can't cope with output dimensions higher than 3") + "Can't cope with output dimensions higher than 3" NIL)))) (COND ((NULL (MEMQ 0 |dims|)) @@ -2062,9 +2048,7 @@ |ty| |fort|) |spadForms|))) ('T - (|error| (CONS - (MAKESTRING - "Unrecognised output format: ") + (|error| (CONS "Unrecognised output format: " (CONS |fort| NIL))))))))) (NREVERSE |spadForms|)))))) @@ -2093,7 +2077,7 @@ ((BOOT-EQUAL |u| '|complex|) 'SHORT-FLOAT) ((BOOT-EQUAL |u| '|double complex|) 'DOUBLE-FLOAT) ('T - (|error| (CONS (MAKESTRING "Unrecognised Fortran type: ") + (|error| (CONS "Unrecognised Fortran type: " (CONS |u| NIL)))))) ;getVal(u,names,values) == @@ -2131,8 +2115,7 @@ ((SPADLET |place| (POSITION |u| |names|)) (NTH |place| |values|)) ('T - (|error| (CONS (MAKESTRING - "No value found for parameter: ") + (|error| (CONS "No value found for parameter: " (CONS |u| NIL))))))))) ;prepareData(args,dummies,values,decls) == @@ -2260,8 +2243,7 @@ (EXIT (|makeVector| (CONS |longZero| (CONS |longZero| NIL)) 'LONG-FLOAT))) - (EXIT (|error| (CONS (MAKESTRING - "Unrecognised Fortran type: ") + (EXIT (|error| (CONS "Unrecognised Fortran type: " (CONS |type| NIL)))))))) (DEFUN |prepareResults| (|results| |args| |dummies| |values| |decls|) @@ -2515,18 +2497,18 @@ (DEFUN |generateDataName| () (declare (special |$fortranTmpDir|)) - (STRCONC |$fortranTmpDir| (|getEnv| (MAKESTRING "HOST")) - (|getEnv| (MAKESTRING "SPADNUM")) - (GENTEMP (MAKESTRING "NAG")) (MAKESTRING "data"))) + (STRCONC |$fortranTmpDir| (|getEnv| "HOST") + (|getEnv| "SPADNUM") + (GENTEMP "NAG") "data")) ;generateResultsName()==STRCONC($fortranTmpDir,getEnv('"HOST"), ; getEnv('"SPADNUM"), GENTEMP('"NAG"),'"results") (DEFUN |generateResultsName| () (declare (special |$fortranTmpDir|)) - (STRCONC |$fortranTmpDir| (|getEnv| (MAKESTRING "HOST")) - (|getEnv| (MAKESTRING "SPADNUM")) - (GENTEMP (MAKESTRING "NAG")) (MAKESTRING "results"))) + (STRCONC |$fortranTmpDir| (|getEnv| "HOST") + (|getEnv| "SPADNUM") + (GENTEMP "NAG") "results")) ;fortCall(objFile,data,results) == ; tmpFile1 := writeData(generateDataName(),data) @@ -2621,8 +2603,8 @@ (PROGN (SPADLET |nagMessagesString| (COND - (|$nagMessages| (MAKESTRING "on")) - ('T (MAKESTRING "off")))) + (|$nagMessages| "on") + ('T "off"))) (|writeData| |tmpFiled| |data|) (SPADLET |toSend| (STRCONC |$nagHost| '| | |nfile| '| | |tmpFiler| '| | @@ -2635,10 +2617,8 @@ ((EQL (|sockGetInt| 8) 1) (SPADLET |results| (|readData| |tmpFiler| |results|))) ('T - (|error| (CONS (MAKESTRING - "An error was detected while reading data: ") - (CONS (MAKESTRING - "perhaps an incorrect array index was given ?") + (|error| (CONS "An error was detected while reading data: " + (CONS "perhaps an incorrect array index was given ?" NIL))))) |results|)))) diff --git a/src/interp/functor.lisp.pamphlet b/src/interp/functor.lisp.pamphlet index 15a34b6..95670e5 100644 --- a/src/interp/functor.lisp.pamphlet +++ b/src/interp/functor.lisp.pamphlet @@ -70,8 +70,7 @@ ('T (SPADLET |$Sublis| (CONS (CONS (|keyItem| D) '|original|) NIL)) - (SAY (MAKESTRING - "-----------------------------------------------------------------------")) + (SAY "-----------------------------------------------------------------------") (|DomainPrint1| D NIL |env|) (DO () ((NULL |$WhereList|) NIL) (SEQ (EXIT (PROGN @@ -88,15 +87,13 @@ (PROGN (TERPRI) (SAY - (CONS (MAKESTRING "Where ") + (CONS "Where " (CONS (CAR |u|) - (CONS (MAKESTRING " is:") + (CONS " is:" NIL)))) (|DomainPrint1| (CDR |u|) |brief| |env|))))))))) - (SAY (MAKESTRING - "-----------------------------------------------------------------------" - ))))))))) + (SAY "-----------------------------------------------------------------------" ))))))))) ;DomainPrint1(D,brief,$e) == @@ -172,7 +169,7 @@ (CONS (CONS (CDR |u|) (INTERNL - (STRCONC (MAKESTRING "View") + (STRCONC "View" (STRINGIMAGE |i|)))) G166124))))))) |$Sublis|)) @@ -185,14 +182,12 @@ ((AND |brief| (> |i| 1)) NIL) ('T (SPADLET |uu| (COPY-SEQ (CDR |u|))) (SETELT |uu| 4 - (MAKESTRING "This domain")) + "This domain") (COND ((NULL |brief|) - (SAY (CONS (MAKESTRING "View number ") + (SAY (CONS "View number " (CONS |i| - (CONS - (MAKESTRING - " corresponding to categories:") + (CONS " corresponding to categories:" NIL)))) (PRETTYPRINT (CAR |u|)))) (COND @@ -237,9 +232,7 @@ ((> |i| 1) (SETELT |uu| 1 (SETELT |uu| 2 - (SETELT |uu| 5 - (MAKESTRING - "As in first view")))))) + (SETELT |uu| 5 "As in first view"))))) (DO ((G166170 (MAXINDEX |uu|)) (|i| 6 (+ |i| 1))) ((> |i| G166170) NIL) @@ -309,7 +302,7 @@ (RETURN (PROGN (SPADLET |name| - (INTERNL (STRCONC (MAKESTRING "Where") + (INTERNL (STRCONC "Where" (STRINGIMAGE |$WhereCounter|)))) (SPADLET |$WhereCounter| (PLUS |$WhereCounter| 1)) |name|)))) @@ -585,8 +578,7 @@ (SEQ (COND ((ATOM |u|) |u|) ((NULL (ATOM (CAR |u|))) - (|error| (CONS (MAKESTRING - "compCategories: need an atom in operator position") + (|error| (CONS "compCategories: need an atom in operator position" (CONS (CAR |u|) NIL)))) ((BOOT-EQUAL (CAR |u|) '|Record|) (CONS (CAR |u|) @@ -641,20 +633,18 @@ ('T (SPADLET |v| (|get| (CAR |u|) '|modemap| |$e|)) (COND ((ATOM |v|) - (|error| (CONS (MAKESTRING - "compCategories: could not get proper modemap for operator") + (|error| (CONS + "compCategories: could not get proper modemap for operator" (CONS (CAR |u|) NIL)))) ('T (COND ((CDR |v|) (|sayBrightly| - (CONS (MAKESTRING "compCategories: ") + (CONS "compCategories: " (CONS '|%b| - (CONS (MAKESTRING "Warning") + (CONS "Warning" (CONS '|%d| - (CONS - (MAKESTRING - "ignoring unexpected stuff at end of modemap") + (CONS "ignoring unexpected stuff at end of modemap" NIL)))))) (|pp| (CDR |v|)))) (COND @@ -943,7 +933,7 @@ (AND (PAIRP |ISTMP#1|) (EQ (QCDR |ISTMP#1|) NIL) (PROGN (SPADLET |v| (QCAR |ISTMP#1|)) 'T)))) |v|) - ('T (|systemErrorHere| (MAKESTRING "optFunctorBodyRequote"))))))) + ('T (|systemErrorHere| "optFunctorBodyRequote")))))) ;optFunctorPROGN l == ; l is [x,:l'] => @@ -1656,7 +1646,7 @@ (SPADLET |$supplementaries| (S- |$supplementaries| |slist|)) (PRETTYPRINT (CONS |instantiator| - (CONS (MAKESTRING " should solve") NIL))) + (CONS " should solve" NIL))) (PRETTYPRINT |slist|) (SPADLET |slist| (PROG (G167031) @@ -2248,25 +2238,13 @@ (CONS |instantiatedBase| (CONS - (INTERN - (MAKESTRING - "START1") - (MAKESTRING - "KEYWORD")) + (INTERN "START1" "KEYWORD") (CONS |count| (CONS - (INTERN - (MAKESTRING - "START2") - (MAKESTRING - "KEYWORD")) + (INTERN "START2" "KEYWORD") (CONS |i| (CONS - (INTERN - (MAKESTRING - "END2") - (MAKESTRING - "KEYWORD")) + (INTERN "END2" "KEYWORD") (CONS (PLUS |j| 1) NIL))))))))) @@ -2697,7 +2675,7 @@ ((AND (PAIRP |code|) (EQ (QCAR |code|) 'QSETREFV)) |code|) ('T (|stackWarning| - (CONS (MAKESTRING "unknown Functor code ") + (CONS "unknown Functor code " (CONS |code| NIL))) |code|)))))) @@ -3134,7 +3112,7 @@ ((NULL |v|) NIL) ((ATOM |v|) (|systemErrorHere| - (MAKESTRING "CheckVector"))) + "CheckVector")) ((ATOM (CAR |v|)) (DO ((G168015 |$catNames| (CDR G168015)) @@ -4355,7 +4333,7 @@ (COND ((EQL (LENGTH |l|) 1) (CAR |l|)) ('T (CONS 'OR |l|)))))) - ('T (|systemErrorHere| (MAKESTRING "ICformat")))))))) + ('T (|systemErrorHere| "ICformat"))))))) ;partPessimise(a,trueconds) == ; atom a => a @@ -4395,7 +4373,7 @@ (SPADLET |LETTMP#1| (OR (|compMakeCategoryObject| |u| |$e|) (|systemErrorHere| - (MAKESTRING "getPossibleViews")))) + "getPossibleViews"))) (SPADLET |vec| (CAR |LETTMP#1|)) (SPADLET |views| (PROG (G168961) @@ -4440,7 +4418,7 @@ (SPADLET |LETTMP#1| (OR (|compMakeCategoryObject| |u| |$e|) (|systemErrorHere| - (MAKESTRING "getViewsConditions")))) + "getViewsConditions"))) (SPADLET |vec| (CAR |LETTMP#1|)) (SPADLET |views| (PROG (G168990) diff --git a/src/interp/g-boot.lisp.pamphlet b/src/interp/g-boot.lisp.pamphlet index fc2e5ef..f2da45f 100644 --- a/src/interp/g-boot.lisp.pamphlet +++ b/src/interp/g-boot.lisp.pamphlet @@ -1066,7 +1066,7 @@ (MKPROGN (CONS |l1| (APPEND |l2| (CONS |name| NIL))))))) ('T (SPADLET |g| - (INTERN (STRCONC (MAKESTRING "LETTMP#") + (INTERN (STRCONC "LETTMP#" (STRINGIMAGE |$letGenVarCounter|)))) (SPADLET |$letGenVarCounter| (PLUS |$letGenVarCounter| 1)) (SPADLET |rhs'| (CONS $LET (CONS |g| (CONS |rhs| NIL)))) @@ -1203,7 +1203,7 @@ (SPADLET |patrev| (|defISReverse| |var2| |var1|)) (SPADLET |rev| (CONS 'REVERSE (CONS |rhs| NIL))) (SPADLET |g| - (INTERN (STRCONC (MAKESTRING "LETTMP#") + (INTERN (STRCONC "LETTMP#" (STRINGIMAGE |$letGenVarCounter|)))) (SPADLET |$letGenVarCounter| (PLUS |$letGenVarCounter| 1)) (SPADLET |l2| (|defLET2| |patrev| |g|)) @@ -1443,7 +1443,7 @@ (CONS 'EQUAL (CONS |lhs| (CONS |a| NIL)))) ((PAIRP |lhs|) (SPADLET |g| - (INTERN (STRCONC (MAKESTRING "ISTMP#") + (INTERN (STRCONC "ISTMP#" (STRINGIMAGE |$isGenVarCounter|)))) (SPADLET |$isGenVarCounter| (PLUS |$isGenVarCounter| 1)) (MKPROGN (CONS (CONS $LET (CONS |g| (CONS |lhs| NIL))) diff --git a/src/interp/g-cndata.lisp.pamphlet b/src/interp/g-cndata.lisp.pamphlet index ece9995..79474cc 100644 --- a/src/interp/g-cndata.lisp.pamphlet +++ b/src/interp/g-cndata.lisp.pamphlet @@ -663,7 +663,7 @@ (|throwKeyedMsg| 'S2IL0014 (CONS |op| (CONS (|plural| (|#| |argtypes|) - (MAKESTRING "argument")) + "argument") (CONS (|bright| (|#| |arglist|)) NIL))))) ('T (PROG (G166428) diff --git a/src/interp/g-error.lisp.pamphlet b/src/interp/g-error.lisp.pamphlet index 2040ed0..70ccab7 100644 --- a/src/interp/g-error.lisp.pamphlet +++ b/src/interp/g-error.lisp.pamphlet @@ -119,7 +119,7 @@ (EQ (QCAR |errorMsg|) '|mathprint|)) |errorMsg|) ((NULL (PAIRP |errorMsg|)) - (CONS (MAKESTRING " ") + (CONS " " (CONS |errorMsg| NIL))) ('T (setq |splitmsg| 'T) (COND @@ -152,7 +152,7 @@ (CONS '|%l| (CONS " " (CONS |u| NIL)))))))))))) - ('T (CONS (MAKESTRING " ") |errorMsg|)))))) + ('T (CONS " " |errorMsg|)))))) (|sayErrorly| |errorLabel| |msg|) (|handleLispBreakLoop| |$BreakMode|))))))) @@ -308,11 +308,11 @@ (PROGN (setq *STANDARD-OUTPUT* |$texOutputStream|) (setq |old| (|pushSatOutput| '|line|)) - (|sayString| (MAKESTRING "\\bgroup\\color{red}")) - (|sayString| (MAKESTRING "\\begin{verbatim}")) + (|sayString| "\\bgroup\\color{red}") + (|sayString| "\\begin{verbatim}") (|sayErrorly1| |errorLabel| |msg|) - (|sayString| (MAKESTRING "\\end{verbatim}")) - (|sayString| (MAKESTRING "\\egroup")) + (|sayString| "\\end{verbatim}") + (|sayString| "\\egroup") (|popSatOutput| |old|))))) ;sayErrorly1(errorLabel, msg) == @@ -329,7 +329,7 @@ (DECLARE (SPECIAL |$testingErrorPrefix|)) (RETURN (PROGN - (|sayBrightly| (MAKESTRING " ")) + (|sayBrightly| " ") (COND (|$testingSystem| (|sayMSG| |$testingErrorPrefix|))) (|sayBrightly| (CONS " >> " (CONS |errorLabel| (CONS ":" NIL)))) diff --git a/src/interp/g-opt.lisp.pamphlet b/src/interp/g-opt.lisp.pamphlet index 4eed8de..2c4a645 100644 --- a/src/interp/g-opt.lisp.pamphlet +++ b/src/interp/g-opt.lisp.pamphlet @@ -96,16 +96,16 @@ (COND (|$reportOptimization| (|sayBrightlyI| - (|bright| (MAKESTRING "Original LISP code:"))) + (|bright| "Original LISP code:")) (|pp| |def|))) (SPADLET |def'| (|optimize| (COPY |def|))) (COND (|$reportOptimization| (|sayBrightlyI| - (|bright| (MAKESTRING "Optimized LISP code:"))) + (|bright| "Optimized LISP code:")) (|pp| |def'|) (|sayBrightlyI| - (|bright| (MAKESTRING "Final LISP code:"))))) + (|bright| "Final LISP code:")))) (SPADLET |name| (CAR |def'|)) (SPADLET |slamOrLam| (CAADR |def'|)) (SPADLET |args| (CADADR |def'|)) @@ -169,8 +169,7 @@ (EXIT (RPLAC (CAR |x|) |body|))) (IF (NULL (<= (LENGTH |argl|) (LENGTH |a|))) (SEQ (SAY - (MAKESTRING - "length mismatch in XLAM expression")) + "length mismatch in XLAM expression") (EXIT (PRETTYPRINT |y|))) NIL) (EXIT (RPLAC (CAR |x|) @@ -504,7 +503,7 @@ ('T (RPLAC (CAR |x|) 'SPADCALL) (COND (|$QuickCode| (RPLACA |fn| 'QREFELT))) (RPLAC (CDR |x|) (APPEND |a| (CONS |fn| NIL))) |x|))) - ('T (|systemErrorHere| (MAKESTRING "optCall")))))))))) + ('T (|systemErrorHere| "optCall"))))))))) ;optCallSpecially(q,x,n,R) == ; y:= LASSOC(R,$specialCaseKeyList) => optSpecialCall(x,y,n) @@ -701,7 +700,7 @@ ((NULL (SPADLET |name| (BPINAME |u|))) (|keyedSystemError| 'S2OO0001 (CONS |u| NIL))) ((BOOT-EQUAL |name| '|Undef|) - (MOAN (MAKESTRING "optimiser found unknown function"))) + (MOAN "optimiser found unknown function")) ('T |name|))))) ;optMkRecord ["mkRecord",:u] == @@ -1366,7 +1365,7 @@ ;optRECORDCOPY ["RECORDCOPY",name,len] == ; len=1 => ["LIST",["CAR",name]] ; len=2 => ["CONS",["CAR",name],["CDR",name]] -; ["MOVEVEC",["MAKE_-VEC",len],name] +; ["MOVEVEC",["MAKE_-ARRAY",len],name] (DEFUN |optRECORDCOPY| (G167262) (PROG (|name| |len|) diff --git a/src/interp/g-timer.lisp.pamphlet b/src/interp/g-timer.lisp.pamphlet index 7d2f981..3aa0761 100644 --- a/src/interp/g-timer.lisp.pamphlet +++ b/src/interp/g-timer.lisp.pamphlet @@ -75,10 +75,10 @@ (SPADDIFFERENCE 70 (|#| |strname|)) (|#| |strval|)) - (MAKESTRING ".")) + ".") (|bright| |strval|))))))) (|sayBrightly| - (|bright| (|fillerSpaces| 72 (MAKESTRING "-")))) + (|bright| (|fillerSpaces| 72 "-"))) (|sayBrightly| (|concat| (|bright| "Total") (|fillerSpaces| @@ -133,7 +133,7 @@ (RETURN (SEQ (PROGN (SPADLET |total| 0) - (SPADLET |str| (MAKESTRING "")) + (SPADLET |str| "") (SPADLET |otherStatTotal| (GETL '|other| |property|)) (DO ((G166123 |listofnames| (CDR G166123)) (G166105 NIL)) @@ -163,7 +163,7 @@ (SPADLET |timestr| (|normalizeStatAndStringify| |n|))) - ('T (SPADLET |timestr| (MAKESTRING "")) + ('T (SPADLET |timestr| "") (SPADLET |otherStatTotal| (PLUS |otherStatTotal| |n|)))) (SPADLET |str| @@ -186,7 +186,7 @@ (GETL |cl| |classproperty|))))) (COND ((NEQUAL |flag| '|long|) (SPADLET |total| 0) - (SPADLET |str| (MAKESTRING "")) + (SPADLET |str| "") (DO ((G166136 |listofclasses| (CDR G166136)) (G166112 NIL)) ((OR (ATOM G166136) @@ -216,8 +216,8 @@ (STRCONC (|normalizeStatAndStringify| |total|) " " |units|)) (COND - ((BOOT-EQUAL |str| (MAKESTRING "")) |total|) - ('T (STRCONC |str| (MAKESTRING " = ") |total|)))))))) + ((BOOT-EQUAL |str| "") |total|) + ('T (STRCONC |str| " = " |total|)))))))) ;normalizeStatAndStringify t == ; RNUMP t => @@ -238,16 +238,16 @@ (COND ((RNUMP |t|) (SPADLET |t| (|roundStat| |t|)) (COND - ((BOOT-EQUAL |t| 0.0) (MAKESTRING "0")) - ('T (FORMAT NIL (MAKESTRING "~,2F") |t|)))) + ((BOOT-EQUAL |t| 0.0) "0") + ('T (FORMAT NIL "~,2F" |t|)))) ((integerp |t|) (SPADLET K 1024) (SPADLET M (TIMES K K)) (COND ((> |t| (TIMES 9 M)) (CONCAT (STRINGIMAGE (QUOTIENT (PLUS |t| (TIMES 512 K)) M)) - (MAKESTRING "M"))) + "M")) ((> |t| (TIMES 9 K)) (CONCAT (STRINGIMAGE (QUOTIENT (PLUS |t| 512) K)) - (MAKESTRING "K"))) + "K")) ('T (STRINGIMAGE |t|)))) ('T (STRINGIMAGE |t|)))))) @@ -278,18 +278,18 @@ (PROG (|opening|) (RETURN (COND - ((BOOT-EQUAL |time| (MAKESTRING "")) |oldstr|) + ((BOOT-EQUAL |time| "") |oldstr|) ('T (SPADLET |opening| (COND - ((BOOT-EQUAL |flag| '|long|) (MAKESTRING "(")) - ('T (MAKESTRING " (")))) + ((BOOT-EQUAL |flag| '|long|) "(") + ('T " ("))) (COND - ((BOOT-EQUAL |oldstr| (MAKESTRING "")) - (STRCONC |time| |opening| |abb| (MAKESTRING ")"))) + ((BOOT-EQUAL |oldstr| "") + (STRCONC |time| |opening| |abb| ")")) ('T - (STRCONC |oldstr| (MAKESTRING " + ") |time| |opening| |abb| - (MAKESTRING ")"))))))))) + (STRCONC |oldstr| " + " |time| |opening| |abb| + ")")))))))) ;peekTimedName() == IFCAR $timedNameStack @@ -470,8 +470,8 @@ (DEFUN |printNamedStats| (|listofnames|) (PROGN (|printNamedStatsByProperty| |listofnames| '|TimeTotal|) - (|sayBrightly| (MAKESTRING " ")) - (|sayBrightly| (MAKESTRING "Space (in bytes):")) + (|sayBrightly| " ") + (|sayBrightly| "Space (in bytes):") (|printNamedStatsByProperty| |listofnames| '|SpaceTotal|))) ;makeLongTimeString(listofnames,listofclasses) == @@ -482,7 +482,7 @@ (DEFUN |makeLongTimeString| (|listofnames| |listofclasses|) (DECLARE (SPECIAL |$printTimeIfTrue|)) (|makeLongStatStringByProperty| |listofnames| |listofclasses| - '|TimeTotal| '|ClassTimeTotal| (MAKESTRING "sec") + '|TimeTotal| '|ClassTimeTotal| "sec" |$printTimeIfTrue|)) ;makeLongSpaceString(listofnames,listofclasses) == @@ -493,7 +493,7 @@ (DEFUN |makeLongSpaceString| (|listofnames| |listofclasses|) (DECLARE (SPECIAL |$printStorageIfTrue|)) (|makeLongStatStringByProperty| |listofnames| |listofclasses| - '|SpaceTotal| '|ClassSpaceTotal| (MAKESTRING "bytes") + '|SpaceTotal| '|ClassSpaceTotal| "bytes" |$printStorageIfTrue|)) ;computeElapsedTime() == diff --git a/src/interp/g-util.lisp.pamphlet b/src/interp/g-util.lisp.pamphlet index 7fe3921..ddf37c8 100644 --- a/src/interp/g-util.lisp.pamphlet +++ b/src/interp/g-util.lisp.pamphlet @@ -359,7 +359,7 @@ (COND ((EQL |nb| 0) |str|) (|nb| (SUBSTRING |str| |nb| NIL)) - ('T (MAKESTRING "")))))))) + ('T ""))))))) ;concat(:l) == concatList l @@ -726,13 +726,13 @@ ('T (SPADLET |target| (CAR |sig|)) (SPADLET |args| (CDR |sig|)) (SPADLET |target| (|formatUnabbreviated| |target|)) (COND - ((NULL |args|) (CONS (MAKESTRING "() -> ") |target|)) + ((NULL |args|) (CONS "() -> " |target|)) ((NULL (CDR |args|)) (APPEND (|formatUnabbreviated| (QCAR |args|)) - (CONS (MAKESTRING " -> ") |target|))) + (CONS " -> " |target|))) ('T (SPADLET |args| (|formatUnabbreviatedTuple| |args|)) - (CONS (MAKESTRING "(") - (APPEND |args| (CONS (MAKESTRING ") -> ") |target|)))))))))) + (CONS "(" + (APPEND |args| (CONS ") -> " |target|)))))))))) ;formatUnabbreviatedTuple t == ; -- t is a list of types @@ -783,7 +783,7 @@ (RETURN (COND ((ATOM |t|) (CONS |t| NIL)) - ((NULL |t|) (CONS (MAKESTRING "()") NIL)) + ((NULL |t|) (CONS "()" NIL)) ((AND (PAIRP |t|) (PROGN (SPADLET |p| (QCAR |t|)) @@ -798,7 +798,7 @@ 'T))))) (|member| |p| '(|:| ":"))) (CONS |sel| - (CONS (MAKESTRING ": ") (|formatUnabbreviated| |arg|)))) + (CONS ": " (|formatUnabbreviated| |arg|)))) ((AND (PAIRP |t|) (EQ (QCAR |t|) '|Union|) (PROGN (SPADLET |args| (QCDR |t|)) 'T)) (CONS '|Union| @@ -824,7 +824,7 @@ (AND (PAIRP |ISTMP#1|) (EQ (QCDR |ISTMP#1|) NIL) (PROGN (SPADLET |arg1| (QCAR |ISTMP#1|)) 'T)))) (CONS |arg| - (CONS (MAKESTRING " ") (|formatUnabbreviated| |arg1|)))) + (CONS " " (|formatUnabbreviated| |arg1|)))) ((AND (PAIRP |t|) (PROGN (SPADLET |arg| (QCAR |t|)) @@ -884,7 +884,7 @@ (SPADLET |parse| (OR (|ncParseFromString| |s|) (|systemError| - (MAKESTRING "String for TeX will not parse")))) + "String for TeX will not parse"))) (|parse2Outform| |parse|))))) ;parse2Outform x == @@ -1388,43 +1388,43 @@ ; ['"\endscroll",$charRbrace,'"scroll",$charLbrace,'"\end"]] (SPADLET |$HTmacs| - (CONS (CONS (MAKESTRING "\\beginmenu") + (CONS (CONS "\\beginmenu" (CONS |$charRbrace| - (CONS (MAKESTRING "menu") + (CONS "menu" (CONS |$charLbrace| - (CONS (MAKESTRING "\\begin") + (CONS "\\begin" NIL))))) - (CONS (CONS (MAKESTRING "\\endmenu") + (CONS (CONS "\\endmenu" (CONS |$charRbrace| - (CONS (MAKESTRING "menu") + (CONS "menu" (CONS |$charLbrace| - (CONS (MAKESTRING "\\end") NIL))))) - (CONS (CONS (MAKESTRING "\\beginitems") + (CONS "\\end" NIL))))) + (CONS (CONS "\\beginitems" (CONS |$charRbrace| - (CONS (MAKESTRING "items") + (CONS "items" (CONS |$charLbrace| - (CONS (MAKESTRING "\\begin") + (CONS "\\begin" NIL))))) - (CONS (CONS (MAKESTRING "\\enditems") + (CONS (CONS "\\enditems" (CONS |$charRbrace| - (CONS (MAKESTRING "items") + (CONS "items" (CONS |$charLbrace| - (CONS (MAKESTRING "\\end") + (CONS "\\end" NIL))))) (CONS (CONS - (MAKESTRING "\\beginscroll") + "\\beginscroll" (CONS |$charRbrace| - (CONS (MAKESTRING "scroll") + (CONS "scroll" (CONS |$charLbrace| - (CONS (MAKESTRING "\\begin") + (CONS "\\begin" NIL))))) (CONS (CONS - (MAKESTRING "\\endscroll") + "\\endscroll" (CONS |$charRbrace| - (CONS (MAKESTRING "scroll") + (CONS "scroll" (CONS |$charLbrace| - (CONS (MAKESTRING "\\end") + (CONS "\\end" NIL))))) NIL))))))) diff --git a/src/interp/hashcode.lisp.pamphlet b/src/interp/hashcode.lisp.pamphlet index c25ed57..25934d1 100644 --- a/src/interp/hashcode.lisp.pamphlet +++ b/src/interp/hashcode.lisp.pamphlet @@ -74,7 +74,7 @@ ('T (|hashString| (SYMBOL-NAME |type|))))) ((STRINGP |type|) (|hashCombine| (|hashString| |type|) - (|hashString| (MAKESTRING "Enumeration")))) + (|hashString| "Enumeration"))) ((AND (PAIRP |type|) (EQ (QCAR |type|) 'QUOTE) (PROGN (SPADLET |ISTMP#1| (QCDR |type|)) @@ -102,7 +102,7 @@ (SPADLET |hash| (|hashString| (SYMBOL-NAME |op|))) (COND ((BOOT-EQUAL |op| '|Mapping|) - (SPADLET |hash| (|hashString| (MAKESTRING "->"))) + (SPADLET |hash| (|hashString| "->")) (SPADLET |retType| (CAR |args|)) (SPADLET |mapArgs| (CDR |args|)) (DO ((G166088 |mapArgs| (CDR G166088)) @@ -214,7 +214,7 @@ ;--putConstructorProperty('LocalAlgebra,'coSig,'(NIL T T T)) ;--putConstructorProperty('Localize,'coSig,'(NIL T T T)) -(SPADLET |$VoidHash| (|hashString| (MAKESTRING "Void"))) +(SPADLET |$VoidHash| (|hashString| "Void")) @ \eject diff --git a/src/interp/ht-util.lisp.pamphlet b/src/interp/ht-util.lisp.pamphlet index d90c2ae..7ea68bf 100644 --- a/src/interp/ht-util.lisp.pamphlet +++ b/src/interp/ht-util.lisp.pamphlet @@ -122,7 +122,7 @@ (|stripSpaces| (|htpLabelInputString| |htPage| |buttonName|)) - (MAKESTRING "t")) + "t") (EXIT (RETURN |buttonName|))))))))))) ;htpSetRadioButtonAlist(htPage, val) == @@ -196,7 +196,7 @@ (COND ((AND |props| (STRINGP (SPADLET |s| (ELT |props| 0)))) (COND - ((BOOT-EQUAL |s| (MAKESTRING "")) |s|) + ((BOOT-EQUAL |s| "") |s|) ('T (|trimString| |s|)))) ('T NIL)))))) @@ -232,12 +232,12 @@ (DEFUN |replacePercentByDollar,fn| (|s| |i| |n|) (PROG (|m|) (RETURN - (SEQ (IF (> |i| |n|) (EXIT (MAKESTRING ""))) + (SEQ (IF (> |i| |n|) (EXIT "")) (IF (> (SPADLET |m| (|charPosition| (|char| '%) |s| |i|)) |n|) (EXIT (SUBSTRING |s| |i| NIL))) (EXIT (STRCONC (SUBSTRING |s| |i| (SPADDIFFERENCE |m| |i|)) - (MAKESTRING "$") + "$" (|replacePercentByDollar,fn| |s| (PLUS |m| 1) |n|))))))) @@ -349,8 +349,8 @@ (COND ((SPADLET |msg| (|htpLabelInputString| |htPage| |label|)) (COND - ((BOOT-EQUAL |msg| (MAKESTRING "t")) 1) - ((BOOT-EQUAL |msg| (MAKESTRING "nil")) 0) + ((BOOT-EQUAL |msg| "t") 1) + ((BOOT-EQUAL |msg| "nil") 0) ('T |msg|))) ('T (SPADLET |props| @@ -478,11 +478,11 @@ (COND ((STRINGP |s|) (COND - ((BOOT-EQUAL |s| (MAKESTRING "\\$")) (MAKESTRING "\\%")) - ((BOOT-EQUAL |s| (MAKESTRING "{\\em $}")) - (MAKESTRING "{\\em \\%}")) + ((BOOT-EQUAL |s| "\\$") "\\%") + ((BOOT-EQUAL |s| "{\\em $}") + "{\\em \\%}") ('T |s|))) - ((BOOT-EQUAL |s| '$) (MAKESTRING "\\%")) + ((BOOT-EQUAL |s| '$) "\\%") ('T (PRINC-TO-STRING |s|)))) ;stringize s == @@ -503,7 +503,7 @@ (declare (special |$curPage|)) (PROGN (|htInitPageNoScroll| |propList| |title|) - (|htSayStandard| (MAKESTRING "\\beginscroll ")) + (|htSayStandard| "\\beginscroll ") |$curPage|)) ;--htInitPageNoHeading(propList) == @@ -530,7 +530,7 @@ (DEFUN |htShowPage| () (PROGN - (|htSayStandard| (MAKESTRING "\\endscroll")) + (|htSayStandard| "\\endscroll") (|htShowPageNoScroll|))) ;htShowPageNoScroll() == @@ -550,7 +550,7 @@ (declare (special |$htLineList| |$curPage| |$newPage|)) (RETURN (PROGN - (|htSayStandard| (MAKESTRING "\\autobuttons")) + (|htSayStandard| "\\autobuttons") (|htpSetPageDescription| |$curPage| (NREVERSE (|htpPageDescription| |$curPage|))) (SPADLET |$newPage| NIL) @@ -639,7 +639,7 @@ (|htProcessDoitButton| |items|)) ('T (|systemError| - (CONS (MAKESTRING "unknown itemType") + (CONS "unknown itemType" (CONS |itemType| NIL)))))))))))) ;htMakeErrorPage htPage == @@ -673,9 +673,9 @@ (DEFUN |htQuote| (|s|) (PROGN - (|iht| (MAKESTRING "\"")) + (|iht| "\"") (|iht| |s|) - (|iht| (MAKESTRING "\"")))) + (|iht| "\""))) ;htProcessToggleButtons buttons == ; iht '"\newline\indent{5}\beginitems " @@ -694,7 +694,7 @@ (declare (special |$curPage|)) (RETURN (SEQ (PROGN - (|iht| (MAKESTRING "\\newline\\indent{5}\\beginitems ")) + (|iht| "\\newline\\indent{5}\\beginitems ") (DO ((G166302 |buttons| (CDR G166302)) (G166286 NIL)) ((OR (ATOM G166302) @@ -716,21 +716,19 @@ (CONS '|button| (CONS |defaultValue| NIL))))) (|iht| (CONS - (MAKESTRING - "\\item{\\em\\inputbox[") + "\\item{\\em\\inputbox[" (CONS (|htpLabelDefault| |$curPage| |buttonName|) - (CONS (MAKESTRING "]{") + (CONS "]{" (CONS |buttonName| (CONS - (MAKESTRING - "}{\\htbmfile{pick}}{\\htbmfile{unpick}}\\space{}") + "}{\\htbmfile{pick}}{\\htbmfile{unpick}}\\space{}" NIL)))))) (|bcIssueHt| |message|) - (|iht| (MAKESTRING "\\space{}}")) + (|iht| "\\space{}}") (|bcIssueHt| |info|))))) - (|iht| (MAKESTRING "\\enditems\\indent{0} "))))))) + (|iht| "\\enditems\\indent{0} ")))))) ;htProcessBcButtons buttons == ; for [defaultValue, buttonName] in buttons repeat @@ -768,23 +766,22 @@ |buttonName|)) (COND ((EQL |k| 0) - (|iht| (CONS (MAKESTRING "\\off{") + (|iht| (CONS "\\off{" (CONS |buttonName| - (CONS (MAKESTRING "}") NIL))))) + (CONS "}" NIL))))) ((EQL |k| 1) - (|iht| (CONS (MAKESTRING "\\on{") + (|iht| (CONS "\\on{" (CONS |buttonName| - (CONS (MAKESTRING "}") NIL))))) + (CONS "}" NIL))))) ('T - (|iht| (CONS (MAKESTRING "\\inputbox[") + (|iht| (CONS "\\inputbox[" (CONS (|htpLabelDefault| |$curPage| |buttonName|) - (CONS (MAKESTRING "]{") + (CONS "]{" (CONS |buttonName| (CONS - (MAKESTRING - "}{\\htbmfile{pick}}{\\htbmfile{unpick}}") + "}{\\htbmfile{pick}}{\\htbmfile{unpick}}" NIL)))))))))))))))) ;htProcessBcStrings strings == @@ -818,7 +815,7 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (SPADLET |mess2| (MAKESTRING "")) + (SPADLET |mess2| "") (COND ((NULL (LASSOC |stringName| (|htpInputAreaAlist| |$curPage|))) @@ -831,32 +828,31 @@ ((|htpLabelErrorMsg| |$curPage| |stringName|) (|iht| (CONS - (MAKESTRING "\\centerline{{\\em ") + "\\centerline{{\\em " (CONS (|htpLabelErrorMsg| |$curPage| |stringName|) - (CONS (MAKESTRING "}}") NIL)))) + (CONS "}}" NIL)))) (SPADLET |mess2| (CONCAT |mess2| (|bcSadFaces|))) (|htpSetLabelErrorMsg| |$curPage| |stringName| NIL))) - (|iht| (CONS (MAKESTRING "\\inputstring{") + (|iht| (CONS "\\inputstring{" (CONS |stringName| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS |numChars| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS (|htpLabelDefault| |$curPage| |stringName|) - (CONS (MAKESTRING "} ") + (CONS "} " (CONS |mess2| NIL))))))))))))))))) ;bcSadFaces() == ; '"\space{1}{\em\htbitmap{error}\htbitmap{error}\htbitmap{error}}" (DEFUN |bcSadFaces| () - (MAKESTRING - "\\space{1}{\\em\\htbitmap{error}\\htbitmap{error}\\htbitmap{error}}")) + "\\space{1}{\\em\\htbitmap{error}\\htbitmap{error}\\htbitmap{error}}") ;htLispLinks(links,:option) == ; [links,options] := beforeAfter('options,links) @@ -882,9 +878,9 @@ (SPADLET |links| (CAR |LETTMP#1|)) (SPADLET |options| (CADR |LETTMP#1|)) (SPADLET |indent| (OR (LASSOC '|indent| |options|) 5)) - (|iht| (MAKESTRING "\\newline\\indent{")) + (|iht| "\\newline\\indent{") (|iht| (|stringize| |indent|)) - (|iht| (MAKESTRING "}\\beginitems")) + (|iht| "}\\beginitems") (DO ((G166403 |links| (CDR G166403)) (G166387 NIL)) ((OR (ATOM G166403) (PROGN (SETQ G166387 (CAR G166403)) NIL) @@ -898,18 +894,18 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (|iht| (MAKESTRING "\\item[")) + (|iht| "\\item[") (SPADLET |call| (COND ((IFCAR |option|) - (MAKESTRING "\\lispmemolink")) + "\\lispmemolink") ('T - (MAKESTRING "\\lispdownlink")))) + "\\lispdownlink"))) (|htMakeButton| |call| |message| (|mkCurryFun| |func| |value|)) - (|iht| (CONS (MAKESTRING "]\\space{}") NIL)) + (|iht| (CONS "]\\space{}" NIL)) (|bcIssueHt| |info|))))) - (|iht| (MAKESTRING "\\enditems\\indent{0} "))))))) + (|iht| "\\enditems\\indent{0} ")))))) ;htLispMemoLinks(links) == htLispLinks(links,true) @@ -947,7 +943,7 @@ NIL) (SEQ (EXIT (PROGN (|htMakeButton| - (MAKESTRING "\\lispdownlink") |message| + "\\lispdownlink" |message| (|mkCurryFun| |func| |value|) |skipStateInfo?|) (|bcIssueHt| |info|)))))))))) @@ -979,7 +975,7 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (|htMakeButton| (MAKESTRING "\\lisplink") + (|htMakeButton| "\\lisplink" |message| (|mkCurryFun| |func| |value|)) (|bcIssueHt| |info|)))))))))) @@ -1063,13 +1059,11 @@ (CONS (CONS |groupName| (|buttonNames| |buttons|)) (|htpRadioButtonAlist| |$curPage|))) (SPADLET |boxesName| (GENTEMP)) - (|iht| (CONS (MAKESTRING - "\\newline\\indent{5}\\radioboxes{") + (|iht| (CONS "\\newline\\indent{5}\\radioboxes{" (CONS |boxesName| - (CONS (MAKESTRING - "}{\\htbmfile{pick}}{\\htbmfile{unpick}}\\beginitems ") + (CONS "}{\\htbmfile{pick}}{\\htbmfile{unpick}}\\beginitems " NIL)))) - (SPADLET |defaultValue| (MAKESTRING "1")) + (SPADLET |defaultValue| "1") (DO ((G166568 |buttons| (CDR G166568)) (G166540 NIL)) ((OR (ATOM G166568) @@ -1090,24 +1084,23 @@ (CONS '|button| (CONS |defaultValue| NIL))) (SPADLET |defaultValue| - (MAKESTRING "0")))) + "0"))) (|iht| (CONS - (MAKESTRING - "\\item{\\em\\radiobox[") + "\\item{\\em\\radiobox[" (CONS (|htpLabelDefault| |$curPage| |buttonName|) - (CONS (MAKESTRING "]{") + (CONS "]{" (CONS |buttonName| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS |boxesName| (CONS - (MAKESTRING "}\\space{}") + "}\\space{}" NIL)))))))) (|bcIssueHt| |message|) - (|iht| (MAKESTRING "\\space{}}")) + (|iht| "\\space{}}") (|bcIssueHt| |info|))))) - (|iht| (MAKESTRING "\\enditems\\indent{0} "))))))) + (|iht| "\\enditems\\indent{0} ")))))) ;htBcRadioButtons [groupName, :buttons] == ; htpSetRadioButtonAlist($curPage, [[groupName, :buttonNames buttons], @@ -1138,12 +1131,11 @@ (CONS (CONS |groupName| (|buttonNames| |buttons|)) (|htpRadioButtonAlist| |$curPage|))) (SPADLET |boxesName| (GENTEMP)) - (|iht| (CONS (MAKESTRING "\\radioboxes{") + (|iht| (CONS "\\radioboxes{" (CONS |boxesName| - (CONS (MAKESTRING - "}{\\htbmfile{pick}}{\\htbmfile{unpick}} ") + (CONS "}{\\htbmfile{pick}}{\\htbmfile{unpick}} " NIL)))) - (SPADLET |defaultValue| (MAKESTRING "1")) + (SPADLET |defaultValue| "1") (DO ((G166616 |buttons| (CDR G166616)) (G166588 NIL)) ((OR (ATOM G166616) @@ -1164,19 +1156,19 @@ (CONS '|button| (CONS |defaultValue| NIL))) (SPADLET |defaultValue| - (MAKESTRING "0")))) + "0"))) (|iht| (CONS - (MAKESTRING "{\\em\\radiobox[") + "{\\em\\radiobox[" (CONS (|htpLabelDefault| |$curPage| |buttonName|) - (CONS (MAKESTRING "]{") + (CONS "]{" (CONS |buttonName| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS |boxesName| - (CONS (MAKESTRING "}") NIL)))))))) + (CONS "}" NIL)))))))) (|bcIssueHt| |message|) - (|iht| (MAKESTRING "\\space{}}")) + (|iht| "\\space{}}") (|bcIssueHt| |info|)))))))))) ;setUpDefault(name, props) == @@ -1231,7 +1223,7 @@ (declare (special |$curPage|)) (RETURN (SEQ (PROGN - (|iht| (MAKESTRING "\\newline\\indent{5}\\beginitems ")) + (|iht| "\\newline\\indent{5}\\beginitems ") (DO ((G166685 |strings| (CDR G166685)) (G166665 NIL)) ((OR (ATOM G166685) @@ -1263,29 +1255,28 @@ ((|htpLabelErrorMsg| |$curPage| |stringName|) (|iht| (CONS - (MAKESTRING - "\\centerline{{\\em ") + "\\centerline{{\\em " (CONS (|htpLabelErrorMsg| |$curPage| |stringName|) - (CONS (MAKESTRING "}}") NIL)))) + (CONS "}}" NIL)))) (SPADLET |mess2| (CONCAT |mess2| (|bcSadFaces|))) (|htpSetLabelErrorMsg| |$curPage| |stringName| NIL))) - (|iht| (MAKESTRING "\\item ")) + (|iht| "\\item ") (|bcIssueHt| |mess1|) - (|iht| (CONS (MAKESTRING "\\inputstring{") + (|iht| (CONS "\\inputstring{" (CONS |stringName| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS |numChars| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS (|htpLabelDefault| |$curPage| |stringName|) - (CONS (MAKESTRING "} ") NIL)))))))) + (CONS "} " NIL)))))))) (|bcIssueHt| |mess2|))))) - (|iht| (MAKESTRING "\\enditems\\indent{0}\\newline "))))))) + (|iht| "\\enditems\\indent{0}\\newline ")))))) ;htProcessDomainConditions condList == ; htpSetDomainConditions($curPage, renamePatternVariables condList) @@ -1572,7 +1563,7 @@ (RETURN (COND ((NULL (STRINGP |template|)) |template|) - ('T (SPADLET |i| (SEARCH (MAKESTRING "%l") |template|)) + ('T (SPADLET |i| (SEARCH "%l" |template|)) (COND ((NULL |i|) |template|) ('T @@ -1589,16 +1580,16 @@ (DEFUN |htMakeDoneButton| (|message| |func|) (PROGN - (|bcHt| (MAKESTRING "\\newline\\vspace{1}\\centerline{")) + (|bcHt| "\\newline\\vspace{1}\\centerline{") (COND - ((BOOT-EQUAL |message| (MAKESTRING "Continue")) - (|bchtMakeButton| (MAKESTRING "\\lispdownlink") + ((BOOT-EQUAL |message| "Continue") + (|bchtMakeButton| "\\lispdownlink" '|\\ContinueBitmap| |func|)) ('T - (|bchtMakeButton| (MAKESTRING "\\lispdownlink") - (CONCAT (MAKESTRING "\\box{") |message| (MAKESTRING "}")) + (|bchtMakeButton| "\\lispdownlink" + (CONCAT "\\box{" |message| "}") |func|))) - (|bcHt| (MAKESTRING "} ")))) + (|bcHt| "} "))) ;htProcessDoneButton [label , func] == ; iht '"\newline\vspace{1}\centerline{" @@ -1616,19 +1607,19 @@ (PROGN (SPADLET |label| (CAR G166950)) (SPADLET |func| (CADR G166950)) - (|iht| (MAKESTRING "\\newline\\vspace{1}\\centerline{")) + (|iht| "\\newline\\vspace{1}\\centerline{") (COND - ((BOOT-EQUAL |label| (MAKESTRING "Continue")) - (|htMakeButton| (MAKESTRING "\\lispdownlink") + ((BOOT-EQUAL |label| "Continue") + (|htMakeButton| "\\lispdownlink" '|\\ContinueBitmap| |func|)) - ((BOOT-EQUAL |label| (MAKESTRING "Push to enter names")) - (|htMakeButton| (MAKESTRING "\\lispdownlink") - (MAKESTRING "\\ControlBitmap{clicktoset}") |func|)) + ((BOOT-EQUAL |label| "Push to enter names") + (|htMakeButton| "\\lispdownlink" + "\\ControlBitmap{clicktoset}" |func|)) ('T - (|htMakeButton| (MAKESTRING "\\lispdownlink") - (CONCAT (MAKESTRING "\\box{") |label| (MAKESTRING "}")) + (|htMakeButton| "\\lispdownlink" + (CONCAT "\\box{" |label| "}") |func|))) - (|iht| (MAKESTRING "} ")))))) + (|iht| "} "))))) ;htMakeButton(htCommand, message, func,:options) == ;----------> OBSELETE <---------------------------------- @@ -1655,19 +1646,19 @@ (RETURN (SEQ (PROGN (SPADLET |skipStateInfo?| (IFCAR |options|)) - (|iht| (CONS |htCommand| (CONS (MAKESTRING "{") NIL))) + (|iht| (CONS |htCommand| (CONS "{" NIL))) (|bcIssueHt| |message|) (COND (|skipStateInfo?| - (|iht| (CONS (MAKESTRING "}{(|htDoneButton| '|") + (|iht| (CONS "}{(|htDoneButton| '|" (CONS |func| - (CONS (MAKESTRING "| ") + (CONS "| " (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING ")}") NIL))))))) + (CONS ")}" NIL))))))) ('T - (|iht| (CONS (MAKESTRING "}{(|htDoneButton| '|") + (|iht| (CONS "}{(|htDoneButton| '|" (CONS |func| - (CONS (MAKESTRING "| (PROGN ") NIL)))) + (CONS "| (PROGN " NIL)))) (DO ((G166977 (|htpInputAreaAlist| |$curPage|) (CDR G166977)) (G166965 NIL)) @@ -1682,29 +1673,27 @@ NIL) (SEQ (EXIT (PROGN (|iht| (CONS - (MAKESTRING - "(|htpSetLabelInputString| ") + "(|htpSetLabelInputString| " (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING "'|") + (CONS "'|" (CONS |id| - (CONS (MAKESTRING "| ") NIL)))))) + (CONS "| " NIL)))))) (COND ((BOOT-EQUAL |type| '|string|) (|iht| (CONS - (MAKESTRING - "\"\\stringvalue{") + "\"\\stringvalue{" (CONS |id| - (CONS (MAKESTRING "}\"") + (CONS "}\"" NIL))))) ('T (|iht| (CONS - (MAKESTRING "\"\\boxvalue{") + "\"\\boxvalue{" (CONS |id| - (CONS (MAKESTRING "}\"") + (CONS "}\"" NIL)))))) - (|iht| (MAKESTRING ") ")))))) + (|iht| ") "))))) (|iht| (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING "))}") NIL)))))))))) + (CONS "))}" NIL)))))))))) ;bchtMakeButton(htCommand, message, func) == ; bcHt [htCommand, '"{", message, @@ -1724,13 +1713,12 @@ (RETURN (SEQ (PROGN (|bcHt| (CONS |htCommand| - (CONS (MAKESTRING "{") + (CONS "{" (CONS |message| (CONS - (MAKESTRING - "}{(|htDoneButton| '|") + "}{(|htDoneButton| '|" (CONS |func| - (CONS (MAKESTRING "| (PROGN ") + (CONS "| (PROGN " NIL))))))) (DO ((G167004 (|htpInputAreaAlist| |$curPage|) (CDR G167004)) @@ -1746,26 +1734,25 @@ NIL) (SEQ (EXIT (PROGN (|bcHt| (CONS - (MAKESTRING - "(|htpSetLabelInputString| ") + "(|htpSetLabelInputString| " (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING "'|") + (CONS "'|" (CONS |id| - (CONS (MAKESTRING "| ") NIL)))))) + (CONS "| " NIL)))))) (COND ((BOOT-EQUAL |type| '|string|) (|bcHt| (CONS - (MAKESTRING "\"\\stringvalue{") + "\"\\stringvalue{" (CONS |id| - (CONS (MAKESTRING "}\"") NIL))))) + (CONS "}\"" NIL))))) ('T (|bcHt| (CONS - (MAKESTRING "\"\\boxvalue{") + "\"\\boxvalue{" (CONS |id| - (CONS (MAKESTRING "}\"") NIL)))))) - (|bcHt| (MAKESTRING ") ")))))) + (CONS "}\"" NIL)))))) + (|bcHt| ") "))))) (|bcHt| (CONS (|htpName| |$curPage|) - (CONS (MAKESTRING "))} ") NIL)))))))) + (CONS "))} " NIL)))))))) ;htProcessDoitButton [label, command, func] == ; fun := mkCurryFun(func, [command]) @@ -1783,15 +1770,13 @@ (SPADLET |command| (CADR G167017)) (SPADLET |func| (CADDR G167017)) (SPADLET |fun| (|mkCurryFun| |func| (CONS |command| NIL))) - (|iht| (MAKESTRING "\\newline\\vspace{1}\\centerline{")) - (|htMakeButton| (MAKESTRING "\\lispcommand") - (CONCAT (MAKESTRING "\\box{") |label| (MAKESTRING "}")) + (|iht| "\\newline\\vspace{1}\\centerline{") + (|htMakeButton| "\\lispcommand" + (CONCAT "\\box{" |label| "}") |fun|) - (|iht| (MAKESTRING "} ")) - (|iht| (MAKESTRING - "\\vspace{2}{Select \\ \\UpButton{} \\ to go back one page.}")) - (|iht| (MAKESTRING -"\\newline{Select \\ \\ExitButton{QuitPage} \\ to remove this window.}")))))) + (|iht| "} ") + (|iht| "\\vspace{2}{Select \\ \\UpButton{} \\ to go back one page.}") + (|iht| "\\newline{Select \\ \\ExitButton{QuitPage} \\ to remove this window.}"))))) ;htMakeDoitButton(label, command) == ; -- use bitmap button if just plain old "Do It" @@ -1810,24 +1795,20 @@ (declare (special |$curPage|)) (PROGN (COND - ((BOOT-EQUAL |label| (MAKESTRING "Do It")) - (|bcHt| (MAKESTRING -"\\newline\\vspace{1}\\centerline{\\lispcommand{\\DoItBitmap}{(|doDoitButton| "))) + ((BOOT-EQUAL |label| "Do It") + (|bcHt| "\\newline\\vspace{1}\\centerline{\\lispcommand{\\DoItBitmap}{(|doDoitButton| ")) ('T - (|bcHt| (CONS (MAKESTRING - "\\newline\\vspace{1}\\centerline{\\lispcommand{\\box{") + (|bcHt| (CONS "\\newline\\vspace{1}\\centerline{\\lispcommand{\\box{" (CONS |label| - (CONS (MAKESTRING "}}{(|doDoitButton| ") + (CONS "}}{(|doDoitButton| " NIL)))))) (|bcHt| (|htpName| |$curPage|)) - (|bcHt| (CONS (MAKESTRING " \"") + (|bcHt| (CONS " \"" (CONS (|htEscapeString| |command|) - (CONS (MAKESTRING "\"") NIL)))) - (|bcHt| (MAKESTRING ")}}")) - (|bcHt| (MAKESTRING - "\\vspace{2}{Select \\ \\UpButton{} \\ to go back one page.}")) - (|bcHt| (MAKESTRING - "\\newline{Select \\ \\ExitButton{QuitPage} \\ to remove this window.}")))) + (CONS "\"" NIL)))) + (|bcHt| ")}}") + (|bcHt| "\\vspace{2}{Select \\ \\UpButton{} \\ to go back one page.}") + (|bcHt| "\\newline{Select \\ \\ExitButton{QuitPage} \\ to remove this window.}"))) ;doDoitButton(htPage, command) == ; executeInterpreterCommand command @@ -1865,7 +1846,7 @@ ((|typeCheckInputAreas| |htPage|) (|htMakeErrorPage| |htPage|)) ((NULL (FBOUNDP |func|)) (|systemError| - (CONS (MAKESTRING "unknown function") (CONS |func| NIL)))) + (CONS "unknown function" (CONS |func| NIL)))) ('T (FUNCALL (SYMBOL-FUNCTION |func|) |htPage|)))) ;typeCheckInputAreas htPage == @@ -1972,8 +1953,8 @@ ((NULL (|ncParseFromString| |string|)) (|htpSetLabelErrorMsg| |htPage| - (MAKESTRING "Syntax Error") - (MAKESTRING "Syntax Error"))) + "Syntax Error" + "Syntax Error")) ('T NIL))) ('T (SPADLET |val| @@ -2053,15 +2034,15 @@ (QCAR |ISTMP#3|)) 'T))))))))) (|systemError| - (MAKESTRING "currently invalid domain condition"))) + "currently invalid domain condition")) ((EQUAL |pattern| '(|String|)) (CONS '(|String|) (|wrap| |s1|))) ('T (SPADLET |val| (|parseAndEval| |string|)) (COND ((STRINGP |val|) (COND - ((BOOT-EQUAL |val| (MAKESTRING "Syntax Error ")) - (MAKESTRING "Error: Syntax Error ")) + ((BOOT-EQUAL |val| "Syntax Error ") + "Error: Syntax Error ") ('T (|condErrorMsg| |pattern|)))) ('T (SPADLET |type| (CAR |val|)) (SPADLET |data| (CDR |val|)) @@ -2086,7 +2067,7 @@ ((PAIRP |typeString|) (SPADLET |typeString| (APPLY (|function| CONCAT) |typeString|)))) - (CONCAT (MAKESTRING "Error: Could not make your input into a ") + (CONCAT "Error: Could not make your input into a " |typeString|))))) ;parseAndEval string == @@ -2145,14 +2126,14 @@ ('T (SPADLET |syntaxError| 'T) (CDR |v|)))) ('T (|oldParseString| |string|)))) (COND - (|syntaxError| (MAKESTRING "Syntax Error ")) + (|syntaxError| "Syntax Error ") (|pform| (SPADLET |val| (|applyWithOutputToString| '|processInteractive| (CONS |pform| (CONS NIL NIL)))) (COND ((CAR |val|) (CAR |val|)) - ('T (MAKESTRING "Type Analysis Error")))) + ('T "Type Analysis Error"))) ('T NIL)))))) ;oldParseString string == @@ -2187,7 +2168,7 @@ (PROG (|opForm| |lastArg| |argList|) (RETURN (SEQ (PROGN - (SPADLET |opForm| (CONCAT (CAR |l|) (MAKESTRING "("))) + (SPADLET |opForm| (CONCAT (CAR |l|) "(")) (SPADLET |lastArg| (|last| |l|)) (SPADLET |l| (CDR |l|)) (SPADLET |argList| NIL) @@ -2198,11 +2179,11 @@ NIL) (SEQ (EXIT (SPADLET |argList| (CONS - (CONCAT |arg| (MAKESTRING ", ")) + (CONCAT |arg| ", ") |argList|))))) (SPADLET |argList| (NREVERSE (CONS |lastArg| |argList|))) (CONCAT |opForm| (APPLY (|function| CONCAT) |argList|) - (MAKESTRING ")"))))))) + ")")))))) ;htMakeInputList stringList == ;-- makes an input form for constructing a list @@ -2226,7 +2207,7 @@ NIL) (SEQ (EXIT (SPADLET |argList| (CONS - (CONCAT |arg| (MAKESTRING ", ")) + (CONCAT |arg| ", ") |argList|))))) (SPADLET |argList| (NREVERSE (CONS |lastArg| |argList|))) (|bracketString| (APPLY (|function| CONCAT) |argList|))))))) @@ -2235,12 +2216,12 @@ ;bracketString string == CONCAT('"[",string,'"]") (DEFUN |bracketString| (|string|) - (CONCAT (MAKESTRING "[") |string| (MAKESTRING "]"))) + (CONCAT "[" |string| "]")) ;quoteString string == CONCAT('"_"", string, '"_"") (DEFUN |quoteString| (|string|) - (CONCAT (MAKESTRING "\"") |string| (MAKESTRING "\""))) + (CONCAT "\"" |string| "\"")) ;$funnyQuote := char 127 @@ -2361,15 +2342,14 @@ (STRINGIMAGE (SPADDIFFERENCE (PLUS |maxWidth2| |maxWidth1|) 1))) - (|htSay| (MAKESTRING - "\\tab{2}\\newline Variable\\tab{") + (|htSay| "\\tab{2}\\newline Variable\\tab{" (STRINGIMAGE (PLUS |maxWidth1| (QUOTIENT |maxWidth2| 3))) - (MAKESTRING "}Description\\tab{") + "}Description\\tab{" (STRINGIMAGE (PLUS (PLUS |maxWidth2| |maxWidth1|) 2)) - (MAKESTRING "}Value\\newline\\beginitems ")) + "}Value\\newline\\beginitems ") (DO ((G167392 (REVERSE |okList|) (CDR G167392)) (|setData| NIL)) ((OR (ATOM G167392) @@ -2378,36 +2358,33 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING "\\item")) + (|htSay| "\\item") (SPADLET |label| (STRCONC - (MAKESTRING - "\\menuitemstyle{") + "\\menuitemstyle{" (ELT |setData| 0) - (MAKESTRING "}"))) + "}")) (SPADLET |links| (CONS |label| (CONS (CONS (CONS '|text| (CONS - (MAKESTRING "\\tab{") + "\\tab{" (CONS |tabset1| - (CONS (MAKESTRING "}") + (CONS "}" (CONS (ELT |setData| 1) (CONS - (MAKESTRING - "\\tab{") + "\\tab{" (CONS |tabset2| (CONS - (MAKESTRING - "}{\\em ") + "}{\\em " (CONS (|htShowSetTreeValue| |setData|) (CONS - (MAKESTRING "}") + "}" NIL)))))))))) NIL) (CONS '|htShowSetPage| @@ -2420,7 +2397,7 @@ (CONS '|options| (CONS '(|indent| . 0) NIL)))) NIL)))))) - (|htSay| (MAKESTRING "\\enditems")) (|htShowPage|))))))) + (|htSay| "\\enditems") (|htShowPage|))))))) ;htShowCount s == --# discounting {\em .. } ; m := #s @@ -2482,15 +2459,15 @@ ((BOOT-EQUAL |st| 'LITERALS) (|object2String| (|translateTrueFalse2YesNo| (|eval| (ELT |setData| 4))))) - ((BOOT-EQUAL |st| 'TREE) (MAKESTRING "...")) + ((BOOT-EQUAL |st| 'TREE) "...") ('T (|systemError|))))))) ;mkSetTitle() == STRCONC('"Command {\em )set ",listOfStrings2String $path,'"}") (DEFUN |mkSetTitle| () (declare (special |$path|)) - (STRCONC (MAKESTRING "Command {\\em )set ") - (|listOfStrings2String| |$path|) (MAKESTRING "}"))) + (STRCONC "Command {\\em )set " + (|listOfStrings2String| |$path|) "}")) ;listOfStrings2String u == ; null u => '"" @@ -2498,9 +2475,9 @@ (DEFUN |listOfStrings2String| (|u|) (COND - ((NULL |u|) (MAKESTRING "")) + ((NULL |u|) "") ('T - (STRCONC (|listOfStrings2String| (CDR |u|)) (MAKESTRING " ") + (STRCONC (|listOfStrings2String| (CDR |u|)) " " (|stringize| (CAR |u|)))))) ;htShowSetPage(htPage, branch) == @@ -2530,7 +2507,7 @@ |$path|))) (SPADLET |setData| (|assoc| |branch| |setTree|)) (COND - ((NULL |setData|) (|systemError| (MAKESTRING "No Set Data"))) + ((NULL |setData|) (|systemError| "No Set Data")) ('T (SPADLET |st| (ELT |setData| 3)) (COND ((BOOT-EQUAL |st| 'FUNCTION) @@ -2543,8 +2520,8 @@ (|htShowSetTree| (ELT |setData| 5))) ((BOOT-EQUAL |st| 'STRING) (|htSetNotAvailable| |htPage| - (MAKESTRING ")set compiler"))) - ('T (|systemError| (MAKESTRING "Unknown data type")))))))))) + ")set compiler")) + ('T (|systemError| "Unknown data type"))))))))) ;htShowLiteralsPage(htPage, setData) == ; htSetLiterals(htPage,setData.setName,setData.setLabel, @@ -2572,19 +2549,17 @@ (RETURN (SEQ (PROGN (SPADLET |page| - (|htInitPage| (MAKESTRING "Set Command") + (|htInitPage| "Set Command" (|htpPropertyList| |htPage|))) (|htpSetProperty| |page| '|variable| |variable|) - (|bcHt| (CONS (MAKESTRING "\\centerline{Set {\\em ") + (|bcHt| (CONS "\\centerline{Set {\\em " (CONS |name| - (CONS (MAKESTRING "}}\\newline") NIL)))) - (|bcHt| (CONS (MAKESTRING "{\\em Description: } ") + (CONS "}}\\newline" NIL)))) + (|bcHt| (CONS "{\\em Description: } " (CONS |message| - (CONS (MAKESTRING - "\\newline\\vspace{1} ") + (CONS "\\newline\\vspace{1} " NIL)))) - (|bcHt| (MAKESTRING - "Select one of the following: \\newline\\tab{3} ")) + (|bcHt| "Select one of the following: \\newline\\tab{3} ") (SPADLET |links| (PROG (G167460) (SPADLET G167460 NIL) @@ -2599,11 +2574,10 @@ (SEQ (EXIT (SETQ G167460 (CONS (CONS - (STRCONC (MAKESTRING "") + (STRCONC "" (STRINGIMAGE |opt|)) (CONS - (MAKESTRING - "\\newline\\tab{3}") + "\\newline\\tab{3}" (CONS |functionToCall| (CONS |opt| NIL)))) G167460)))))))) @@ -2613,7 +2587,7 @@ '|\\indent{0}\\newline\\vspace{1} The current setting is: {\\em | (CONS (|translateTrueFalse2YesNo| (EVAL |variable|)) - (CONS (MAKESTRING "} ") NIL)))) + (CONS "} " NIL)))) (|htShowPage|)))))) ;htSetLiteral(htPage, val) == @@ -2623,7 +2597,7 @@ (DEFUN |htSetLiteral| (|htPage| |val|) (PROGN - (|htInitPage| (MAKESTRING "Set Command") NIL) + (|htInitPage| "Set Command" NIL) (SET (|htpProperty| |htPage| '|variable|) (|translateYesNo2TrueFalse| |val|)) (|htKill| |htPage| |val|))) @@ -2668,33 +2642,33 @@ (|htInitPage| (|mkSetTitle|) (|htpPropertyList| |htPage|))) (|htpSetProperty| |page| '|variable| (ELT |setData| 4)) - (|bcHt| (CONS (MAKESTRING "\\centerline{Set {\\em ") + (|bcHt| (CONS "\\centerline{Set {\\em " (CONS (ELT |setData| 0) - (CONS (MAKESTRING "}}\\newline") NIL)))) + (CONS "}}\\newline" NIL)))) (SPADLET |message| (ELT |setData| 1)) - (|bcHt| (CONS (MAKESTRING "{\\em Description: } ") + (|bcHt| (CONS "{\\em Description: } " (CONS |message| - (CONS (MAKESTRING "\\newline\\vspace{1} ") + (CONS "\\newline\\vspace{1} " NIL)))) (SPADLET |LETTMP#1| (ELT |setData| 5)) (SPADLET |$htInitial| (CAR |LETTMP#1|)) (SPADLET |$htFinal| (CADR |LETTMP#1|)) (COND ((BOOT-EQUAL |$htFinal| (PLUS |$htInitial| 1)) - (|bcHt| (MAKESTRING "Enter the integer {\\em ")) + (|bcHt| "Enter the integer {\\em ") (|bcHt| (|stringize| |$htInitial|)) - (|bcHt| (MAKESTRING "} or {\\em ")) + (|bcHt| "} or {\\em ") (|bcHt| (|stringize| |$htFinal|)) - (|bcHt| (MAKESTRING "}:"))) + (|bcHt| "}:")) ((NULL |$htFinal|) - (|bcHt| (MAKESTRING "Enter an integer greater than {\\em ")) + (|bcHt| "Enter an integer greater than {\\em ") (|bcHt| (|stringize| (SPADDIFFERENCE |$htInitial| 1))) - (|bcHt| (MAKESTRING "}:"))) - ('T (|bcHt| (MAKESTRING "Enter an integer between {\\em ")) + (|bcHt| "}:")) + ('T (|bcHt| "Enter an integer between {\\em ") (|bcHt| (|stringize| |$htInitial|)) - (|bcHt| (MAKESTRING "} and {\\em ")) + (|bcHt| "} and {\\em ") (|bcHt| (|stringize| |$htFinal|)) - (|bcHt| (MAKESTRING "}:")))) + (|bcHt| "}:"))) (|htMakePage| (CONS '(|domainConditions| (|Satisfies| S |chkRange|)) (CONS (CONS '|bcStrings| @@ -2703,7 +2677,7 @@ (CONS '|value| (CONS 'S NIL)))) NIL)) NIL))) - (|htSetvarDoneButton| (MAKESTRING "Select to Set Value") + (|htSetvarDoneButton| "Select to Set Value" '|htSetInteger|) (|htShowPage|))))) @@ -2725,14 +2699,12 @@ (COND ((NULL (INTEGERP |val|)) (|errorPage| |htPage| - (CONS (MAKESTRING "Value Error") + (CONS "Value Error" (CONS NIL - (CONS (MAKESTRING - "\\vspace{3}\\centerline{{\\em ") + (CONS "\\vspace{3}\\centerline{{\\em " (CONS |val| (CONS - (MAKESTRING - "}}\\vspace{2}\\newline\\centerline{Click on \\UpBitmap{} to re-enter value}") + "}}\\vspace{2}\\newline\\centerline{Click on \\UpBitmap{} to re-enter value}" NIL))))))) ('T (SET (|htpProperty| |htPage| '|variable|) |val|) (|htKill| |htPage| |val|))))))) @@ -2797,13 +2769,12 @@ (SPADLET |page| (|htInitPage| (|mkSetTitle|) (|htpPropertyList| |htPage|))) - (|bcHt| (CONS (MAKESTRING "\\centerline{Set {\\em ") + (|bcHt| (CONS "\\centerline{Set {\\em " (CONS (ELT |setData| 0) - (CONS (MAKESTRING "}}\\newline") NIL)))) - (|bcHt| (CONS (MAKESTRING "{\\em Description: } ") + (CONS "}}\\newline" NIL)))) + (|bcHt| (CONS "{\\em Description: } " (CONS (ELT |setData| 1) - (CONS (MAKESTRING - "\\newline\\vspace{1} ") + (CONS "\\newline\\vspace{1} " NIL)))) (SPADLET |currentValue| (EVAL |variable|)) (|htMakePage| @@ -2814,15 +2785,15 @@ (CONS (CONS '|text| |phrase|) (CONS (CONS '|inputStrings| (CONS - (CONS (MAKESTRING "") - (CONS (MAKESTRING "") + (CONS "" + (CONS "" (CONS 60 (CONS |currentValue| (CONS '|value| (CONS 'S NIL)))))) NIL)) NIL)))) - (|htSetvarDoneButton| (MAKESTRING "Select To Set Value") + (|htSetvarDoneButton| "Select To Set Value" '|htSetFunCommand|) (|htShowPage|))))))) @@ -2836,17 +2807,17 @@ (DEFUN |htSetvarDoneButton| (|message| |func|) (PROGN - (|bcHt| (MAKESTRING "\\newline\\vspace{1}\\centerline{")) + (|bcHt| "\\newline\\vspace{1}\\centerline{") (COND - ((OR (BOOT-EQUAL |message| (MAKESTRING "Select to Set Value")) - (BOOT-EQUAL |message| (MAKESTRING "Select to Set Values"))) - (|bchtMakeButton| (MAKESTRING "\\lisplink") - (MAKESTRING "\\ControlBitmap{clicktoset}") |func|)) + ((OR (BOOT-EQUAL |message| "Select to Set Value") + (BOOT-EQUAL |message| "Select to Set Values")) + (|bchtMakeButton| "\\lisplink" + "\\ControlBitmap{clicktoset}" |func|)) ('T - (|bchtMakeButton| (MAKESTRING "\\lisplink") - (CONCAT (MAKESTRING "\\fbox{") |message| (MAKESTRING "}")) + (|bchtMakeButton| "\\lisplink" + (CONCAT "\\fbox{" |message| "}") |func|))) - (|bcHt| (MAKESTRING "} ")))) + (|bcHt| "} "))) ;htFunctionSetLiteral(htPage, val) == ; htInitPage('"Set Command", nil) @@ -2855,7 +2826,7 @@ (DEFUN |htFunctionSetLiteral| (|htPage| |val|) (PROGN - (|htInitPage| (MAKESTRING "Set Command") NIL) + (|htInitPage| "Set Command" NIL) (SET (|htpProperty| |htPage| '|variable|) (|translateYesNo2TrueFalse| |val|)) (|htSetFunCommandContinue| |htPage| |val|))) @@ -2942,24 +2913,22 @@ (declare (special |$path|)) (RETURN (PROGN - (|htInitPage| (MAKESTRING "System Command") NIL) + (|htInitPage| "System Command" NIL) (SPADLET |string| - (STRCONC (MAKESTRING "{\\em )set ") + (STRCONC "{\\em )set " (|listOfStrings2String| (CONS |value| |$path|)) - (MAKESTRING "}"))) + "}")) (|htMakePage| (CONS '(|text| "{Here is the AXIOM system command you could have issued:}" "\\vspace{2}\\newline\\centerline{\\tt") (CONS (CONS '|text| |string|) NIL))) (|htMakePage| '((|text| . "}\\vspace{1}\\newline\\rm"))) - (|htSay| (MAKESTRING - "\\vspace{2}{Select \\ \\UpButton{} \\ to go back.}")) - (|htSay| (MAKESTRING - "\\newline{Select \\ \\ExitButton{QuitPage} \\ to remove this window.}")) + (|htSay| "\\vspace{2}{Select \\ \\UpButton{} \\ to go back.}") + (|htSay| "\\newline{Select \\ \\ExitButton{QuitPage} \\ to remove this window.}") (|htProcessDoitButton| - (CONS (MAKESTRING "Press to Remove Page") - (CONS (MAKESTRING "") (CONS '|htDoNothing| NIL)))) + (CONS "Press to Remove Page" + (CONS "" (CONS '|htDoNothing| NIL)))) (|htShowPage|))))) ;htSetNotAvailable(htPage,whatToType) == @@ -2980,12 +2949,12 @@ (RETURN (PROGN (SPADLET |page| - (|htInitPage| (MAKESTRING "Unavailable Set Command") + (|htInitPage| "Unavailable Set Command" (|htpPropertyList| |htPage|))) - (|htInitPage| (MAKESTRING "Unavailable System Command") NIL) + (|htInitPage| "Unavailable System Command" NIL) (SPADLET |string| - (STRCONC (MAKESTRING "{\\em ") |whatToType| - (MAKESTRING "}"))) + (STRCONC "{\\em " |whatToType| + "}")) (|htMakePage| (CONS '(|text| "\\vspace{1}\\newline" "{Sorry, but this system command is not available through HyperDoc. Please directly issue this command in an AXIOM window for more information:}" @@ -2993,8 +2962,8 @@ (CONS (CONS '|text| |string|) NIL))) (|htMakePage| '((|text| . "}\\vspace{1}\\newline"))) (|htProcessDoitButton| - (CONS (MAKESTRING "Press to Remove Page") - (CONS (MAKESTRING "") (CONS '|htDoNothing| NIL)))) + (CONS "Press to Remove Page" + (CONS "" (CONS '|htDoNothing| NIL)))) (|htShowPage|))))) ;htDoNothing(htPage,command) == nil @@ -3140,8 +3109,7 @@ (AND G167646 (IDENTP |x|)))))))) |parsedNames|) ('T - (MAKESTRING - "Please enter a list of identifiers separated by blanks")))))))) + "Please enter a list of identifiers separated by blanks"))))))) ;chkPosInteger s == ; (u := parseOnly s) and INTEGERP u and u > 0 => u @@ -3153,7 +3121,7 @@ (COND ((AND (SPADLET |u| (|parseOnly| |s|)) (INTEGERP |u|) (> |u| 0)) |u|) - ('T (MAKESTRING "Please enter a positive integer")))))) + ('T "Please enter a positive integer"))))) ;chkOutputFileName s == ; bcString2WordList s in '(CONSOLE console) => 'console @@ -3180,7 +3148,7 @@ ((AND (SPADLET |u| (|ncParseFromString| |s|)) (INTEGERP |u|) (>= |u| 0)) |u|) - ('T (MAKESTRING "Please enter a non-negative integer")))))) + ('T "Please enter a non-negative integer"))))) ;chkRange s == ; (u := ncParseFromString s) and INTEGERP u @@ -3201,11 +3169,11 @@ (OR (NULL |$htFinal|) (<= |u| |$htFinal|))) |u|) ((NULL |$htFinal|) - (STRCONC (MAKESTRING "Please enter an integer greater than ") + (STRCONC "Please enter an integer greater than " (|stringize| (SPADDIFFERENCE |$htInitial| 1)))) ('T - (STRCONC (MAKESTRING "Please enter an integer between ") - (|stringize| |$htInitial|) (MAKESTRING " and ") + (STRCONC "Please enter an integer between " + (|stringize| |$htInitial|) " and " (|stringize| |$htFinal|))))))) ;chkAllNonNegativeInteger s == @@ -3219,8 +3187,7 @@ (OR (AND (SPADLET |u| (|ncParseFromString| |s|)) (|member| |u| '(|a| |al| |all| A AL ALL)) 'ALL) (|chkNonNegativeInteger| |s|) - (MAKESTRING - "Please enter {\\em all} or a non-negative integer"))))) + "Please enter {\\em all} or a non-negative integer")))) ;htMakePathKey path == ; null path => systemError '"path is not set" @@ -3232,12 +3199,12 @@ (DEFUN |htMakePathKey,fn| (|a| |b|) (SEQ (IF (NULL |b|) (EXIT |a|)) (EXIT (|htMakePathKey,fn| - (STRCONC |a| (MAKESTRING ".") (PNAME (CAR |b|))) + (STRCONC |a| "." (PNAME (CAR |b|))) (CDR |b|))))) (DEFUN |htMakePathKey| (|path|) (COND - ((NULL |path|) (|systemError| (MAKESTRING "path is not set"))) + ((NULL |path|) (|systemError| "path is not set")) ('T (INTERN (|htMakePathKey,fn| (PNAME (CAR |path|)) (CDR |path|)))))) @@ -3283,44 +3250,44 @@ ; htSetNotAvailable(htPage,'")set compiler output") (DEFUN |htSetOutputLibrary| (|htPage|) - (|htSetNotAvailable| |htPage| (MAKESTRING ")set compiler output"))) + (|htSetNotAvailable| |htPage| ")set compiler output")) ;htSetInputLibrary htPage == ; htSetNotAvailable(htPage,'")set compiler input") (DEFUN |htSetInputLibrary| (|htPage|) - (|htSetNotAvailable| |htPage| (MAKESTRING ")set compiler input"))) + (|htSetNotAvailable| |htPage| ")set compiler input")) ;htSetExpose htPage == ; htSetNotAvailable(htPage,'")set expose") (DEFUN |htSetExpose| (|htPage|) - (|htSetNotAvailable| |htPage| (MAKESTRING ")set expose"))) + (|htSetNotAvailable| |htPage| ")set expose")) ;htSetKernelProtect htPage == ; htSetNotAvailable(htPage,'")set kernel protect") (DEFUN |htSetKernelProtect| (|htPage|) - (|htSetNotAvailable| |htPage| (MAKESTRING ")set kernel protect"))) + (|htSetNotAvailable| |htPage| ")set kernel protect")) ;htSetKernelWarn htPage == ; htSetNotAvailable(htPage,'")set kernel warn") (DEFUN |htSetKernelWarn| (|htPage|) - (|htSetNotAvailable| |htPage| (MAKESTRING ")set kernel warn"))) + (|htSetNotAvailable| |htPage| ")set kernel warn")) ;htSetOutputCharacters htPage == ; htSetNotAvailable(htPage,'")set output characters") (DEFUN |htSetOutputCharacters| (|htPage|) - (|htSetNotAvailable| |htPage| (MAKESTRING ")set output characters"))) + (|htSetNotAvailable| |htPage| ")set output characters")) ;htSetLinkerArgs htPage == ; htSetNotAvailable(htPage,'")set fortran calling linker") (DEFUN |htSetLinkerArgs| (|htPage|) (|htSetNotAvailable| |htPage| - (MAKESTRING ")set fortran calling linker"))) + ")set fortran calling linker")) ;htSetCache(htPage,:options) == ; $path := '(functions cache) @@ -3439,21 +3406,20 @@ (CONS (CONS (STRCONC - (MAKESTRING - "Function {\\em ") + "Function {\\em " |name| - (MAKESTRING "} will cache")) - (CONS (MAKESTRING "values") + "} will cache") + (CONS "values" (CONS 5 (CONS 10 (CONS (|htMakeLabel| - (MAKESTRING "c") |i|) + "c" |i|) (CONS 'ALLPI NIL)))))) NIL)) NIL))))) (|htSetvarDoneButton| - (MAKESTRING "Select to Set Values") '|htCacheSet|) + "Select to Set Values" '|htCacheSet|) (|htShowPage|)))))))) ;htMakeLabel(prefix,i) == INTERN STRCONC(prefix,stringize i) @@ -3504,7 +3470,7 @@ (SPADLET |num| (|chkAllNonNegativeInteger| (|htpLabelInputString| |htPage| - (|htMakeLabel| (MAKESTRING "c") + (|htMakeLabel| "c" |i|)))) (SPADLET |$cacheAlist| (ADDASSOC (INTERN |name|) |num| @@ -3514,15 +3480,15 @@ (SPADLET |$cacheCount| |n|) (SPADLET |$cacheAlist| (|deleteAssoc| '|all| |$cacheAlist|)))) - (|htInitPage| (MAKESTRING "Cache Summary") NIL) - (|bcHt| (MAKESTRING "In general, interpreter functions ")) + (|htInitPage| "Cache Summary" NIL) + (|bcHt| "In general, interpreter functions ") (|bcHt| (COND ((EQL |$cacheCount| 0) '|will {\\em not} be cached.|) - ('T (|bcHt| (MAKESTRING "cache ")) + ('T (|bcHt| "cache ") (|htAllOrNum| |$cacheCount|) - (MAKESTRING "} values.")))) - (|bcHt| (MAKESTRING "\\vspace{1}\\newline ")) + "} values."))) + (|bcHt| "\\vspace{1}\\newline ") (COND (|$cacheAlist| (DO ((G167801 |$cacheAlist| (CDR G167801)) @@ -3542,16 +3508,15 @@ ((NEQUAL |val| |$cacheCount|) (PROGN (|bcHt| - (MAKESTRING - "\\newline function {\\em ")) + "\\newline function {\\em ") (|bcHt| (|stringize| |name|)) (|bcHt| - (MAKESTRING "} will cache ")) + "} will cache ") (|htAllOrNum| |val|) - (|bcHt| (MAKESTRING "} values")))))))))) + (|bcHt| "} values"))))))))) (|htProcessDoitButton| - (CONS (MAKESTRING "Press to Remove Page") - (CONS (MAKESTRING "") (CONS '|htDoNothing| NIL)))) + (CONS "Press to Remove Page" + (CONS "" (CONS '|htDoNothing| NIL)))) (|htShowPage|)))))) ;htAllOrNum val == bcHt @@ -3561,10 +3526,10 @@ (DEFUN |htAllOrNum| (|val|) (|bcHt| (COND - ((BOOT-EQUAL |val| '|all|) (MAKESTRING "{\\em all")) - ((EQL |val| 0) (MAKESTRING "{\\em no")) + ((BOOT-EQUAL |val| '|all|) "{\\em all") + ((EQL |val| 0) "{\\em no") ('T - (STRCONC (MAKESTRING "the last {\\em ") + (STRCONC "the last {\\em " (|stringize| |val|)))))) ;htCacheOne names == @@ -3600,7 +3565,7 @@ (|inputStrings| ("Enter {\\em all} or a positive integer:" "" 5 10 |c1| ALLPI)))) - (|htSetvarDoneButton| (MAKESTRING "Select to Set Value") + (|htSetvarDoneButton| "Select to Set Value" '|htCacheSet|) (|htShowPage|))))) @@ -3622,8 +3587,8 @@ (declare (special |$saturn|)) (COND (|$saturn| (|downlinkSaturn| |page|)) - ('T (|htInitPage| (MAKESTRING "Bridge") NIL) - (|htSay| (MAKESTRING "\\replacepage{") |page| (MAKESTRING "}")) + ('T (|htInitPage| "Bridge" NIL) + (|htSay| "\\replacepage{" |page| "}") (|htShowPage|)))) ;downlinkSaturn fn == @@ -3641,7 +3606,7 @@ (RETURN (SEQ (PROGN (SPADLET |u| (|dbReadLines| |fn|)) - (SPADLET |lines| (MAKESTRING "")) + (SPADLET |lines| "") (DO () ((NULL (AND (PAIRP |u|) (PROGN @@ -3668,9 +3633,9 @@ (DEFUN |dbNonEmptyPattern| (|pattern|) (COND - ((NULL |pattern|) (MAKESTRING "*")) + ((NULL |pattern|) "*") ('T (SPADLET |pattern| (STRINGIMAGE |pattern|)) - (COND ((> (|#| |pattern|) 0) |pattern|) ('T (MAKESTRING "*")))))) + (COND ((> (|#| |pattern|) 0) |pattern|) ('T "*"))))) ;htSystemVariables() == main where ; main == @@ -3770,13 +3735,13 @@ (CONS (CONS '|text| (CONS (ELT |options| 0) - (CONS (MAKESTRING "-") + (CONS "-" (CONS (OR (ELT |options| 1) - (MAKESTRING "")) + "") NIL)))) NIL) - (CONS (MAKESTRING "") + (CONS "" (CONS '|htSetSystemVariableKind| (CONS @@ -3798,8 +3763,8 @@ NIL)) NIL)))))) (IF (BOOT-EQUAL |class| 'STRING) - (EXIT (|htSay| (MAKESTRING "{\\em ") |val| - (MAKESTRING "}\\space{1}")))) + (EXIT (|htSay| "{\\em " |val| + "}\\space{1}"))) (EXIT (DO ((G167913 |options| (CDR G167913)) (|x| NIL)) ((OR (ATOM G167913) (PROGN (SETQ |x| (CAR G167913)) NIL)) @@ -3808,13 +3773,13 @@ (AND (BOOT-EQUAL |val| 'T) (BOOT-EQUAL |x| '|on|))) (AND (NULL |val|) (BOOT-EQUAL |x| '|off|))) - (EXIT (|htSay| (MAKESTRING "{\\em ") |x| - (MAKESTRING "}\\space{1}")))) + (EXIT (|htSay| "{\\em " |x| + "}\\space{1}"))) (EXIT (|htMakePage| (CONS (CONS '|bcLispLinks| (CONS (CONS |x| - (CONS (MAKESTRING " ") + (CONS " " (CONS '|htSetSystemVariable| (CONS (CONS |variable| @@ -3835,8 +3800,8 @@ (|htMakePage| (CONS (CONS '|bcLinks| (CONS - (CONS (MAKESTRING "reset") - (CONS (MAKESTRING "") + (CONS "reset" + (CONS "" (CONS '|htSetSystemVariableKind| (CONS @@ -3876,8 +3841,8 @@ (NREVERSE (|htSystemVariables,fn| |$setOptions| NIL 'T))) - (|htInitPage| (MAKESTRING "System Variables") NIL) - (|htSay| (MAKESTRING "\\beginmenu")) + (|htInitPage| "System Variables" NIL) + (|htSay| "\\beginmenu") (SPADLET |lastHeading| NIL) (DO ((G167961 |table| (CDR G167961)) (G167879 NIL)) ((OR (ATOM G167961) @@ -3897,17 +3862,17 @@ NIL)) NIL) (SEQ (EXIT (PROGN - (|htSay| (MAKESTRING "\\newline\\item ")) + (|htSay| "\\newline\\item ") (COND ((BOOT-EQUAL |heading| |lastHeading|) - (|htSay| (MAKESTRING "\\tab{8}"))) + (|htSay| "\\tab{8}")) ('T (|htSay| |heading| - (MAKESTRING "\\tab{8}")) + "\\tab{8}") (SPADLET |lastHeading| |heading|))) - (|htSay| (MAKESTRING "{\\em ") |name| + (|htSay| "{\\em " |name| '|}\\tab{22}| |message|) - (|htSay| (MAKESTRING "\\tab{80}")) + (|htSay| "\\tab{80}") (COND ((BOOT-EQUAL |key| 'FUNCTION) (COND @@ -3916,8 +3881,8 @@ (CONS (CONS '|bcLinks| (CONS - (CONS (MAKESTRING "reset") - (CONS (MAKESTRING "") + (CONS "reset" + (CONS "" (CONS |func| (CONS NIL NIL)))) NIL)) NIL))) @@ -3957,10 +3922,9 @@ (SPADLET |valuesOrFunction| (CADDDR |option|)) (|htSay| - (MAKESTRING - "\\newline\\tab{22}") + "\\newline\\tab{22}" |msg| - (MAKESTRING "\\tab{80}")) + "\\tab{80}") (|htSystemVariables,functionTail| |name| |class| |var| |valuesOrFunction|))))))))) @@ -3968,7 +3932,7 @@ (|htSystemVariables,displayOptions| |name| |key| |variable| |val| |options|))))))) - (|htSay| (MAKESTRING "\\endmenu")) (|htShowPage|))))))) + (|htSay| "\\endmenu") (|htShowPage|))))))) ;htSetSystemVariableKind(htPage,[variable,name,fun]) == ; value := htpLabelInputString(htPage,name) @@ -4018,7 +3982,7 @@ (DEFUN |htGloss| (|pattern|) (|htGlossPage| NIL - (OR (|dbNonEmptyPattern| |pattern|) (MAKESTRING "*")) 'T)) + (OR (|dbNonEmptyPattern| |pattern|) "*") 'T)) ;htGlossPage(htPage,pattern,tryAgain?) == ; $wildCard: local := char '_* @@ -4066,7 +4030,7 @@ (SEQ (PROGN (SPADLET |$wildCard| (|char| '*)) (COND - ((BOOT-EQUAL |pattern| (MAKESTRING "*")) + ((BOOT-EQUAL |pattern| "*") (|downlink| '|GlossaryPage|)) ('T (SPADLET |filter| (|pmTransFilter| |pattern|)) (SPADLET |grepForm| (|mkGrepPattern| |filter| '|none|)) @@ -4074,25 +4038,22 @@ (SPADLET |results| (|applyGrep| |grepForm| '|gloss|)) (SPADLET |defstream| (MAKE-INSTREAM - (STRCONC (|getEnv| (MAKESTRING "AXIOM")) - (MAKESTRING - "/algebra/glossdef.text")))) + (STRCONC (|getEnv| "AXIOM") + "/algebra/glossdef.text"))) (SPADLET |lines| (|gatherGlossLines| |results| |defstream|)) (SPADLET |heading| (COND - ((BOOT-EQUAL |pattern| (MAKESTRING "")) - (MAKESTRING "Glossary")) + ((BOOT-EQUAL |pattern| "") + "Glossary") ((NULL |lines|) - (CONS (MAKESTRING - "No glossary items match {\\em ") + (CONS "No glossary items match {\\em " (CONS |pattern| - (CONS (MAKESTRING "}") NIL)))) + (CONS "}" NIL)))) ('T - (CONS (MAKESTRING - "Glossary items matching {\\em ") + (CONS "Glossary items matching {\\em " (CONS |pattern| - (CONS (MAKESTRING "}") NIL)))))) + (CONS "}" NIL)))))) (COND ((NULL |lines|) (COND @@ -4109,25 +4070,25 @@ NIL)) ('T (|errorPage| |htPage| - (CONS (MAKESTRING "Sorry") + (CONS "Sorry" (CONS NIL (CONS - (CONS (MAKESTRING "\\centerline{") + (CONS "\\centerline{" (APPEND |heading| - (CONS (MAKESTRING "}") NIL))) + (CONS "}" NIL))) NIL))))))) ('T (|errorPage| |htPage| - (CONS (MAKESTRING "Sorry") + (CONS "Sorry" (CONS NIL (CONS (CONS - (MAKESTRING "\\centerline{") + "\\centerline{" (APPEND |heading| - (CONS (MAKESTRING "}") NIL))) + (CONS "}" NIL))) NIL))))))) ('T (|htInitPageNoScroll| NIL |heading|) - (|htSay| (MAKESTRING "\\beginscroll\\beginmenu")) + (|htSay| "\\beginscroll\\beginmenu") (DO ((G168058 |lines| (CDR G168058)) (|line| NIL)) ((OR (ATOM G168058) @@ -4137,31 +4098,29 @@ (SPADLET |tick| (|charPosition| |$tick| |line| 1)) - (|htSay| (MAKESTRING - "\\item{\\em \\menuitemstyle{}}\\tab{0}{\\em ") + (|htSay| "\\item{\\em \\menuitemstyle{}}\\tab{0}{\\em " (|escapeString| (SUBSTRING |line| 0 |tick|)) - (MAKESTRING "} ") + "} " (SUBSTRING |line| (PLUS |tick| 1) NIL)))))) - (|htSay| (MAKESTRING "\\endmenu ")) - (|htSay| (MAKESTRING "\\endscroll\\newline ")) + (|htSay| "\\endmenu ") + (|htSay| "\\endscroll\\newline ") (|htMakePage| (CONS (CONS '|bcLinks| (CONS - (CONS (MAKESTRING "Search") - (CONS (MAKESTRING "") + (CONS "Search" + (CONS "" (CONS '|htGlossSearch| (CONS NIL NIL)))) NIL)) NIL)) - (|htSay| (MAKESTRING - " for glossary entry matching ")) + (|htSay| " for glossary entry matching ") (|htMakePage| (CONS (CONS '|bcStrings| (CONS (CONS 24 - (CONS (MAKESTRING "*") + (CONS "*" (CONS '|filter| (CONS 'EM NIL)))) NIL)) NIL)) @@ -4311,17 +4270,14 @@ (|bcErrorPage| |s|)) ((NULL |s|) (|errorPage| NIL - (CONS (CONS (MAKESTRING "Missing search string") + (CONS (CONS "Missing search string" NIL) (CONS NIL - (CONS (MAKESTRING - "\\vspace{2}\\centerline{To select one of the greek letters:}\\newline ") + (CONS "\\vspace{2}\\centerline{To select one of the greek letters:}\\newline " (CONS - (MAKESTRING - "\\centerline{{\\em first} enter a search key into the input area}\\newline ") + "\\centerline{{\\em first} enter a search key into the input area}\\newline " (CONS - (MAKESTRING - "\\centerline{{\\em then } move the mouse cursor to the work {\\em search} and click}") + "\\centerline{{\\em then } move the mouse cursor to the work {\\em search} and click}" NIL))))))) ('T (SPADLET |filter| (|patternCheck| |s|)) (SPADLET |names| @@ -4341,13 +4297,12 @@ (CONS |x| |nonmatches|))))))) (SPADLET |matches| (NREVERSE |matches|)) (SPADLET |nonmatches| (NREVERSE |nonmatches|)) - (|htInitPage| (MAKESTRING "Greek Names") NIL) + (|htInitPage| "Greek Names" NIL) (COND ((NULL |matches|) (|htInitPage| - (CONS (MAKESTRING - "Greek names matching search string {\\em ") - (CONS |ss| (CONS (MAKESTRING "}") NIL))) + (CONS "Greek names matching search string {\\em " + (CONS |ss| (CONS "}" NIL))) NIL) (|htSay| '|\\vspace{2}\\centerline{Sorry, but no greek letters match your search string}\\centerline{{\\em | |ss| @@ -4355,32 +4310,29 @@ (|htShowPage|)) ('T (|htInitPage| - (CONS (MAKESTRING - "Greek letters matching search string {\\em ") - (CONS |ss| (CONS (MAKESTRING "}") NIL))) + (CONS "Greek letters matching search string {\\em " + (CONS |ss| (CONS "}" NIL))) NIL) (COND (|nonmatches| - (|htSay| (MAKESTRING - "The greek letters that {\\em match} your search string {\\em ") - |ss| (MAKESTRING "}:"))) + (|htSay| "The greek letters that {\\em match} your search string {\\em " + |ss| "}:")) ('T - (|htSay| (MAKESTRING "Your search string {\\em ") + (|htSay| "Your search string {\\em " |ss| '|} matches all of the greek letters:|))) - (|htSay| (MAKESTRING "{\\em \\table{")) + (|htSay| "{\\em \\table{") (DO ((G168158 |matches| (CDR G168158)) (|x| NIL)) ((OR (ATOM G168158) (PROGN (SETQ |x| (CAR G168158)) NIL)) NIL) - (SEQ (EXIT (|htSay| (MAKESTRING "{") |x| - (MAKESTRING "}"))))) - (|htSay| (MAKESTRING "}}\\vspace{1}")) + (SEQ (EXIT (|htSay| "{" |x| + "}")))) + (|htSay| "}}\\vspace{1}") (COND (|nonmatches| - (|htSay| (MAKESTRING - "The greek letters that {\\em do not match} your search string:{\\em \\table{")) + (|htSay| "The greek letters that {\\em do not match} your search string:{\\em \\table{") (DO ((G168167 |nonmatches| (CDR G168167)) (|x| NIL)) ((OR (ATOM G168167) @@ -4388,9 +4340,9 @@ (SETQ |x| (CAR G168167)) NIL)) NIL) - (SEQ (EXIT (|htSay| (MAKESTRING "{") |x| - (MAKESTRING "}"))))) - (|htSay| (MAKESTRING "}}")))) + (SEQ (EXIT (|htSay| "{" |x| + "}")))) + (|htSay| "}}"))) (|htShowPage|)))))))))) ;htTextSearch(filter) == @@ -4437,24 +4389,19 @@ (|bcErrorPage| |s|)) ((NULL |s|) (|errorPage| NIL - (CONS (CONS (MAKESTRING "Missing search string") + (CONS (CONS "Missing search string" NIL) (CONS NIL - (CONS (MAKESTRING - "\\vspace{2}\\centerline{To select one of the lines of text:}\\newline ") + (CONS "\\vspace{2}\\centerline{To select one of the lines of text:}\\newline " (CONS - (MAKESTRING - "\\centerline{{\\em first} enter a search key into the input area}\\newline ") + "\\centerline{{\\em first} enter a search key into the input area}\\newline " (CONS - (MAKESTRING - "\\centerline{{\\em then } move the mouse cursor to the work {\\em search} and click}") + "\\centerline{{\\em then } move the mouse cursor to the work {\\em search} and click}" NIL))))))) ('T (SPADLET |filter| |s|) (SPADLET |lines| - (CONS (MAKESTRING - "{{\\em Fruit flies} *like* a {\\em banana and califlower ears.}}") - (CONS (MAKESTRING - "{{\\em Sneak Sears Silas with Savings Snatch}}") + (CONS "{{\\em Fruit flies} *like* a {\\em banana and califlower ears.}}" + (CONS "{{\\em Sneak Sears Silas with Savings Snatch}}" NIL))) (DO ((G168191 |lines| (CDR G168191)) (|x| NIL)) ((OR (ATOM G168191) @@ -4469,13 +4416,12 @@ (CONS |x| |nonmatches|))))))) (SPADLET |matches| (NREVERSE |matches|)) (SPADLET |nonmatches| (NREVERSE |nonmatches|)) - (|htInitPage| (MAKESTRING "Text Matches") NIL) + (|htInitPage| "Text Matches" NIL) (COND ((NULL |matches|) (|htInitPage| - (CONS (MAKESTRING - "Lines matching search string {\\em ") - (CONS |s| (CONS (MAKESTRING "}") NIL))) + (CONS "Lines matching search string {\\em " + (CONS |s| (CONS "}" NIL))) NIL) (|htSay| '|\\vspace{2}\\centerline{Sorry, but no lines match your search string}\\centerline{{\\em | |s| @@ -4483,31 +4429,28 @@ (|htShowPage|)) ('T (|htInitPage| - (CONS (MAKESTRING - "Lines matching search string {\\em ") - (CONS |s| (CONS (MAKESTRING "}") NIL))) + (CONS "Lines matching search string {\\em " + (CONS |s| (CONS "}" NIL))) NIL) (COND (|nonmatches| - (|htSay| (MAKESTRING - "The lines that {\\em match} your search string {\\em ") - |s| (MAKESTRING "}:"))) + (|htSay| "The lines that {\\em match} your search string {\\em " + |s| "}:")) ('T - (|htSay| (MAKESTRING "Your search string {\\em ") + (|htSay| "Your search string {\\em " |s| '|} matches both lines:|))) - (|htSay| (MAKESTRING "{\\em \\table{")) + (|htSay| "{\\em \\table{") (DO ((G168200 |matches| (CDR G168200)) (|x| NIL)) ((OR (ATOM G168200) (PROGN (SETQ |x| (CAR G168200)) NIL)) NIL) - (SEQ (EXIT (|htSay| (MAKESTRING "{") |x| - (MAKESTRING "}"))))) - (|htSay| (MAKESTRING "}}\\vspace{1}")) + (SEQ (EXIT (|htSay| "{" |x| + "}")))) + (|htSay| "}}\\vspace{1}") (COND (|nonmatches| - (|htSay| (MAKESTRING - "The line that {\\em does not match} your search string:{\\em \\table{")) + (|htSay| "The line that {\\em does not match} your search string:{\\em \\table{") (DO ((G168209 |nonmatches| (CDR G168209)) (|x| NIL)) ((OR (ATOM G168209) @@ -4515,9 +4458,9 @@ (SETQ |x| (CAR G168209)) NIL)) NIL) - (SEQ (EXIT (|htSay| (MAKESTRING "{") |x| - (MAKESTRING "}"))))) - (|htSay| (MAKESTRING "}}")))) + (SEQ (EXIT (|htSay| "{" |x| + "}")))) + (|htSay| "}}"))) (|htShowPage|)))))))))) ;htTutorialSearch pattern == @@ -4544,24 +4487,23 @@ (OR (|dbNonEmptyPattern| |pattern|) (RETURN (|errorPage| NIL - (CONS (MAKESTRING "Empty search key") + (CONS "Empty search key" (CONS NIL (CONS - (MAKESTRING - "\\vspace{3}\\centerline{You must enter some search string") + "\\vspace{3}\\centerline{You must enter some search string" NIL))))))) (SPADLET |s| (|mkUnixPattern| |s|)) (SPADLET |source| - (MAKESTRING "$AXIOM/doc/hypertex/pages/ht.db")) - (SPADLET |target| (MAKESTRING "/tmp/temp.text.$SPADNUM")) - (OBEY (STRCONC (MAKESTRING "$AXIOM/lib/hthits") - (MAKESTRING " \"") |s| (MAKESTRING "\" ") - |source| (MAKESTRING " > ") |target|)) + "$AXIOM/doc/hypertex/pages/ht.db") + (SPADLET |target| "/tmp/temp.text.$SPADNUM") + (OBEY (STRCONC "$AXIOM/lib/hthits" + " \"" |s| "\" " + |source| " > " |target|)) (SPADLET |lines| (|dbReadLines| '|temp|)) (|htInitPageNoScroll| NIL - (CONS (MAKESTRING "Tutorial Pages mentioning {\\em ") - (CONS |pattern| (CONS (MAKESTRING "}") NIL)))) - (|htSay| (MAKESTRING "\\beginscroll\\table{")) + (CONS "Tutorial Pages mentioning {\\em " + (CONS |pattern| (CONS "}" NIL)))) + (|htSay| "\\beginscroll\\table{") (DO ((G168241 |lines| (CDR G168241)) (|line| NIL)) ((OR (ATOM G168241) (PROGN (SETQ |line| (CAR G168241)) NIL)) @@ -4570,12 +4512,12 @@ (SPADLET |LETTMP#1| (|dbParts| |line| 3 0)) (SPADLET |name| (CAR |LETTMP#1|)) (SPADLET |title| (CADR |LETTMP#1|)) - (|htSay| (CONS (MAKESTRING "{\\downlink{") + (|htSay| (CONS "{\\downlink{" (CONS |title| - (CONS (MAKESTRING "}{") + (CONS "}{" (CONS |name| - (CONS (MAKESTRING "}}") NIL)))))))))) - (|htSay| (MAKESTRING "}")) + (CONS "}}" NIL)))))))))) + (|htSay| "}") (|htShowPage|)))))) ;mkUnixPattern s == @@ -4620,15 +4562,15 @@ NIL) (SEQ (EXIT (SPADLET |u| (STRCONC (SUBSTRING |u| 0 |i|) - (MAKESTRING ".*") + ".*" (SUBSTRING |u| (PLUS |i| 1) NIL)))))) (COND ((NEQUAL (ELT |u| 0) |$wild|) - (SPADLET |u| (STRCONC (MAKESTRING "[^a-zA-Z]") |u|))) + (SPADLET |u| (STRCONC "[^a-zA-Z]" |u|))) ('T (SPADLET |u| (SUBSTRING |u| 1 NIL)))) (COND ((NEQUAL (ELT |u| (SPADLET |k| (MAXINDEX |u|))) |$wild|) - (SPADLET |u| (STRCONC |u| (MAKESTRING "[^a-zA-Z]")))) + (SPADLET |u| (STRCONC |u| "[^a-zA-Z]"))) ('T (SPADLET |u| (SUBSTRING |u| 0 |k|)))) |u|))))) diff --git a/src/interp/htcheck.lisp.pamphlet b/src/interp/htcheck.lisp.pamphlet index f3f2231..de7f665 100644 --- a/src/interp/htcheck.lisp.pamphlet +++ b/src/interp/htcheck.lisp.pamphlet @@ -99,8 +99,8 @@ (SEQ (PROGN (SPADLET |$htMacroTable| (MAKE-HASHTABLE 'UEQUAL)) (SPADLET |fn| - (CONCAT (|getEnv| (MAKESTRING "AXIOM")) - (MAKESTRING "/doc/util.ht"))) + (CONCAT (|getEnv| "AXIOM") + "/doc/util.ht")) (COND ((PROBE-FILE |fn|) (SPADLET |instream| (MAKE-INSTREAM |fn|)) @@ -134,7 +134,7 @@ (SEQ (EXIT (HPUT |$htMacroTable| |s| |n|))))) ('T (|sayBrightly| - (MAKESTRING "Warning: macro table not found")))) + "Warning: macro table not found"))) |$htMacroTable|))))) ;READLINE(:s) == @@ -166,7 +166,7 @@ (PROG (|k| |command| |m| |i| |j| |digitString| |numOfArgs|) (RETURN (SEQ (COND - ((NULL (|stringPrefix?| (MAKESTRING "\\newcommand{") + ((NULL (|stringPrefix?| "\\newcommand{" |line|)) NIL) ('T (SPADLET |k| (|charPosition| (|char| '}) |line| 11)) @@ -266,7 +266,7 @@ (|member| |arg| (ELT |tree| 4))) ((BOOT-EQUAL |kind| 'INTEGER) (INTEGERP |arg|)) ((BOOT-EQUAL |kind| 'FUNCTION) (ATOM |arg|)) - ('T (|systemError| (MAKESTRING "unknown tree branch"))))))))) + ('T (|systemError| "unknown tree branch")))))))) ;buildHtMacroTable() diff --git a/src/interp/i-analy.lisp.pamphlet b/src/interp/i-analy.lisp.pamphlet index 59283e2..aaf230d 100644 --- a/src/interp/i-analy.lisp.pamphlet +++ b/src/interp/i-analy.lisp.pamphlet @@ -964,7 +964,7 @@ (SPADLET |ms| (|bottomUp| |pred|)) (COND ((NEQUAL |$Boolean| (CAR |ms|)) - (|throwKeyedMsg| (MAKESTRING "S2IB0001") (CONS |name| NIL))) + (|throwKeyedMsg| "S2IB0001" (CONS |name| NIL))) ('T |ms|)))))) ;bottomUpCompilePredicate(pred, name) == @@ -1016,7 +1016,7 @@ (COND ((SPADLET |m| (|isType| |t|)) (|bottomUpType| |t| |m|)) ((EQ |id| '|noMapVal|) - (|throwKeyedMsg| (MAKESTRING "S2IB0002") NIL)) + (|throwKeyedMsg| "S2IB0002" NIL)) ((EQ |id| '|noBranch|) (|keyedSystemError| 'S2GE0016 (CONS "bottomUpIdentifier" @@ -1127,7 +1127,7 @@ ((SPADLET |m| (|getMode| |t|)) (COND ((AND (PAIRP |m|) (EQ (QCAR |m|) '|Mapping|)) - (|throwKeyedMsg| (MAKESTRING "S2IB0003") + (|throwKeyedMsg| "S2IB0003" (CONS (|getUnname| |t|) NIL))) ('T (COND @@ -1716,14 +1716,14 @@ ((NULL |$genValue|) (SPADLET |amsl| (|printableArgModeSetList|)) (|throwKeyedMsgSP| 'S2IB0008 - (CONS (MAKESTRING "the union object") + (CONS "the union object" (CONS |amsl| NIL)) |op|)) ('T (SPADLET |object| (|retract| (|getValue| |op|))) (COND ((BOOT-EQUAL |object| '|failed|) (|throwKeyedMsgSP| 'S2IB0008 - (CONS (MAKESTRING "the union object") + (CONS "the union object" (CONS |amsl| NIL)) |op|)) ('T @@ -1782,7 +1782,7 @@ (COND ((SPADLET |o| (|getValue| |op0|)) (|prefix2String| (|objMode| |o|))) - ('T (MAKESTRING "")))) + ('T ""))) (SPADLET |msgKey| (COND ((NULL |amsl|) 'S2IB0013) @@ -1949,8 +1949,8 @@ (SPADLET |val| (|fetchOutput| |i|)) (|putValue| |op| |val|) (|putModeSet| |op| (CONS (|objMode| |val|) NIL))) - ('T (|throwKeyedMsgSP| (MAKESTRING "S2IB0006") NIL |t|)))) - ('T (|throwKeyedMsgSP| (MAKESTRING "S2IB0006") NIL |op|))))))) + ('T (|throwKeyedMsgSP| "S2IB0006" NIL |t|)))) + ('T (|throwKeyedMsgSP| "S2IB0006" NIL |op|))))))) ;bottomUpFormRetract(t,op,opName,argl,amsl) == ; -- tries to find one argument, which can be pulled back, and calls diff --git a/src/interp/i-coerce.lisp.pamphlet b/src/interp/i-coerce.lisp.pamphlet index 5a01c10..81d6719 100644 --- a/src/interp/i-coerce.lisp.pamphlet +++ b/src/interp/i-coerce.lisp.pamphlet @@ -853,7 +853,7 @@ The special routines that do the coercions typically involve a "2" ((AND (PAIRP |t1|) (PROGN (SPADLET D (QCAR |t1|)) 'T)) (SPADLET |fun| (OR (GETL D '|retract|) - (INTERN (STRCONC (MAKESTRING "retract") + (INTERN (STRCONC "retract" (STRINGIMAGE D))))) (COND ((|functionp| |fun|) (PUT D '|retract| |fun|) @@ -915,7 +915,7 @@ The special routines that do the coercions typically involve a "2" (SPADLET |val| (|objValUnwrap| |object|)) (SPADLET |target| (CONS '|Union| - (CONS |u| (CONS (MAKESTRING "failed") NIL)))) + (CONS |u| (CONS "failed" NIL)))) (SPADLET |funName| '|retractIfCan|) (COND (|$reportBottomUpFlag| @@ -3596,7 +3596,7 @@ Interpreter Coercion Query Functions (|$reportBottomUpFlag| (|sayFunctionSelection| '|map| |args| |t2| NIL - (MAKESTRING "coercion facility (map)")))) + "coercion facility (map)"))) (SPADLET |mms| (|selectMms1| '|map| |t2| |args| |args| NIL)) @@ -4007,7 +4007,7 @@ Interpreter Coercion Query Functions (PROGN (SPADLET D (QCAR |source|)) 'T)) (SPADLET |fun| (OR (GETL D '|coerceCommute|) - (INTERN (STRCONC (MAKESTRING "commute") + (INTERN (STRCONC "commute" (STRINGIMAGE D))))) (COND ((|functionp| |fun|) (PUT D '|coerceCommute| |fun|) diff --git a/src/interp/i-eval.lisp.pamphlet b/src/interp/i-eval.lisp.pamphlet index c29e942..1fdbf6f 100644 --- a/src/interp/i-eval.lisp.pamphlet +++ b/src/interp/i-eval.lisp.pamphlet @@ -1268,7 +1268,7 @@ the alternate polynomial types of Symbols. ((QUOTE T) (SPADLET |t'| (|coerceOrRetract| |t'| |t|)) (AND |t'| (|wrapped2Quote| (|objVal| |t'|)))))) - ((QUOTE T) (|systemErrorHere| (MAKESTRING "getArgValue"))))))) + ((QUOTE T) (|systemErrorHere| "getArgValue")))))) ;getArgValue2(a,t,se?,opName) == ; se? and (objMode(getValue a) ^= t) => @@ -1470,7 +1470,7 @@ the alternate polynomial types of Symbols. (DEFUN |failCheck| (|x|) (declare (special |$coerceFailure| |$String|)) (COND - ((BOOT-EQUAL |x| (MAKESTRING "failed")) + ((BOOT-EQUAL |x| "failed") (|stopTimingProcess| (|peekTimedName|)) (THROW (QUOTE |interpreter|) (|objNewWrap| "failed" |$String|))) ((BOOT-EQUAL |x| |$coerceFailure|) NIL) diff --git a/src/interp/i-intern.lisp.pamphlet b/src/interp/i-intern.lisp.pamphlet index 5c7d1cb..1e23d5a 100644 --- a/src/interp/i-intern.lisp.pamphlet +++ b/src/interp/i-intern.lisp.pamphlet @@ -126,8 +126,8 @@ Maker of attrib tree from parser form ((QUOTE T) (SPADLET |fn| (|lnPlaceOfOrigin| (|poGetLineObject| |pos|))) (COND - ((OR (NULL |fn|) (BOOT-EQUAL |fn| (MAKESTRING "strings"))) - (SPADLET |fn| (MAKESTRING "console")))) + ((OR (NULL |fn|) (BOOT-EQUAL |fn| "strings")) + (SPADLET |fn| "console"))) (|putSrcPos| |atree| |fn| (|pfSourceText| |pf|) (|pfLinePosn| |pos|) @@ -278,7 +278,7 @@ we match the correct number of args (RETURN (COND ((NULL |x|) - (|throwKeyedMsg| (QUOTE S2IP0005) (CONS (MAKESTRING "NIL") NIL))) + (|throwKeyedMsg| (QUOTE S2IP0005) (CONS "NIL" NIL))) ((VECP |x|) |x|) ((ATOM |x|) (COND @@ -300,7 +300,7 @@ we match the correct number of args (SPADLET |argl| (QCDR |x|)) (QUOTE T))) (|mkAtree2| |x| |op| |argl|)) - ((QUOTE T) (|systemErrorHere| (MAKESTRING "mkAtree1"))))))) + ((QUOTE T) (|systemErrorHere| "mkAtree1")))))) @ \subsection{mkAtree2} @@ -732,7 +732,7 @@ mkAtree2 and mkAtree3 were created because mkAtree1 got so big (EXIT (IF (BOOT-EQUAL |a| |b|) |a| - (|throwMessage| (MAKESTRING " double declaration of parameter"))))) + (|throwMessage| " double declaration of parameter")))) (EXIT (OR |a| |b|)))) (DEFUN |mkAtree3| (|x| |op| |argl|) @@ -1410,7 +1410,7 @@ Transforms from an atree back into a tree ((BOOT-EQUAL |newOp| (QUOTE |Dollar|)) (SPADLET |newOp| (QUOTE |$elt|)))) (CONS |newOp| (|unVectorize| |argl|))) - ((QUOTE T) (|systemErrorHere| (MAKESTRING "unVectorize"))))))) + ((QUOTE T) (|systemErrorHere| "unVectorize")))))) @ \section{Stuffing and Getting Info} @@ -1998,7 +1998,7 @@ May be a number or a vector ((SPADLET |u| (|get| |id| (QUOTE |value|) |e|)) (COND ((BOOT-EQUAL (|objMode| |u|) |$EmptyMode|) - (|systemErrorHere| (MAKESTRING "getValueFromSpecificEnvironment"))) + (|systemErrorHere| "getValueFromSpecificEnvironment")) ((QUOTE T) (SPADLET |v| (|objValUnwrap| |u|)) (COND @@ -2477,8 +2477,8 @@ by x. x is a VAT. (SPADLET |col| (|srcPosColumn| |sp|)) (SPADLET |dots| (COND - ((EQL |col| 0) (MAKESTRING "")) - ((QUOTE T) (|fillerSpaces| |col| (MAKESTRING "."))))) + ((EQL |col| 0) "") + ((QUOTE T) (|fillerSpaces| |col| ".")))) (|sayBrightly| (CONS (|fillerSpaces| (|#| |s|) " ") (CONS |dots| (CONS "^" NIL)))) (QUOTE T)))))) diff --git a/src/interp/i-map.lisp.pamphlet b/src/interp/i-map.lisp.pamphlet index ebd9d1c..064f35e 100644 --- a/src/interp/i-map.lisp.pamphlet +++ b/src/interp/i-map.lisp.pamphlet @@ -94,7 +94,7 @@ (COND ((OR (> 7 |sz|) (NEQUAL (|char| '*) (ELT |name'| 0))) NIL) ((NULL (DIGITP (ELT |name'| 1))) NIL) - ((NULL (STRPOS (MAKESTRING ";") |name'| 1 NIL)) NIL) + ((NULL (STRPOS ";" |name'| 1 NIL)) NIL) ('T 'T))))))) ;makeInternalMapMinivectorName(name) == @@ -104,18 +104,18 @@ (DEFUN |makeInternalMapMinivectorName| (|name|) (COND - ((STRINGP |name|) (INTERN (STRCONC |name| (MAKESTRING ";MV")))) - ('T (INTERN (STRCONC (PNAME |name|) (MAKESTRING ";MV")))))) + ((STRINGP |name|) (INTERN (STRCONC |name| ";MV"))) + ('T (INTERN (STRCONC (PNAME |name|) ";MV"))))) ;mkCacheName(name) == INTERNL(STRINGIMAGE name,'";AL") (DEFUN |mkCacheName| (|name|) - (INTERNL (STRINGIMAGE |name|) (MAKESTRING ";AL"))) + (INTERNL (STRINGIMAGE |name|) ";AL")) ;mkAuxiliaryName(name) == INTERNL(STRINGIMAGE name,'";AUX") (DEFUN |mkAuxiliaryName| (|name|) - (INTERNL (STRINGIMAGE |name|) (MAKESTRING ";AUX"))) + (INTERNL (STRINGIMAGE |name|) ";AUX")) ;--% Adding a function definition ;isMapExpr x == x is ['MAP,:.] @@ -1783,7 +1783,7 @@ (EXIT (SETQ G167142 (APPEND G167142 - (CONS (MAKESTRING " ") + (CONS " " (CONS |map| NIL))))))))) NIL)))))) ('T (PUSH |mapAndArgTypes| |$analyzingMapList|) @@ -1890,7 +1890,7 @@ (COND (|$reportInterpOnly| (|sayMSG| |msg|) (|sayMSG| - (MAKESTRING " We will attempt to interpret the code.")))) + " We will attempt to interpret the code."))) (COND ((NULL |$compilingMap|) (THROW '|loopCompiler| '|tryInterpOnly|)) @@ -2599,7 +2599,7 @@ (CONS (COND ((PAIRP |sig|) (|prefix2String| (CAR |sig|))) - ('T (MAKESTRING "?"))) + ('T "?")) NIL)))) ('T (|sayKeyedMsg| 'S2IM0015 @@ -3667,7 +3667,7 @@ ; INTERN CONCAT('"#",STRINGIMAGE i) (DEFUN |mkSharpVar| (|i|) - (INTERN (CONCAT (MAKESTRING "#") (STRINGIMAGE |i|)))) + (INTERN (CONCAT "#" (STRINGIMAGE |i|)))) ;mapPredTran pred == ; -- transforms "x in i..j" to "x>=i and x<=j" diff --git a/src/interp/i-output.lisp.pamphlet b/src/interp/i-output.lisp.pamphlet index a355a91..baac0a3 100644 --- a/src/interp/i-output.lisp.pamphlet +++ b/src/interp/i-output.lisp.pamphlet @@ -81,9 +81,9 @@ ((ATOM |o|) (COND ((STRINGP |o|) |o|) - ((BOOT-EQUAL |o| '| |) (MAKESTRING " ")) - ((BOOT-EQUAL |o| '|)|) (MAKESTRING ")")) - ((BOOT-EQUAL |o| '|(|) (MAKESTRING "(")) + ((BOOT-EQUAL |o| '| |) " ") + ((BOOT-EQUAL |o| '|)|) ")") + ((BOOT-EQUAL |o| '|(|) "(") ('T (STRINGIMAGE |o|)))) ('T (APPLY 'STRCONC @@ -430,7 +430,7 @@ these functions return an updated ``layout so far'' in general (RETURN (SEQ (COND ((|member| |x| '("failed" "nil" "prime" "sqfr" "irred")) - (STRCONC (MAKESTRING "\"") |x| (MAKESTRING "\""))) + (STRCONC "\"" |x| "\"")) ((STRINGP |x|) |x|) ((VECP |x|) (|outputTran| @@ -727,7 +727,7 @@ these functions return an updated ``layout so far'' in general (SPADLET |targ'| (CONS 'PAREN (CONS |targ'| NIL))))) (CONS 'CONCAT (CONS (|outputTran| (CONS |fun| |l|)) - (CONS (MAKESTRING "$") (CONS |targ'| NIL))))) + (CONS "$" (CONS |targ'| NIL))))) ((OR (AND (PAIRP |x|) (EQ (QCAR |x|) '|$elt|) (PROGN (SPADLET |ISTMP#1| (QCDR |x|)) @@ -760,7 +760,7 @@ these functions return an updated ``layout so far'' in general (SPADLET |targ'| (CONS 'PAREN (CONS |targ'| NIL))))) (CONS 'CONCAT (CONS (|outputTran| |c|) - (CONS (MAKESTRING "$") (CONS |targ'| NIL))))) + (CONS "$" (CONS |targ'| NIL))))) ((AND (PAIRP |x|) (EQ (QCAR |x|) '-) (PROGN (SPADLET |ISTMP#1| (QCDR |x|)) @@ -863,7 +863,7 @@ these functions return an updated ``layout so far'' in general (PROGN (SPADLET |foo3| (QCAR |ISTMP#2|)) 'T))))) - (BOOT-EQUAL |op'| (MAKESTRING "*")) + (BOOT-EQUAL |op'| "*") (OR (AND (PAIRP |foo3|) (EQ (QCAR |foo3|) '|log|) (PROGN (SPADLET |ISTMP#1| (QCDR |foo3|)) @@ -1299,7 +1299,7 @@ NIL (SPADLET |arg'| (CAR |LETTMP#1|)) (SPADLET |def'| (CDR |LETTMP#1|)) (SPADLET |arg'| (|outputTran| |arg'|)) - (COND ((NULL |arg'|) (SPADLET |arg'| (MAKESTRING "()")))) + (COND ((NULL |arg'|) (SPADLET |arg'| "()"))) (CONS 'CONCATB (CONS |$op| (CONS (|outputTran| |arg'|) @@ -1787,7 +1787,7 @@ NIL (SPADLET |init| (CADDR G167334)) (SPADLET |one| (CADDDR G167334)) (SPADLET |optFinal| (CDDDDR G167334)) - (SPADLET |d| (|appChar| (MAKESTRING "for ") |x| |y| |d|)) + (SPADLET |d| (|appChar| "for " |x| |y| |d|)) (SPADLET |d| (APP |a| (SPADLET |w| (PLUS |x| 4)) |y| |d|)) (SPADLET |d| (|appChar| " in " (SPADLET |w| (PLUS |w| (WIDTH |a|))) @@ -2219,7 +2219,7 @@ NIL ('T '+))) (SPADLET |opString| (OR (GETL |infixOp| 'INFIXOP) - (MAKESTRING ","))) + ",")) (SPADLET |d| (APP |opString| |x| |y| |d|)) (SPADLET |x| (PLUS |x| (WIDTH |opString|))) (SPADLET |arg| (|absym| |arg|)) @@ -2281,7 +2281,7 @@ NIL NIL)))) ('T (SPADLET |opString| - (OR (GETL |op| 'INFIXOP) (MAKESTRING ","))) + (OR (GETL |op| 'INFIXOP) ",")) (SPADLET |opWidth| (WIDTH |opString|)) (SPADLET |frst| (CADR |e|)) (SPADLET |rst| (CDDR |e|)) @@ -3027,8 +3027,8 @@ NIL (COND ((BOOT-EQUAL |name| |firstName|) - (MAKESTRING "where ")) - ('T (MAKESTRING "and ")))) + "where ") + ('T "and "))) (SPADLET |line| (STRCONC |andWhere| (PNAME |name|))) @@ -3529,7 +3529,7 @@ NIL (SPADLET |opCode| (COND ((BOOT-EQUAL |kind| '|sigma|) - (CONS (CONS '(0 . 0) (MAKESTRING ">")) + (CONS (CONS '(0 . 0) ">") (CONS (CONS '(0 . 1) (|specialChar| '|hbar|)) (CONS (CONS '(0 . -1) (|specialChar| '|hbar|)) @@ -3946,8 +3946,7 @@ NIL (|sayALGEBRA| (CONS '|%l| (CONS '|%b| - (CONS (MAKESTRING - " Too wide to Print") + (CONS " Too wide to Print" (CONS '|%d| NIL))))) (THROW '|output| NIL)) ('T @@ -4241,8 +4240,8 @@ NIL (|compiledLookup| '|print| '($) (|TextWriter|)))) (|sayMSGNT| - (APPEND (|bright| (MAKESTRING "AXIOM-XL")) - (CONS (MAKESTRING "output: ") NIL))) + (APPEND (|bright| "AXIOM-XL") + (CONS "output: " NIL))) (SPADCALL (SPADCALL |textwrit|) |expr| |printfun|) (|sayMSGNT| '|%l|)) ((AND (PAIRP |domain|) (EQ (QCAR |domain|) '|Tuple|) @@ -4254,10 +4253,10 @@ NIL (CONS '|List| (CONS S NIL)))) ('T (|sayALGEBRA| - (APPEND (|bright| (MAKESTRING "LISP")) - (CONS (MAKESTRING "output:") + (APPEND (|bright| "LISP") + (CONS "output:" (CONS '|%l| - (CONS (OR |expr| (MAKESTRING "NIL")) + (CONS (OR |expr| "NIL") NIL))))))))))) ;outputNumber(start,linelength,num) == @@ -4293,9 +4292,9 @@ NIL ((> |start| 1) (SPADLET |blnks| (|fillerSpaces| (SPADDIFFERENCE |start| 1) - (MAKESTRING " ")))) - ('T (SPADLET |blnks| (MAKESTRING "")))) - (SPADLET |under| (MAKESTRING "_")) + " "))) + ('T (SPADLET |blnks| ""))) + (SPADLET |under| "_") (SPADLET |firsttime| (> |linelength| 3)) (COND ((> |linelength| 2) @@ -4323,7 +4322,7 @@ NIL (|firsttime| (SPADLET |blnks| (CONCAT |blnks| - (MAKESTRING " "))) + " ")) (SPADLET |linelength| (SPADDIFFERENCE |linelength| 1)) @@ -4360,8 +4359,8 @@ NIL ((> |start| 1) (SPADLET |blnks| (|fillerSpaces| (SPADDIFFERENCE |start| 1) - (MAKESTRING " ")))) - ('T (SPADLET |blnks| (MAKESTRING "")))) + " "))) + ('T (SPADLET |blnks| ""))) (DO () ((NULL (> (SIZE |str|) |linelength|)) NIL) (SEQ (EXIT (PROGN (COND @@ -4488,9 +4487,7 @@ NIL (COND (|x'| (|objValUnwrap| |x'|)) - ('T - (MAKESTRING - "unprintableObject"))))) + ('T "unprintableObject")))) G168949)))))))) (CONS |u| |argl|)))))) ('T |form|)))))) @@ -4712,7 +4709,7 @@ NIL (PROGN (SETQ |a| (CAR G169131)) NIL)) NIL) (SEQ (EXIT (|charyTop| |a| |start| |linelength|)))) - (MAKESTRING " ")) + " ") ((AND (PAIRP |u|) (PROGN (SPADLET |ISTMP#1| (QCAR |u|)) @@ -4776,7 +4773,7 @@ NIL (SEQ (EXIT (PROGN (|scylla| |n| |d|) (SPADLET |n| (SPADDIFFERENCE |n| 1)))))) - (MAKESTRING " "))))))))))) + " ")))))))))) ;charyTopWidth u == ; atom u => u @@ -5018,7 +5015,7 @@ NIL (COND ((CDR |u|) (|charybdis| (CONS 'ELSE (CDR |u|)) |start| |linelength|))) - (MAKESTRING " ")))))) + " "))))) ;charySemiColon(u,v,start,linelength) == ; for a in rest u repeat @@ -5042,10 +5039,10 @@ NIL (DEFUN |charyMinus| (|u| |v| |start| |linelength|) (declare (ignore |u|)) (PROGN - (|charybdis| (MAKESTRING "-") |start| |linelength|) + (|charybdis| "-" |start| |linelength|) (|charybdis| (ELT |v| 1) (PLUS |start| 3) (SPADDIFFERENCE |linelength| 3)) - (MAKESTRING " "))) + " ")) ;charyBinary(d,u,v,start,linelength) == ; d in '(" := " "= ") => @@ -5065,14 +5062,14 @@ NIL |start| |linelength|) (|charybdis| (ELT |v| 2) (PLUS |start| 2) (SPADDIFFERENCE |linelength| 2)) - (MAKESTRING " ")) + " ") ('T (|charybdis| (ELT |v| 1) (PLUS |start| 2) (SPADDIFFERENCE |linelength| 2)) (COND (|d| (|prnd| |start| |d|))) (|charybdis| (ELT |v| 2) (PLUS |start| 2) (SPADDIFFERENCE |linelength| 2)) - (MAKESTRING " ")))) + " "))) ;charyEquatnum(u,v,start,linelength) == ; charybdis(['PAREN,u.1],start,linelength) @@ -5085,7 +5082,7 @@ NIL (|charybdis| (CONS 'PAREN (CONS (ELT |u| 1) NIL)) |start| |linelength|) (|charybdis| (ELT |u| 2) |start| |linelength|) - (MAKESTRING " "))) + " ")) ;charySplit(u,v,start,linelength) == ; v:= [first v.0,:rest v] @@ -5120,7 +5117,7 @@ NIL (|charybdis| (ELT |v| 1) (PLUS |start| 2) (SPADDIFFERENCE |linelength| 2)) (COND - ((NULL (CDDR |v|)) (MAKESTRING " ")) + ((NULL (CDDR |v|)) " ") ('T (SPADLET |dm| (CDDR |v|)) (SPADLET |ddm| (CDR |dm|)) (|split2| |u| |dm| |ddm| |start| |linelength|)))) @@ -5158,7 +5155,7 @@ NIL (|prnd| |start| (COND ((SPADLET |d| (GETL (|keyp| |u|) 'INFIXOP)) |d|) - ('T (MAKESTRING ",")))) + ('T ","))) (RPLACD |dm| |ddm|) (SPADLET |m| (> (SPADDIFFERENCE |linelength| 2) @@ -5168,7 +5165,7 @@ NIL (COND (|m| (SPADDIFFERENCE |linelength| 2)) ('T |linelength|))) - (MAKESTRING " "))))) + " ")))) ;charyElse(u,v,start,linelength) == ; charybdis(v.1,start+3,linelength-3) @@ -5182,10 +5179,10 @@ NIL (|charybdis| (ELT |v| 1) (PLUS |start| 3) (SPADDIFFERENCE |linelength| 3)) (COND - ((NULL (CDDR |u|)) (MAKESTRING " ")) - ('T (|prnd| |start| (MAKESTRING ",")) + ((NULL (CDDR |u|)) " ") + ('T (|prnd| |start| ",") (|charybdis| (CONS 'ELSE (CDDR |v|)) |start| |linelength|) - (MAKESTRING " "))))) + " ")))) ;scylla(n,v) == ; y := LASSOC(n,v) @@ -5314,7 +5311,7 @@ NIL ;appagg(u,x,y,d) == appagg1(u,x,y,d,'",") (DEFUN |appagg| (|u| |x| |y| |d|) - (|appagg1| |u| |x| |y| |d| (MAKESTRING ","))) + (|appagg1| |u| |x| |y| |d| ",")) ;appagg1(u,x,y,d,s) == ; null u => d @@ -5340,7 +5337,7 @@ NIL ;appargs(u,x,y,d) == appargs1(u,x,y,d,'";") (DEFUN |appargs| (|u| |x| |y| |d|) - (|appargs1| |u| |x| |y| |d| (MAKESTRING ";"))) + (|appargs1| |u| |x| |y| |d| ";")) ;--Note that the definition of appargs1 below is identical to that of ;--appagg1 above except that the former calls appargs and the latter @@ -5371,9 +5368,9 @@ NIL (DEFUN |apprpar| (|x| |y| |y1| |y2| |d|) (COND ((OR (NULL *TALLPAR) (> 2 (SPADDIFFERENCE |y2| |y1|))) - (APP (MAKESTRING ")") |x| |y| |d|)) + (APP ")" |x| |y| |d|)) ('T - (APP (MAKESTRING ")") |x| |y2| + (APP ")" |x| |y2| (|apprpar1| |x| |y| |y1| (SPADDIFFERENCE |y2| 1) |d|))))) ;apprpar1(x, y, y1, y2, d) == @@ -5382,9 +5379,9 @@ NIL (DEFUN |apprpar1| (|x| |y| |y1| |y2| |d|) (COND - ((BOOT-EQUAL |y1| |y2|) (APP (MAKESTRING ")") |x| |y2| |d|)) + ((BOOT-EQUAL |y1| |y2|) (APP ")" |x| |y2| |d|)) ('T - (APP (MAKESTRING ")") |x| |y2| + (APP ")" |x| |y2| (|apprpar1| |x| |y| |y1| (SPADDIFFERENCE |y2| 1) |d|))))) ;applpar(x, y, y1, y2, d) == @@ -5394,9 +5391,9 @@ NIL (DEFUN |applpar| (|x| |y| |y1| |y2| |d|) (COND ((OR (NULL *TALLPAR) (> 2 (SPADDIFFERENCE |y2| |y1|))) - (APP (MAKESTRING "(") |x| |y| |d|)) + (APP "(" |x| |y| |d|)) ('T - (APP (MAKESTRING "(") |x| |y2| + (APP "(" |x| |y2| (|applpar1| |x| |y| |y1| (SPADDIFFERENCE |y2| 1) |d|))))) ;applpar1(x, y, y1, y2, d) == @@ -5405,9 +5402,9 @@ NIL (DEFUN |applpar1| (|x| |y| |y1| |y2| |d|) (COND - ((BOOT-EQUAL |y1| |y2|) (APP (MAKESTRING "(") |x| |y2| |d|)) + ((BOOT-EQUAL |y1| |y2|) (APP "(" |x| |y2| |d|)) ('T - (APP (MAKESTRING "(") |x| |y2| + (APP "(" |x| |y2| (|applpar1| |x| |y| |y1| (SPADDIFFERENCE |y2| 1) |d|))))) ;--The body of the function appelse assigns 6 local variables. @@ -5468,7 +5465,7 @@ NIL (SPADLET |d| (APP (CADR |u|) |x| |y| |d|)) (SPADLET |d| (APP (|agg| 2 |u|) |xptr| |yptr| |d|)) (SPADLET |xptr| (PLUS |xptr| (WIDTH (|agg| 2 |u|)))) - (SPADLET |d| (APP (MAKESTRING "=") |xptr| |yptr| |d|)) + (SPADLET |d| (APP "=" |xptr| |yptr| |d|)) (SPADLET |d| (APP (|agg| 3 |u|) (PLUS 1 |xptr|) |yptr| |d|)) (SPADLET |yptr| (PLUS (PLUS (PLUS |y| 1) (|superspan| (CADR |u|))) @@ -5538,8 +5535,8 @@ NIL ('T (SPADLET |ac| (|absym| (CAR |u|))) (SPADLET |sc| (COND - ((|syminusp| (CAR |u|)) (MAKESTRING "-")) - ('T (MAKESTRING "+")))) + ((|syminusp| (CAR |u|)) "-") + ('T "+"))) (SPADLET |dp| (|member| (|keyp| (|absym| (CAR |u|))) '(+ -))) (SPADLET |tempx| (PLUS (PLUS |x| (WIDTH |ac|)) (COND (|dp| 5) ('T 3)))) @@ -5598,7 +5595,7 @@ NIL ; appagg1(rest u, x, y, d, '";") (DEFUN |appsc| (|u| |x| |y| |d|) - (|appagg1| (CDR |u|) |x| |y| |d| (MAKESTRING ";"))) + (|appagg1| (CDR |u|) |x| |y| |d| ";")) ;appsetq(u, x, y, d) == ; w := WIDTH first u @@ -5613,7 +5610,7 @@ NIL (SPADLET |w| (WIDTH (CAR |u|))) (SPADLET |temparg1| (APP (CADR |u|) |x| |y| |d|)) (SPADLET |temparg2| - (APP (MAKESTRING ":") (PLUS |x| |w|) |y| |temparg1|)) + (APP ":" (PLUS |x| |w|) |y| |temparg1|)) (APP (CADR (CDR |u|)) (PLUS (PLUS |x| 2) |w|) |y| |temparg2|))))) ;appsub(u, x, y, d) == @@ -5653,7 +5650,7 @@ NIL (COND ((NULL |l|) |l|) ((EQ (SPADLET |a| (CAAR |l|)) 1) - (LIST 'CONCAT (CADR (CAR |l|)) (MAKESTRING " OTHERWISE"))) + (LIST 'CONCAT (CADR (CAR |l|)) " OTHERWISE")) ((EQCAR |a| 'COMPARG) (|starstarcond| (CONS (|transcomparg| (CADR |a|)) (CDR |l|)) |iforwhen|)) @@ -5663,7 +5660,7 @@ NIL ('T (LIST 'VCONCAT (|starstarcond| (CONS (CAR |l|) NIL) |iforwhen|) - (LIST 'VCONCAT (MAKESTRING " ") + (LIST 'VCONCAT " " (|starstarcond| (CDR |l|) |iforwhen|)))))))) ;eq0(u) == 0 @@ -5829,7 +5826,7 @@ NIL (PROGN (SPADLET |temparg1| (APP (CADR |u|) |x| |y| |d|)) (SPADLET |temparg2| - (APP (MAKESTRING "/") (PLUS |x| (WIDTH (CADR |u|))) + (APP "/" (PLUS |x| (WIDTH (CADR |u|))) |y| |temparg1|)) (APP (CADR (CDR |u|)) (PLUS (PLUS |x| 1) (WIDTH (CADR |u|))) |y| |temparg2|))))) @@ -5862,12 +5859,12 @@ NIL (SPADLET |y| (CAR |x|)) (SPADLET |u| (|remWidth| - (REVERSEWOC (CONS (MAKESTRING " ") (CDR |x|))))) + (REVERSEWOC (CONS " " (CDR |x|))))) (|charybdis| |u| |i| |n|) (COND ((NULL |$collectOutput|) (TERPRI |$algebraOutputStream|))) (|charybdis| (CONS 'ELSE (LIST |y|)) |i| |n|) - (MAKESTRING " "))))) + " ")))) ;appvertline(char, x, yl, yu, d) == ; yu < yl => d @@ -6329,9 +6326,9 @@ NIL (PROGN (COND ((BOOT-EQUAL |flag| - (MAKESTRING "ON")) + "ON") (SPADLET |flag| - (MAKESTRING "OFF")) + "OFF") (RETURN NIL))) (COND ((NULL |row|) @@ -6353,7 +6350,7 @@ NIL (RETURN (PROGN (SPADLET |flag| - (MAKESTRING "ON")) + "ON") NIL))))))) ('T (SPADLET |d| @@ -6541,7 +6538,7 @@ NIL (SETQ G169906 (CONS (LIST 'CONCAT - (MAKESTRING " ") |y|) + " " |y|) G169906))))))))) (DO () (NIL NIL) (SEQ (EXIT (PROGN @@ -6588,7 +6585,7 @@ NIL (COND (|$collectOutput| (TERPRI |$algebraOutputStream|))) - (SPADLET |ichr| (MAKESTRING " ")) + (SPADLET |ichr| " ") (SPADLET |u| |nextu|) (COND ((NULL |u|) (RETURN NIL)))))))))))) @@ -7261,7 +7258,7 @@ NIL (SPADLET |b| (CADR |u|)) (SPADLET |a| (CADDR |u|)) (SPADLET |w| (|vConcatWidth| |u|)) - (SPADLET |d| (APP (MAKESTRING "(") |x| |y| |d|)) + (SPADLET |d| (APP "(" |x| |y| |d|)) (SPADLET |x| (PLUS |x| 1)) (SPADLET |y1| (SPADDIFFERENCE |y| (|height| |a|))) (SPADLET |xoff| (QUOTIENT (SPADDIFFERENCE |w| (WIDTH |a|)) 2)) @@ -7270,7 +7267,7 @@ NIL (SPADLET |xoff| (QUOTIENT (SPADDIFFERENCE |w| (WIDTH |b|)) 2)) (SPADLET |d| (APP |b| (PLUS |x| |xoff|) |y2| |d|)) (SPADLET |x| (PLUS |x| |w|)) - (APP (MAKESTRING ")") |x| |y| |d|))))) + (APP ")" |x| |y| |d|))))) ;vConcatSub u == ; subspan u.1 + +/[height a for a in CDDR u] diff --git a/src/interp/i-resolv.lisp.pamphlet b/src/interp/i-resolv.lisp.pamphlet index 0c5843f..10011c1 100644 --- a/src/interp/i-resolv.lisp.pamphlet +++ b/src/interp/i-resolv.lisp.pamphlet @@ -385,7 +385,7 @@ this symmetric resolution is done the following way: (NULL (NULL |bad|))) NIL) (SEQ (EXIT (COND - ((BOOT-EQUAL |d| (MAKESTRING "failed")) + ((BOOT-EQUAL |d| "failed") (SPADLET |ud| (CONS |d| |ud|))) ((NULL (SPADLET |d'| (|resolveTT| |d| |t2|))) @@ -401,7 +401,7 @@ this symmetric resolution is done the following way: (NULL (NULL |bad|))) NIL) (SEQ (EXIT (COND - ((BOOT-EQUAL |d| (MAKESTRING "failed")) + ((BOOT-EQUAL |d| "failed") (SPADLET |ud| (APPEND |ud| (CONS |d| NIL)))) ((NULL (SPADLET |d'| @@ -1384,7 +1384,7 @@ this symmetric resolution is done the following way: NIL) (SEQ (EXIT (PROGN (SPADLET |sharp| - (INTERNL (MAKESTRING "#") + (INTERNL "#" (STRINGIMAGE |i|))) (COND ((BOOT-EQUAL |sharp| |pat|) diff --git a/src/interp/i-spec1.lisp.pamphlet b/src/interp/i-spec1.lisp.pamphlet index 814b1fb..d85ae8f 100644 --- a/src/interp/i-spec1.lisp.pamphlet +++ b/src/interp/i-spec1.lisp.pamphlet @@ -83,7 +83,7 @@ There are several special modes used in these functions: ;--% Void stuff ;voidValue() == '"()" -(DEFUN |voidValue| () (MAKESTRING "()")) +(DEFUN |voidValue| () "()") ;--% Handlers for Anonymous Function Definitions ;upADEF t == @@ -306,9 +306,9 @@ There are several special modes used in these functions: (SEQ (PROGN (SPADLET |$mapName| (|makeInternalMapName| - (MAKESTRING "anonymousFunction") (|#| |vars|) + "anonymousFunction" (|#| |vars|) |$anonymousMapCounter| - (MAKESTRING "internal"))) + "internal")) (SPADLET |$anonymousMapCounter| (PLUS 1 |$anonymousMapCounter|)) (SPADLET |$compilingMap| 'T) @@ -389,8 +389,7 @@ There are several special modes used in these functions: (SEQ (COND ((NULL (CAR |types|)) (|throwKeyedMsg| 'S2IS0056 NIL) (|throwMessage| - (MAKESTRING - " map result type needed but not present."))) + " map result type needed but not present.")) ('T (SPADLET |arglCode| (CONS 'LIST @@ -660,7 +659,7 @@ There are several special modes used in these functions: (|objValUnwrap| |canonicalAE|) NIL))))) (SPADLET |saeTypeSynonym| - (INTERN (STRCONC (MAKESTRING "SAE") + (INTERN (STRCONC "SAE" (STRINGIMAGE |a|)))) (SPADLET |saeTypeSynonymValue| (|objNew| |sae| '(|Domain|))) @@ -679,18 +678,18 @@ There are several special modes used in these functions: (|sayMSG| (|concat| (CONS '|%l| - (CONS (MAKESTRING " ") + (CONS " " (CONS |saeTypeSynonym| - (CONS (MAKESTRING " := ") + (CONS " := " (|prefix2String| (|objVal| |saeTypeSynonymValue|)))))))) (|sayMSG| (|concat| - (CONS (MAKESTRING " ") + (CONS " " (CONS |a| - (CONS (MAKESTRING " : ") + (CONS " : " (CONS |saeTypeSynonym| - (CONS (MAKESTRING " := ") + (CONS " := " (CONS |a| NIL)))))))))) (|putValue| |op| T2) (|putModeSet| |op| (CONS |sae| NIL))))))))))) @@ -770,7 +769,7 @@ There are several special modes used in these functions: ((NULL (AND (PAIRP |ms|) (EQ (QCDR |ms|) NIL) (EQUAL (QCAR |ms|) |$Boolean|))) (|throwKeyedMsgSP| 'S2IS0054 - (CONS 1 (CONS (MAKESTRING "\"and\"") NIL)) |term1|)) + (CONS 1 (CONS "\"and\"" NIL)) |term1|)) (|$genValue| (COND ((|BooleanEquality| @@ -783,7 +782,7 @@ There are several special modes used in these functions: ((NULL (AND (PAIRP |ms|) (EQ (QCDR |ms|) NIL) (EQUAL (QCAR |ms|) |$Boolean|))) (|throwKeyedMsgSP| 'S2IS0054 - (CONS 2 (CONS (MAKESTRING "\"and\"") NIL)) + (CONS 2 (CONS "\"and\"" NIL)) |term2|)) ('T (|putValue| |x| (|getValue| |term2|)) (|putModeSet| |x| |ms|)))))) @@ -792,7 +791,7 @@ There are several special modes used in these functions: ((NULL (AND (PAIRP |ms|) (EQ (QCDR |ms|) NIL) (EQUAL (QCAR |ms|) |$Boolean|))) (|throwKeyedMsgSP| 'S2IS0054 - (CONS 2 (CONS (MAKESTRING "\"and\"") NIL)) |term2|)) + (CONS 2 (CONS "\"and\"" NIL)) |term2|)) ('T (SPADLET |cond| (CONS (|mkAtreeNode| '=) @@ -863,7 +862,7 @@ There are several special modes used in these functions: ((NULL (AND (PAIRP |ms|) (EQ (QCDR |ms|) NIL) (EQUAL (QCAR |ms|) |$Boolean|))) (|throwKeyedMsgSP| 'S2IS0054 - (CONS 1 (CONS (MAKESTRING "\"or\"") NIL)) |term1|)) + (CONS 1 (CONS "\"or\"" NIL)) |term1|)) (|$genValue| (COND ((|BooleanEquality| @@ -876,7 +875,7 @@ There are several special modes used in these functions: ((NULL (AND (PAIRP |ms|) (EQ (QCDR |ms|) NIL) (EQUAL (QCAR |ms|) |$Boolean|))) (|throwKeyedMsgSP| 'S2IS0054 - (CONS 2 (CONS (MAKESTRING "\"or\"") NIL)) + (CONS 2 (CONS "\"or\"" NIL)) |term2|)) ('T (|putValue| |x| (|getValue| |term2|)) (|putModeSet| |x| |ms|)))))) @@ -885,7 +884,7 @@ There are several special modes used in these functions: ((NULL (AND (PAIRP |ms|) (EQ (QCDR |ms|) NIL) (EQUAL (QCAR |ms|) |$Boolean|))) (|throwKeyedMsgSP| 'S2IS0054 - (CONS 2 (CONS (MAKESTRING "\"or\"") NIL)) |term2|)) + (CONS 2 (CONS "\"or\"" NIL)) |term2|)) ('T (SPADLET |cond| (CONS (|mkAtreeNode| '=) @@ -1551,11 +1550,9 @@ There are several special modes used in these functions: ('T (|keyedSystemError| 'S2GE0016 (CONS - (MAKESTRING - "transformCollect") + "transformCollect" (CONS - (MAKESTRING - "Unknown type of iterator") + "Unknown type of iterator" NIL)))))))))))))) (APPEND |iterList| (CONS |bodyTree| NIL))))))) @@ -1676,7 +1673,7 @@ There are several special modes used in these functions: 'T)))) (EXIT (|bottomUpCompilePredicate| - |pred| (MAKESTRING "until")))))))) + |pred| "until"))))))) (SPADLET |mode| (CONS '|Tuple| (CONS |m| NIL))) (|evalCOLLECT| |op| (CDR |t|) |mode|) (|putModeSet| |op| (CONS |mode| NIL))))))))))) @@ -1720,7 +1717,7 @@ There are several special modes used in these functions: (QCAR |ISTMP#1|)) 'T)))) (|bottomUpCompilePredicate| |pred| - (MAKESTRING "while"))) + "while")) ((AND (PAIRP |iter|) (EQ (QCAR |iter|) 'SUCHTHAT) (PROGN @@ -1732,7 +1729,7 @@ There are several special modes used in these functions: (QCAR |ISTMP#1|)) 'T)))) (|bottomUpCompilePredicate| |pred| - (MAKESTRING "|"))) + "|")) ((AND (PAIRP |iter|) (EQ (QCAR |iter|) 'UNTIL)) NIL) @@ -1881,7 +1878,7 @@ There are several special modes used in these functions: 'T))))))) (|throwKeyedMsg| 'S2IS0006 (CONS |index| NIL))) ('T (|put| |index| '|mode| |ud| |$env|) - (|mkLocalVar| (MAKESTRING "the iterator expression") + (|mkLocalVar| "the iterator expression" |index|))))))))) ;upLoopIterSTEP(index,lower,step,upperList) == @@ -1918,7 +1915,7 @@ There are several special modes used in these functions: ((NULL (OR (|typeIsASmallInteger| |ltype|) (|isEqualOrSubDomain| |ltype| |$Integer|))) (|throwKeyedMsg| 'S2IS0007 - (CONS (MAKESTRING "lower") NIL))) + (CONS "lower" NIL))) ('T (SPADLET |stype| (IFCAR (|bottomUpUseSubdomain| |step|))) @@ -1946,7 +1943,7 @@ There are several special modes used in these functions: (|isEqualOrSubDomain| |utype| |$Integer|))) (|throwKeyedMsg| 'S2IS0007 - (CONS (MAKESTRING "upper") NIL)))))))) + (CONS "upper" NIL)))))))) (COND (|utype| (SPADLET |types| (CONS |utype| |types|))) ('T (SPADLET |types| (CONS |stype| |types|)))) @@ -1954,7 +1951,7 @@ There are several special modes used in these functions: (|resolveTypeListAny| (REMDUP |types|))) (|put| |index| '|mode| |type| |$env|) (|mkLocalVar| - (MAKESTRING "the iterator expression") |index|))))))))))) + "the iterator expression" |index|))))))))))) ;evalCOLLECT(op,[:itrl,body],m) == ; iters := [evalLoopIter itr for itr in itrl] @@ -2789,7 +2786,7 @@ There are several special modes used in these functions: 'T)))))))) (|throwKeyedMsg| 'S2IS0006 (CONS |index| NIL))) ('T (|put| |index| '|mode| |ud| |$env|) - (|mkLocalVar| (MAKESTRING "the iterator expression") + (|mkLocalVar| "the iterator expression" |index|) (SPADLET |s| (COND @@ -2867,7 +2864,7 @@ There are several special modes used in these functions: |lower|))) |$Integer|)) (|throwKeyedMsg| 'S2IS0007 - (CONS (MAKESTRING "lower") NIL))) + (CONS "lower" NIL))) ((NULL (|isEqualOrSubDomain| (SPADLET |stype| (IFCAR (|bottomUpUseSubdomain| |step|))) @@ -2887,7 +2884,7 @@ There are several special modes used in these functions: |$Integer|)) (EXIT (|throwKeyedMsg| 'S2IS0007 - (CONS (MAKESTRING "upper") NIL)))))))) + (CONS "upper" NIL)))))))) (|put| |index| '|mode| (SPADLET |type| (|resolveTT| |ltype| |stype|)) @@ -2895,7 +2892,7 @@ There are several special modes used in these functions: (COND ((NULL |type|) (EXIT (|throwKeyedMsg| 'S2IS0010 NIL)))) - (|mkLocalVar| (MAKESTRING "the iterator expression") + (|mkLocalVar| "the iterator expression" |index|) (SPADLET |s| (COND @@ -3004,7 +3001,7 @@ There are several special modes used in these functions: (PROGN (SPADLET |ud| (QCAR |ISTMP#1|)) 'T)))))) - (|systemError| (MAKESTRING "Not a Stream"))) + (|systemError| "Not a Stream")) ('T (SPADLET |newVal| (|objNew| (|objVal| |val|) @@ -3148,7 +3145,7 @@ There are several special modes used in these functions: (SPADLET |indMode| (QCAR |ISTMP#1|)) 'T)))))) - (|keyedSystemError| (MAKESTRING "S2GE0016") + (|keyedSystemError| "S2GE0016" '("mkIterFun" "bad stream index type"))) ('T (|put| |index| '|mode| |indMode| |$env|) (|mkLocalVar| |$mapName| |index|) @@ -3553,7 +3550,7 @@ There are several special modes used in these functions: (PROGN (SPADLET |ud| (QCAR |ISTMP#1|)) 'T)))))) - (|systemError| (MAKESTRING "Not a Stream"))) + (|systemError| "Not a Stream")) ('T (SPADLET |newVal| (|objNew| (|objVal| |val|) @@ -4853,8 +4850,7 @@ There are several special modes used in these functions: ((|isWrapped| (|objVal| |triple|)) |triple|) ((|isLocalVar| (|objVal| |triple|)) (|compFailure| - (MAKESTRING - " Local variable or parameter used in type"))) + " Local variable or parameter used in type")) ('T (|objNewWrap| (|timedEVALFUN| (|objVal| |triple|)) (|objMode| |triple|)))))))) diff --git a/src/interp/i-spec2.lisp.pamphlet b/src/interp/i-spec2.lisp.pamphlet index 3ac0223..4fa3a2f 100644 --- a/src/interp/i-spec2.lisp.pamphlet +++ b/src/interp/i-spec2.lisp.pamphlet @@ -98,16 +98,16 @@ There are several special modes used in these functions: (COND ((OR (NULL (LISTP |def|)) (NULL |def|)) (|keyedSystemError| 'S2GE0016 - (CONS (MAKESTRING "upDEF") - (CONS (MAKESTRING "bad map definition") NIL)))) + (CONS "upDEF" + (CONS "bad map definition" NIL)))) ('T (SPADLET |mapOp| (CAR |def|)) (COND ((LISTP |mapOp|) (COND ((NULL |mapOp|) (|keyedSystemError| 'S2GE0016 - (CONS (MAKESTRING "upDEF") - (CONS (MAKESTRING "bad map definition") + (CONS "upDEF" + (CONS "bad map definition" NIL)))) ('T (SPADLET |mapOp| (CAR |mapOp|)))))) (|put| |mapOp| '|value| |v| |$e|) @@ -530,7 +530,7 @@ There are several special modes used in these functions: (declare (ignore |type|)) (PROGN (|sayKeyedMsg| 'S2IS0055 - (CONS (MAKESTRING "free") (CONS |var| NIL))) + (CONS "free" (CONS |var| NIL))) |var|)) ;uplocalWithType(var,type) == @@ -541,7 +541,7 @@ There are several special modes used in these functions: (declare (ignore |type|)) (PROGN (|sayKeyedMsg| 'S2IS0055 - (CONS (MAKESTRING "local") (CONS |var| NIL))) + (CONS "local" (CONS |var| NIL))) |var|)) ;--% Handlers for has @@ -635,7 +635,7 @@ There are several special modes used in these functions: (SPADLET |b| (QCAR |ISTMP#3|)) 'T))))))))) NIL) - ('T (|bottomUpPredicate| |cond| (MAKESTRING "if/when")) + ('T (|bottomUpPredicate| |cond| "if/when") (COND (|$genValue| (|interpIF| |op| |cond| |a| |b|)) ('T (|compileIF| |op| |cond| |a| |b| |t|)))))))) @@ -991,8 +991,8 @@ There are several special modes used in these functions: ((NULL (AND (PAIRP |mS|) (EQ (QCDR |mS|) NIL) (PROGN (SPADLET |m| (QCAR |mS|)) 'T))) (|keyedSystemError| 'S2GE0016 - (CONS (MAKESTRING "upisAndIsnt") - (CONS (MAKESTRING "non-unique modeset") NIL)))) + (CONS "upisAndIsnt" + (CONS "non-unique modeset" NIL)))) ('T (|putPvarModes| (|removeConstruct| |pattern|) |m|) (|evalis| |op| (CDR |t|) |m|) (|putModeSet| |op| (CONS |$Boolean| NIL)))))))) @@ -1464,9 +1464,8 @@ There are several special modes used in these functions: ('T (|isPatMatch| (CDR |l|) |restPats|)))) ('T (|keyedSystemError| 'S2GE0016 - (CONS (MAKESTRING "isPatMatch") - (CONS (MAKESTRING - "unknown form of is predicate") + (CONS "isPatMatch" + (CONS "unknown form of is predicate" NIL))))))))) ;--% Handler for iterate @@ -1484,7 +1483,7 @@ There are several special modes used in these functions: (RETURN (COND ((NULL |$repeatBodyLabel|) - (|throwKeyedMsg| 'S2IS0029 (CONS (MAKESTRING "iterate") NIL))) + (|throwKeyedMsg| 'S2IS0029 (CONS "iterate" NIL))) ('T (SPADLET |$iterateCount| (PLUS |$iterateCount| 1)) (SPADLET |code| (CONS 'THROW @@ -1518,7 +1517,7 @@ There are several special modes used in these functions: (AND (PAIRP |ISTMP#1|) (EQ (QCDR |ISTMP#1|) NIL))))) NIL) ((NULL |$repeatLabel|) - (|throwKeyedMsg| 'S2IS0029 (CONS (MAKESTRING "break") NIL))) + (|throwKeyedMsg| 'S2IS0029 (CONS "break" NIL))) ('T (SPADLET |$breakCount| (PLUS |$breakCount| 1)) (SPADLET |code| (CONS 'THROW @@ -1599,7 +1598,7 @@ There are several special modes used in these functions: (|upLETWithPatternOnLhs| |t|)) ((BOOT-EQUAL |var| 'QUOTE) (|throwKeyedMsg| 'S2IS0027 - (CONS (MAKESTRING "A quoted form") NIL))) + (CONS "A quoted form" NIL))) ('T (|upLETWithFormOnLhs| |op| |lhs| |rhs|)))) ('T (SPADLET |var| (|getUnname| |lhs|)) (COND @@ -1624,12 +1623,12 @@ There are several special modes used in these functions: (|putHist| |var| '|isInterpreterFunction| NIL |$e|) (|sayKeyedMsg| 'S2IS0049 - (CONS (MAKESTRING "Function") + (CONS "Function" (CONS |var| NIL)))) ((|get| |var| '|isInterpreterRule| |$e|) (|putHist| |var| '|isInterpreterRule| NIL |$e|) (|sayKeyedMsg| 'S2IS0049 - (CONS (MAKESTRING "Rule") (CONS |var| NIL)))) + (CONS "Rule" (CONS |var| NIL)))) ('T NIL)) (COND ((AND (NULL (|isTupleForm| |rhs|)) @@ -1844,12 +1843,9 @@ There are several special modes used in these functions: (|isSubDomain| |om| |dm|) (|isSubDomain| |dm| |om|)))) (|compFailure| - (CONS (MAKESTRING - " The type of the local variable") + (CONS " The type of the local variable" (APPEND (|bright| |name|) - (CONS - (MAKESTRING - "has changed in the computation.") + (CONS "has changed in the computation." NIL))))) ('T (COND @@ -1929,7 +1925,7 @@ There are several special modes used in these functions: (SPADLET |failCode| (CONS '|spadThrowBrightly| (CONS (CONS '|concat| - (CONS (MAKESTRING " Pattern") + (CONS " Pattern" (CONS (CONS 'QUOTE (CONS @@ -1937,8 +1933,7 @@ There are several special modes used in these functions: (|form2String| |pattern|)) NIL)) (CONS - (MAKESTRING - "is not matched in assignment to right-hand side.") + "is not matched in assignment to right-hand side." NIL)))) NIL))) (COND @@ -2307,7 +2302,7 @@ There are several special modes used in these functions: ((NEQUAL (|#| |args|) 1) (|throwKeyedMsg| 'S2IS0041 (CONS (CONS (|getUnname| |htOp|) - (CONS (MAKESTRING ".[") + (CONS ".[" (CONS (|getUnname| (CAR |args|)) (CONS (PROG (G167309) @@ -2328,11 +2323,11 @@ There are several special modes used in these functions: (SETQ G167309 (APPEND G167309 (CONS - (MAKESTRING ",") + "," (CONS (|getUnname| |arg|) NIL))))))))) - (CONS (MAKESTRING "]") NIL))))) + (CONS "]" NIL))))) NIL))) ('T (SPADLET |keyMode| '(|Any|)) (|putMode| |htOp| @@ -2476,8 +2471,7 @@ There are several special modes used in these functions: (OR G167374 (CONTAINED |var| |type|))))))))) (|compFailure| - (CONS (MAKESTRING - " Cannot compile type assignment to") + (CONS " Cannot compile type assignment to" (|bright| |opName|)))) ('T (SPADLET |mode| @@ -3107,12 +3101,8 @@ There are several special modes used in these functions: NIL) ('T (|keyedSystemError| 'S2GE0016 - (CONS - (MAKESTRING - "transformREPEAT") - (CONS - (MAKESTRING - "Unknown type of iterator") + (CONS "transformREPEAT" + (CONS "Unknown type of iterator" NIL)))))))))))))) (APPEND |iterList| (CONS |bodyTree| NIL))))))) @@ -3236,7 +3226,7 @@ There are several special modes used in these functions: 'T)))) (EXIT (|bottomUpCompilePredicate| - |pred| (MAKESTRING "until")))))))) + |pred| "until"))))))) (|evalREPEAT| |op| (CDR |t|) |repeatMode|) (|putModeSet| |op| (CONS |repeatMode| NIL))))))))))) @@ -3543,9 +3533,8 @@ There are several special modes used in these functions: (COND ((NULL (SPADLET |m| (|computedMode| (|last| |args|)))) (|keyedSystemError| 'S2GE0016 - (CONS (MAKESTRING "upSEQ") - (CONS (MAKESTRING - "last line of SEQ has no mode") + (CONS "upSEQ" + (CONS "last line of SEQ has no mode" NIL)))) ('T (|evalSEQ| |op| |args| |m|) (|putModeSet| |op| (CONS |m| NIL)))))))))) @@ -3953,9 +3942,8 @@ There are several special modes used in these functions: NIL) ((NULL |$genValue|) (|compFailure| - (APPEND (|bright| (MAKESTRING " where")) - (CONS (MAKESTRING - "for compiled code is not yet implemented.") + (APPEND (|bright| " where") + (CONS "for compiled code is not yet implemented." NIL)))) ('T (SPADLET |$whereCacheList| NIL) (SPADLET |LETTMP#1| diff --git a/src/interp/i-util.lisp.pamphlet b/src/interp/i-util.lisp.pamphlet index 96ef3e8..b169a26 100644 --- a/src/interp/i-util.lisp.pamphlet +++ b/src/interp/i-util.lisp.pamphlet @@ -105,7 +105,7 @@ lisp code is unwrapped. ; sayNewLine() (DEFUN |spadPrompt| () - (PROGN (SAY (MAKESTRING " AXIOM")) (|sayNewLine|))) + (PROGN (SAY " AXIOM") (|sayNewLine|))) ;inputPrompt str == ; -- replaces older INPUT-PROMPT @@ -285,12 +285,11 @@ lisp code is unwrapped. (|$reportBottomUpFlag| (|sayMessage| (|concat| - (CONS (MAKESTRING - " Retrospective determination of slot") + (CONS " Retrospective determination of slot" (CONS '|%b| (CONS |slot| (CONS '|%d| - (CONS (MAKESTRING "of") + (CONS "of" (CONS '|%b| (APPEND (|prefix2String| |domain|) diff --git a/src/interp/info.lisp.pamphlet b/src/interp/info.lisp.pamphlet index 35336a0..f621bf8 100644 --- a/src/interp/info.lisp.pamphlet +++ b/src/interp/info.lisp.pamphlet @@ -212,7 +212,7 @@ modemap is of the form : ((op (targ arg1 arg2 ... argn)) pred (elt $ n)) (CONS '|not| (CONS (|formatPred| |a|) NIL)) (CONS (|formatInfo| |c|) NIL)))))))) - ('T (|systemError| (MAKESTRING "formatInfo")))))))) + ('T (|systemError| "formatInfo"))))))) ;liftCond (clause is [ante,conseq]) == ; conseq is ["COND",:l] => @@ -331,7 +331,7 @@ modemap is of the form : ((op (targ arg1 arg2 ... argn)) pred (elt $ n)) (SEQ (EXIT (SETQ G166262 (CONS (|formatPred| |w|) G166262))))))))) - ('T (|systemError| (MAKESTRING "formatPred")))))))) + ('T (|systemError| "formatPred"))))))) ;chaseInferences(pred,$e) == ; foo hasToInfo pred where @@ -906,8 +906,8 @@ modemap is of the form : ((op (targ arg1 arg2 ... argn)) pred (elt $ n)) (SPADLET |vval| (CAR |LETTMP#1|)) (SPADLET |vmode| (CADR |LETTMP#1|)) (SPADLET |venv| (CADDR |LETTMP#1|)) - (SAY (MAKESTRING "augmenting ") |name| - (MAKESTRING ": ") |u|) + (SAY "augmenting " |name| + ": " |u|) (SPADLET |key| (COND ((CONTAINED '$ |vmode|) '|domain|) @@ -967,8 +967,8 @@ modemap is of the form : ((op (targ arg1 arg2 ... argn)) pred (elt $ n)) (SPADLET |vval| (CAR |LETTMP#1|)) (SPADLET |vmode| (CADR |LETTMP#1|)) (SPADLET |venv| (CADDR |LETTMP#1|)) - (SAY (MAKESTRING "augmenting ") |name| - (MAKESTRING ": ") |u|) + (SAY "augmenting " |name| + ": " |u|) (SPADLET |key| (COND ((CONTAINED '$ |vmode|) '|domain|) @@ -1048,8 +1048,8 @@ modemap is of the form : ((op (targ arg1 arg2 ... argn)) pred (elt $ n)) (APPEND |$functorLocalParameters| (CONS |viewName| NIL)))) ('T NIL)))) - (SAY (MAKESTRING "augmenting ") |name| - (MAKESTRING ": ") |cat|) + (SAY "augmenting " |name| + ": " |cat|) (SPADLET |$e| (|put| |name| '|value| (CONS |vval| @@ -1057,11 +1057,11 @@ modemap is of the form : ((op (targ arg1 arg2 ... argn)) pred (elt $ n)) (CONS |venv| NIL))) |$e|))))) ('T - (SAY (MAKESTRING "extension of ") |vval| - (MAKESTRING " to ") |cat| - (MAKESTRING " ignored")) + (SAY "extension of " |vval| + " to " |cat| + " ignored") |$e|))) - ('T (|systemError| (MAKESTRING "knownInfo")))))))))) + ('T (|systemError| "knownInfo"))))))))) ;mkJoin(cat,mode) == ; mode is ['Join,:cats] => ['Join,cat,:cats] @@ -1092,8 +1092,7 @@ modemap is of the form : ((op (targ arg1 arg2 ... argn)) pred (elt $ n)) ('T (|systemError| (CONS |name| - (CONS (MAKESTRING - " is not bound in the current environment") + (CONS " is not bound in the current environment" NIL)))))))) @ diff --git a/src/interp/interop.lisp.pamphlet b/src/interp/interop.lisp.pamphlet index 39adeca..310030e 100644 --- a/src/interp/interop.lisp.pamphlet +++ b/src/interp/interop.lisp.pamphlet @@ -168,7 +168,7 @@ (CONS |DNameApplyID| (CONS (CONS |DNameStringID| (|StringToCompStr| - (MAKESTRING "->"))) + "->")) (CONS (CONS |DNameTupleID| (CDR |args|)) (CONS (CONS |DNameTupleID| @@ -774,27 +774,27 @@ ;$hashOp1 := hashString '"1" -(SPADLET |$hashOp1| (|hashString| (MAKESTRING "1"))) +(SPADLET |$hashOp1| (|hashString| "1")) ;$hashOp0 := hashString '"0" -(SPADLET |$hashOp0| (|hashString| (MAKESTRING "0"))) +(SPADLET |$hashOp0| (|hashString| "0")) ;$hashOpApply := hashString '"apply" -(SPADLET |$hashOpApply| (|hashString| (MAKESTRING "apply"))) +(SPADLET |$hashOpApply| (|hashString| "apply")) ;$hashOpSet := hashString '"set!" -(SPADLET |$hashOpSet| (|hashString| (MAKESTRING "set!"))) +(SPADLET |$hashOpSet| (|hashString| "set!")) ;$hashSeg := hashString '".." -(SPADLET |$hashSeg| (|hashString| (MAKESTRING ".."))) +(SPADLET |$hashSeg| (|hashString| "..")) ;$hashPercent := hashString '"%" -(SPADLET |$hashPercent| (|hashString| (MAKESTRING "%"))) +(SPADLET |$hashPercent| (|hashString| "%")) ;oldAxiomDomainLookupExport _ ; (domenv, self, op, sig, box, skipdefaults, env) == diff --git a/src/interp/iterator.lisp.pamphlet b/src/interp/iterator.lisp.pamphlet index 8abd72c..5f35110 100644 --- a/src/interp/iterator.lisp.pamphlet +++ b/src/interp/iterator.lisp.pamphlet @@ -342,9 +342,7 @@ (SPADLET |repeatOrCollect| 'COLLECTVEC) (EXIT (CADR |u|))))) - (|stackMessage| - (MAKESTRING - "Invalid collect bodytype")) + (|stackMessage| "Invalid collect bodytype") (EXIT (RETURN NIL))))) (EXIT |$NoValueMode|))) (PROGN diff --git a/src/interp/lisplib.lisp.pamphlet b/src/interp/lisplib.lisp.pamphlet index a6d0627..a807429 100644 --- a/src/interp/lisplib.lisp.pamphlet +++ b/src/interp/lisplib.lisp.pamphlet @@ -148,7 +148,7 @@ (SPADLET |p| (|pathname| (CONS |fn| - (CONS |ft| (CONS (MAKESTRING "*") NIL))))) + (CONS |ft| (CONS "*" NIL))))) (COND (|cache| (|hasFileProperty| |p| |id| |fn|)) ('T (|hasFilePropertyNoCache| |p| |id| |fn|)))))))) @@ -407,7 +407,7 @@ (COND ((BOOT-EQUAL (CATCH 'VERSIONCHECK (LOAD |fullLibName|)) (SPADDIFFERENCE 1)) - (PRINC (MAKESTRING " wrong library version...recompile ")) + (PRINC " wrong library version...recompile ") (PRINC |fullLibName|) (TERPRI) (TOPLEVEL)) ('T (|clearConstructorCache| |cname|) (|installConstructor| |cname| |kind|) @@ -769,9 +769,9 @@ ((NULL |nfile|) (SPADLET |nfile| |file|) (COND ((OR - (BOOT-EQUAL |fn| (MAKESTRING "*")) + (BOOT-EQUAL |fn| "*") (BOOT-EQUAL |fn| - (MAKESTRING "NIL"))) + "NIL")) (|sayKeyedMsg| 'S2IL0016 NIL)) ('T (|sayKeyedMsg| 'S2IL0003 @@ -781,7 +781,7 @@ NIL)) (COND ((AND (> (SIZE |ans|) 0) - (BOOT-EQUAL (MAKESTRING ")") + (BOOT-EQUAL ")" (SUBSTRING |ans| 0 1))) (SPADLET |n| 2)) ('T (SPADLET |n| 1))) @@ -1038,7 +1038,7 @@ (PROGN (COND ((EQ (CAR |df|) 'DEF) (CAR |df|))) (SPADLET |op| (CAADR |df|)) - (|sayMSG| (|fillerSpaces| 72 (MAKESTRING "-"))) + (|sayMSG| (|fillerSpaces| 72 "-")) (SPADLET $LISPLIB 'T) (SPADLET |$op| |op|) (SPADLET |$lisplibAttributes| NIL) @@ -1064,14 +1064,14 @@ (|compileDocumentation| |libName|)) ('T (|sayMSG| - (CONS (MAKESTRING " initializing ") + (CONS " initializing " (CONS |$spadLibFT| (APPEND (|bright| |libName|) - (CONS (MAKESTRING "for") + (CONS "for" (|bright| |op|)))))) (|initializeLisplib| |libName|) (|sayMSG| - (CONS (MAKESTRING " compiling into ") + (CONS " compiling into " (CONS |$spadLibFT| (|bright| |libName|)))) (SPADLET |ok| NIL) (UNWIND-PROTECT @@ -1079,7 +1079,7 @@ (SPADLET |res| (FUNCALL |fn| |df| |m| |e| |prefix| |fal|)) (|sayMSG| - (CONS (MAKESTRING " finalizing ") + (CONS " finalizing " (CONS |$spadLibFT| (|bright| |libName|)))) (|finalizeLisplib| |libName|) (SPADLET |ok| 'T)) @@ -1088,7 +1088,7 @@ (SPADLET |filearg| ($FILEP |libName| |$spadLibFT| |$libraryDirectory|)) (RPACKFILE |filearg|) (FRESH-LINE |$algebraOutputStream|) - (|sayMSG| (|fillerSpaces| 72 (MAKESTRING "-"))) + (|sayMSG| (|fillerSpaces| 72 "-")) (|unloadOneConstructor| |op| |libName|) (LOCALDATABASE (LIST (GETDATABASE |op| 'ABBREVIATION)) NIL) (SPADLET |$newConlist| (CONS |op| |$newConlist|)) @@ -1123,7 +1123,7 @@ (CONS (CONS 'FILE (CONS |libName| (CONS 'DOCLB NIL))) (CONS (CONS 'MODE 'O) NIL)))) - (|lisplibWrite| (MAKESTRING "documentation") + (|lisplibWrite| "documentation" (|finalizeDocumentation|) |stream|) (RSHUT |stream|) (RPACKFILE (CONS |libName| (CONS 'DOCLB NIL))) @@ -1253,25 +1253,25 @@ |$lisplibKind|)) (RETURN (SEQ (PROGN - (|lisplibWrite| (MAKESTRING "constructorForm") + (|lisplibWrite| "constructorForm" (|removeZeroOne| |$lisplibForm|) |$libFile|) - (|lisplibWrite| (MAKESTRING "constructorKind") + (|lisplibWrite| "constructorKind" (SPADLET |kind| (|removeZeroOne| |$lisplibKind|)) |$libFile|) - (|lisplibWrite| (MAKESTRING "constructorModemap") + (|lisplibWrite| "constructorModemap" (|removeZeroOne| |$lisplibModemap|) |$libFile|) (SPADLET |$lisplibCategory| (OR |$lisplibCategory| (CADAR |$lisplibModemap|))) - (|lisplibWrite| (MAKESTRING "constructorCategory") + (|lisplibWrite| "constructorCategory" |$lisplibCategory| |$libFile|) - (|lisplibWrite| (MAKESTRING "sourceFile") + (|lisplibWrite| "sourceFile" (|namestring| /EDITFILE) |$libFile|) - (|lisplibWrite| (MAKESTRING "modemaps") + (|lisplibWrite| "modemaps" (|removeZeroOne| |$lisplibModemapAlist|) |$libFile|) (SPADLET |opsAndAtts| (|getConstructorOpsAndAtts| |$lisplibForm| |kind| |$lisplibModemap|)) - (|lisplibWrite| (MAKESTRING "operationAlist") + (|lisplibWrite| "operationAlist" (|removeZeroOne| (CAR |opsAndAtts|)) |$libFile|) (COND ((BOOT-EQUAL |kind| '|category|) @@ -1299,27 +1299,27 @@ (CONS (CONS |a| |v|) G166609)))))))) (SPADLET |$NRTslot1PredicateList| NIL) (|NRTgenInitialAttributeAlist| (CDR |opsAndAtts|)))) - (|lisplibWrite| (MAKESTRING "superDomain") + (|lisplibWrite| "superDomain" (|removeZeroOne| |$lisplibSuperDomain|) |$libFile|) - (|lisplibWrite| (MAKESTRING "signaturesAndLocals") + (|lisplibWrite| "signaturesAndLocals" (|removeZeroOne| (|mergeSignatureAndLocalVarAlists| |$lisplibSignatureAlist| |$lisplibVariableAlist|)) |$libFile|) - (|lisplibWrite| (MAKESTRING "attributes") + (|lisplibWrite| "attributes" (|removeZeroOne| |$lisplibAttributes|) |$libFile|) - (|lisplibWrite| (MAKESTRING "predicates") + (|lisplibWrite| "predicates" (|removeZeroOne| |$lisplibPredicates|) |$libFile|) - (|lisplibWrite| (MAKESTRING "abbreviation") + (|lisplibWrite| "abbreviation" |$lisplibAbbreviation| |$libFile|) - (|lisplibWrite| (MAKESTRING "parents") + (|lisplibWrite| "parents" (|removeZeroOne| |$lisplibParents|) |$libFile|) - (|lisplibWrite| (MAKESTRING "ancestors") + (|lisplibWrite| "ancestors" (|removeZeroOne| |$lisplibAncestors|) |$libFile|) - (|lisplibWrite| (MAKESTRING "documentation") + (|lisplibWrite| "documentation" (|finalizeDocumentation|) |$libFile|) - (|lisplibWrite| (MAKESTRING "slot1Info") + (|lisplibWrite| "slot1Info" (|removeZeroOne| |$lisplibSlot1|) |$libFile|) (COND (|$profileCompiler| (|profileWrite|))) (COND @@ -1329,15 +1329,15 @@ ((NEQUAL ERRORS 0) (PROGN (|sayMSG| - (CONS (MAKESTRING " Errors in processing ") + (CONS " Errors in processing " (CONS |kind| - (CONS (MAKESTRING " ") + (CONS " " (APPEND (|bright| |libName|) - (CONS (MAKESTRING ":") NIL)))))) + (CONS ":" NIL)))))) (|sayMSG| - (CONS (MAKESTRING " not replacing ") + (CONS " not replacing " (CONS |$spadLibFT| - (CONS (MAKESTRING " for") + (CONS " for" (|bright| |libName|))))))))))))) ;lisplibDoRename(libName) == @@ -1364,7 +1364,7 @@ (PROGN (|sayMSG| (|bright| - (CONS (MAKESTRING " Illegal ") (CONS |$spadLibFT| NIL)))) + (CONS " Illegal " (CONS |$spadLibFT| NIL)))) (COND ((|member| |error| '(|duplicateAbb| |wrongType|)) (|sayKeyedMsg| 'S2IL0007 @@ -1514,7 +1514,7 @@ (SPADLET |t| (OR (|compMakeCategoryObject| |target| |$e|) (|systemErrorHere| - (MAKESTRING "getSlotFromFunctor")))) + "getSlotFromFunctor"))) (ELT (CAR |t|) |slot|))))))) ;getSlot1 domainName == @@ -1546,7 +1546,7 @@ (|pathname| (CONS |fn| (CONS |$spadLibFT| - (CONS (MAKESTRING "*") NIL))))) + (CONS "*" NIL))))) (COND ((NULL (|isExistingFile| |p|)) (|sayKeyedMsg| 'S2IL0003 (CONS (|namestring| |p|) NIL)) @@ -1569,12 +1569,12 @@ (SPADLET |t| (OR (|compMakeCategoryObject| |target| |$e|) (|systemErrorHere| - (MAKESTRING "getSlot1")))) + "getSlot1"))) (ELT (CAR |t|) 1)) ('T (|sayKeyedMsg| 'S2IL0022 (CONS (|namestring| |p|) - (CONS (MAKESTRING "constructor modemap") NIL))) + (CONS "constructor modemap" NIL))) NIL))))))) ;transformOperationAlist operationAlist == @@ -1711,7 +1711,7 @@ ; pp x (DEFUN |sayNonUnique| (|x|) - (PROGN (|sayBrightlyNT| (MAKESTRING "Non-unique:")) (|pp| |x|))) + (PROGN (|sayBrightlyNT| "Non-unique:") (|pp| |x|))) ;-- flattenOperationAlist operationAlist == ;-- --new form is ( ) @@ -1787,7 +1787,7 @@ |sig|)) ('T (|sayMSG| - (CONS (MAKESTRING " using slot 1 of ") + (CONS " using slot 1 of " (CONS |domainForm| NIL))) (SPADLET |constructorArglist| (CDR |domainForm|)) (SPADLET |nsig| (|#| |sig|)) @@ -1888,7 +1888,7 @@ (QCAR |ISTMP#4|)) 'T)))))))))) |n|) - ('T (|systemErrorHere| (MAKESTRING "findSlotNumber")))))))))) + ('T (|systemErrorHere| "findSlotNumber"))))))))) ;bustUnion d == ; d is ["Union",domain,utype] and utype='"failed" => domain @@ -1909,7 +1909,7 @@ (PROGN (SPADLET |utype| (QCAR |ISTMP#2|)) 'T))))) - (BOOT-EQUAL |utype| (MAKESTRING "failed"))) + (BOOT-EQUAL |utype| "failed")) |domain|) ('T |d|))))) @@ -2112,7 +2112,7 @@ 'T)))))))))) |n|) ('T - (|systemErrorHere| (MAKESTRING "findDomainSlotNumber"))))))))) + (|systemErrorHere| "findDomainSlotNumber")))))))) ;getConstructorModemap form == ; GETDATABASE(opOf form, 'CONSTRUCTORMODEMAP) @@ -2195,7 +2195,7 @@ |$FormalMapVariableList|))))) (COND ((NULL (VECP |u|)) - (|systemErrorHere| (MAKESTRING "getSlotFromCategoryForm"))) + (|systemErrorHere| "getSlotFromCategoryForm")) ('T (ELT |u| |index|))))))) ;--% constructor evaluation diff --git a/src/interp/mark.lisp.pamphlet b/src/interp/mark.lisp.pamphlet index 2d32a11..630e725 100644 --- a/src/interp/mark.lisp.pamphlet +++ b/src/interp/mark.lisp.pamphlet @@ -623,7 +623,7 @@ Entire constructor is then assembled and prettyprinted (COND ((NULL (AND (PAIRP |mode|) (EQ (QCAR |mode|) '|Mapping|) (PROGN (SPADLET |ml| (QCDR |mode|)) 'T))) - (|error| (MAKESTRING "markLambda")))) + (|error| "markLambda"))) (SPADLET |args| (PROG (G166421) (SPADLET G166421 NIL) @@ -1057,7 +1057,7 @@ Entire constructor is then assembled and prettyprinted (SPADLET |id| (|markLhs| |form|)) (COND ((NULL |$insideCapsuleFunctionIfTrue|) - (SPADLET |$from| (MAKESTRING "Setq")) + (SPADLET |$from| "Setq") (SPADLET |code| (CAR T$)) (|markEncodeChanges| |code| NIL) (SPADLET |noriginalLet| (|markSpliceInChanges| |originalBody|)) @@ -1070,7 +1070,7 @@ Entire constructor is then assembled and prettyprinted (SPADLET |entry| (CONS |originalLet| |nlet|)) (SPADLET |$importStack| (CONS NIL |$importStack|)) (SPADLET |$freeStack| (CONS NIL |$freeStack|)) - (|capsuleStack| (MAKESTRING "Setq") |entry|) + (|capsuleStack| "Setq" |entry|) (CONS |code| (CDR T$))) ('T (COND @@ -1099,7 +1099,7 @@ Entire constructor is then assembled and prettyprinted (RETURN (PROGN (SPADLET |$coerceList| NIL) - (SPADLET |$from| (MAKESTRING "Capsule expression")) + (SPADLET |$from| "Capsule expression") (SPADLET |code| (CAR T$)) (|markEncodeChanges| |code| NIL) (SPADLET |noriginal| (|markSpliceInChanges| |originalExpr|)) @@ -1107,7 +1107,7 @@ Entire constructor is then assembled and prettyprinted (SPADLET |entry| (CONS |originalExpr| |nexpr|)) (SPADLET |$importStack| (CONS NIL |$importStack|)) (SPADLET |$freeStack| (CONS NIL |$freeStack|)) - (|capsuleStack| (MAKESTRING "capsuleExpression") |entry|) + (|capsuleStack| "capsuleExpression" |entry|) (CONS |code| (CDR T$)))))) ;markLhs x == @@ -1239,7 +1239,7 @@ Entire constructor is then assembled and prettyprinted (SPADLET |originalBody| (CAR (CDDDDR |originalDef|))) (SPADLET |signature| (|markFindOriginalSignature| |form| |sig|)) - (SPADLET |$from| (MAKESTRING "compDefineFunctor1")) + (SPADLET |$from| "compDefineFunctor1") (|markEncodeChanges| |code| NIL) (SPADLET |frees| (COND @@ -1325,7 +1325,7 @@ Entire constructor is then assembled and prettyprinted |subtractions|)) |$importStack|)) (SPADLET |entry| (CONS |originalDef| |ndef|)) - (|capsuleStack| (MAKESTRING "Def") |entry|)) + (|capsuleStack| "Def" |entry|)) ('T NIL)))))) ;reduceImports x == @@ -2157,7 +2157,7 @@ Entire constructor is then assembled and prettyprinted (COND ((EQL |path| 0) NIL) ('T |path|))) (COND ((AND (BOUNDP '|$shout2|) |$shout2|) - (|pp| (MAKESTRING "=========")) (|pp| |path|) + (|pp| "=========") (|pp| |path|) (SPADLET |ipath| (REVERSE |path|)) (DO ((G167681 |u| (CDR G167681)) (|x| NIL)) ((OR (ATOM G167681) @@ -2175,9 +2175,9 @@ Entire constructor is then assembled and prettyprinted (COND (|$monitorCoerce| (|sayBrightlyNT| - (CONS (MAKESTRING "From ") + (CONS "From " (CONS |$from| - (CONS (MAKESTRING ": ") NIL)))) + (CONS ": " NIL)))) (|pp| |entry|))) (SPADLET |$coerceList| (CONS (COPY |entry|) |$coerceList|))))))))) @@ -2258,7 +2258,7 @@ Entire constructor is then assembled and prettyprinted (SPADLET |path| (OR (|markGetPath| |a| |b|) (RETURN NIL))) (COND ((AND (BOUNDP '|$shout1|) |$shout1|) - (|pp| (MAKESTRING "=========")) (|pp| |path|) (|pp| |a|) + (|pp| "=========") (|pp| |path|) (|pp| |a|) (|pp| |b|))) (APPEND (CAR |path|) (|markPath1| (CDR |u|)))))) ('T NIL))))) @@ -2301,12 +2301,12 @@ Entire constructor is then assembled and prettyprinted (SPADLET |$amb| (CONS |u| (CONS |x| (CONS |y| NIL)))) (SPADLET |key| (COND - ((NULL |u|) (MAKESTRING "no match")) - ('T (MAKESTRING "ambiguous")))) + ((NULL |u|) "no match") + ('T "ambiguous"))) (|sayBrightly| - (CONS (MAKESTRING "-----") + (CONS "-----" (CONS |key| - (CONS (MAKESTRING "--------") NIL)))) + (CONS "--------" NIL)))) (COND ((NULL (BOUNDP '|$pathErrorStack|)) (SETQ |$pathErrorStack| NIL))) @@ -2322,7 +2322,7 @@ Entire constructor is then assembled and prettyprinted NIL) (SEQ (EXIT (|pp| |p|)))) (SPADLET |$x| |x|) (SPADLET |$y| |y|) - (|pp| (MAKESTRING "---------------------")) (|pp| |x|) + (|pp| "---------------------") (|pp| |x|) (|pp| |y|) (|foobar| |key|) (COND ((NULL |u|) (CONS 1729 NIL)) @@ -2372,7 +2372,7 @@ Entire constructor is then assembled and prettyprinted (SEQ (PROGN (COND ((AND (BOUNDP '|$shout|) |$shout|) - (|pp| (MAKESTRING "-----")) (|pp| |x|) (|pp| |y|) + (|pp| "-----") (|pp| |x|) (|pp| |y|) (|pp| |s|))) (COND ((BOOT-EQUAL |x| |y|) |s|) @@ -2763,10 +2763,9 @@ Entire constructor is then assembled and prettyprinted (CONS |target| (CONS |loc| NIL)))) (COND ((AND (BOUNDP '|$hohum|) |$hohum|) - (|pp| (MAKESTRING "---------->>>>>")) + (|pp| "---------->>>>>") (|pp| |$data|) (|pp| |body|) - (|pp| (MAKESTRING - "-------------------------->")))) + (|pp| "-------------------------->"))) (SPADLET |body| (|markInsertNextChange| |body|)))))) |body|))))) @@ -2863,13 +2862,13 @@ Entire constructor is then assembled and prettyprinted ('T NIL))))) (COND ((ATOM |x|) - (|pp| (MAKESTRING "Translator RPLACA error")) + (|pp| "Translator RPLACA error") (|pp| |$data|) (|foobum| |form|) |form|) ('T (COND ((AND (BOUNDP '|$hohum|) |$hohum|) (|pp| (CONS |i| - (CONS (MAKESTRING " >>> ") + (CONS " >>> " (CONS |x| NIL)))))) (SETQ $CHANGE (COPY |x|)) (COND @@ -3631,7 +3630,7 @@ Entire constructor is then assembled and prettyprinted (PROGN (|markSay| (|form2String| |att|)) (|markSay| - (MAKESTRING ": Category == with")) + ": Category == with") (|markTerpri|) (|markTerpri|)))))))))))))) @@ -4032,8 +4031,7 @@ Entire constructor is then assembled and prettyprinted (SETQ G169273 (OR G169273 |new|))))))))) (PROGN - (|pp| (MAKESTRING - "------------MISSING----------------")) + (|pp| "------------MISSING----------------") (SPADLET |$f| |form|) (SPADLET |$b| |body|) (SPADLET |newform| @@ -4391,9 +4389,8 @@ Entire constructor is then assembled and prettyprinted (APPEND G169473 (CONS (STRCONC |name| - (MAKESTRING - ": Category == with")) - (CONS (MAKESTRING "") NIL)))))))))) + ": Category == with") + (CONS "" NIL)))))))))) (SPADLET |nbody| (COND ((AND (PAIRP |$originalBody|) @@ -4553,11 +4550,11 @@ Entire constructor is then assembled and prettyprinted (SPADLET |kind| (CAR G169586)) (SPADLET |a| (CADR G169586)) (SPADLET |b| (CDDR G169586)) - (|markSay| (MAKESTRING "--)abbrev ")) + (|markSay| "--)abbrev ") (|markSay| |kind|) - (|markSay| (MAKESTRING " ")) + (|markSay| " ") (|markSay| |a|) - (|markSay| (MAKESTRING " ")) + (|markSay| " ") (|markSay| |b|) (|markTerpri|))))) @@ -5484,7 +5481,7 @@ Entire constructor is then assembled and prettyprinted ((NULL (ALPHA-CHAR-P (ELT |x| (SPADDIFFERENCE |n| 1)))) NIL) - ((NULL (|substring?| (MAKESTRING ":= ") + ((NULL (|substring?| ":= " |x| (PLUS |n| 1))) NIL) ('T (SPADLET |m| (PLUS |n| 3)) @@ -5520,15 +5517,14 @@ Entire constructor is then assembled and prettyprinted NIL) ('T (|sayMessage| - (MAKESTRING - "Converting input line:")) + "Converting input line:") (|sayMessage| - (CONS (MAKESTRING "WAS: ") + (CONS "WAS: " (CONS |x| NIL))) (SETELT |x| (PLUS |n| 1) (|char| '=)) (|sayMessage| - (CONS (MAKESTRING "IS: ") + (CONS "IS: " (CONS |x| NIL))) (TERPRI))))))))))) |origLines|))))) @@ -5546,8 +5542,8 @@ Entire constructor is then assembled and prettyprinted (SPADLET |u| (COND ((ATOM |x|) - (CONS (MAKESTRING ">> ") (CONS |x| NIL))) - ('T (CONS (MAKESTRING ">> ") |x|)))) + (CONS ">> " (CONS |x| NIL))) + ('T (CONS ">> " |x|)))) (|sayBrightly| |u|))))) ;moveImportsAfterDefinitions lines == @@ -5593,7 +5589,7 @@ Entire constructor is then assembled and prettyprinted (SPADLET |n| (|charPosition| |$blank| |x| (PLUS 1 |m|)))) - (|substring?| (MAKESTRING "== ") + (|substring?| "== " |x| (PLUS |n| 1))) (SPADLET |name| (SUBSTRING |x| |m| @@ -5603,7 +5599,7 @@ Entire constructor is then assembled and prettyprinted |defineAlist|))) ((SPADLET |k| (|leadingSubstring?| - (MAKESTRING "import from ") + "import from " |x| 0)) (SPADLET |importAlist| (CONS @@ -5705,7 +5701,7 @@ Entire constructor is then assembled and prettyprinted (SEQ (EXIT (SETQ G170683 (OR G170683 (CHAR= |c| - (ELT (MAKESTRING "() ,;") |i|))))))))))))) + (ELT "() ,;" |i|))))))))))))) ;moveLinesAfter(alist, lines) == ; n := #lines @@ -5811,7 +5807,7 @@ Entire constructor is then assembled and prettyprinted NIL)) NIL) (SEQ (EXIT (PROGN - (|pp| (MAKESTRING "------------")) + (|pp| "------------") (|pp| |p|) (|pp| |q|))))) (|#| |r|)))))) @@ -5910,16 +5906,15 @@ Entire constructor is then assembled and prettyprinted NIL)) NIL) (SEQ (EXIT (PROGN - (|pp| (MAKESTRING - "!!-------------------------------!!")) + (|pp| "!!-------------------------------!!") (SPADLET |res| (|mkGetPaths| |x| |y|)) (SPADLET |oldRes| (|markPaths| |x| |y| (CONS NIL NIL))) (|pp| |x|) (|pp| |y|) - (|sayBrightlyNT| (MAKESTRING "new: ")) + (|sayBrightlyNT| "new: ") (|pp| |res|) - (|sayBrightlyNT| (MAKESTRING "old: ")) + (|sayBrightlyNT| "old: ") (|pp| |oldRes|))))))))) ;reverseDown u == [REVERSE x for x in u] @@ -6298,7 +6293,7 @@ Entire constructor is then assembled and prettyprinted (SPADLET |opName| (INTERN (STRCONC |ops| - (MAKESTRING "X") + "X" (STRINGIMAGE |i|)))) (RPLACA |form| |opName|) (SPADLET |$acc| diff --git a/src/interp/match.lisp.pamphlet b/src/interp/match.lisp.pamphlet index dc7e287..54a299f 100644 --- a/src/interp/match.lisp.pamphlet +++ b/src/interp/match.lisp.pamphlet @@ -246,7 +246,7 @@ ((BOOT-EQUAL |op| '|not|) (NULL (|superMatch?| (CAR |argl|) |subject|))) ('T - (|systemError| (MAKESTRING "unknown pattern form"))))) + (|systemError| "unknown pattern form")))) ('T (|basicMatch?| |pattern| |subject|))))))) ;patternCheck pattern == main where @@ -386,10 +386,9 @@ |pattern| (PLUS |i| 1) |$wildCard|))))))))) (|sayBrightly| - (CONS (MAKESTRING - "Invalid use of underscores in pattern: ") + (CONS "Invalid use of underscores in pattern: " (CONS |pattern| NIL))) - (MAKESTRING "!!!!!!!!!!!!!!")) + "!!!!!!!!!!!!!!") ('T (SPADLET |c| (|patternCheck,wild| |pattern| '($ |#| % & @))) @@ -421,7 +420,7 @@ (RETURN (COND ((NULL (CHARP |wildcard|)) - (|systemError| (MAKESTRING "Wildcard must be a character"))) + (|systemError| "Wildcard must be a character")) ('T (SPADLET |$wildCard| |wildcard|) (SPADLET |subject| (DOWNCASE |subject|)) (COND diff --git a/src/interp/modemap.lisp.pamphlet b/src/interp/modemap.lisp.pamphlet index 1cc8f90..d8730c0 100644 --- a/src/interp/modemap.lisp.pamphlet +++ b/src/interp/modemap.lisp.pamphlet @@ -162,10 +162,9 @@ ((QSLESSP 1 (|#| |mml|)) (|stackWarning| (CONS |numOfArgs| - (CONS (MAKESTRING " argument form of: ") + (CONS " argument form of: " (CONS |op| - (CONS (MAKESTRING - " has more than one modemap") + (CONS " has more than one modemap" NIL))))) (CAR |mml|)) ('T NIL))))) @@ -348,7 +347,7 @@ (APPEND |lt| (CONS |id| (CONS |v| NIL))) |pred| |fn| |e|)) ('T (|addModemap1| |op| |mc| |sig| |pred| |fn| |e|)))) - ('T (|systemErrorHere| (MAKESTRING "addEltModemap"))))))) + ('T (|systemErrorHere| "addEltModemap")))))) ;addModemap1(op,mc,sig,pred,fn,e) == ; --mc is the "mode of computation"; fn the "implementation" @@ -918,7 +917,7 @@ ((AND |$insideFunctorIfTrue| (BOOT-EQUAL |name| '$)) (COND (|$domainShell| (ELT |$domainShell| 1)) - ('T (|systemError| (MAKESTRING "$ has no shell now"))))) + ('T (|systemError| "$ has no shell now")))) ((SPADLET T$ (|compMakeCategoryObject| |form| |$e|)) (SPADLET |$e| (CADDR T$)) (ELT (CAR T$) 1)) ('T @@ -1154,8 +1153,8 @@ (SPADLET |l| (|getDomainsInScope| |e|)) (COND ((|member| |x| |l|) - (SAY (MAKESTRING "****** Domain: ") |x| - (MAKESTRING " already in scope")))) + (SAY "****** Domain: " |x| + " already in scope"))) (SPADLET |newValue| (CONS |x| (|delete| |x| |l|))) (COND (|$insideCapsuleFunctionIfTrue| diff --git a/src/interp/msgdb.lisp.pamphlet b/src/interp/msgdb.lisp.pamphlet index 5301d04..dee5817 100644 --- a/src/interp/msgdb.lisp.pamphlet +++ b/src/interp/msgdb.lisp.pamphlet @@ -75,7 +75,7 @@ (SETQ G166098 (OR G166098 |j|))))))))) (RETURN NIL))) - (SPADLET |buf| (MAKESTRING "")) + (SPADLET |buf| "") (DO () ((NULL (AND (> |maxIndex| |k|) (NEQUAL (SPADLET |c| (ELT |l| |k|)) @@ -152,8 +152,8 @@ |y|)))))))) (SPADLET |head1| (CONS (COND - (|center| (MAKESTRING "%ce")) - ('T (MAKESTRING "%rj"))) + (|center| "%ce") + ('T "%rj")) (NREVERSE |y|))) (COND ((NULL |tail|) (CONS |head1| NIL)) @@ -183,11 +183,11 @@ (PROG (|item| |attList|) (RETURN (SEQ (COND - ((NEQUAL (CAR |msg|) (MAKESTRING "%atbeg")) + ((NEQUAL (CAR |msg|) "%atbeg") (CONS |msg| (CONS NIL NIL))) ('T (SPADLET |attList| NIL) (DO ((G166190 NIL - (BOOT-EQUAL |item| (MAKESTRING "%atend")))) + (BOOT-EQUAL |item| "%atend"))) (G166190 NIL) (SEQ (EXIT (PROGN (SPADLET |msg| (CDR |msg|)) @@ -308,7 +308,7 @@ ((<= |a| |nargs|) (ELT |args| (SPADDIFFERENCE |a| 1))) - ('T (MAKESTRING "???")))) + ('T "???"))) (SPADLET |q| NIL) (DO ((G166224 (SPADDIFFERENCE |n| 1)) (|i| 2 (QSADD1 |i|))) @@ -327,13 +327,13 @@ ((MEMQ (|char| '|m|) |q|) (SPADLET |arg| (CONS - (CONS (MAKESTRING "%m") |arg|) + (CONS "%m" |arg|) NIL)))) (COND ((MEMQ (|char| '|s|) |q|) (SPADLET |arg| (CONS - (CONS (MAKESTRING "%s") |arg|) + (CONS "%s" |arg|) NIL)))) (COND ((MEMQ (|char| '|p|) |q|) @@ -399,22 +399,22 @@ ((MEMQ (|char| '|c|) |q|) (SPADLET |arg| (CONS - (CONS (MAKESTRING "%ce") |arg|) + (CONS "%ce" |arg|) NIL)))) (COND ((MEMQ (|char| '|r|) |q|) (SPADLET |arg| (CONS - (CONS (MAKESTRING "%rj") |arg|) + (CONS "%rj" |arg|) NIL)))) (COND ((MEMQ (|char| '|l|) |q|) (SPADLET |l| - (CONS (MAKESTRING "%l") |l|)))) + (CONS "%l" |l|)))) (COND ((MEMQ (|char| '|b|) |q|) (SPADLET |l| - (CONS (MAKESTRING "%b") |l|)))) + (CONS "%b" |l|)))) (SPADLET |l| (COND ((PAIRP |arg|) @@ -423,7 +423,7 @@ (MEMQ (|char| '|y|) |q|) (BOOT-EQUAL (CAR |arg|) - (MAKESTRING "%y")) + "%y") (EQL (LENGTH |arg|) 1)) (APPEND (REVERSE |arg|) |l|)) @@ -432,17 +432,17 @@ (CAR |arg|)) (SPADLET |tail| (CDR |arg|)) - (CONS (MAKESTRING "%y") + (CONS "%y" (APPEND (REVERSE |tail|) (CONS - (MAKESTRING "%n") + "%n" (CONS |head| |l|))))))) ('T (CONS |arg| |l|)))) (COND ((MEMQ (|char| '|b|) |q|) (SPADLET |l| - (CONS (MAKESTRING "%d") |l|)))) + (CONS "%d" |l|)))) (DO ((G166261 '(|.| |,| ! |:| |;| ?) (CDR G166261)) (|ch| NIL)) @@ -492,10 +492,10 @@ ((EQL (LENGTH |msg|) 1) |msg|) ('T (SPADLET |blanksOff| NIL) (SPADLET |x| (CAR |msg|)) (COND - ((BOOT-EQUAL |x| (MAKESTRING "%n")) + ((BOOT-EQUAL |x| "%n") (SPADLET |blanksOff| 'T) (SPADLET |msg1| NIL)) ('T (SPADLET |msg1| (LIST |x|)))) - (SPADLET |blank| (MAKESTRING " ")) + (SPADLET |blank| " ") (DO ((G166308 (CDR |msg|) (CDR G166308)) (|y| NIL)) ((OR (ATOM G166308) (PROGN (SETQ |y| (CAR G166308)) NIL)) @@ -609,7 +609,7 @@ ((NULL (PAIRP |msg|)) |msg|) ('T (SPADLET |blanks| - (CONS (MAKESTRING " ") (CONS '| | NIL))) + (CONS " " (CONS '| | NIL))) (SPADLET |haveBlank| NIL) (SPADLET |prims| '(|%b| |%d| |%l| |%i| |%u| |%m| |%ce| |%rj| "%b" @@ -638,7 +638,7 @@ ; escapeSpecialChars STRINGIMAGE name) (DEFUN |operationLink| (|name|) - (FORMAT NIL (MAKESTRING "\\lispLink{\\verb!(|oSearch| \"~a\")!}{~a}") + (FORMAT NIL "\\lispLink{\\verb!(|oSearch| \"~a\")!}{~a}" |name| (|escapeSpecialChars| (STRINGIMAGE |name|)))) ;---------------------------------------- @@ -663,7 +663,7 @@ (DEFUN |throwPatternMsg| (|key| |args|) (declare (special |$testingErrorPrefix| |$testingSystem|)) (PROGN - (|sayMSG| (MAKESTRING " ")) + (|sayMSG| " ") (COND (|$testingSystem| (|sayMSG| |$testingErrorPrefix|))) (|sayPatternMsg| |key| |args|) (|spadThrow|))) @@ -691,7 +691,7 @@ (declare (special |$testingErrorPrefix| |$testingSystem|)) (PROGN (BUMPERRORCOUNT |kind|) - (|sayMSG| (MAKESTRING " ")) + (|sayMSG| " ") (COND (|$testingSystem| (|sayMSG| |$testingErrorPrefix|))) (|sayKeyedMsg| |key| |args|) (|spadThrow|))) @@ -708,7 +708,7 @@ (PROGN (COND ((AND |atree| (SPADLET |sp| (|getSrcPos| |atree|))) - (|sayMSG| (MAKESTRING " ")) (|srcPosDisplay| |sp|))) + (|sayMSG| " ") (|srcPosDisplay| |sp|))) (|throwKeyedMsg| |key| |args|))))) ;throwKeyedMsg(key,args) == @@ -738,9 +738,9 @@ (SPADLET *STANDARD-OUTPUT* |$texOutputStream|) (SPADLET |last| (|pushSatOutput| '|line|)) (|sayString| - (MAKESTRING "\\bgroup\\color{red}\\begin{list}\\item{} ")) + "\\bgroup\\color{red}\\begin{list}\\item{} ") (|sayKeyedMsgAsTeX| |key| |args|) - (|sayString| (MAKESTRING "\\end{list}\\egroup")) + (|sayString| "\\end{list}\\egroup") (|popSatOutput| |last|) (|spadThrow|))))) @@ -758,7 +758,7 @@ (RETURN (PROGN (SPADLET *STANDARD-OUTPUT* |$texOutputStream|) - (|sayMSG| (MAKESTRING " ")) + (|sayMSG| " ") (COND (|$testingSystem| (|sayMSG| |$testingErrorPrefix|))) (|sayKeyedMsg| |key| |args|) (|spadThrow|))))) @@ -782,11 +782,11 @@ (declare (special |$testingErrorPrefix| |$testingSystem|)) (RETURN (SEQ (PROGN - (|sayMSG| (MAKESTRING " ")) + (|sayMSG| " ") (COND (|$testingSystem| (|sayMSG| |$testingErrorPrefix|))) (|sayKeyedMsg| |descKey| |descArgs|) - (|sayMSG| (MAKESTRING " ")) + (|sayMSG| " ") (DO ((G166441 |l| (CDR G166441)) (G166429 NIL) (|i| 1 (QSADD1 |i|))) ((OR (ATOM G166441) @@ -801,7 +801,7 @@ (SEQ (EXIT (PROGN (SPADLET |n| (STRCONC (|object2String| |i|) - (MAKESTRING "."))) + ".")) (|sayKeyedMsg| |key| (CONS |n| |args|)))))) (|spadThrow|)))))) @@ -846,13 +846,13 @@ (RETURN (PROGN (SPADLET *STANDARD-OUTPUT* |$texOutputStream|) - (|sayString| (MAKESTRING "\\bgroup\\color{red}")) - (|sayString| (MAKESTRING "\\begin{verbatim}")) + (|sayString| "\\bgroup\\color{red}") + (|sayString| "\\begin{verbatim}") (|sayKeyedMsg| 'S2GE0000 NIL) (BUMPCOMPERRORCOUNT) (|sayKeyedMsgAsTeX| |key| |args|) - (|sayString| (MAKESTRING "\\end{verbatim}")) - (|sayString| (MAKESTRING "\\egroup")) + (|sayString| "\\end{verbatim}") + (|sayString| "\\egroup") (|handleLispBreakLoop| |$BreakMode|))))) ;keyedSystemError1(key,args) == @@ -888,12 +888,12 @@ ('T (SPADLET |was| |$saturnMode|) (COND ((BOOT-EQUAL |arg| '|verb|) (SPADLET |$saturnMode| '|verb|) - (|sayString| (MAKESTRING "\\begin{verbatim}")) |was|) + (|sayString| "\\begin{verbatim}") |was|) ((BOOT-EQUAL |arg| '|line|) (SPADLET |$saturnMode| '|line|) - (|sayString| (MAKESTRING "\\end{verbatim}")) |was|) + (|sayString| "\\end{verbatim}") |was|) ('T (|sayString| - (FORMAT NIL (MAKESTRING "What is: ~a") |$saturnMode|)) + (FORMAT NIL "What is: ~a" |$saturnMode|)) |$saturnMode|))))))) ;popSatOutput(newmode) == @@ -912,12 +912,12 @@ (COND ((BOOT-EQUAL |newmode| |$saturnMode|) NIL) ((BOOT-EQUAL |newmode| '|verb|) (SPADLET |$saturnMode| '|verb|) - (|sayString| (MAKESTRING "\\begin{verbatim}"))) + (|sayString| "\\begin{verbatim}")) ((BOOT-EQUAL |newmode| '|line|) (SPADLET |$saturnMode| '|line|) - (|sayString| (MAKESTRING "\\end{verbatim}"))) + (|sayString| "\\end{verbatim}")) ('T (|sayString| - (FORMAT NIL (MAKESTRING "What is: ~a") |$saturnMode|)) + (FORMAT NIL "What is: ~a" |$saturnMode|)) |$saturnMode|))) ;systemErrorHere functionName == @@ -970,7 +970,7 @@ (COND (|$displayMsgNumber| (SPADLET |msg| - (CONS (MAKESTRING "%b") + (CONS "%b" (CONS |key| (CONS '|:| (CONS '|%d| |msg|))))))) (SPADLET |u| (|flowSegmentedMsg| |msg| $LINELENGTH 3)) @@ -1009,7 +1009,7 @@ (DEFUN |throwKeyedMsgFromDb| (|key| |args| |dbName|) (declare (special |$testingErrorPrefix| |$testingSystem|)) (PROGN - (|sayMSG| (MAKESTRING " ")) + (|sayMSG| " ") (COND (|$testingSystem| (|sayMSG| |$testingErrorPrefix|))) (|sayKeyedMsgFromDb| |key| |args| |dbName|) (|spadThrow|))) @@ -1115,15 +1115,15 @@ ('T (SPADLET |potentialMarg| 0) (SPADLET |actualMarg| 0) (SPADLET |off| (COND - ((<= |offset| 0) (MAKESTRING "")) + ((<= |offset| 0) "") ('T - (|fillerSpaces| |offset| (MAKESTRING " "))))) + (|fillerSpaces| |offset| " ")))) (SPADLET |off1| (COND - ((<= |offset| 1) (MAKESTRING "")) + ((<= |offset| 1) "") ('T (|fillerSpaces| (SPADDIFFERENCE |offset| 1) - (MAKESTRING " "))))) + " ")))) (SPADLET |firstLine| 'T) (COND ((PAIRP |msg|) (SPADLET |lnl| |offset|) @@ -1258,7 +1258,7 @@ ((AND (NULL |$Coerce|) |$reportInterpOnly|) (COND ((AND |atree| (SPADLET |sp| (|getSrcPos| |atree|))) - (|sayMSG| (MAKESTRING " ")) (|srcPosDisplay| |sp|))) + (|sayMSG| " ") (|srcPosDisplay| |sp|))) (|sayKeyedMsg| |key| |args|) (|sayKeyedMsg| 'S2IB0009 NIL))) (COND ((NULL |$compilingMap|) @@ -1288,11 +1288,11 @@ ;bright x == ['"%b",:(PAIRP(x) and NULL CDR LASTNODE x => x; [x]),'"%d"] (DEFUN |bright| (|x|) - (CONS (MAKESTRING "%b") + (CONS "%b" (APPEND (COND ((AND (PAIRP |x|) (NULL (CDR (LASTNODE |x|)))) |x|) ('T (CONS |x| NIL))) - (CONS (MAKESTRING "%d") NIL)))) + (CONS "%d" NIL)))) ;--bright x == ['%b,:(ATOM x => [x]; x),'%d] ;mkMessage msg == @@ -1417,34 +1417,34 @@ (BOOT-EQUAL (ELT |x| 0) (|char| '|\\|)) (BOOT-EQUAL (ELT |x| 1) (|char| '%))) (|sayString| (SUBSTRING |x| 1 NIL))) - ((BOOT-EQUAL |x| (MAKESTRING "%l")) (|sayNewLine|) + ((BOOT-EQUAL |x| "%l") (|sayNewLine|) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| $MARG) NIL) - (SEQ (EXIT (|sayString| (MAKESTRING " ")))))) - ((BOOT-EQUAL |x| (MAKESTRING "%i")) + (SEQ (EXIT (|sayString| " "))))) + ((BOOT-EQUAL |x| "%i") (SPADLET $MARG (PLUS $MARG 3))) - ((BOOT-EQUAL |x| (MAKESTRING "%u")) + ((BOOT-EQUAL |x| "%u") (SPADLET $MARG (SPADDIFFERENCE $MARG 3)) (COND ((MINUSP $MARG) (SPADLET $MARG 0)) ('T NIL))) - ((BOOT-EQUAL |x| (MAKESTRING "%U")) (SPADLET $MARG 0)) - ((BOOT-EQUAL |x| (MAKESTRING "%")) - (|sayString| (MAKESTRING " "))) - ((BOOT-EQUAL |x| (MAKESTRING "%%")) - (|sayString| (MAKESTRING "%"))) - ((BOOT-EQUAL |x| (MAKESTRING "%b")) + ((BOOT-EQUAL |x| "%U") (SPADLET $MARG 0)) + ((BOOT-EQUAL |x| "%") + (|sayString| " ")) + ((BOOT-EQUAL |x| "%%") + (|sayString| "%")) + ((BOOT-EQUAL |x| "%b") (COND ((NULL (IS-CONSOLE CUROUTSTREAM)) - (|sayString| (MAKESTRING " "))) + (|sayString| " ")) ((NULL |$highlightAllowed|) - (|sayString| (MAKESTRING " "))) + (|sayString| " ")) ('T (|sayString| |$highlightFontOn|)))) ((SPADLET |k| (|blankIndicator| |x|)) (BLANKS |k|)) - ((BOOT-EQUAL |x| (MAKESTRING "%d")) + ((BOOT-EQUAL |x| "%d") (COND ((NULL (IS-CONSOLE CUROUTSTREAM)) - (|sayString| (MAKESTRING " "))) + (|sayString| " ")) ((NULL |$highlightAllowed|) - (|sayString| (MAKESTRING " "))) + (|sayString| " ")) ('T (|sayString| |$highlightFontOff|)))) ((STRINGP |x|) (|sayString| |x|)) ('T (|brightPrintHighlight| |x|))))))))) @@ -1481,31 +1481,31 @@ (declare (special $MARG)) (RETURN (SEQ (COND - ((BOOT-EQUAL |x| (MAKESTRING "%l")) - (|sayString| (MAKESTRING "\\\\")) + ((BOOT-EQUAL |x| "%l") + (|sayString| "\\\\") (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| $MARG) NIL) - (SEQ (EXIT (|sayString| (MAKESTRING "\\ ")))))) - ((BOOT-EQUAL |x| (MAKESTRING "%i")) + (SEQ (EXIT (|sayString| "\\ "))))) + ((BOOT-EQUAL |x| "%i") (SPADLET $MARG (PLUS $MARG 3))) - ((BOOT-EQUAL |x| (MAKESTRING "%u")) + ((BOOT-EQUAL |x| "%u") (SPADLET $MARG (SPADDIFFERENCE $MARG 3)) (COND ((MINUSP $MARG) (SPADLET $MARG 0)) ('T NIL))) - ((BOOT-EQUAL |x| (MAKESTRING "%U")) (SPADLET $MARG 0)) - ((BOOT-EQUAL |x| (MAKESTRING "%")) - (|sayString| (MAKESTRING "\\ "))) - ((BOOT-EQUAL |x| (MAKESTRING "%%")) - (|sayString| (MAKESTRING "%"))) - ((BOOT-EQUAL |x| (MAKESTRING "%b")) - (|sayString| (MAKESTRING " {\\tt "))) + ((BOOT-EQUAL |x| "%U") (SPADLET $MARG 0)) + ((BOOT-EQUAL |x| "%") + (|sayString| "\\ ")) + ((BOOT-EQUAL |x| "%%") + (|sayString| "%")) + ((BOOT-EQUAL |x| "%b") + (|sayString| " {\\tt ")) ((SPADLET |k| (|blankIndicator| |x|)) (DO ((|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| |k|) NIL) - (SEQ (EXIT (|sayString| (MAKESTRING "\\ ")))))) - ((BOOT-EQUAL |x| (MAKESTRING "%d")) - (|sayString| (MAKESTRING "} "))) - ((BOOT-EQUAL |x| (MAKESTRING "\"$\"")) - (|sayString| (MAKESTRING "\"\\verb!$!\""))) - ((BOOT-EQUAL |x| (MAKESTRING "$")) - (|sayString| (MAKESTRING "\\verb!$!"))) + (SEQ (EXIT (|sayString| "\\ "))))) + ((BOOT-EQUAL |x| "%d") + (|sayString| "} ")) + ((BOOT-EQUAL |x| "\"$\"") + (|sayString| "\"\\verb!$!\"")) + ((BOOT-EQUAL |x| "$") + (|sayString| "\\verb!$!")) ((STRINGP |x|) (|sayString| |x|)) ('T (|brightPrintHighlight| |x|))))))) @@ -1578,21 +1578,21 @@ (|$texFormatting| (|brightPrintHighlightAsTeX| |x|)) ((IDENTP |x|) (SPADLET |pn| (PNAME |x|)) (|sayString| |pn|)) - ((VECP |x|) (|sayString| (MAKESTRING "UNPRINTABLE"))) + ((VECP |x|) (|sayString| "UNPRINTABLE")) ((ATOM |x|) (|sayString| (|object2String| |x|))) ('T (SPADLET |key| (CAR |x|)) (SPADLET |rst| (CDR |x|)) (COND ((IDENTP |key|) (SPADLET |key| (PNAME |key|)))) (COND - ((BOOT-EQUAL |key| (MAKESTRING "%m")) + ((BOOT-EQUAL |key| "%m") (|mathprint| |rst|)) ((|member| |key| '("%p" "%s")) (PRETTYPRIN0 |rst|)) - ((BOOT-EQUAL |key| (MAKESTRING "%ce")) + ((BOOT-EQUAL |key| "%ce") (|brightPrintCenter| |rst|)) - ((BOOT-EQUAL |key| (MAKESTRING "%rj")) + ((BOOT-EQUAL |key| "%rj") (|brightPrintRightJustify| |rst|)) - ((BOOT-EQUAL |key| (MAKESTRING "%t")) + ((BOOT-EQUAL |key| "%t") (SPADLET $MARG (PLUS $MARG (|tabber| |rst|)))) - ('T (|sayString| (MAKESTRING "(")) + ('T (|sayString| "(") (|brightPrint1| |key|) (COND ((EQ |key| '|TAGGEDreturn|) @@ -1600,22 +1600,20 @@ (CONS (CAR |rst|) (CONS (CADR |rst|) (CONS (CADDR |rst|) - (CONS - (MAKESTRING - "environment (omitted)") + (CONS "environment (omitted)" NIL))))))) (DO ((G166741 |rst| (CDR G166741)) (|y| NIL)) ((OR (ATOM G166741) (PROGN (SETQ |y| (CAR G166741)) NIL)) NIL) (SEQ (EXIT (PROGN - (|sayString| (MAKESTRING " ")) + (|sayString| " ") (|brightPrint1| |y|))))) (COND ((AND |rst| (SPADLET |la| (LASTATOM |rst|))) - (|sayString| (MAKESTRING " . ")) + (|sayString| " . ") (|brightPrint1| |la|))) - (|sayString| (MAKESTRING ")")))))))))) + (|sayString| ")"))))))))) ;brightPrintHighlightAsTeX x == ; IDENTP x => @@ -1653,20 +1651,20 @@ ((IDENTP |x|) (SPADLET |pn| (PNAME |x|)) (|sayString| |pn|)) ((ATOM |x|) (|sayString| (|object2String| |x|))) - ((VECP |x|) (|sayString| (MAKESTRING "UNPRINTABLE"))) + ((VECP |x|) (|sayString| "UNPRINTABLE")) ('T (SPADLET |key| (CAR |x|)) (SPADLET |rst| (CDR |x|)) (COND - ((BOOT-EQUAL |key| (MAKESTRING "%m")) + ((BOOT-EQUAL |key| "%m") (|mathprint| |rst|)) - ((BOOT-EQUAL |key| (MAKESTRING "%m")) |rst|) - ((BOOT-EQUAL |key| (MAKESTRING "%s")) - (|sayString| (MAKESTRING "\\verb_")) - (PRETTYPRIN0 |rst|) (|sayString| (MAKESTRING "_"))) - ((BOOT-EQUAL |key| (MAKESTRING "%ce")) + ((BOOT-EQUAL |key| "%m") |rst|) + ((BOOT-EQUAL |key| "%s") + (|sayString| "\\verb_") + (PRETTYPRIN0 |rst|) (|sayString| "_")) + ((BOOT-EQUAL |key| "%ce") (|brightPrintCenter| |rst|)) - ((BOOT-EQUAL |key| (MAKESTRING "%t")) + ((BOOT-EQUAL |key| "%t") (SPADLET $MARG (PLUS $MARG (|tabber| |rst|)))) - ('T (|sayString| (MAKESTRING "(")) + ('T (|sayString| "(") (|brightPrint1| |key|) (COND ((EQ |key| '|TAGGEDreturn|) @@ -1674,22 +1672,20 @@ (CONS (CAR |rst|) (CONS (CADR |rst|) (CONS (CADDR |rst|) - (CONS - (MAKESTRING - "environment (omitted)") + (CONS "environment (omitted)" NIL))))))) (DO ((G166770 |rst| (CDR G166770)) (|y| NIL)) ((OR (ATOM G166770) (PROGN (SETQ |y| (CAR G166770)) NIL)) NIL) (SEQ (EXIT (PROGN - (|sayString| (MAKESTRING " ")) + (|sayString| " ") (|brightPrint1| |y|))))) (COND ((AND |rst| (SPADLET |la| (LASTATOM |rst|))) - (|sayString| (MAKESTRING " . ")) + (|sayString| " . ") (|brightPrint1| |la|))) - (|sayString| (MAKESTRING ")")))))))))) + (|sayString| ")"))))))))) ;tabber num == ; maxTab := 50 @@ -1745,7 +1741,7 @@ (DIVIDE (SPADDIFFERENCE $LINELENGTH |wid|) 2)) (SPADLET |x| (LIST (|fillerSpaces| (ELT |f| 0) - (MAKESTRING " ")) + " ") |x|)))) (DO ((G166799 |x| (CDR G166799)) (|y| NIL)) ((OR (ATOM G166799) @@ -1769,7 +1765,7 @@ (DIVIDE (SPADDIFFERENCE $LINELENGTH |wid|) 2)) (SPADLET |y| (CONS (|fillerSpaces| (ELT |f| 0) - (MAKESTRING " ")) + " ") |y|)))) (DO ((G166816 |y| (CDR G166816)) (|z| NIL)) ((OR (ATOM G166816) @@ -1802,8 +1798,8 @@ (PROG (|lst| |words|) (RETURN (SEQ (COND - ((ATOM |x|) (|sayString| (MAKESTRING "\\centerline{")) - (|sayString| |x|) (|sayString| (MAKESTRING "}"))) + ((ATOM |x|) (|sayString| "\\centerline{") + (|sayString| |x|) (|sayString| "}")) ('T (SPADLET |lst| |x|) (DO () ((NULL |lst|) NIL) (SEQ (EXIT (PROGN @@ -1821,7 +1817,7 @@ (SPADLET |lst| (CDR |lst|)))))) (COND (|lst| (SPADLET |lst| (CDR |lst|)))) - (|sayString| (MAKESTRING "\\centerline{")) + (|sayString| "\\centerline{") (SPADLET |words| (NREVERSE |words|)) (DO ((G166868 |words| (CDR G166868)) (|zz| NIL)) @@ -1831,7 +1827,7 @@ NIL)) NIL) (SEQ (EXIT (|brightPrint0| |zz|)))) - (|sayString| (MAKESTRING "}")))))) + (|sayString| "}"))))) NIL)))))) ;brightPrintRightJustify x == @@ -1873,7 +1869,7 @@ (SPADLET |x| (LIST (|fillerSpaces| (SPADDIFFERENCE $LINELENGTH |wid|) - (MAKESTRING " ")) + " ") |x|)) (DO ((G166891 |x| (CDR G166891)) (|y| NIL)) ((OR (ATOM G166891) @@ -1897,7 +1893,7 @@ (SPADLET |y| (CONS (|fillerSpaces| (SPADDIFFERENCE $LINELENGTH |wid|) - (MAKESTRING " ")) + " ") |y|)))) (DO ((G166908 |y| (CDR G166908)) (|z| NIL)) ((OR (ATOM G166908) @@ -1959,12 +1955,12 @@ (COND ((NULL |$highlightAllowed|) 1) ('T 1))) ((|member| |x| '("%l" |%l|)) 0) ((AND (STRINGP |x|) (> (STRINGLENGTH |x|) 2) - (BOOT-EQUAL (ELT |x| 0) (MAKESTRING "%")) - (BOOT-EQUAL (ELT |x| 1) (MAKESTRING "x"))) + (BOOT-EQUAL (ELT |x| 0) "%") + (BOOT-EQUAL (ELT |x| 1) "x")) (INTERN (ELT |x| 3))) ((STRINGP |x|) (STRINGLENGTH |x|)) ((IDENTP |x|) (STRINGLENGTH (PNAME |x|))) - ((VECP |x|) (STRINGLENGTH (MAKESTRING "UNPRINTABLE"))) + ((VECP |x|) (STRINGLENGTH "UNPRINTABLE")) ((ATOM |x|) (STRINGLENGTH (STRINGIMAGE |x|))) ('T (PLUS 2 (|sayBrightlyLength| |x|))))) @@ -2032,7 +2028,7 @@ NIL) ('T (SPADLET |w| (MIN (PLUS |m| 3) $LINELENGTH)) (SPADLET |p| (QUOTIENT $LINELENGTH |w|)) - (SPADLET |n| (|#| |l|)) (SPADLET |str| (MAKESTRING "")) + (SPADLET |n| (|#| |l|)) (SPADLET |str| "") (DO ((G166999 (SPADDIFFERENCE |n| 1)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G166999) NIL) @@ -2045,14 +2041,14 @@ (|fillerSpaces| (SPADDIFFERENCE |w| (|#| |c|)) - (MAKESTRING " ")))) + " "))) (COND ((EQL (REMAINDER (PLUS |i| 1) |p|) 0) (PROGN (|sayMSG| |str|) - (SPADLET |str| (MAKESTRING ""))))))))) + (SPADLET |str| "")))))))) (COND - ((NEQUAL |str| (MAKESTRING "")) (|sayMSG| |str|))) + ((NEQUAL |str| "") (|sayMSG| |str|))) NIL))))))) ;say2PerLine l == say2PerLineWidth(l,$LINELENGTH / 2) @@ -2080,7 +2076,7 @@ (PROGN (SETQ |x| (CAR G167033)) NIL)) NIL) (SEQ (EXIT (|sayLongOperation| |x|)))) - (|sayBrightly| (MAKESTRING ""))))))) + (|sayBrightly| "")))))) ;say2Split(l,short,long,width) == ; l is [x,:l'] => @@ -2171,13 +2167,13 @@ (|fillerSpaces| (SPADDIFFERENCE (QUOTIENT $LINELENGTH 2) (|sayDisplayWidth| (CAR |l|))) - (MAKESTRING " "))) + " ")) (COND ((SPADLET |l| (CDR |l|)) (|sayBrightlyNT| (CAR |l|)) (SPADLET |l| (CDR |l|)) - (|sayBrightly| (MAKESTRING ""))) - ('T (|sayBrightly| (MAKESTRING "")))))))))) + (|sayBrightly| "")) + ('T (|sayBrightly| ""))))))))) ;sayDisplayStringWidth x == ; null x => 0 @@ -2222,7 +2218,7 @@ (PLUS G167123 (|sayDisplayWidth,fn| |y|))))))))) ((OR (BOOT-EQUAL |x| '%%) - (BOOT-EQUAL |x| (MAKESTRING "%%"))) + (BOOT-EQUAL |x| "%%")) 1) ('T (|#| (|atom2String| |x|)))))))) @@ -2321,7 +2317,7 @@ (DEFUN |center80| (|text|) (declare (special $LINELENGTH)) - (|centerNoHighlight| |text| $LINELENGTH (MAKESTRING " "))) + (|centerNoHighlight| |text| $LINELENGTH " ")) ;centerAndHighlight(text,:argList) == ; width := IFCAR argList or $LINELENGTH @@ -2344,7 +2340,7 @@ (SEQ (PROGN (SPADLET |width| (OR (IFCAR |argList|) $LINELENGTH)) (SPADLET |fillchar| - (OR (IFCAR (IFCDR |argList|)) (MAKESTRING " "))) + (OR (IFCAR (IFCDR |argList|)) " ")) (SPADLET |wid| (PLUS (|entryWidth| |text|) 2)) (COND ((>= |wid| (SPADDIFFERENCE |width| 2)) @@ -2355,7 +2351,7 @@ (DIVIDE (SPADDIFFERENCE (SPADDIFFERENCE |width| |wid|) 2) 2)) - (SPADLET |fill1| (MAKESTRING "")) + (SPADLET |fill1| "") (DO ((G167221 (ELT |f| 0)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167221) NIL) (SEQ (EXIT (SPADLET |fill1| @@ -2396,7 +2392,7 @@ (SEQ (PROGN (SPADLET |width| (OR (IFCAR |argList|) $LINELENGTH)) (SPADLET |fillchar| - (OR (IFCAR (IFCDR |argList|)) (MAKESTRING " "))) + (OR (IFCAR (IFCDR |argList|)) " ")) (COND ((SPADLET |u| (|splitSayBrightlyArgument| |text|)) (SPADLET |text| (CAR |u|)) @@ -2410,7 +2406,7 @@ (DIVIDE (SPADDIFFERENCE (SPADDIFFERENCE |width| |wid|) 2) 2)) - (SPADLET |fill1| (MAKESTRING "")) + (SPADLET |fill1| "") (DO ((G167248 (ELT |f| 0)) (|i| 1 (QSADD1 |i|))) ((QSGREATERP |i| G167248) NIL) (SEQ (EXIT (SPADLET |fill1| @@ -2510,18 +2506,18 @@ ; '"$", '"&", '"^", '"__", '"_~"] (SPADLET |$htSpecialChars| - (CONS (MAKESTRING "#") - (CONS (MAKESTRING "[") - (CONS (MAKESTRING "]") - (CONS (MAKESTRING "%") - (CONS (MAKESTRING "{") - (CONS (MAKESTRING "}") - (CONS (MAKESTRING "\\") - (CONS (MAKESTRING "$") - (CONS (MAKESTRING "&") - (CONS (MAKESTRING "^") - (CONS (MAKESTRING "_") - (CONS (MAKESTRING "~") + (CONS "#" + (CONS "[" + (CONS "]" + (CONS "%" + (CONS "{" + (CONS "}" + (CONS "\\" + (CONS "$" + (CONS "&" + (CONS "^" + (CONS "_" + (CONS "~" NIL))))))))))))) ;$htCharAlist := '( @@ -2555,7 +2551,7 @@ (SEQ (COND ((SPADLET |u| (LASSOC |s| |$htCharAlist|)) |u|) ((|member| |s| |$htSpecialChars|) - (STRCONC (MAKESTRING "\\") |s|)) + (STRCONC "\\" |s|)) ((NULL |$saturn|) |s|) ((ALPHA-CHAR-P (ELT |s| 0)) |s|) ((NULL (PROG (G167323) @@ -2571,7 +2567,7 @@ (|dbSpecialDisplayOpChar?| (ELT |s| |i|)))))))))) |s|) - ('T (SPADLET |buf| (MAKESTRING "")) + ('T (SPADLET |buf| "") (DO ((G167338 (MAXINDEX |s|)) (|i| 0 (QSADD1 |i|))) ((QSGREATERP |i| G167338) NIL) (SEQ (EXIT (SPADLET |buf| @@ -2579,8 +2575,8 @@ ((|dbSpecialDisplayOpChar?| (ELT |s| |i|)) (STRCONC |buf| - (MAKESTRING "\\verb!") - (ELT |s| |i|) (MAKESTRING "!"))) + "\\verb!" + (ELT |s| |i|) "!")) ('T (STRCONC |buf| (ELT |s| |i|)))))))) |buf|)))))) diff --git a/src/interp/nag-c02.lisp.pamphlet b/src/interp/nag-c02.lisp.pamphlet index e358fea..e1d4c1b 100644 --- a/src/interp/nag-c02.lisp.pamphlet +++ b/src/interp/nag-c02.lisp.pamphlet @@ -46,7 +46,7 @@ (DEFUN |c02aff| () (PROGN (|htInitPage| - (MAKESTRING "C02AFF - All Zeros of a Complex Polynomial") NIL) + "C02AFF - All Zeros of a Complex Polynomial" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) (|text| @@ -75,7 +75,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c02affSolve|) + (|htMakeDoneButton| "Continue" '|c02affSolve|) (|htShowPage|))) ;c02affSolve htPage == @@ -123,19 +123,19 @@ (DEFUN |c02affSolve,f| (|i| |n|) (PROG (|prefix| |post| |rnam| |inam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline z**")) + (SEQ (SPADLET |prefix| "\\newline z**") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE (PLUS (SPADDIFFERENCE |n| |i|) 1)) - (MAKESTRING "\\space{1}"))) - (SPADLET |post| (MAKESTRING "\\tab{30} ")) - (SPADLET |post| (STRCONC |post| (MAKESTRING "\\space{1}"))) + "\\space{1}")) + (SPADLET |post| "\\tab{30} ") + (SPADLET |post| (STRCONC |post| "\\space{1}")) (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") + (INTERN (STRCONC "r" (STRINGIMAGE |i|)))) (SPADLET |inam| - (INTERN (STRCONC (MAKESTRING "i") + (INTERN (STRCONC "i" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -172,8 +172,8 @@ (SPADLET |scale| (COND ((BOOT-EQUAL |logical| '|true|) - (MAKESTRING "true")) - ('T (MAKESTRING "false")))) + "true") + ('T "false"))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -203,14 +203,12 @@ (|htInitPage| '|C02AFF - All Zeros of a Complex Polynomial| (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING - "\\menuitemstyle{} \\tab{2} Enter the coefficients of the polynomial: ")) - (|htSay| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING - "Real parts \\tab{30} Imaginary parts ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{} \\tab{2} Enter the coefficients of the polynomial: ") + (|htSay| "\\blankline ") + (|htSay| "Real parts \\tab{30} Imaginary parts ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|c02affGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|scale| |scale|) @@ -280,8 +278,7 @@ (SPADLET |n| '5) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C02AFF - All Zeros of a Complex Polynomial") + "C02AFF - All Zeros of a Complex Polynomial" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -309,7 +306,7 @@ (|bcStrings| (10 "10.0" |r6| F)) (|text| . "\\tab{30} ") (|text| . "\\space{1} ") (|bcStrings| (10 "1.0" |i6| F)) (|text| . "\\newline ") (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c02affGen|) + (|htMakeDoneButton| "Continue" '|c02affGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|scale| |scale|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -359,7 +356,7 @@ (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (SPADLET |imagstring| (|bcwords2liststring| |imaglist|)) (|linkGen| - (STRCONC (MAKESTRING "c02aff([") |realstring| '|,| + (STRCONC "c02aff([" |realstring| '|,| |imagstring| '|],| (STRINGIMAGE |n|) '|,| |scale| '|,| (STRINGIMAGE |ifail|) '|)|))))))) @@ -396,7 +393,7 @@ (DEFUN |c02agf| () (PROGN (|htInitPage| - (MAKESTRING "C02AGF - All Zeros of a Real Polynomial") NIL) + "C02AGF - All Zeros of a Real Polynomial" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) (|text| @@ -425,7 +422,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c02agfSolve|) + (|htMakeDoneButton| "Continue" '|c02agfSolve|) (|htShowPage|))) ;c02agfSolve htPage == @@ -468,14 +465,14 @@ (DEFUN |c02agfSolve,f| (|i| |n|) (PROG (|prefix| |rnam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline z**")) + (SEQ (SPADLET |prefix| "\\newline z**") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE (PLUS (SPADDIFFERENCE |n| |i|) 1)) - (MAKESTRING "\\space{1}"))) + "\\space{1}")) (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") + (INTERN (STRCONC "r" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -504,8 +501,8 @@ (SPADLET |scale| (COND ((BOOT-EQUAL |logical| '|true|) - (MAKESTRING "true")) - ('T (MAKESTRING "false")))) + "true") + ('T "false"))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -535,12 +532,11 @@ (|htInitPage| '|C02AGF - All Zeros of a Real Polynomial| (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the coefficients of the polynomial: ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter the coefficients of the polynomial: ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|c02agfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|scale| |scale|) @@ -591,8 +587,7 @@ (SPADLET |n| '5) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C02AGF - All Zeros of a Real Polynomial") + "C02AGF - All Zeros of a Real Polynomial" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -611,7 +606,7 @@ (|text| . "z**0 \\space{1} ") (|bcStrings| (10 "6.0" |r6| F)) (|text| . "\\newline ") (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c02agfGen|) + (|htMakeDoneButton| "Continue" '|c02agfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|scale| |scale|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -651,7 +646,7 @@ (CONS |left| |reallist|)))))) (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (|linkGen| - (STRCONC (MAKESTRING "c02agf([") |realstring| '|],| + (STRCONC "c02agf([" |realstring| '|],| (STRINGIMAGE |n|) '|,| |scale| '|,| (STRINGIMAGE |ifail|) '|)|))))))) diff --git a/src/interp/nag-c05.lisp.pamphlet b/src/interp/nag-c05.lisp.pamphlet index ba420ed..61dd514 100644 --- a/src/interp/nag-c05.lisp.pamphlet +++ b/src/interp/nag-c05.lisp.pamphlet @@ -68,8 +68,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "C05ADF - Zero of continuous function in given interval, Bus and Dekker algorithm") + "C05ADF - Zero of continuous function in given interval, Bus and Dekker algorithm" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -115,7 +114,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c05adfGen|) + (|htMakeDoneButton| "Continue" '|c05adfGen|) (|htShowPage|))) ;c05adfGen htPage == @@ -153,11 +152,11 @@ (SPADLET |temp1| (COND ((> |temp| 0.0) |eps|) - ('T (MAKESTRING "1.0e-5")))) + ('T "1.0e-5"))) (SPADLET |expression| (|htpLabelInputString| |htPage| '|expression|)) (SPADLET |prefix| - (STRCONC (MAKESTRING "c05adf(") |a| '|,| |b| '|,| + (STRCONC "c05adf(" |a| '|,| |b| '|,| |temp1| '|,| |eta| '|,| (STRINGIMAGE |ifail|))) (|linkGen| @@ -200,8 +199,7 @@ (DEFUN |c05nbf| () (PROGN (|htInitPage| - (MAKESTRING - "C05NBF - Solution of system of nonlinear equations using function values only") + "C05NBF - Solution of system of nonlinear equations using function values only" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -231,7 +229,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c05nbfSolve|) + (|htMakeDoneButton| "Continue" '|c05nbfSolve|) (|htShowPage|))) ;c05nbfSolve htPage == @@ -280,15 +278,15 @@ (DEFUN |c05nbfSolve,fa| (|i|) (PROG (|prefix| |funct| |nam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline {\\em Function ")) + (SEQ (SPADLET |prefix| "\\newline {\\em Function ") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE |i|) - (MAKESTRING ":} \\space{1}"))) + ":} \\space{1}")) (SPADLET |funct| - (STRCONC (MAKESTRING "X[") (STRINGIMAGE |i|) + (STRCONC "X[" (STRINGIMAGE |i|) '|] + 1|)) (SPADLET |nam| - (INTERN (STRCONC (MAKESTRING "n") + (INTERN (STRCONC "n" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -303,7 +301,7 @@ (PROG (|xnam|) (RETURN (SEQ (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") + (INTERN (STRCONC "x" (STRINGIMAGE |i|)))) (EXIT (CONS '|bcStrings| (CONS (CONS 4 @@ -344,12 +342,10 @@ (APPEND G166099 (|c05nbfSolve,fa| |i|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{}\\tab{2} Enter initial guess ")) + "\\blankline \\menuitemstyle{}\\tab{2} Enter initial guess ") (SPADLET |middle| (STRCONC |middle| - (MAKESTRING - "of the solution vector {\\it x}: \\newline "))) + "of the solution vector {\\it x}: \\newline ")) (SPADLET |middle| (CONS '|text| |middle|)) (SPADLET |vecList| (PROG (G166111) @@ -374,12 +370,11 @@ (|htInitPage| '|C05NBF - Solution of system of nonlinear equations using function values only| (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{}\\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the functions \\htbitmap{fi} below in terms of X[1]...X[n]: ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{}\\tab{2} ") + (|htSay| "Enter the functions \\htbitmap{fi} below in terms of X[1]...X[n]: ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|c05nbfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -502,7 +497,7 @@ (|bcStrings| (4 "-1.0" |x7| F)) (|bcStrings| (4 "-1.0" |x8| F)) (|bcStrings| (4 "-1.0" |x9| F)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c05nbfGen|) + (|htMakeDoneButton| "Continue" '|c05nbfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|xtol| |xtol|) @@ -610,8 +605,7 @@ (DEFUN |c05pbf| () (PROGN (|htInitPage| - (MAKESTRING - "C05PBF - Solution of system of nonlinear equations using first derivatives") + "C05PBF - Solution of system of nonlinear equations using first derivatives" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -641,7 +635,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c05pbfSolve|) + (|htMakeDoneButton| "Continue" '|c05pbfSolve|) (|htShowPage|))) ;c05pbfSolve htPage == @@ -690,15 +684,15 @@ (DEFUN |c05pbfSolve,fa| (|i|) (PROG (|prefix| |funct| |nam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline {\\em Function ")) + (SEQ (SPADLET |prefix| "\\newline {\\em Function ") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE |i|) - (MAKESTRING ":} \\space{1}"))) + ":} \\space{1}")) (SPADLET |funct| - (STRCONC (MAKESTRING "X[") (STRINGIMAGE |i|) + (STRCONC "X[" (STRINGIMAGE |i|) '|] + 1|)) (SPADLET |nam| - (INTERN (STRCONC (MAKESTRING "n") + (INTERN (STRCONC "n" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -713,7 +707,7 @@ (PROG (|xnam|) (RETURN (SEQ (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") + (INTERN (STRCONC "x" (STRINGIMAGE |i|)))) (EXIT (CONS '|bcStrings| (CONS (CONS 4 @@ -754,12 +748,10 @@ (APPEND G166197 (|c05pbfSolve,fa| |i|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{}\\tab{2} Enter initial guess ")) + "\\blankline \\menuitemstyle{}\\tab{2} Enter initial guess ") (SPADLET |middle| (STRCONC |middle| - (MAKESTRING - "of the solution vector {\\it x}: \\newline "))) + "of the solution vector {\\it x}: \\newline ")) (SPADLET |middle| (CONS '|text| |middle|)) (SPADLET |vecList| (PROG (G166209) @@ -782,15 +774,13 @@ |funcList|)) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C05PBF - Solution of system of nonlinear equations using first derivatives") + "C05PBF - Solution of system of nonlinear equations using first derivatives" (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{}\\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the functions \\htbitmap{fi} below in terms of X[1]...X[n]: ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{}\\tab{2} ") + (|htSay| "Enter the functions \\htbitmap{fi} below in terms of X[1]...X[n]: ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|c05pbfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -856,8 +846,7 @@ (SPADLET |n| '9) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C05PBF - Solution of system of nonlinear equations using first derivatives") + "C05PBF - Solution of system of nonlinear equations using first derivatives" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -914,7 +903,7 @@ (|bcStrings| (4 "-1.0" |x7| F)) (|bcStrings| (4 "-1.0" |x8| F)) (|bcStrings| (4 "-1.0" |x9| F)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c05pbfGen|) + (|htMakeDoneButton| "Continue" '|c05pbfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|xtol| |xtol|) diff --git a/src/interp/nag-c06.lisp.pamphlet b/src/interp/nag-c06.lisp.pamphlet index 51b6a86..29854cb 100644 --- a/src/interp/nag-c06.lisp.pamphlet +++ b/src/interp/nag-c06.lisp.pamphlet @@ -42,8 +42,7 @@ (DEFUN |c06eaf| () (PROGN (|htInitPage| - (MAKESTRING - "C06EAF - Single 1-D real discrete Fourier transform ") + "C06EAF - Single 1-D real discrete Fourier transform " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -68,7 +67,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06eafSolve|) + (|htMakeDoneButton| "Continue" '|c06eafSolve|) (|htShowPage|))) ;c06eafSolve htPage == @@ -106,9 +105,9 @@ (DEFUN |c06eafSolve,f| (|i|) (PROG (|prefix| |rnam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{15} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{15} ") (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") + (INTERN (STRCONC "r" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -157,16 +156,14 @@ (|htInitPage| '|C06EAF - Single 1-D real discrete Fourier transform | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the sequence to be transformed: ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter the sequence to be transformed: ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING - "Note : On exit, the transformed sequence is stored ")) - (|htSay| (MAKESTRING "in Hermitian form ")) - (|htSay| (MAKESTRING "\\blankline ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htSay| "Note : On exit, the transformed sequence is stored ") + (|htSay| "in Hermitian form ") + (|htSay| "\\blankline ") + (|htMakeDoneButton| "Continue" '|c06eafGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -214,8 +211,7 @@ (SPADLET |n| '7) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06EAF - Single 1-D real discrete Fourier transform ") + "C06EAF - Single 1-D real discrete Fourier transform " NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -241,7 +237,7 @@ . "Note : On exit, the transformed sequence is stored ") (|text| . "in Hermitian form ") (|text| . "\\blankline "))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06eafGen|) + (|htMakeDoneButton| "Continue" '|c06eafGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|inputArea| @@ -277,7 +273,7 @@ (CONS |left| |reallist|)))))) (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (|linkGen| - (STRCONC (MAKESTRING "c06eaf(") (STRINGIMAGE |n|) + (STRCONC "c06eaf(" (STRINGIMAGE |n|) '|,[| |realstring| '|],| (STRINGIMAGE |ifail|) '|)|))))))) @@ -310,8 +306,7 @@ (DEFUN |c06ebf| () (PROGN (|htInitPage| - (MAKESTRING - "C06EBF - Single 1-D Hermitian discrete Fourier transform ") + "C06EBF - Single 1-D Hermitian discrete Fourier transform " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -334,7 +329,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06ebfSolve|) + (|htMakeDoneButton| "Continue" '|c06ebfSolve|) (|htShowPage|))) ;c06ebfSolve htPage == @@ -371,9 +366,9 @@ (DEFUN |c06ebfSolve,f| (|i|) (PROG (|prefix| |rnam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{15} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{15} ") (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") + (INTERN (STRCONC "r" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -422,15 +417,13 @@ (|htInitPage| '|C06EBF - Single 1-D real discrete Fourier transform | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the sequence to be transformed, stored in Hermitian form: ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter the sequence to be transformed, stored in Hermitian form: ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING - "Note : On exit, the components of the discrete Fourier transform ")) - (|htSay| (MAKESTRING "\\blankline ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htSay| "Note : On exit, the components of the discrete Fourier transform ") + (|htSay| "\\blankline ") + (|htMakeDoneButton| "Continue" '|c06ebfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -477,8 +470,7 @@ (SPADLET |n| '7) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06EBF - Single 1-D Hermitian discrete Fourier transform ") + "C06EBF - Single 1-D Hermitian discrete Fourier transform " NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -504,7 +496,7 @@ (|text| . "Note : On exit, the components of the discrete Fourier transform") (|text| . "\\blankline "))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06ebfGen|) + (|htMakeDoneButton| "Continue" '|c06ebfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|inputArea| @@ -540,7 +532,7 @@ (CONS |left| |reallist|)))))) (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (|linkGen| - (STRCONC (MAKESTRING "c06ebf(") (STRINGIMAGE |n|) + (STRCONC "c06ebf(" (STRINGIMAGE |n|) '|,[| |realstring| '|],| (STRINGIMAGE |ifail|) '|)|))))))) @@ -572,8 +564,7 @@ (DEFUN |c06ecf| () (PROGN (|htInitPage| - (MAKESTRING - "C06ECF - Single 1-D complex discrete Fourier transform ") + "C06ECF - Single 1-D complex discrete Fourier transform " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -595,7 +586,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06ecfSolve|) + (|htMakeDoneButton| "Continue" '|c06ecfSolve|) (|htShowPage|))) ;c06ecfSolve htPage == @@ -636,13 +627,13 @@ (DEFUN |c06ecfSolve,f| (|i|) (PROG (|prefix| |post| |xnam| |ynam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) - (SPADLET |post| (MAKESTRING "\\tab{32} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{2} ") + (SPADLET |post| "\\tab{32} ") (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") + (INTERN (STRCONC "x" (STRINGIMAGE |i|)))) (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "y") + (INTERN (STRCONC "y" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -703,13 +694,11 @@ (|htInitPage| '|C06ECF - Single 1-D complex discrete Fourier transform | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{2} Real parts of sequence: \\tab{30} ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{32} Imaginary parts: ")) + (|htSay| "\\menuitemstyle{}\\tab{2} Real parts of sequence: \\tab{30} ") + (|htSay| "\\menuitemstyle{}\\tab{32} Imaginary parts: ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htMakeDoneButton| "Continue" '|c06ecfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -768,8 +757,7 @@ (SPADLET |n| '7) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06ECF - Single 1-D complex discrete Fourier transform ") + "C06ECF - Single 1-D complex discrete Fourier transform " (|htpPropertyList| |htPage|))) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -806,7 +794,7 @@ (|text| . "\\tab{32} ") (|bcStrings| (10 "0.16298" |y7| F)) (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06ecfGen|) + (|htMakeDoneButton| "Continue" '|c06ecfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|inputArea| @@ -853,7 +841,7 @@ (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (SPADLET |imagstring| (|bcwords2liststring| |imaglist|)) (|linkGen| - (STRCONC (MAKESTRING "c06ecf(") (STRINGIMAGE |n|) + (STRCONC "c06ecf(" (STRINGIMAGE |n|) '|,[| |realstring| '|],[| |imagstring| '|],| (STRINGIMAGE |ifail|) '|)|))))))) @@ -892,8 +880,7 @@ (DEFUN |c06ekf| () (PROGN (|htInitPage| - (MAKESTRING - "C06EKF - Circular convolution or correlation of two real vectors") + "C06EKF - Circular convolution or correlation of two real vectors" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -921,7 +908,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06ekfSolve|) + (|htMakeDoneButton| "Continue" '|c06ekfSolve|) (|htShowPage|))) ;c06ekfSolve htPage == @@ -968,13 +955,13 @@ (DEFUN |c06ekfSolve,f| (|i|) (PROG (|prefix| |post| |xnam| |ynam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) - (SPADLET |post| (MAKESTRING "\\tab{34} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{2} ") + (SPADLET |post| "\\tab{34} ") (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") + (INTERN (STRCONC "x" (STRINGIMAGE |i|)))) (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "y") + (INTERN (STRCONC "y" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -1039,14 +1026,12 @@ (|htInitPage| '|C06EKF - Single 1-D complex discrete Fourier transform | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{2} Elements of period of vector {\\em x}: ")) - (|htSay| (MAKESTRING "\\tab{31} ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{34} Elements of period of vector {\\em y}:")) + (|htSay| "\\menuitemstyle{}\\tab{2} Elements of period of vector {\\em x}: ") + (|htSay| "\\tab{31} ") + (|htSay| "\\menuitemstyle{}\\tab{34} Elements of period of vector {\\em y}:") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htMakeDoneButton| "Continue" '|c06ekfGen|) (|htpSetProperty| |page| '|job| |job|) (|htpSetProperty| |page| '|n| |n|) @@ -1115,8 +1100,7 @@ (SPADLET |n| '9) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06EKF - Circular convolution or correlation of two real vectors ") + "C06EKF - Circular convolution or correlation of two real vectors " (|htpPropertyList| |htPage|))) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -1153,7 +1137,7 @@ (|bcStrings| (10 "0.00" |x9| F)) (|text| . "\\tab{34} ") (|bcStrings| (10 "0.00" |y9| F)) (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06ekfGen|) + (|htMakeDoneButton| "Continue" '|c06ekfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|job| |job|) @@ -1203,7 +1187,7 @@ (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (SPADLET |imagstring| (|bcwords2liststring| |imaglist|)) (|linkGen| - (STRCONC (MAKESTRING "c06ekf(") (STRINGIMAGE |job|) + (STRCONC "c06ekf(" (STRINGIMAGE |job|) '|,| (STRINGIMAGE |n|) '|,[| |realstring| '|],[| |imagstring| '|],| (STRINGIMAGE |ifail|) '|)|))))))) @@ -1248,8 +1232,7 @@ (DEFUN |c06fpf| () (PROGN (|htInitPage| - (MAKESTRING - "C06FPF - Multiple 1-D real discrete Fourier transform ") + "C06FPF - Multiple 1-D real discrete Fourier transform " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -1282,7 +1265,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06fpfSolve|) + (|htMakeDoneButton| "Continue" '|c06fpfSolve|) (|htShowPage|))) ;c06fpfSolve htPage == @@ -1340,7 +1323,7 @@ (PROG (|xnam|) (RETURN (SEQ (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "r") (STRINGIMAGE |i|) + (INTERN (STRCONC "r" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -1361,16 +1344,16 @@ (SEQ (EXIT (SETQ G166334 (APPEND G166334 (|c06fpfSolve,g| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SPADLET |prefix| "\\newline \\tab{2} ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) (DEFUN |c06fpfSolve,h| (|k|) (PROG (|prefix| |trignam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{2} ") (SPADLET |trignam| - (INTERN (STRCONC (MAKESTRING "t") + (INTERN (STRCONC "t" (STRINGIMAGE |k|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -1406,9 +1389,9 @@ (SPADLET |call| (|htpButtonValue| |htPage| '|init|)) (SPADLET |init| (COND - ((BOOT-EQUAL |call| '|i|) (MAKESTRING "i")) - ((BOOT-EQUAL |call| '|s|) (MAKESTRING "s")) - ('T (MAKESTRING "r")))) + ((BOOT-EQUAL |call| '|i|) "i") + ((BOOT-EQUAL |call| '|s|) "s") + ('T "r"))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -1438,8 +1421,7 @@ (APPEND G166366 (|c06fpfSolve,h| |k|))))))))) (SPADLET |prefix| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Trigonometric coefficients ")) + "\\blankline \\menuitemstyle{} \\tab{2} Trigonometric coefficients ") (SPADLET |prefix| (STRCONC |prefix| '|(not required if initial call) {\\it TRIG}: |)) @@ -1455,13 +1437,11 @@ (|htInitPage| '|C06FPF - Multiple 1-D real discrete Fourier transform | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter each sequence to be transformed, {\\it x}. ")) - (|htSay| (MAKESTRING - "(Each column to contain a sequence.) ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter each sequence to be transformed, {\\it x}. ") + (|htSay| "(Each column to contain a sequence.) ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|c06fpfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) @@ -1550,8 +1530,7 @@ (SPADLET |m| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06FPF - Multiple 1-D real discrete Fourier transform ") + "C06FPF - Multiple 1-D real discrete Fourier transform " NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -1613,7 +1592,7 @@ (|text| . "\\newline \\tab{2} ") (|bcStrings| (6 "0.0" |t12| F)) (|text| . "\\blankline "))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06fpfGen|) + (|htMakeDoneButton| "Continue" '|c06fpfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) (|htpSetProperty| |page| '|init| |init|) @@ -1671,7 +1650,7 @@ (SPADLET |xlist| (CONS |left| |xlist|)))))) (SPADLET |xstring| (|bcwords2liststring| |xlist|)) (SPADLET |prefix| - (STRCONC (MAKESTRING "c06fpf(") (STRINGIMAGE |m|) + (STRCONC "c06fpf(" (STRINGIMAGE |m|) '|, | (STRINGIMAGE |n|) '|, "|)) (SPADLET |prefix| (STRCONC |prefix| |init| '|",[| |xstring| '|],[| @@ -1718,8 +1697,7 @@ (DEFUN |c06fqf| () (PROGN (|htInitPage| - (MAKESTRING - "C06FQF - Multiple 1-D Hermitian discrete Fourier transform ") + "C06FQF - Multiple 1-D Hermitian discrete Fourier transform " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -1752,7 +1730,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06fqfSolve|) + (|htMakeDoneButton| "Continue" '|c06fqfSolve|) (|htShowPage|))) ;c06fqfSolve htPage == @@ -1810,7 +1788,7 @@ (PROG (|xnam|) (RETURN (SEQ (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "r") (STRINGIMAGE |i|) + (INTERN (STRCONC "r" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -1831,7 +1809,7 @@ (SEQ (EXIT (SETQ G166457 (APPEND G166457 (|c06fqfSolve,g| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SPADLET |prefix| "\\newline \\tab{2} ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -1840,7 +1818,7 @@ (RETURN (SEQ (SPADLET |prefix| '|\\newline \\tab{2} |) (SPADLET |trignam| - (INTERN (STRCONC (MAKESTRING "t") + (INTERN (STRCONC "t" (STRINGIMAGE |k|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -1876,9 +1854,9 @@ (SPADLET |call| (|htpButtonValue| |htPage| '|init|)) (SPADLET |init| (COND - ((BOOT-EQUAL |call| '|i|) (MAKESTRING "i")) - ((BOOT-EQUAL |call| '|s|) (MAKESTRING "s")) - ('T (MAKESTRING "r")))) + ((BOOT-EQUAL |call| '|i|) "i") + ((BOOT-EQUAL |call| '|s|) "s") + ('T "r"))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -1908,8 +1886,7 @@ (APPEND G166489 (|c06fqfSolve,h| |k|))))))))) (SPADLET |prefix| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Trignometric coefficients ")) + "\\blankline \\menuitemstyle{} \\tab{2} Trignometric coefficients ") (SPADLET |prefix| (STRCONC |prefix| '|(not required if initial call) {\\it TRIG}: |)) @@ -1925,13 +1902,11 @@ (|htInitPage| '|C06FQF - Multiple 1-D Hermitian discrete Fourier transform | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter each sequence to be transformed, {\\it x}. ")) - (|htSay| (MAKESTRING - "(Each column to contain a sequence.) ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter each sequence to be transformed, {\\it x}. ") + (|htSay| "(Each column to contain a sequence.) ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|c06fqfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) @@ -2020,8 +1995,7 @@ (SPADLET |m| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06FQF - Multiple 1-D Hermitian discrete Fourier transform ") + "C06FQF - Multiple 1-D Hermitian discrete Fourier transform " NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -2083,7 +2057,7 @@ (|text| . "\\newline \\tab{2} ") (|bcStrings| (6 "0.0" |t12| F)) (|text| . "\\blankline "))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06fqfGen|) + (|htMakeDoneButton| "Continue" '|c06fqfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) (|htpSetProperty| |page| '|init| |init|) @@ -2141,7 +2115,7 @@ (SPADLET |xlist| (CONS |left| |xlist|)))))) (SPADLET |xstring| (|bcwords2liststring| |xlist|)) (SPADLET |prefix| - (STRCONC (MAKESTRING "c06fqf(") (STRINGIMAGE |m|) + (STRCONC "c06fqf(" (STRINGIMAGE |m|) '|, | (STRINGIMAGE |n|) '|, "|)) (SPADLET |prefix| (STRCONC |prefix| |init| '|",[| |xstring| '|],[| @@ -2188,8 +2162,7 @@ (DEFUN |c06frf| () (PROGN (|htInitPage| - (MAKESTRING - "C06FRF - Multiple 1-D complex discrete Fourier transform ") + "C06FRF - Multiple 1-D complex discrete Fourier transform " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -2222,7 +2195,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06frfSolve|) + (|htMakeDoneButton| "Continue" '|c06frfSolve|) (|htShowPage|))) ;c06frfSolve htPage == @@ -2293,7 +2266,7 @@ (PROG (|xnam|) (RETURN (SEQ (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") (STRINGIMAGE |i|) + (INTERN (STRCONC "x" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -2314,7 +2287,7 @@ (SEQ (EXIT (SETQ G166580 (APPEND G166580 (|c06frfSolve,gx| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SPADLET |prefix| "\\newline \\tab{2} ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -2322,7 +2295,7 @@ (PROG (|ynam|) (RETURN (SEQ (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "y") (STRINGIMAGE |i|) + (INTERN (STRCONC "y" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -2343,7 +2316,7 @@ (SEQ (EXIT (SETQ G166603 (APPEND G166603 (|c06frfSolve,gy| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SPADLET |prefix| "\\newline \\tab{2} ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -2352,7 +2325,7 @@ (RETURN (SEQ (SPADLET |prefix| '|\\newline \\tab{2} |) (SPADLET |trignam| - (INTERN (STRCONC (MAKESTRING "t") + (INTERN (STRCONC "t" (STRINGIMAGE |k|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -2388,9 +2361,9 @@ (SPADLET |call| (|htpButtonValue| |htPage| '|init|)) (SPADLET |init| (COND - ((BOOT-EQUAL |call| '|i|) (MAKESTRING "i")) - ((BOOT-EQUAL |call| '|s|) (MAKESTRING "s")) - ('T (MAKESTRING "r")))) + ((BOOT-EQUAL |call| '|i|) "i") + ((BOOT-EQUAL |call| '|s|) "s") + ('T "r"))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -2419,8 +2392,7 @@ (APPEND G166635 (|c06frfSolve,fy| |i| |m|))))))))) (SPADLET |prefix| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the imaginary parts ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the imaginary parts ") (SPADLET |prefix| (STRCONC |prefix| '|of each sequence to be transformed, {\\it y}. |)) @@ -2444,8 +2416,7 @@ (APPEND G166643 (|c06frfSolve,h| |k|))))))))) (SPADLET |prefix| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Trignometric coefficients ")) + "\\blankline \\menuitemstyle{} \\tab{2} Trignometric coefficients ") (SPADLET |prefix| (STRCONC |prefix| '|(not required if initial call) {\\it TRIG}: |)) @@ -2462,13 +2433,11 @@ (|htInitPage| '|C06FRF - Multiple 1-D real discrete Fourier transform | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the real parts of each sequence to be transformed, {\\it x}. ")) - (|htSay| (MAKESTRING - "(Each column to contain the real parts of a sequence.) ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter the real parts of each sequence to be transformed, {\\it x}. ") + (|htSay| "(Each column to contain the real parts of a sequence.) ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|c06frfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) @@ -2587,8 +2556,7 @@ (SPADLET |m| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06FRF - Multiple 1-D real discrete Fourier transform ") + "C06FRF - Multiple 1-D real discrete Fourier transform " NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -2681,7 +2649,7 @@ (|text| . "\\newline \\tab{2} ") (|bcStrings| (6 "0.0" |t12| F)) (|text| . "\\blankline "))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06frfGen|) + (|htMakeDoneButton| "Continue" '|c06frfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) (|htpSetProperty| |page| '|init| |init|) @@ -2752,7 +2720,7 @@ (SPADLET |xlist| (CONS |left| |xlist|)))))) (SPADLET |xstring| (|bcwords2liststring| |xlist|)) (SPADLET |prefix| - (STRCONC (MAKESTRING "c06frf(") (STRINGIMAGE |m|) + (STRCONC "c06frf(" (STRINGIMAGE |m|) '|, | (STRINGIMAGE |n|) '|, "|)) (SPADLET |prefix| (STRCONC |prefix| |init| '|",[| |xstring| '|],[| @@ -2802,7 +2770,7 @@ (DEFUN |c06fuf| () (PROGN (|htInitPage| - (MAKESTRING "C06FUF - 2-D complex discrete Fourier transform ") + "C06FUF - 2-D complex discrete Fourier transform " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -2838,7 +2806,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06fufSolve|) + (|htMakeDoneButton| "Continue" '|c06fufSolve|) (|htShowPage|))) ;c06fufSolve htPage == @@ -2917,7 +2885,7 @@ (PROG (|xnam|) (RETURN (SEQ (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") (STRINGIMAGE |i|) + (INTERN (STRCONC "x" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -2938,7 +2906,7 @@ (SEQ (EXIT (SETQ G166756 (APPEND G166756 (|c06fufSolve,gx| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SPADLET |prefix| "\\newline \\tab{2} ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -2946,7 +2914,7 @@ (PROG (|ynam|) (RETURN (SEQ (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "y") (STRINGIMAGE |i|) + (INTERN (STRCONC "y" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -2967,7 +2935,7 @@ (SEQ (EXIT (SETQ G166779 (APPEND G166779 (|c06fufSolve,gy| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SPADLET |prefix| "\\newline \\tab{2} ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -2976,7 +2944,7 @@ (RETURN (SEQ (SPADLET |prefix| '|\\newline \\tab{2} |) (SPADLET |trignam| - (INTERN (STRCONC (MAKESTRING "tm") + (INTERN (STRCONC "tm" (STRINGIMAGE |k|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -2992,7 +2960,7 @@ (RETURN (SEQ (SPADLET |prefix| '|\\newline \\tab{2} |) (SPADLET |trignam| - (INTERN (STRCONC (MAKESTRING "tn") + (INTERN (STRCONC "tn" (STRINGIMAGE |k|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -3028,9 +2996,9 @@ (SPADLET |call| (|htpButtonValue| |htPage| '|init|)) (SPADLET |init| (COND - ((BOOT-EQUAL |call| '|i|) (MAKESTRING "i")) - ((BOOT-EQUAL |call| '|s|) (MAKESTRING "s")) - ('T (MAKESTRING "r")))) + ((BOOT-EQUAL |call| '|i|) "i") + ((BOOT-EQUAL |call| '|s|) "s") + ('T "r"))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -3059,8 +3027,7 @@ (APPEND G166818 (|c06fufSolve,fy| |i| |m|))))))))) (SPADLET |prefix| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the imaginary parts ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the imaginary parts ") (SPADLET |prefix| (STRCONC |prefix| '|of each sequence to be transformed, {\\it y}. |)) @@ -3084,8 +3051,7 @@ (APPEND G166826 (|c06fufSolve,hm| |k|))))))))) (SPADLET |prefix| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Trignometric coefficients ")) + "\\blankline \\menuitemstyle{} \\tab{2} Trignometric coefficients ") (SPADLET |prefix| (STRCONC |prefix| '|(not required if initial call) {\\it TRIGM}: |)) @@ -3105,8 +3071,7 @@ (APPEND G166835 (|c06fufSolve,hn| |k|))))))))) (SPADLET |prefix| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} {\\it TRIGN}: ")) + "\\blankline \\menuitemstyle{} \\tab{2} {\\it TRIGN}: ") (SPADLET |prefix| (STRCONC |prefix| '|\\newline \\tab{2} |)) (SPADLET |trignList| @@ -3122,13 +3087,11 @@ (|htInitPage| '|C06FUF - 2-D complex discrete Fourier transform | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the real part of each sequence to be transformed, {\\it x}. ")) - (|htSay| (MAKESTRING - "(Each column to contain the real parts of a sequence.) ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter the real part of each sequence to be transformed, {\\it x}. ") + (|htSay| "(Each column to contain the real parts of a sequence.) ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|c06fufGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) @@ -3250,8 +3213,7 @@ (SPADLET |m| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06FUF - 2-D real discrete Fourier transform ") + "C06FUF - 2-D real discrete Fourier transform " NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -3346,7 +3308,7 @@ (|text| . "\\newline \\tab{2} ") (|bcStrings| (6 "0.0" |tn10| F)) (|text| . "\\blankline "))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06fufGen|) + (|htMakeDoneButton| "Continue" '|c06fufGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) (|htpSetProperty| |page| '|init| |init|) @@ -3432,7 +3394,7 @@ (SPADLET |xlist| (CONS |left| |xlist|)))))) (SPADLET |xstring| (|bcwords2liststring| |xlist|)) (SPADLET |prefix| - (STRCONC (MAKESTRING "c06fuf(") (STRINGIMAGE |m|) + (STRCONC "c06fuf(" (STRINGIMAGE |m|) '|, | (STRINGIMAGE |n|) '|, "|)) (SPADLET |prefix| (STRCONC |prefix| |init| '|",[| |xstring| '|],[| @@ -3470,8 +3432,7 @@ (DEFUN |c06gbf| () (PROGN (|htInitPage| - (MAKESTRING - "C06GBF - Complex conjugate of a Hermitian sequence ") + "C06GBF - Complex conjugate of a Hermitian sequence " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -3495,7 +3456,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06gbfSolve|) + (|htMakeDoneButton| "Continue" '|c06gbfSolve|) (|htShowPage|))) ;c06gbfSolve htPage == @@ -3532,9 +3493,9 @@ (DEFUN |c06gbfSolve,f| (|i|) (PROG (|prefix| |rnam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{15} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{15} ") (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") + (INTERN (STRCONC "r" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -3583,15 +3544,13 @@ (|htInitPage| '|C06GBF - Complex conjugate of a Hermitian sequence | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the Hermitian sequence to be transformed stored in Hermitian form: ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter the Hermitian sequence to be transformed stored in Hermitian form: ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING - "Note : On exit, the imaginary values are negated ")) - (|htSay| (MAKESTRING "\\blankline ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htSay| "Note : On exit, the imaginary values are negated ") + (|htSay| "\\blankline ") + (|htMakeDoneButton| "Continue" '|c06gbfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -3639,8 +3598,7 @@ (SPADLET |n| '7) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06GBF - Complex conjugate of a Hermitian sequence ") + "C06GBF - Complex conjugate of a Hermitian sequence " NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -3667,7 +3625,7 @@ (|text| . "Note : On exit, the imaginary values are negated ") (|text| . "\\blankline "))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06gbfGen|) + (|htMakeDoneButton| "Continue" '|c06gbfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|inputArea| @@ -3703,7 +3661,7 @@ (CONS |left| |reallist|)))))) (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (|linkGen| - (STRCONC (MAKESTRING "c06gbf(") (STRINGIMAGE |n|) + (STRCONC "c06gbf(" (STRINGIMAGE |n|) '|,[| |realstring| '|],| (STRINGIMAGE |ifail|) '|)|))))))) @@ -3737,7 +3695,7 @@ (DEFUN |c06gcf| () (PROGN (|htInitPage| - (MAKESTRING "C06GCF - Complex conjugate of complex sequence ") + "C06GCF - Complex conjugate of complex sequence " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -3762,7 +3720,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06gcfSolve|) + (|htMakeDoneButton| "Continue" '|c06gcfSolve|) (|htShowPage|))) ;c06gcfSolve htPage == @@ -3799,9 +3757,9 @@ (DEFUN |c06gcfSolve,f| (|i|) (PROG (|prefix| |rnam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{15} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{15} ") (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") + (INTERN (STRCONC "r" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -3850,15 +3808,13 @@ (|htInitPage| '|C06GCF - Complex conjugate of a Hermitian sequence | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\menuitemstyle{} \\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the imaginary parts of the sequence: ")) + (|htSay| "\\menuitemstyle{} \\tab{2} ") + (|htSay| "Enter the imaginary parts of the sequence: ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING - "Note : On exit, these values are negated ")) - (|htSay| (MAKESTRING "\\blankline ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htSay| "Note : On exit, these values are negated ") + (|htSay| "\\blankline ") + (|htMakeDoneButton| "Continue" '|c06gcfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -3905,8 +3861,7 @@ (SPADLET |n| '7) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06GCF - Complex conjugate of complex sequence ") + "C06GCF - Complex conjugate of complex sequence " NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -3930,7 +3885,7 @@ (|text| . "\\blankline ") (|text| . "Note : On exit, these values are negated ") (|text| . "\\blankline "))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06gcfGen|) + (|htMakeDoneButton| "Continue" '|c06gcfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|inputArea| @@ -3966,7 +3921,7 @@ (CONS |left| |reallist|)))))) (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (|linkGen| - (STRCONC (MAKESTRING "c06gcf(") (STRINGIMAGE |n|) + (STRCONC "c06gcf(" (STRINGIMAGE |n|) '|,[| |realstring| '|],| (STRINGIMAGE |ifail|) '|)|))))))) @@ -4006,8 +3961,7 @@ (DEFUN |c06gqf| () (PROGN (|htInitPage| - (MAKESTRING - "C06GQF - Complex conjugate of multiple Hermitian sequences ") + "C06GQF - Complex conjugate of multiple Hermitian sequences " NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -4038,7 +3992,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06gqfSolve|) + (|htMakeDoneButton| "Continue" '|c06gqfSolve|) (|htShowPage|))) ;c06gqfSolve htPage == @@ -4086,7 +4040,7 @@ (PROG (|rnam|) (RETURN (SEQ (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") (STRINGIMAGE |i|) + (INTERN (STRCONC "r" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -4107,7 +4061,7 @@ (SEQ (EXIT (SETQ G167087 (APPEND G167087 (|c06gqfSolve,f| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SPADLET |prefix| "\\newline \\tab{2} ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -4161,15 +4115,13 @@ (|htInitPage| '|C06GQF - Complex conjugate of multiple Hermitian sequences | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\newline ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{2} Please enter each sequence to be ")) - (|htSay| (MAKESTRING - "transformed in Hermitian format. (Each column to contain ")) - (|htSay| (MAKESTRING "a sequence.) ")) + (|htSay| "\\newline ") + (|htSay| "\\menuitemstyle{}\\tab{2} Please enter each sequence to be ") + (|htSay| "transformed in Hermitian format. (Each column to contain ") + (|htSay| "a sequence.) ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htMakeDoneButton| "Continue" '|c06gqfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) @@ -4229,8 +4181,7 @@ (SPADLET |n| '6) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06GQF - Complex conjugate of multiple Hermitian sequences ") + "C06GQF - Complex conjugate of multiple Hermitian sequences " (|htpPropertyList| |htPage|))) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -4264,7 +4215,7 @@ (|bcStrings| (6 "0.8723" |y26| F)) (|bcStrings| (6 "0.4815" |y36| F)) (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06gqfGen|) + (|htMakeDoneButton| "Continue" '|c06gqfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -4303,7 +4254,7 @@ (CONS |right| |reallist|)))))) (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (|linkGen| - (STRCONC (MAKESTRING "c06gqf(") (STRINGIMAGE |m|) '|,| + (STRCONC "c06gqf(" (STRINGIMAGE |m|) '|,| (STRINGIMAGE |n|) '|,[| |realstring| '|],| (STRINGIMAGE |ifail|) '|)|))))))) @@ -4343,8 +4294,7 @@ (DEFUN |c06gsf| () (PROGN (|htInitPage| - (MAKESTRING - "C06GSF - Convert Hermitian sequences to general complex sequences") + "C06GSF - Convert Hermitian sequences to general complex sequences" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -4377,7 +4327,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06gsfSolve|) + (|htMakeDoneButton| "Continue" '|c06gsfSolve|) (|htShowPage|))) ;c06gsfSolve htPage == @@ -4425,7 +4375,7 @@ (PROG (|rnam|) (RETURN (SEQ (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "r") (STRINGIMAGE |i|) + (INTERN (STRCONC "r" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -4446,7 +4396,7 @@ (SEQ (EXIT (SETQ G167167 (APPEND G167167 (|c06gsfSolve,f| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) + (SPADLET |prefix| "\\newline \\tab{2} ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -4500,15 +4450,13 @@ (|htInitPage| '|C06GSF - Convert Hermitian sequences to general complex sequences | (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING "\\newline ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{2} Please enter each sequence to be ")) - (|htSay| (MAKESTRING - "transformed in Hermitian format. (Each column to contain a ")) - (|htSay| (MAKESTRING "sequence.) ")) + (|htSay| "\\newline ") + (|htSay| "\\menuitemstyle{}\\tab{2} Please enter each sequence to be ") + (|htSay| "transformed in Hermitian format. (Each column to contain a ") + (|htSay| "sequence.) ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htMakeDoneButton| "Continue" '|c06gsfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) @@ -4568,8 +4516,7 @@ (SPADLET |n| '6) (SPADLET |page| (|htInitPage| - (MAKESTRING - "C06GSF - Convert Hermitian sequences to general complex sequences ") + "C06GSF - Convert Hermitian sequences to general complex sequences " (|htpPropertyList| |htPage|))) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -4603,7 +4550,7 @@ (|bcStrings| (6 "0.8723" |y26| F)) (|bcStrings| (6 "0.4815" |y36| F)) (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|c06gsfGen|) + (|htMakeDoneButton| "Continue" '|c06gsfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|m| |m|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -4642,7 +4589,7 @@ (CONS |right| |reallist|)))))) (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (|linkGen| - (STRCONC (MAKESTRING "c06gsf(") (STRINGIMAGE |m|) '|,| + (STRCONC "c06gsf(" (STRINGIMAGE |m|) '|,| (STRINGIMAGE |n|) '|,[| |realstring| '|],| (STRINGIMAGE |ifail|) '|)|))))))) diff --git a/src/interp/nag-d01.lisp.pamphlet b/src/interp/nag-d01.lisp.pamphlet index ae699a0..b2db45f 100644 --- a/src/interp/nag-d01.lisp.pamphlet +++ b/src/interp/nag-d01.lisp.pamphlet @@ -72,8 +72,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01AJF - 1-D quadrature, adaptive, finite interval, allowing for badly-behaved integrands") + "D01AJF - 1-D quadrature, adaptive, finite interval, allowing for badly-behaved integrands" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -124,7 +123,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01ajfGen|) + (|htMakeDoneButton| "Continue" '|d01ajfGen|) (|htShowPage|))) ;d01ajfGen htPage == @@ -242,8 +241,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01AKF - 1-D quadrature, adaptive, finite interval, method suitable for oscillating functions") + "D01AKF - 1-D quadrature, adaptive, finite interval, method suitable for oscillating functions" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -293,7 +291,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01akfGen|) + (|htMakeDoneButton| "Continue" '|d01akfGen|) (|htShowPage|))) ;d01akfGen htPage == @@ -423,8 +421,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01ALF - 1-D quadrature, adaptive, finite interval, allowing for singularities at user-specified break-points ") + "D01ALF - 1-D quadrature, adaptive, finite interval, allowing for singularities at user-specified break-points " NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -486,7 +483,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01alfGen|) + (|htMakeDoneButton| "Continue" '|d01alfGen|) (|htShowPage|))) ;d01alfGen htPage == @@ -539,7 +536,7 @@ (|objValUnwrap| (|htpLabelSpadValue| |htPage| '|npts|))))) (SPADLET |points| (|htpLabelInputString| |htPage| '|points|)) - (SPADLET |points| (STRCONC (MAKESTRING "[[") |points| ']])) + (SPADLET |points| (STRCONC "[[" |points| ']])) (SPADLET |epsabs| (|htpLabelInputString| |htPage| '|epsabs|)) (SPADLET |epsrel| (|htpLabelInputString| |htPage| '|epsrel|)) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) @@ -551,16 +548,16 @@ (|htpLabelInputString| |htPage| '|expression|)) (SPADLET |liw| (QUOTIENT |lw| 2)) (SPADLET |prefix| - (STRCONC (MAKESTRING "d01alf(") |a| '| ,| |b| '| ,| + (STRCONC "d01alf(" |a| '| ,| |b| '| ,| (STRINGIMAGE |npts|) '|,| |points| '|,|)) (SPADLET |prefix| (STRCONC |prefix| |epsabs| '| ,| |epsrel| '| ,| (STRINGIMAGE |lw|))) (SPADLET |middle| - (STRCONC (MAKESTRING " ,") (STRINGIMAGE |liw|) '| ,| + (STRCONC " ," (STRINGIMAGE |liw|) '| ,| (STRINGIMAGE |ifail|) '| ,|)) (SPADLET |end| - (STRCONC (MAKESTRING "(") |express| + (STRCONC "(" |express| '|::Expression Float) :: ASP1(F))|)) (|linkGen| (STRCONC |prefix| |middle| |end|)))))) @@ -627,8 +624,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01AMF 1-D quadrature, adaptive, infinite or semi-infinite interval") + "D01AMF 1-D quadrature, adaptive, infinite or semi-infinite interval" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -685,7 +681,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01amfGen|) + (|htMakeDoneButton| "Continue" '|d01amfGen|) (|htShowPage|))) ;d01amfGen htPage == @@ -747,16 +743,16 @@ (|htpLabelInputString| |htPage| '|expression|)) (SPADLET |liw| (QUOTIENT |lw| 4)) (SPADLET |prefix| - (STRCONC (MAKESTRING "d01amf(") |a| '| ,| + (STRCONC "d01amf(" |a| '| ,| (STRINGIMAGE |inf|) '| ,|)) (SPADLET |prefix| (STRCONC |prefix| |epsabs| '| ,| |epsrel| '| ,| (STRINGIMAGE |lw|))) (SPADLET |middle| - (STRCONC (MAKESTRING " ,") (STRINGIMAGE |liw|) '| ,| + (STRCONC " ," (STRINGIMAGE |liw|) '| ,| (STRINGIMAGE |ifail|) '| ,|)) (SPADLET |end| - (STRCONC (MAKESTRING "(") |express| + (STRCONC "(" |express| '|::Expression Float) :: ASP1(F))|)) (|linkGen| (STRCONC |prefix| |middle| |end|)))))) @@ -830,8 +826,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01ANF - 1-D quadrature, adaptive, finite interval, weight function cos(\\omega x) or sin(\\omega x)") + "D01ANF - 1-D quadrature, adaptive, finite interval, weight function cos(\\omega x) or sin(\\omega x)" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -889,7 +884,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01anfGen|) + (|htMakeDoneButton| "Continue" '|d01anfGen|) (|htShowPage|))) ;d01anfGen htPage == @@ -1034,8 +1029,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01APF - 1-D quadrature, adaptive, finite interval, weight function with end point singularities of algebraico-logarithmic type") + "D01APF - 1-D quadrature, adaptive, finite interval, weight function with end point singularities of algebraico-logarithmic type" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -1108,7 +1102,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01apfGen|) + (|htMakeDoneButton| "Continue" '|d01apfGen|) (|htShowPage|))) ;d01apfGen htPage == @@ -1253,8 +1247,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01AQF - 1-D quadrature, adaptive, finite interval, weight function 1/(x-c), Cauchy principal value (Hilbert transform)") + "D01AQF - 1-D quadrature, adaptive, finite interval, weight function 1/(x-c), Cauchy principal value (Hilbert transform)" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -1308,7 +1301,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01aqfGen|) + (|htMakeDoneButton| "Continue" '|d01aqfGen|) (|htShowPage|))) ;d01aqfGen htPage == @@ -1439,8 +1432,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01ASF - 1-D quadrature, adaptive, semi-infinite interval, weight function cos(\\omega x) or sin(\\omega x)") + "D01ASF - 1-D quadrature, adaptive, semi-infinite interval, weight function cos(\\omega x) or sin(\\omega x)" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -1501,7 +1493,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01asfGen|) + (|htMakeDoneButton| "Continue" '|d01asfGen|) (|htShowPage|))) ;d01asfGen htPage == @@ -1608,8 +1600,7 @@ (DEFUN |d01gaf| () (PROGN (|htInitPage| - (MAKESTRING - "D01GAF - \\space{1} 1-D quadrature, integration of function defined by data values, Gill-Miller method") + "D01GAF - \\space{1} 1-D quadrature, integration of function defined by data values, Gill-Miller method" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -1634,7 +1625,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01gafSolve|) + (|htMakeDoneButton| "Continue" '|d01gafSolve|) (|htShowPage|))) ;d01gafSolve htPage == @@ -1676,13 +1667,13 @@ (DEFUN |d01gafSolve,f| (|i|) (PROG (|prefix| |post| |xnam| |ynam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) - (SPADLET |post| (MAKESTRING "\\tab{40} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{2} ") + (SPADLET |post| "\\tab{40} ") (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") + (INTERN (STRCONC "x" (STRINGIMAGE |i|)))) (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "y") + (INTERN (STRCONC "y" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -1743,15 +1734,12 @@ (|htInitPage| '|D01GAF - 1-D quadrature, integration of function defined by data values| (|htpPropertyList| |htPage|))) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{2} Enter values for {\\em x}: \\tab{38} ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{40} Enter values for {\\em y}: ")) + (|htSay| "\\menuitemstyle{}\\tab{2} Enter values for {\\em x}: \\tab{38} ") + (|htSay| "\\menuitemstyle{}\\tab{40} Enter values for {\\em y}: ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING - "Note:\\space{1}{\\em x} values in ascending or descending order only ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline ") + (|htSay| "Note:\\space{1}{\\em x} values in ascending or descending order only ") + (|htMakeDoneButton| "Continue" '|d01gafGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) @@ -1869,8 +1857,7 @@ (SPADLET |n| '21) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D01GAF - 1-D quadrature, integration of function defined by data values") + "D01GAF - 1-D quadrature, integration of function defined by data values" (|htpPropertyList| |htPage|))) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -1947,7 +1934,7 @@ (|text| . "Note:\\space{1}{\\em x} values in ascending or descending order only ") (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01gafGen|) + (|htMakeDoneButton| "Continue" '|d01gafGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|ifail| |ifail|) (|htpSetProperty| |page| '|inputArea| @@ -1994,7 +1981,7 @@ (SPADLET |realstring| (|bcwords2liststring| |reallist|)) (SPADLET |imagstring| (|bcwords2liststring| |imaglist|)) (|linkGen| - (STRCONC (MAKESTRING "d01gaf([") |realstring| '|],[| + (STRCONC "d01gaf([" |realstring| '|],[| |imagstring| '|],| (STRINGIMAGE |n|) '|,| (STRINGIMAGE |ifail|) '|)|))))))) @@ -2061,8 +2048,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01FCF - Multi-dimensional adaptive quadrature over hyper-rectangle") + "D01FCF - Multi-dimensional adaptive quadrature over hyper-rectangle" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -2118,7 +2104,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01fcfSolve|) + (|htMakeDoneButton| "Continue" '|d01fcfSolve|) (|htShowPage|))) ;d01fcfSolve htPage == @@ -2175,13 +2161,13 @@ (DEFUN |d01fcfSolve,f| (|i|) (PROG (|prefix| |post| |rnam| |inam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) - (SPADLET |post| (MAKESTRING "\\tab{32} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{2} ") + (SPADLET |post| "\\tab{32} ") (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "a") + (INTERN (STRCONC "a" (STRINGIMAGE |i|)))) (SPADLET |inam| - (INTERN (STRCONC (MAKESTRING "b") + (INTERN (STRCONC "b" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -2272,18 +2258,14 @@ |labelList|)) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D01FCF - Multi-dimensional adaptive quadrature over hyper-rectangle") + "D01FCF - Multi-dimensional adaptive quadrature over hyper-rectangle" NIL)) - (|htSay| (MAKESTRING - "Please enter the limits of integration:- ")) - (|htSay| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{2} Lower limits: \\tab{30} ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{32} Upper limits: ")) + (|htSay| "Please enter the limits of integration:- ") + (|htSay| "\\blankline ") + (|htSay| "\\menuitemstyle{}\\tab{2} Lower limits: \\tab{30} ") + (|htSay| "\\menuitemstyle{}\\tab{32} Upper limits: ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|d01fcfGen|) (|htpSetProperty| |page| '|ndim| |ndim|) (|htpSetProperty| |page| '|expression| |expression|) @@ -2345,8 +2327,7 @@ (SPADLET |ndim| '4) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D01FCF - Multi-dimensional adaptive quadrature over hyper-rectangle") + "D01FCF - Multi-dimensional adaptive quadrature over hyper-rectangle" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -2369,7 +2350,7 @@ (|bcStrings| (10 "0.0" |a4| F)) (|text| . "\\tab{32} ") (|bcStrings| (10 "1.0" |b4| F)) (|text| . "\\newline ") (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01fcfGen|) + (|htMakeDoneButton| "Continue" '|d01fcfGen|) (|htpSetProperty| |page| '|ndim| |ndim|) (|htpSetProperty| |page| '|expression| |expression|) (|htpSetProperty| |page| '|minpts| |minpts|) @@ -2510,8 +2491,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01GBF - Multi-dimensional quadrature over hyper-rectangle, Monte Carlo method") + "D01GBF - Multi-dimensional quadrature over hyper-rectangle, Monte Carlo method" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -2566,7 +2546,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01gbfSolve|) + (|htMakeDoneButton| "Continue" '|d01gbfSolve|) (|htShowPage|))) ;d01gbfSolve htPage == @@ -2623,13 +2603,13 @@ (DEFUN |d01gbfSolve,f| (|i|) (PROG (|prefix| |post| |rnam| |inam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline \\tab{2} ")) - (SPADLET |post| (MAKESTRING "\\tab{32} ")) + (SEQ (SPADLET |prefix| "\\newline \\tab{2} ") + (SPADLET |post| "\\tab{32} ") (SPADLET |rnam| - (INTERN (STRCONC (MAKESTRING "a") + (INTERN (STRCONC "a" (STRINGIMAGE |i|)))) (SPADLET |inam| - (INTERN (STRCONC (MAKESTRING "b") + (INTERN (STRCONC "b" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -2720,18 +2700,14 @@ |labelList|)) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D01GBF - Multi-dimensional quadrature over hyper-rectangle, Monte Carlo method") + "D01GBF - Multi-dimensional quadrature over hyper-rectangle, Monte Carlo method" NIL)) - (|htSay| (MAKESTRING - "Please enter the limits of integration:- ")) - (|htSay| (MAKESTRING "\\blankline ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{2} Lower limits: \\tab{30} ")) - (|htSay| (MAKESTRING - "\\menuitemstyle{}\\tab{32} Upper limits: ")) + (|htSay| "Please enter the limits of integration:- ") + (|htSay| "\\blankline ") + (|htSay| "\\menuitemstyle{}\\tab{2} Lower limits: \\tab{30} ") + (|htSay| "\\menuitemstyle{}\\tab{32} Upper limits: ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|d01gbfGen|) (|htpSetProperty| |page| '|ndim| |ndim|) (|htpSetProperty| |page| '|expression| |expression|) @@ -2793,8 +2769,7 @@ (SPADLET |ndim| '4) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D01GBF - Multi-dimensional quadrature over hyper-rectangle, Monte Carlo method") + "D01GBF - Multi-dimensional quadrature over hyper-rectangle, Monte Carlo method" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| F (|Float|))) @@ -2817,7 +2792,7 @@ (|bcStrings| (10 "0.0" |a4| F)) (|text| . "\\tab{32} ") (|bcStrings| (10 "1.0" |b4| F)) (|text| . "\\newline ") (|text| . "\\blankline"))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01gbfGen|) + (|htMakeDoneButton| "Continue" '|d01gbfGen|) (|htpSetProperty| |page| '|ndim| |ndim|) (|htpSetProperty| |page| '|expression| |expression|) (|htpSetProperty| |page| '|mincls| |mincls|) @@ -2958,8 +2933,7 @@ (declare (special |$EmptyMode|)) (PROGN (|htInitPage| - (MAKESTRING - "D01BBF - Weights and abscissae for Gaussian quadrature rules") + "D01BBF - Weights and abscissae for Gaussian quadrature rules" NIL) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -3006,7 +2980,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d01bbfGen|) + (|htMakeDoneButton| "Continue" '|d01bbfGen|) (|htShowPage|))) ;d01bbfGen htPage == diff --git a/src/interp/nag-d02.lisp.pamphlet b/src/interp/nag-d02.lisp.pamphlet index 0644ef6..70d8807 100644 --- a/src/interp/nag-d02.lisp.pamphlet +++ b/src/interp/nag-d02.lisp.pamphlet @@ -69,8 +69,7 @@ (DEFUN |d02bbf| () (PROGN (|htInitPage| - (MAKESTRING - "D02BBF - ODEs, IVP, Runge-Kutta-Merson method, over a range, intermediate output") + "D02BBF - ODEs, IVP, Runge-Kutta-Merson method, over a range, intermediate output" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -118,7 +117,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02bbfSolve|) + (|htMakeDoneButton| "Continue" '|d02bbfSolve|) (|htShowPage|))) ;d02bbfSolve htPage == @@ -182,14 +181,14 @@ (DEFUN |d02bbfSolve,fa| (|i|) (PROG (|prefix| |funct| |nam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline {\\em Function ")) + (SEQ (SPADLET |prefix| "\\newline {\\em Function ") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE |i|) - (MAKESTRING ":} \\space{1}"))) + ":} \\space{1}")) (SPADLET |funct| - (STRCONC (MAKESTRING "Y[") (STRINGIMAGE |i|) '])) + (STRCONC "Y[" (STRINGIMAGE |i|) '])) (SPADLET |nam| - (INTERN (STRCONC (MAKESTRING "n") + (INTERN (STRCONC "n" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -204,7 +203,7 @@ (PROG (|ynam|) (RETURN (SEQ (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "u") + (INTERN (STRCONC "u" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -258,12 +257,10 @@ (APPEND G166080 (|d02bbfSolve,fa| |i|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial ") (SPADLET |middle| (STRCONC |middle| - (MAKESTRING - "values of \\htbitmap{yi}: \\newline \\tab{2}"))) + "values of \\htbitmap{yi}: \\newline \\tab{2}")) (SPADLET |yList| (PROG (G166088) (SPADLET G166088 NIL) @@ -277,12 +274,10 @@ (SPADLET |yList| (CONS (CONS '|text| |middle|) |yList|)) (SPADLET |mid| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Intermediate values of {\\it x}")) + "\\blankline \\menuitemstyle{} \\tab{2} Intermediate values of {\\it x}") (SPADLET |mid| (STRCONC |mid| - (MAKESTRING - " at which \\htbitmap{yi} is required: \\newline \\tab{2}"))) + " at which \\htbitmap{yi} is required: \\newline \\tab{2}")) (SPADLET |vList| (CONS (CONS '|bcStrings| (CONS @@ -302,16 +297,14 @@ (APPEND |yList| |vList|)))) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02BBF - ODEs, IVP, Runge-Kutta-Merson method, over a range, intermediate output") + "D02BBF - ODEs, IVP, Runge-Kutta-Merson method, over a range, intermediate output" NIL)) - (|htSay| (MAKESTRING "\\menuitemstyle{}\\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the functions (i.e. the derivatives) below ")) - (|htSay| (MAKESTRING "as functions of Y[1]...Y[n]: ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{}\\tab{2} ") + (|htSay| "Enter the functions (i.e. the derivatives) below ") + (|htSay| "as functions of Y[1]...Y[n]: ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|d02bbfGen|) (|htpSetProperty| |page| '|x| |x|) (|htpSetProperty| |page| '|xend| |xend|) @@ -373,8 +366,7 @@ (SPADLET |n| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02BBF - ODEs, IVP, Runge-Kutta-Merson method, over a range, intermediate output") + "D02BBF - ODEs, IVP, Runge-Kutta-Merson method, over a range, intermediate output" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -412,7 +404,7 @@ (|htpSetProperty| |page| '|tol| |tol|) (|htpSetProperty| |page| '|irelab| |irelab|) (|htpSetProperty| |page| '|ifail| |ifail|) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02bbfGen|) + (|htMakeDoneButton| "Continue" '|d02bbfGen|) (|htpSetProperty| |page| '|inputArea| (|htpInputAreaAlist| |htPage|)) (|htShowPage|))))) @@ -570,8 +562,7 @@ (DEFUN |d02bhf| () (PROGN (|htInitPage| - (MAKESTRING - "D02BHF - ODEs, IVP, Runge-Kutta-Merson method, until function of solution is zero") + "D02BHF - ODEs, IVP, Runge-Kutta-Merson method, until function of solution is zero" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -625,7 +616,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02bhfSolve|) + (|htMakeDoneButton| "Continue" '|d02bhfSolve|) (|htShowPage|))) ;d02bhfSolve htPage == @@ -691,14 +682,14 @@ (DEFUN |d02bhfSolve,fa| (|i|) (PROG (|prefix| |funct| |nam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline {\\em Function ")) + (SEQ (SPADLET |prefix| "\\newline {\\em Function ") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE |i|) - (MAKESTRING ":} \\space{1}"))) + ":} \\space{1}")) (SPADLET |funct| - (STRCONC (MAKESTRING "Y[") (STRINGIMAGE |i|) '])) + (STRCONC "Y[" (STRINGIMAGE |i|) '])) (SPADLET |nam| - (INTERN (STRCONC (MAKESTRING "n") + (INTERN (STRCONC "n" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -713,7 +704,7 @@ (PROG (|ynam|) (RETURN (SEQ (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "u") + (INTERN (STRCONC "u" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -766,12 +757,10 @@ (APPEND G166200 (|d02bhfSolve,fa| |i|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial ") (SPADLET |middle| (STRCONC |middle| - (MAKESTRING - "values of \\htbitmap{yi}: \\newline "))) + "values of \\htbitmap{yi}: \\newline ")) (SPADLET |yList| (PROG (G166208) (SPADLET G166208 NIL) @@ -785,17 +774,15 @@ (SPADLET |yList| (CONS (CONS '|text| |middle|) |yList|)) (SPADLET |mid| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the function below ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the function below ") (SPADLET |mid| (STRCONC |mid| - (MAKESTRING - "{\\em g(x,y)}: \\newline "))) + "{\\em g(x,y)}: \\newline ")) (SPADLET |vList| (CONS (CONS '|bcStrings| (CONS (CONS 30 - (CONS (MAKESTRING "Y[1]") + (CONS "Y[1]" (CONS '|g| (CONS 'EM NIL)))) NIL)) NIL)) @@ -810,16 +797,14 @@ (APPEND |yList| |vList|)))) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02BHF - ODEs, IVP, Runge-Kutta-Merson method, until function of solution is zero") + "D02BHF - ODEs, IVP, Runge-Kutta-Merson method, until function of solution is zero" NIL)) - (|htSay| (MAKESTRING "\\menuitemstyle{}\\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the functions (i.e. the derivatives) below \\htbitmap{fi} ")) - (|htSay| (MAKESTRING "as functions of Y[1]...Y[n]: ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{}\\tab{2} ") + (|htSay| "Enter the functions (i.e. the derivatives) below \\htbitmap{fi} ") + (|htSay| "as functions of Y[1]...Y[n]: ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|d02bhfGen|) (|htpSetProperty| |page| '|x| |x|) (|htpSetProperty| |page| '|xend| |xend|) @@ -882,8 +867,7 @@ (SPADLET |n| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02BHF - ODEs, IVP, Runge-Kutta-Merson method, until function of solution is zero") + "D02BHF - ODEs, IVP, Runge-Kutta-Merson method, until function of solution is zero" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -918,7 +902,7 @@ (|htpSetProperty| |page| '|irelab| |irelab|) (|htpSetProperty| |page| '|hmax| |hmax|) (|htpSetProperty| |page| '|ifail| |ifail|) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02bhfGen|) + (|htMakeDoneButton| "Continue" '|d02bhfGen|) (|htpSetProperty| |page| '|inputArea| (|htpInputAreaAlist| |htPage|)) (|htShowPage|))))) @@ -1058,8 +1042,7 @@ (DEFUN |d02cjf| () (PROGN (|htInitPage| - (MAKESTRING - "D02CJF - ODEs, IVP, Adams method, until function of solution is zero, intermediate output") + "D02CJF - ODEs, IVP, Adams method, until function of solution is zero, intermediate output" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -1108,7 +1091,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02cjfSolve|) + (|htMakeDoneButton| "Continue" '|d02cjfSolve|) (|htShowPage|))) ;d02cjfSolve htPage == @@ -1176,14 +1159,14 @@ (DEFUN |d02cjfSolve,fa| (|i|) (PROG (|prefix| |funct| |nam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline {\\em Function ")) + (SEQ (SPADLET |prefix| "\\newline {\\em Function ") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE |i|) - (MAKESTRING ":} \\space{1}"))) + ":} \\space{1}")) (SPADLET |funct| - (STRCONC (MAKESTRING "Y[") (STRINGIMAGE |i|) '])) + (STRCONC "Y[" (STRINGIMAGE |i|) '])) (SPADLET |nam| - (INTERN (STRCONC (MAKESTRING "n") + (INTERN (STRCONC "n" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -1198,7 +1181,7 @@ (PROG (|ynam|) (RETURN (SEQ (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "u") + (INTERN (STRCONC "u" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -1229,10 +1212,10 @@ (SPADLET |relabs| (COND ((BOOT-EQUAL |control| '|mix|) - (MAKESTRING "D")) + "D") ((BOOT-EQUAL |control| '|abs|) - (MAKESTRING "A")) - ('T (MAKESTRING "R")))) + "A") + ('T "R"))) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| (COND ((BOOT-EQUAL |error| '|one|) '1) ('T '-1))) @@ -1252,12 +1235,10 @@ (APPEND G166318 (|d02cjfSolve,fa| |i|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial ") (SPADLET |middle| (STRCONC |middle| - (MAKESTRING - "values of \\htbitmap{yi}: \\newline "))) + "values of \\htbitmap{yi}: \\newline ")) (SPADLET |yList| (PROG (G166326) (SPADLET G166326 NIL) @@ -1271,12 +1252,10 @@ (SPADLET |yList| (CONS (CONS '|text| |middle|) |yList|)) (SPADLET |mid| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Intermediate values of {\\it x}")) + "\\blankline \\menuitemstyle{} \\tab{2} Intermediate values of {\\it x}") (SPADLET |mid| (STRCONC |mid| - (MAKESTRING - " at which \\htbitmap{yi} is required: \\newline "))) + " at which \\htbitmap{yi} is required: \\newline ")) (SPADLET |vList| (CONS (CONS '|bcStrings| (CONS @@ -1287,17 +1266,15 @@ NIL)) (SPADLET |vList| (CONS (CONS '|text| |mid|) |vList|)) (SPADLET |midd| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the function below ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the function below ") (SPADLET |midd| (STRCONC |midd| - (MAKESTRING - "{\\em g(x,y)}: \\newline "))) + "{\\em g(x,y)}: \\newline ")) (SPADLET |uList| (CONS (CONS '|bcStrings| (CONS (CONS 30 - (CONS (MAKESTRING "Y[1]") + (CONS "Y[1]" (CONS '|g| (CONS 'EM NIL)))) NIL)) NIL)) @@ -1313,16 +1290,14 @@ (APPEND |vList| |uList|))))) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02CJF - ODEs, IVP, Adams method, until function of solution is zero, intermediate output") + "D02CJF - ODEs, IVP, Adams method, until function of solution is zero, intermediate output" NIL)) - (|htSay| (MAKESTRING "\\menuitemstyle{}\\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the functions (i.e. the derivatives) below \\htbitmap{fi} ")) - (|htSay| (MAKESTRING "as functions of Y[1]...Y[n]: ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{}\\tab{2} ") + (|htSay| "Enter the functions (i.e. the derivatives) below \\htbitmap{fi} ") + (|htSay| "as functions of Y[1]...Y[n]: ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|d02cjfGen|) (|htpSetProperty| |page| '|x| |x|) (|htpSetProperty| |page| '|xend| |xend|) @@ -1388,8 +1363,7 @@ (SPADLET |n| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02CJF - ODEs, IVP, Adams method, until function of solution is zero, intermediate output") + "D02CJF - ODEs, IVP, Adams method, until function of solution is zero, intermediate output" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -1429,7 +1403,7 @@ (|htpSetProperty| |page| '|tol| |tol|) (|htpSetProperty| |page| '|relabs| |relabs|) (|htpSetProperty| |page| '|ifail| |ifail|) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02cjfGen|) + (|htMakeDoneButton| "Continue" '|d02cjfGen|) (|htpSetProperty| |page| '|inputArea| (|htpInputAreaAlist| |htPage|)) (|htShowPage|))))) @@ -1587,8 +1561,7 @@ (DEFUN |d02ejf| () (PROGN (|htInitPage| - (MAKESTRING - "D02EJF - ODEs, stiff IVP, BDF method, until function of solution is zero, intermediate output") + "D02EJF - ODEs, stiff IVP, BDF method, until function of solution is zero, intermediate output" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -1637,7 +1610,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02ejfSolve|) + (|htMakeDoneButton| "Continue" '|d02ejfSolve|) (|htShowPage|))) ;d02ejfSolve htPage == @@ -1709,14 +1682,14 @@ (DEFUN |d02ejfSolve,fa| (|i|) (PROG (|prefix| |funct| |nam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline {\\em Function ")) + (SEQ (SPADLET |prefix| "\\newline {\\em Function ") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE |i|) - (MAKESTRING ":} \\space{1}"))) + ":} \\space{1}")) (SPADLET |funct| - (STRCONC (MAKESTRING "Y[") (STRINGIMAGE |i|) '])) + (STRCONC "Y[" (STRINGIMAGE |i|) '])) (SPADLET |nam| - (INTERN (STRCONC (MAKESTRING "n") + (INTERN (STRCONC "n" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -1731,7 +1704,7 @@ (PROG (|ynam|) (RETURN (SEQ (SPADLET |ynam| - (INTERN (STRCONC (MAKESTRING "u") + (INTERN (STRCONC "u" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -1762,10 +1735,10 @@ (SPADLET |relabs| (COND ((BOOT-EQUAL |control| '|mix|) - (MAKESTRING "D")) + "D") ((BOOT-EQUAL |control| '|abs|) - (MAKESTRING "A")) - ('T (MAKESTRING "R")))) + "A") + ('T "R"))) (SPADLET |iw| (PLUS (TIMES (PLUS |n| 12) |n|) 50)) (SPADLET |error| (|htpButtonValue| |htPage| '|ifail|)) (SPADLET |ifail| @@ -1786,12 +1759,10 @@ (APPEND G166444 (|d02ejfSolve,fa| |i|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial ") (SPADLET |middle| (STRCONC |middle| - (MAKESTRING - "values of \\htbitmap{yi}: \\newline "))) + "values of \\htbitmap{yi}: \\newline ")) (SPADLET |yList| (PROG (G166452) (SPADLET G166452 NIL) @@ -1805,12 +1776,10 @@ (SPADLET |yList| (CONS (CONS '|text| |middle|) |yList|)) (SPADLET |mid| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Intermediate values of {\\it x}")) + "\\blankline \\menuitemstyle{} \\tab{2} Intermediate values of {\\it x}") (SPADLET |mid| (STRCONC |mid| - (MAKESTRING - " at which \\htbitmap{yi} is required: \\newline "))) + " at which \\htbitmap{yi} is required: \\newline ")) (SPADLET |vList| (CONS (CONS '|bcStrings| (CONS @@ -1821,17 +1790,15 @@ NIL)) (SPADLET |vList| (CONS (CONS '|text| |mid|) |vList|)) (SPADLET |midd| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the function below ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the function below ") (SPADLET |midd| (STRCONC |midd| - (MAKESTRING - "{\\em g(x,y)}: \\newline "))) + "{\\em g(x,y)}: \\newline ")) (SPADLET |uList| (CONS (CONS '|bcStrings| (CONS (CONS 30 - (CONS (MAKESTRING "Y[1]") + (CONS "Y[1]" (CONS '|g| (CONS 'EM NIL)))) NIL)) NIL)) @@ -1847,19 +1814,16 @@ (APPEND |vList| |uList|))))) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02EJF - ODEs, stiff IVP, BDF method, until function of solution is zero, intermediate output") + "D02EJF - ODEs, stiff IVP, BDF method, until function of solution is zero, intermediate output" NIL)) - (|htSay| (MAKESTRING "\\menuitemstyle{}\\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the functions (i.e. the derivatives) below \\htbitmap{fi} ")) - (|htSay| (MAKESTRING "as functions of Y[1]...Y[n]: ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{}\\tab{2} ") + (|htSay| "Enter the functions (i.e. the derivatives) below \\htbitmap{fi} ") + (|htSay| "as functions of Y[1]...Y[n]: ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htSay| (MAKESTRING - "\\blankline {\\em Note:} PEDERV is automatically generated using the vector ")) - (|htSay| (MAKESTRING "of derivatives given above. ")) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htSay| "\\blankline {\\em Note:} PEDERV is automatically generated using the vector ") + (|htSay| "of derivatives given above. ") + (|htMakeDoneButton| "Continue" '|d02ejfGen|) (|htpSetProperty| |page| '|x| |x|) (|htpSetProperty| |page| '|xend| |xend|) @@ -1930,8 +1894,7 @@ (SPADLET |n| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02EJF - ODEs, stiff IVP, BDF method, until function of solution is zero, intermediate output") + "D02EJF - ODEs, stiff IVP, BDF method, until function of solution is zero, intermediate output" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -1976,7 +1939,7 @@ (|htpSetProperty| |page| '|relabs| |relabs|) (|htpSetProperty| |page| '|iw| |iw|) (|htpSetProperty| |page| '|ifail| |ifail|) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02ejfGen|) + (|htMakeDoneButton| "Continue" '|d02ejfGen|) (|htpSetProperty| |page| '|inputArea| (|htpInputAreaAlist| |htPage|)) (|htShowPage|))))) @@ -2154,8 +2117,7 @@ (DEFUN |d02gaf| () (PROGN (|htInitPage| - (MAKESTRING - "D02GAF - ODEs, boundary value problem, finite difference technique with deferred correction, simple nonlinear problem") + "D02GAF - ODEs, boundary value problem, finite difference technique with deferred correction, simple nonlinear problem" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -2217,7 +2179,7 @@ (|radioButtons| |cfail| ("" " 1, print warning messages" |cone|) ("" " 0, suppress warning messages" |czero|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02gafSolve|) + (|htMakeDoneButton| "Continue" '|d02gafSolve|) (|htShowPage|))) ;d02gafSolve htPage == @@ -2318,14 +2280,14 @@ (DEFUN |d02gafSolve,fa| (|i|) (PROG (|prefix| |funct| |nam|) (RETURN - (SEQ (SPADLET |prefix| (MAKESTRING "\\newline {\\em Function ")) + (SEQ (SPADLET |prefix| "\\newline {\\em Function ") (SPADLET |prefix| (STRCONC |prefix| (STRINGIMAGE |i|) - (MAKESTRING ":} \\space{1}"))) + ":} \\space{1}")) (SPADLET |funct| - (STRCONC (MAKESTRING "Y[") (STRINGIMAGE |i|) '])) + (STRCONC "Y[" (STRINGIMAGE |i|) '])) (SPADLET |nam| - (INTERN (STRCONC (MAKESTRING "n") + (INTERN (STRCONC "n" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|text| |prefix|) (CONS (CONS '|bcStrings| @@ -2340,7 +2302,7 @@ (PROG (|unam|) (RETURN (SEQ (SPADLET |unam| - (INTERN (STRCONC (MAKESTRING "u") (STRINGIMAGE |i|) + (INTERN (STRCONC "u" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -2361,7 +2323,7 @@ (SEQ (EXIT (SETQ G166576 (APPEND G166576 (|d02gafSolve,fc| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline ")) + (SPADLET |prefix| "\\newline ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -2369,7 +2331,7 @@ (PROG (|vnam|) (RETURN (SEQ (SPADLET |vnam| - (INTERN (STRCONC (MAKESTRING "v") (STRINGIMAGE |i|) + (INTERN (STRCONC "v" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -2390,7 +2352,7 @@ (SEQ (EXIT (SETQ G166599 (APPEND G166599 (|d02gafSolve,fe| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline ")) + (SPADLET |prefix| "\\newline ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -2398,7 +2360,7 @@ (PROG (|xnam|) (RETURN (SEQ (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") + (INTERN (STRCONC "x" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 8 @@ -2492,12 +2454,10 @@ (APPEND G166622 (|d02gafSolve,fa| |i|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter known or estimated ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter known or estimated ") (SPADLET |middle| (STRCONC |middle| - (MAKESTRING - "values of \\htbitmap{yi} at a and b, "))) + "values of \\htbitmap{yi} at a and b, ")) (SPADLET |middle| (STRCONC |middle| '|{\\it U(n,2)}. [\\htbitmap{yi}(a) in the first |)) @@ -2518,16 +2478,13 @@ (SPADLET |uList| (CONS (CONS '|text| |middle|) |uList|)) (SPADLET |mid| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter {\\it V(n,2)}. ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter {\\it V(n,2)}. ") (SPADLET |mid| (STRCONC |mid| - (MAKESTRING - "If U(i,j) is known V(i,j) "))) + "If U(i,j) is known V(i,j) ")) (SPADLET |mid| (STRCONC |mid| - (MAKESTRING - "= 0.0, else V(i,j) = 1.0. \\newline "))) + "= 0.0, else V(i,j) = 1.0. \\newline ")) (SPADLET |vList| (PROG (G166638) (SPADLET G166638 NIL) @@ -2550,12 +2507,10 @@ (APPEND G166646 (|d02gafSolve,ff| |i|))))))))) (SPADLET |end| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial mesh ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the initial mesh ") (SPADLET |end| (STRCONC |end| - (MAKESTRING - "{\\it X(mnp)}: \\newline "))) + "{\\it X(mnp)}: \\newline ")) (SPADLET |xList| (CONS (CONS '|text| |end|) |xList|)) (SPADLET |equationPart| (CONS '(|domainConditions| @@ -2568,16 +2523,14 @@ (APPEND |vList| |xList|))))) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02GAF - ODEs, boundary value problem, finite difference technique with deferred correction, simple nonlinear problem") + "D02GAF - ODEs, boundary value problem, finite difference technique with deferred correction, simple nonlinear problem" NIL)) - (|htSay| (MAKESTRING "\\menuitemstyle{}\\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the functions (i.e. the derivatives) below as functions of ")) - (|htSay| (MAKESTRING "Y[1]...Y[n]: ")) - (|htSay| (MAKESTRING "\\newline ")) + (|htSay| "\\menuitemstyle{}\\tab{2} ") + (|htSay| "Enter the functions (i.e. the derivatives) below as functions of ") + (|htSay| "Y[1]...Y[n]: ") + (|htSay| "\\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|d02gafGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|a| |a|) @@ -2727,8 +2680,7 @@ (SPADLET |n| '3) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02GAF - ODEs, boundary value problem, finite difference technique with deferred correction, simple nonlinear problem") + "D02GAF - ODEs, boundary value problem, finite difference technique with deferred correction, simple nonlinear problem" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -2844,7 +2796,7 @@ (|htpSetProperty| |page| '|liw| |liw|) (|htpSetProperty| |page| '|tol| |tol|) (|htpSetProperty| |page| '|ifail| |ifail|) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02gafGen|) + (|htMakeDoneButton| "Continue" '|d02gafGen|) (|htpSetProperty| |page| '|inputArea| (|htpInputAreaAlist| |htPage|)) (|htShowPage|))))) @@ -3080,8 +3032,7 @@ (DEFUN |d02gbf| () (PROGN (|htInitPage| - (MAKESTRING - "D02GBF - ODEs, boundary value problem, finite difference technique with deferred correction, general nonlinear problem") + "D02GBF - ODEs, boundary value problem, finite difference technique with deferred correction, general nonlinear problem" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -3139,7 +3090,7 @@ (|radioButtons| |cfail| ("" " 1, print warning messages" |cone|) ("" " 0, suppress warning messages" |czero|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02gbfSolve|) + (|htMakeDoneButton| "Continue" '|d02gbfSolve|) (|htShowPage|))) ;d02gbfSolve htPage == @@ -3254,7 +3205,7 @@ (PROG (|cnam|) (RETURN (SEQ (SPADLET |cnam| - (INTERN (STRCONC (MAKESTRING "c") (STRINGIMAGE |i|) + (INTERN (STRCONC "c" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -3275,7 +3226,7 @@ (SEQ (EXIT (SETQ G166859 (APPEND G166859 (|d02gbfSolve,fb| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline ")) + (SPADLET |prefix| "\\newline ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -3283,7 +3234,7 @@ (PROG (|dnam|) (RETURN (SEQ (SPADLET |dnam| - (INTERN (STRCONC (MAKESTRING "d") (STRINGIMAGE |i|) + (INTERN (STRCONC "d" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -3304,7 +3255,7 @@ (SEQ (EXIT (SETQ G166882 (APPEND G166882 (|d02gbfSolve,fd| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline ")) + (SPADLET |prefix| "\\newline ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -3312,7 +3263,7 @@ (PROG (|gamnam|) (RETURN (SEQ (SPADLET |gamnam| - (INTERN (STRCONC (MAKESTRING "gam") + (INTERN (STRCONC "gam" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -3325,7 +3276,7 @@ (PROG (|fnam|) (RETURN (SEQ (SPADLET |fnam| - (INTERN (STRCONC (MAKESTRING "f") (STRINGIMAGE |i|) + (INTERN (STRCONC "f" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -3346,7 +3297,7 @@ (SEQ (EXIT (SETQ G166911 (APPEND G166911 (|d02gbfSolve,fg| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline ")) + (SPADLET |prefix| "\\newline ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -3354,7 +3305,7 @@ (PROG (|gnam|) (RETURN (SEQ (SPADLET |gnam| - (INTERN (STRCONC (MAKESTRING "g") + (INTERN (STRCONC "g" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -3367,7 +3318,7 @@ (PROG (|xnam|) (RETURN (SEQ (SPADLET |xnam| - (INTERN (STRCONC (MAKESTRING "x") + (INTERN (STRCONC "x" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 8 @@ -3457,8 +3408,7 @@ (APPEND G166940 (|d02gbfSolve,fa| |i| |n|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the matrix {\\it D}: ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the matrix {\\it D}: ") (SPADLET |middle| (STRCONC |middle| '|\\newline |)) (SPADLET |dList| (PROG (G166948) @@ -3473,8 +3423,7 @@ (SPADLET |dList| (CONS (CONS '|text| |middle|) |dList|)) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the vector \\gamma: ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the vector \\gamma: ") (SPADLET |middle| (STRCONC |middle| '|\\newline |)) (SPADLET |gamList| (PROG (G166956) @@ -3486,12 +3435,11 @@ (SETQ G166956 (APPEND G166956 (|d02gbfSolve,fe| |i|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline ")) + (SPADLET |prefix| "\\newline ") (SPADLET |gamList| (CONS (CONS '|text| |middle|) |gamList|)) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the matrix ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the matrix ") (SPADLET |middle| (STRCONC |middle| '|{\\it F(x)} from the equation {\\it y' =} |)) @@ -3511,10 +3459,9 @@ (SPADLET |fList| (CONS (CONS '|text| |middle|) |fList|)) (SPADLET |mid| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Enter the vector {\\it g(x)}: ")) + "\\blankline \\menuitemstyle{} \\tab{2} Enter the vector {\\it g(x)}: ") (SPADLET |mid| - (STRCONC |mid| (MAKESTRING "\\newline "))) + (STRCONC |mid| "\\newline ")) (SPADLET |gList| (PROG (G166972) (SPADLET G166972 NIL) @@ -3525,7 +3472,7 @@ (SETQ G166972 (APPEND G166972 (|d02gbfSolve,fh| |i|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline ")) + (SPADLET |prefix| "\\newline ") (SPADLET |gList| (CONS (CONS '|text| |middle|) |gList|)) (SPADLET |xList| @@ -3539,12 +3486,10 @@ (APPEND G166980 (|d02gbfSolve,fi| |i|))))))))) (SPADLET |end| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} The initial mesh {\\it X(mnp)}")) + "\\blankline \\menuitemstyle{} \\tab{2} The initial mesh {\\it X(mnp)}") (SPADLET |end| (STRCONC |end| - (MAKESTRING - ", (all entries = 0 if np < 4): \\newline "))) + ", (all entries = 0 if np < 4): \\newline ")) (SPADLET |xList| (CONS (CONS '|text| |end|) |xList|)) (SPADLET |equationPart| (CONS '(|domainConditions| @@ -3559,15 +3504,13 @@ (APPEND |gList| |xList|))))))) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02GBF - ODEs, boundary value problem, finite difference technique with deferred correction, general nonlinear problem") + "D02GBF - ODEs, boundary value problem, finite difference technique with deferred correction, general nonlinear problem" NIL)) - (|htSay| (MAKESTRING "\\menuitemstyle{}\\tab{2} ")) - (|htSay| (MAKESTRING - "Enter the matrix {\\it C} form the equation {\\it Cy(a) + Dy(b)} ")) - (|htSay| (MAKESTRING "= \\gamma \\newline ")) + (|htSay| "\\menuitemstyle{}\\tab{2} ") + (|htSay| "Enter the matrix {\\it C} form the equation {\\it Cy(a) + Dy(b)} ") + (|htSay| "= \\gamma \\newline ") (|htMakePage| |equationPart|) - (|htMakeDoneButton| (MAKESTRING "Continue") + (|htMakeDoneButton| "Continue" '|d02gbfGen|) (|htpSetProperty| |page| '|n| |n|) (|htpSetProperty| |page| '|a| |a|) @@ -3720,8 +3663,7 @@ (SPADLET |n| '2) (SPADLET |page| (|htInitPage| - (MAKESTRING - "D02GBF - ODEs, boundary value problem, finite difference technique with deferred correction, general nonlinear problem") + "D02GBF - ODEs, boundary value problem, finite difference technique with deferred correction, general nonlinear problem" NIL)) (|htMakePage| '((|domainConditions| (|isDomain| EM |$EmptyMode|) @@ -3837,7 +3779,7 @@ (|htpSetProperty| |page| '|liw| |liw|) (|htpSetProperty| |page| '|tol| |tol|) (|htpSetProperty| |page| '|ifail| |ifail|) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02gbfGen|) + (|htMakeDoneButton| "Continue" '|d02gbfGen|) (|htpSetProperty| |page| '|inputArea| (|htpInputAreaAlist| |htPage|)) (|htShowPage|))))) @@ -4138,8 +4080,7 @@ (DEFUN |d02kef| () (PROGN (|htInitPage| - (MAKESTRING - "D02KEF - 2nd order Sturm-Liouville problem, regular/singular system, finite/infinite range, eigenvalue and eigenfunction, user-specified break-points") + "D02KEF - 2nd order Sturm-Liouville problem, regular/singular system, finite/infinite range, eigenvalue and eigenfunction, user-specified break-points" NIL) (|htMakePage| '((|domainConditions| (|isDomain| PI (|PositiveInteger|))) @@ -4202,7 +4143,7 @@ (|radioButtons| |ifail| ("" " -1, Print error messages" |minusOne|) ("" " 1, Suppress error messages" |one|)))) - (|htMakeDoneButton| (MAKESTRING "Continue") '|d02kefSolve|) + (|htMakeDoneButton| "Continue" '|d02kefSolve|) (|htShowPage|))) ;d02kefSolve htPage == @@ -4297,7 +4238,7 @@ (PROG (|xpnam|) (RETURN (SEQ (SPADLET |xpnam| - (INTERN (STRCONC (MAKESTRING "xp") + (INTERN (STRCONC "xp" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 10 @@ -4310,7 +4251,7 @@ (PROG (|ylnam|) (RETURN (SEQ (SPADLET |ylnam| - (INTERN (STRCONC (MAKESTRING "yl") + (INTERN (STRCONC "yl" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 42 @@ -4323,7 +4264,7 @@ (PROG (|yrnam|) (RETURN (SEQ (SPADLET |yrnam| - (INTERN (STRCONC (MAKESTRING "yr") + (INTERN (STRCONC "yr" (STRINGIMAGE |i|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 42 @@ -4336,7 +4277,7 @@ (PROG (|hnam|) (RETURN (SEQ (SPADLET |hnam| - (INTERN (STRCONC (MAKESTRING "h") (STRINGIMAGE |i|) + (INTERN (STRCONC "h" (STRINGIMAGE |i|) (STRINGIMAGE |j|)))) (EXIT (CONS (CONS '|bcStrings| (CONS (CONS 6 @@ -4357,7 +4298,7 @@ (SEQ (EXIT (SETQ G167280 (APPEND G167280 (|d02kefSolve,fe| |i| |j|))))))))) - (SPADLET |prefix| (MAKESTRING "\\newline ")) + (SPADLET |prefix| "\\newline ") (EXIT (SPADLET |labelList| (CONS (CONS '|text| |prefix|) |labelList|))))))) @@ -4436,8 +4377,7 @@ (APPEND G167297 (|d02kefSolve,fa| |i|))))))))) (SPADLET |middle| - (MAKESTRING - "\\blankline \\menuitemstyle{} \\tab{2} Value of {\\it p} for COEFFN:")) + "\\blankline \\menuitemstyle{} \\tab{2} Value of {\\it p} for COEFFN:") (SPADLET |middle| (STRCONC |middle| '|\\newline |)) (SPADLET |cList| (CONS (CONS '|text| |middle|) @@ -4449,8 +4389,7 @@ NIL))