diff options
author | dos-reis <gdr@axiomatics.org> | 2009-08-14 10:48:09 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2009-08-14 10:48:09 +0000 |
commit | d2afe2366c2c592327cd0eb6593a3536a6eff54d (patch) | |
tree | 11438ab261e17b8ccdd1f91ba83bb3b93032ec5e /src/interp/br-search.boot | |
parent | 9bcc210fb444e41fc45e6ccd9ef2be197337d3e8 (diff) | |
download | open-axiom-d2afe2366c2c592327cd0eb6593a3536a6eff54d.tar.gz |
* boot/tokens.boot: Retire "^=". Introduce "~=".
* boot/ast.boot: Use "~=" instead of "^=".
* boot/includer.boot: Likewise.
* boot/translator.boot: Likewise.
* interp/as.boot: Likewise.
* interp/bc-misc.boot: Likewise.
* interp/bc-solve.boot: Likewise.
* interp/bc-util.boot: Likewise.
* interp/br-con.boot: Likewise.
* interp/br-data.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-op2.boot: Likewise.
* interp/br-prof.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/category.boot: Likewise.
* interp/cattable.boot: Likewise.
* interp/clam.boot: Likewise.
* interp/clammed.boot: Likewise.
* interp/compiler.boot: Likewise.
* interp/database.boot: Likewise.
* interp/define.boot: Likewise.
* interp/format.boot: Likewise.
* interp/fortcall.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-cndata.boot: Likewise.
* interp/g-opt.boot: Likewise.
* interp/g-timer.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/guess.boot: Likewise.
* interp/ht-root.boot: Likewise.
* interp/ht-util.boot: Likewise.
* interp/htsetvar.boot: Likewise.
* interp/i-analy.boot: Likewise.
* interp/i-code.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-eval.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-intern.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-resolv.boot: Likewise.
* interp/i-spec1.boot: Likewise.
* interp/i-spec2.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/i-toplev.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/int-top.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/intfile.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/macex.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/match.boot: Likewise.
* interp/modemap.boot: Likewise.
* interp/msg.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/nruncomp.boot: Likewise.
* interp/nrunfast.boot: Likewise.
* interp/nrungo.boot: Likewise.
* interp/nrunopt.boot: Likewise.
* interp/parse.boot: Likewise.
* interp/pathname.boot: Likewise.
* interp/pf2atree.boot: Likewise.
* interp/pf2sex.boot: Likewise.
* interp/postpar.boot: Likewise.
* interp/profile.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/record.boot: Likewise.
* interp/scan.boot: Likewise.
* interp/setvars.boot: Likewise.
* interp/simpbool.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/topics.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/wi2.boot: Likewise.
* interp/word.boot: Likewise.
Diffstat (limited to 'src/interp/br-search.boot')
-rw-r--r-- | src/interp/br-search.boot | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot index 4890e4ba..ef589edf 100644 --- a/src/interp/br-search.boot +++ b/src/interp/br-search.boot @@ -143,7 +143,7 @@ pmTransFilter s == => (parse := pmParseFromString s) and checkPmParse parse or ['error,'"Illegal search string",'"\vspace{3}\center{{\em Your search string} ",escapeSpecialChars s,'" {\em has incorrect syntax}}"] or/[s . i = char '_* and s.(i + 1) = char '_* - and (i=0 or s . (i - 1) ^= char $charUnderscore) for i in 0..(MAXINDEX s - 1)] + and (i=0 or s . (i - 1) ~= char $charUnderscore) for i in 0..(MAXINDEX s - 1)] => ['error,'"Illegal search string",'"\vspace{3}\center{Consecutive {\em *}'s are not allowed in search patterns}"] s @@ -266,7 +266,7 @@ mkGrepPattern1(x,:options) == --called by mkGrepPattern (and grepConstructName?) sl is [s,:r] => h(r,[$wild1,s,:res]) res := rest res if not MEMQ('w,$options) then - if first res ^= '"" then res := ['"`",:res] + if first res ~= '"" then res := ['"`",:res] else if res is [.,p,:r] and p = $wild1 then res := r "STRCONC"/NREVERSE res remUnderscores s == @@ -283,7 +283,7 @@ mkGrepPattern1(x,:options) == --called by mkGrepPattern (and grepConstructName?) n := SIZE t if startpos < 0 or startpos > n then error "index out of range" k:= startpos - for i in startpos .. n-1 while c ^= ELT(t,i) + for i in startpos .. n-1 while c ~= ELT(t,i) or i > startpos and ELT(t,i-1) = '__ repeat (k := k+1) k addOptions s == --add front anchor @@ -361,7 +361,7 @@ looksLikeDomainForm x == coSig := LASSOC('coSig,CDDR entry) k := #coSig atom x => k = 1 - k ^= #x => false + k ~= #x => false and/[p for key in rest coSig for arg in rest x] where p() == key => looksLikeDomainForm arg @@ -392,7 +392,7 @@ genSearch(filter,:options) == --"Complete" from HD (see man0.ht) and aokSearch if includeDoc? then docSearchAlist := grepConstruct(key,'w,true) docSearchAlist is ['error,:.] => bcErrorPage docSearchAlist - docSearchAlist := [x for x in docSearchAlist | x.0 ^= char 'x]--drop defaults + docSearchAlist := [x for x in docSearchAlist | x.0 ~= char 'x]--drop defaults genSearch1(filter,genSearchTran regSearchAlist,genSearchTran docSearchAlist) genSearchTran alist == [[x,y,:y] for [x,:y] in alist] @@ -486,7 +486,7 @@ genSearchSay(pair,summarize,kind,who,fn) == else htSay('"{\em ",count,'" ",pluralize kind,'"} ") short => 'done - if uniqueCount ^= 1 then + if uniqueCount ~= 1 then htSayStandard '"\indent{4}" htSay '"\newline " htBeginTable() @@ -504,7 +504,7 @@ genSearchSay(pair,summarize,kind,who,fn) == htMakePage [['bcLinks, [id,'"",fn,who + 8*i]]] i := i + #group bcHt '"}" - if uniqueCount ^= 1 then + if uniqueCount ~= 1 then htEndTable() htSayStandard '"\indent{0}" @@ -522,7 +522,7 @@ genSearchUniqueCount(u) == lastid := nil for item in u while count < $browseCountThreshold repeat id := dbGetName item - if id ^= lastid then + if id ~= lastid then count := count + 1 lastid := id count @@ -546,7 +546,7 @@ docSearch filter == --"Documentation" from HD (see man0.ht) key := removeSurroundingStars filter docSearchAlist := grepConstruct(filter,'w,true) docSearchAlist is ['error,:.] => bcErrorPage docSearchAlist - docSearchAlist := [x for x in docSearchAlist | x.0 ^= char 'x] --drop defaults + docSearchAlist := [x for x in docSearchAlist | x.0 ~= char 'x] --drop defaults docSearch1(filter,genSearchTran docSearchAlist) docSearch1(filter,doc) == @@ -581,9 +581,9 @@ sayDocMessage message == htSay('"{\em ") if message is [leftEnd,left,middle,right,rightEnd] then htSay(leftEnd,left,'"}") - if left ^= '"" and left.(MAXINDEX left) = $blank then htBlank() + if left ~= '"" and left.(MAXINDEX left) = $blank then htBlank() htSay middle - if right ^= '"" and right.0 = $blank then htBlank() + if right ~= '"" and right.0 = $blank then htBlank() htSay('"{\em ",right,rightEnd) else htSay message @@ -749,7 +749,7 @@ dbSearch(lines,kind,filter) == --called by attribute, operation, constructor sea dbSearchAbbrev([.,:conlist],kind,filter) == null conlist => emptySearchPage('"abbreviation",filter) kind := intern kind - if kind ^= 'constructor then + if kind ~= 'constructor then conlist := [x for x in conlist | LASSOC('kind,IFCDR IFCDR x) = kind] conlist is [[nam,:.]] => conPage DOWNCASE nam cAlist := [[con,:true] for con in conlist] |