steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor peg compiler cache 

Instead of a cache stored in a global variable, the compiled parser is stored in a slot in the parser delegate.
db4
Chris Double 2008-03-30 14:00:45 +13:00
parent 2e04b8623d
commit 691d26068d
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extra/peg/peg-docs.factor
View File

@ -21,16 +21,9 @@ HELP: compile
}
{ $description
"Compile the parser to a word. The word will have stack effect ( -- result )."
"The mapping from parser to compiled word is kept in a cache. If you later change "
"the definition of a parser you'll need to clear this cache with "
{ $link reset-compiled-parsers } " before using " { $link compile } " on that parser again."
}
{ $see-also parse } ;
HELP: reset-compiled-parsers
{ $description
"Reset the cache mapping parsers to compiled words." } ;
HELP: token
{ $values
{ "string" "a string" }

28
extra/peg/peg.factor
View File

@ -10,6 +10,10 @@ USE: prettyprint
TUPLE: parse-result remaining ast ;
TUPLE: parser id compiled ;
M: parser equal? [ id>> ] 2apply = ;
C: <parser> parser
SYMBOL: ignore
: <parse-result> ( remaining ast -- parse-result )
@ -194,14 +198,6 @@ C: <head> peg-head
] H{ } make-assoc swap bind ; inline
: compiled-parsers ( -- cache )
\ compiled-parsers get-global [ H{ } clone dup \ compiled-parsers set-global ] unless* ;
: reset-compiled-parsers ( -- )
H{ } clone \ compiled-parsers set-global ;
reset-compiled-parsers
GENERIC: (compile) ( parser -- quot )
@ -226,11 +222,11 @@ GENERIC: (compile) ( parser -- quot )
#! Circular parsers are supported by getting the word
#! name and storing it in the cache, before compiling,
#! so it is picked up when re-entered.
dup id>> compiled-parsers [
drop dup gensym swap 2dup id>> compiled-parsers set-at
2dup parser-body define
dupd "peg" set-word-prop
] cache nip ;
dup compiled>> [
nip
] [
gensym tuck >>compiled 2dup parser-body define dupd "peg" set-word-prop
] if* ;
: compile ( parser -- word )
[ compiled-parser ] with-compilation-unit ;
@ -253,10 +249,6 @@ SYMBOL: id
1 id set-global 0
] if* ;
TUPLE: parser id ;
M: parser equal? [ id>> ] 2apply = ;
C: <parser> parser
: delegates ( -- cache )
\ delegates get-global [ H{ } clone dup \ delegates set-global ] unless* ;
@ -269,7 +261,7 @@ reset-delegates
#! Set the delegate for the parser. Equivalent parsers
#! get a delegate with the same id.
dup clone delegates [
drop next-id <parser>
drop next-id f <parser>
] cache over set-delegate ;
TUPLE: token-parser symbol ;