From 5505ab2d0069eb2809753217a93e9a4551c997f9 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Fri, 15 Feb 2008 20:28:37 +0000 Subject: Tidy src/boot --- src/boot/parser.boot | 6 +++--- 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 -- cgit v1.2.3