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

parser: Refactor the parser some. scan-datum vs scan-token come on...

modern-harvey3-triple
Doug Coleman 2018-08-09 17:21:06 -04:00
parent bd329c7497
commit e06eb4ad3e
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/parser/parser.factor
View File

@ -60,8 +60,24 @@ ERROR: number-expected ;
dup string>number [ ] [ no-word ] ?if dup string>number [ ] [ no-word ] ?if
] ?if ; ] ?if ;
DEFER: scan-object
: parse-lower-colon2 ( obj -- obj' )
[ char: \: = ] cut-tail length [ scan-object ] replicate 2array
handle-lower-colon ;
: parse-single-quote ( obj -- obj' )
"'" split1 2array handle-single-quote ;
: string>new-parser ( string -- string/obj ? )
{
! { [ dup strict-lower-colon? ] [ parse-lower-colon2 t ] }
{ [ dup strict-single-quote? ] [ parse-single-quote t ] }
[ f ]
} cond ;
: ?scan-datum ( -- word/number/f ) : ?scan-datum ( -- word/number/f )
?scan-token dup [ parse-datum ] when ; ?scan-token
string>new-parser [ ] [ dup [ parse-datum ] when ] if ;
: scan-datum ( -- word/number ) : scan-datum ( -- word/number )
?scan-datum [ \ word throw-unexpected-eof ] unless* ; ?scan-datum [ \ word throw-unexpected-eof ] unless* ;
@ -127,19 +143,9 @@ ERROR: classoid-expected object ;
[ pick push drop t ] [ pick push drop t ]
} cond ; } cond ;
: parse-lower-colon2 ( accum obj -- accum )
[ char: \: = ] cut-tail length [ scan-object ] replicate 2array
handle-lower-colon suffix! ;
: parse-single-quote ( accum obj -- accum )
"'" split1 2array handle-single-quote suffix! ;
: parse-until-step ( accum end -- accum ? ) : parse-until-step ( accum end -- accum ? )
?scan-token { ?scan-token string>new-parser
! { [ dup strict-lower-colon? ] [ nip parse-lower-colon2 t ] } [ nip suffix! t ] [ (parse-until-step) ] if ;
! { [ dup strict-single-quote? ] [ nip parse-single-quote t ] }
[ (parse-until-step) ]
} cond ;
: (parse-until) ( accum end -- accum ) : (parse-until) ( accum end -- accum )
[ parse-until-step ] keep swap [ (parse-until) ] [ drop ] if ; [ parse-until-step ] keep swap [ (parse-until) ] [ drop ] if ;