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

Make replace-escapes infer and fix remaining unit test breakage in ebnf

db4
Chris Double 2008-06-20 15:14:30 +12:00
parent d22a24a90e
commit 7239c4d79f
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/peg/ebnf/ebnf-tests.factor
View File

@ -448,7 +448,7 @@ foo=<foreign any-char> 'd'
] unit-test ] unit-test
[ [
"USING: peg.ebnf ; [EBNF foo='a' foo='b' EBNF]" eval "USING: peg.ebnf ; [EBNF foo='a' foo='b' EBNF]" eval drop
] must-fail ] must-fail

15
extra/peg/ebnf/ebnf.factor
View File

@ -63,12 +63,17 @@ C: <ebnf> ebnf
#! begin and end. #! begin and end.
[ syntax ] 2dip syntax pack ; [ syntax ] 2dip syntax pack ;
: replace-escapes ( string -- string ) #! Don't want to use 'replace' in an action since replace doesn't infer.
#! Do the compilation of the peg at parse time and call (replace).
PEG: escaper ( string -- ast )
[ [
"\\t" token [ drop "\t" ] action , "\\t" token [ drop "\t" ] action ,
"\\n" token [ drop "\n" ] action , "\\n" token [ drop "\n" ] action ,
"\\r" token [ drop "\r" ] action , "\\r" token [ drop "\r" ] action ,
] choice* replace ; ] choice* any-char-parser 2array choice repeat0 ;
: replace-escapes ( string -- string )
escaper sift [ [ tree-write ] each ] with-string-writer ;
: insert-escapes ( string -- string ) : insert-escapes ( string -- string )
[ [
@ -319,7 +324,11 @@ M: ebnf (transform) ( ast -- parser )
M: ebnf-rule (transform) ( ast -- parser ) M: ebnf-rule (transform) ( ast -- parser )
dup elements>> dup elements>>
(transform) [ (transform) [
swap symbol>> dup get [ "Rule '" over append "' defined more than once" append throw ] [ set ] if swap symbol>> dup get { [ tuple? ] [ delegate parser? ] } 1&& [
"Rule '" over append "' defined more than once" append throw
] [
set
] if
] keep ; ] keep ;
M: ebnf-sequence (transform) ( ast -- parser ) M: ebnf-sequence (transform) ( ast -- parser )