diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-29 03:20:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-29 03:20:55 +0000 |
| commit | 9c532285f28b723a3f70fc4eba19e3856ecbd3dd (patch) | |
| tree | 8cab2c9b8ac48fd5b39bfc7a1fd192ede88c4117 /src/interp/word.boot | |
| parent | ca4b1b74d8e743f50f0db37f1b33265f46547f01 (diff) | |
| download | open-axiom-9c532285f28b723a3f70fc4eba19e3856ecbd3dd.tar.gz | |
SUBSTRING cleanup
Diffstat (limited to 'src/interp/word.boot')
| -rw-r--r-- | src/interp/word.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/word.boot b/src/interp/word.boot index 16e26324..fc553899 100644 --- a/src/interp/word.boot +++ b/src/interp/word.boot @@ -99,7 +99,7 @@ getListOfFunctionNames(fnames) == stream:= DEFIOSTREAM(['(MODE . INPUT),['FILE,fn,'DIRECT,'_*]],80,0) while (not PLACEP (x:= readLine stream)) repeat (s := # x) < 26 => 'iterate - res:= [SUBSTRING(x,26,NIL),:res] + res:= [subString(x,26),:res] SHUT stream res @@ -112,12 +112,12 @@ wordsOfString1(s,j) == tailWords:= isBreakCharacter s.(k+1) => n:= or/[i for i in (k+2)..(MAXINDEX(s)-1)|not isBreakCharacter s.i] - null n => [SUBSTRING(s,k,nil)] - n > k+1 => [SUBSTRING(s,k,n-k-1),:wordsOfString1(s,n-1)] + null n => [subString(s,k)] + n > k+1 => [subString(s,k,n-k-1),:wordsOfString1(s,n-1)] m := or/[i for i in (k+2)..(MAXINDEX(s)-1) | isBreakCharacter s.i] => - [SUBSTRING(s,k,m-k),:wordsOfString1(s,m)] - [SUBSTRING(s,k,nil)] - k > j+1 => [SUBSTRING(s,j,k-j),:tailWords] + [subString(s,k,m-k),:wordsOfString1(s,m)] + [subString(s,k)] + k > j+1 => [subString(s,j,k-j),:tailWords] tailWords nil |