diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-13 09:29:07 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-13 09:29:07 +0000 |
| commit | 0df19c03c721d4ef214b335445a530dbfa66d570 (patch) | |
| tree | 9ce093588b0d376b7c61c3f219dc61ea8dd2e7ba /src/boot/scanner.boot | |
| parent | 665cb7df0fd6106b61a88667ae132e613d395cc4 (diff) | |
| download | open-axiom-0df19c03c721d4ef214b335445a530dbfa66d570.tar.gz | |
* boot/utility.boot (charPosition): New.
* boot/scanner.boot (shoeAccumulateLines): Use it.
(shoeS): Likewise.
Diffstat (limited to 'src/boot/scanner.boot')
| -rw-r--r-- | src/boot/scanner.boot | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/boot/scanner.boot b/src/boot/scanner.boot index e1f6bd0b..841d26db 100644 --- a/src/boot/scanner.boot +++ b/src/boot/scanner.boot @@ -135,8 +135,7 @@ shoeAccumulateLines(s,string)== command and #command>0 => stringChar(command,0) = char ";" => shoeAccumulateLines($r,string) - a:=STRPOS('";",command,0,nil) - a=> + a := charPosition(char ";",command,0) => shoeAccumulateLines($r, strconc(string,subString(command,0,a-1))) shoeAccumulateLines($r,strconc(string,command)) @@ -314,8 +313,8 @@ shoeS()== SoftShoeError([$linepos,:$n],'"quote added") '"" n := $n - strsym := STRPOS ('"_"",$ln,$n,nil) or $sz - escsym := STRPOS ('"__",$ln,$n,nil) or $sz + strsym := charPosition(char "_"",$ln,$n) or $sz + escsym := charPosition(char "__",$ln,$n) or $sz mn := MIN(strsym,escsym) mn=$sz => $n:=$sz |