diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-02-15 20:28:37 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-02-15 20:28:37 +0000 |
| commit | 5505ab2d0069eb2809753217a93e9a4551c997f9 (patch) | |
| tree | 4fa77d6041f8a2d915d915feaa2a4a1dab52c799 /src/boot | |
| parent | 9d17d5a9314c999f1495392909dbfdb09b0dc1e3 (diff) | |
| download | open-axiom-5505ab2d0069eb2809753217a93e9a4551c997f9.tar.gz | |
Tidy src/boot
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/parser.boot | 6 | ||||
| -rw-r--r-- | src/boot/translator.boot | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/boot/parser.boot b/src/boot/parser.boot index fc21f148..5cc2d856 100644 --- a/src/boot/parser.boot +++ b/src/boot/parser.boot @@ -286,13 +286,13 @@ bpMissingMate(close,open)== bpMissing s== bpSpecificErrorHere(CONCAT(PNAME s,'" possibly missing")) - THROW("TRAPPOINT","TRAPPED") + throw TRAPPOINT "TRAPPED" bpCompMissing s == bpEqKey s or bpMissing s bpTrap()== bpGeneralErrorHere() - THROW("TRAPPOINT","TRAPPED") + throw TRAPPOINT "TRAPPED" bpRecoverTrap()== bpFirstToken() @@ -310,7 +310,7 @@ bpListAndRecover(f)== c:=$inputStream while not done repeat -- $trapped:local:=false - found:=CATCH("TRAPPOINT",APPLY(f,nil)) + found:=try APPLY(f,nil) catch TRAPPOINT if found="TRAPPED" then $inputStream:=c diff --git a/src/boot/translator.boot b/src/boot/translator.boot index f8adef8b..801848b8 100644 --- a/src/boot/translator.boot +++ b/src/boot/translator.boot @@ -338,7 +338,7 @@ shoeOutParse stream == $bpCount:local:=0 $bpParenCount:local:=0 bpFirstTok() - found:=CATCH("TRAPPOINT",bpOutItem()) + found:=try bpOutItem() catch TRAPPOINT if found="TRAPPED" then nil else if not bStreamNull $inputStream |