diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-26 08:10:59 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-26 08:10:59 +0000 |
| commit | 8e0498b66e19be7e22039866d695c1cb81707bd6 (patch) | |
| tree | 162eee1a3365c43d8b35bff9eb7b23b00d6af09c /src/interp/guess.boot | |
| parent | 9584120cc4fd35f1ae0639430e07d5936f1ac39b (diff) | |
| download | open-axiom-8e0498b66e19be7e22039866d695c1cb81707bd6.tar.gz | |
* boot/tokens.boot: Automatically translate alphabetic?, digit?,
lowerCase?, upperCase?, readByte, readInteger, readLine,
writeByte, writeLine.
* interp/as.boot: Use them.
* interp/bc-matrix.boot: Likewise.
* interp/bc-solve.boot: Likewise.
* interp/br-con.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/database.boot: Likewise.
* interp/format.boot: Likewise.
* interp/fortcall.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/guess.boot: Likewise.
* interp/ht-root.boot: Likewise.
* interp/htcheck.boot: Likewise.
* interp/htsetvar.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/int-top.boot: Likewise.
* interp/intfile.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/pf2sex.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/scan.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/sys-utility.boot: Likewise.
* interp/topics.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/word.boot: Likewise.
Diffstat (limited to 'src/interp/guess.boot')
| -rw-r--r-- | src/interp/guess.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/guess.boot b/src/interp/guess.boot index ab1abb8e..30c4e96c 100644 --- a/src/interp/guess.boot +++ b/src/interp/guess.boot @@ -69,13 +69,13 @@ wordsOfString(s) == [UPCASE x for x in wordsOfStringKeepCase s] wordsOfStringKeepCase s == wordsOfString1(s,0) or [COPY s] wordsOfString1(s,j) == - k := or/[i for i in j..(MAXINDEX(s)-1) | UPPER_-CASE_-P s.i] => + k := or/[i for i in j..(MAXINDEX(s)-1) | upperCase? s.i] => tailWords:= - UPPER_-CASE_-P s.(k+1) => - n:= or/[i for i in (k+2)..(MAXINDEX(s)-1)|not UPPER_-CASE_-P s.i] + upperCase? s.(k+1) => + n:= or/[i for i in (k+2)..(MAXINDEX(s)-1)|not upperCase? s.i] null n => [SUBSTRING(s,k,nil)] n > k+1 => [SUBSTRING(s,k,n-k-1),:wordsOfString1(s,n-1)] - m := or/[i for i in (k+2)..(MAXINDEX(s)-1) | UPPER_-CASE_-P s.i] => + m := or/[i for i in (k+2)..(MAXINDEX(s)-1) | upperCase? s.i] => [SUBSTRING(s,k,m-k),:wordsOfString1(s,m)] [SUBSTRING(s,k,nil)] k > j+1 => [SUBSTRING(s,j,k-j),:tailWords] @@ -85,7 +85,7 @@ wordsOfString1(s,j) == wordKeys s == removeDuplicates [UPCASE s.0,:fn(s,1,-1,MAXINDEX s,nil)] where fn(s,i,lastKeyIndex,n,acc) == i > n => acc - UPPER_-CASE_-P s.i => + upperCase? s.i => -- i = lastKeyIndex + 1 => fn(s,i + 1,i,n,[s.i,:rest acc]) fn(s,i + 1,i,n,[s.i,:acc]) fn(s,i + 1,lastKeyIndex,n,acc) |