diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-19 16:04:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-19 16:04:55 +0000 |
| commit | 0baf7a71d80fc15fdab5caa551b7e00800dccbef (patch) | |
| tree | 859d6581ba133d0123a27d7e82f0c64b5aea46bc /src/interp/match.boot | |
| parent | ba495f17f8e3a8b780f038fd6f2d5877ccc2476e (diff) | |
| download | open-axiom-0baf7a71d80fc15fdab5caa551b7e00800dccbef.tar.gz | |
* interp/vmlisp.lisp (VECP): Remove.
(REFVECP): Likewise.
(CVECP): Likewise.
(QMEMQ): Likewise.
* interp/bootlex.lisp (TRANSLABEL1): Adjust.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/category.boot: Likewise.
* interp/database.boot: Likewise.
* interp/debug.lisp: Likewise.
* interp/format.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-cndata.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/ggreater.lisp: Likewise.
* interp/guess.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-resolv.boot: Likewise.
* interp/i-spec2.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/union.lisp: Likewise.
* interp/trace.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/pathname.boot: Likewise.
* interp/nrunopt.boot: Likewise.
* interp/nrunfast.boot: Likewise.
* interp/nruncomp.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/msg.boot: Likewise.
* interp/match.boot: Likewise.
* interp/word.boot: Likewise.
Diffstat (limited to 'src/interp/match.boot')
| -rw-r--r-- | src/interp/match.boot | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interp/match.boot b/src/interp/match.boot index 775049c4..2411f599 100644 --- a/src/interp/match.boot +++ b/src/interp/match.boot @@ -44,20 +44,20 @@ maskMatch?(mask,subject) == substring?(part, whole, startpos) == --This function should be replaced by STRING< - np := SIZE part - nw := SIZE whole + np := # part + nw := # whole np > nw - startpos => false and/[CHAR_-EQUAL(part.ip, whole.iw) for ip in 0..np-1 for iw in startpos.. ] anySubstring?(part,whole,startpos) == - np := SIZE part - nw := SIZE whole + np := # part + nw := # whole or/[((k := i) and "and"/[CHAR_-EQUAL(part.ip,whole.iw) for ip in 0..np - 1 for iw in i..]) for i in startpos..nw - np] => k charPosition(c,t,startpos) == - n := SIZE t + n := # t startpos < 0 or startpos > n => n k:= startpos for i in startpos .. n-1 repeat @@ -71,9 +71,9 @@ rightCharPosition(c,t,startpos) == --startpos often equals MAXINDEX t (rightmost k stringPosition(s,t,startpos) == - n := SIZE t + n := # t if startpos < 0 or startpos > n then error '"index out of range" - if SIZE s = 0 then return startpos -- bug in STRPOS + if # s = 0 then return startpos -- bug in STRPOS r := STRPOS(s,t,startpos,NIL) if r = nil then n else r |