diff options
Diffstat (limited to 'src/interp/ht-root.boot')
| -rw-r--r-- | src/interp/ht-root.boot | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interp/ht-root.boot b/src/interp/ht-root.boot index 3f3f5c85..4933bcd8 100644 --- a/src/interp/ht-root.boot +++ b/src/interp/ht-root.boot @@ -51,7 +51,7 @@ downlinkSaturn fn == n := MAXINDEX line n < 1 => nil line.0 = (char '_%) => nil - lines := STRCONC(lines,line) + lines := strconc(lines,line) issueHTSaturn lines dbNonEmptyPattern pattern == @@ -146,7 +146,7 @@ htGlossPage(htPage,pattern,tryAgain?) == grepForm := mkGrepPattern(filter,'none) $key: local := 'none results := applyGrep(grepForm,'gloss) - defstream := MAKE_-INSTREAM STRCONC(systemRootDirectory(),'"doc/glossdef.text") + defstream := MAKE_-INSTREAM strconc(systemRootDirectory(),'"doc/glossdef.text") lines := gatherGlossLines(results,defstream) -- removeFile pathname --SHUT instream @@ -191,7 +191,7 @@ gatherGlossLines(results,defstream) == (j := charPosition($tick,x,1)) and (nextPointer := SUBSTRING(x,0,j)) and (nextPointer = pointer) repeat xtralines := [SUBSTRING(x,j + 1,nil),:xtralines] - acc := [STRCONC(keyAndTick,def, "STRCONC"/nreverse xtralines),:acc] + acc := [strconc(keyAndTick,def, "STRCONC"/nreverse xtralines),:acc] reverse acc htGlossSearch(htPage,junk) == htGloss htpLabelInputString(htPage,'filter) @@ -268,7 +268,7 @@ htTutorialSearch pattern == s := mkUnixPattern s source := '"$AXIOM/share/hypertex/pages/ht.db" target :='"/tmp/temp.text.$SPADNUM" - runCommand STRCONC('"$AXIOM/lib/hthits",'" _"",s,'"_" ",source,'" > ",target) + runCommand strconc('"$AXIOM/lib/hthits",'" _"",s,'"_" ",source,'" > ",target) lines := dbReadLines 'temp htInitPageNoScroll(nil,['"Tutorial Pages mentioning {\em ",pattern,'"}"]) htSay('"\beginscroll\table{") @@ -282,10 +282,10 @@ mkUnixPattern s == u := mkUpDownPattern s starPositions := reverse [i for i in 1..(-1 + MAXINDEX u) | u.i = $wild] for i in starPositions repeat - u := STRCONC(SUBSTRING(u,0,i),'".*",SUBSTRING(u,i + 1,nil)) - if u.0 ~= $wild then u := STRCONC('"[^a-zA-Z]",u) + u := strconc(SUBSTRING(u,0,i),'".*",SUBSTRING(u,i + 1,nil)) + if u.0 ~= $wild then u := strconc('"[^a-zA-Z]",u) else u := SUBSTRING(u,1,nil) - if u.(k := MAXINDEX u) ~= $wild then u := STRCONC(u,'"[^a-zA-Z]") + if u.(k := MAXINDEX u) ~= $wild then u := strconc(u,'"[^a-zA-Z]") else u := SUBSTRING(u,0,k) u |