diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-12 19:46:02 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-12 19:46:02 +0000 |
| commit | 39982663dc44f7b44c63af6ae4182f8d60d7d341 (patch) | |
| tree | 693411e42dfe41f48a7558846a0b0fcdd84cd775 /src/interp/parse.boot | |
| parent | a5396a491b1b308b622db3e12da734e6fb1fdb53 (diff) | |
| download | open-axiom-39982663dc44f7b44c63af6ae4182f8d60d7d341.tar.gz | |
* interp/spad-parser.spad: New parsing functions.
* interp/fnewmeta.lisp: Use them,
(PARSE-Return): Remove.
(PARSE-Throw): Likewise.
(PARSE-Jump): Likewise.
(PARSE-Exit): Likewise.
(PARSE-Leave): Likewise.
(PARSE-ElseClause): Likewise.
(PARSE-Label): Likewise.
Diffstat (limited to 'src/interp/parse.boot')
| -rw-r--r-- | src/interp/parse.boot | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interp/parse.boot b/src/interp/parse.boot index f7db82fe..1af246df 100644 --- a/src/interp/parse.boot +++ b/src/interp/parse.boot @@ -264,9 +264,9 @@ parseOr t == parseIf ["IF",y,parseOr ["or",:rest u],"true"] parseIf ["IF",x,"true",parseOr ["or",:rest u]] -parseExit: %ParseForm -> %Form -parseExit t == - t isnt ["exit",a,:b] => systemErrorHere ["parseExit",t] +doParseExit: %ParseForm -> %Form +doParseExit t == + t isnt ["exit",a,:b] => systemErrorHere ["doParseExit",t] -- note: I wanted to convert 1s to 0s here to facilitate indexing in -- comp code; unfortunately, parseTran-ning is sometimes done more -- than once so that the count can be decremented more than once @@ -279,9 +279,9 @@ parseExit t == ["exit",1,a] -parseLeave: %ParseForm -> %Form -parseLeave t == - t isnt ["leave",a,:b] => systemErrorHere ["parseLeave",t] +doParseLeave: %ParseForm -> %Form +doParseLeave t == + t isnt ["leave",a,:b] => systemErrorHere ["doParseLeave",t] a:= parseTran a b:= parseTran b b => @@ -448,7 +448,7 @@ for x in [[":", :"parseColon"],_ ["CATEGORY", :"parseCategory"],_ ["construct", :"parseConstruct"],_ ["DEF", :"parseDEF"],_ - ["exit", :"parseExit"],_ + ["exit", :"doParseExit"],_ ["has", :"parseHas"],_ ["IF", :"parseIf"],_ ["IN", :"parseIn"],_ @@ -456,7 +456,7 @@ for x in [[":", :"parseColon"],_ ["is", :"parseIs"],_ ["isnt", :"parseIsnt"],_ ["Join", :"parseJoin"],_ - ["leave", :"parseLeave"],_ + ["leave", :"doParseLeave"],_ ["%LET", :"parseLET"],_ ["LETD", :"parseLETD"],_ ["MDEF", :"parseMDEF"],_ |