Allow var names in ebnf but ignore them for now
parent
a23e0ce15c
commit
78633e03a0
|
@ -19,6 +19,7 @@ TUPLE: ebnf-repeat1 group ;
|
||||||
TUPLE: ebnf-optional group ;
|
TUPLE: ebnf-optional group ;
|
||||||
TUPLE: ebnf-rule symbol elements ;
|
TUPLE: ebnf-rule symbol elements ;
|
||||||
TUPLE: ebnf-action parser code ;
|
TUPLE: ebnf-action parser code ;
|
||||||
|
TUPLE: ebnf-var parser name ;
|
||||||
TUPLE: ebnf rules ;
|
TUPLE: ebnf rules ;
|
||||||
|
|
||||||
C: <ebnf-non-terminal> ebnf-non-terminal
|
C: <ebnf-non-terminal> ebnf-non-terminal
|
||||||
|
@ -34,6 +35,7 @@ C: <ebnf-repeat1> ebnf-repeat1
|
||||||
C: <ebnf-optional> ebnf-optional
|
C: <ebnf-optional> ebnf-optional
|
||||||
C: <ebnf-rule> ebnf-rule
|
C: <ebnf-rule> ebnf-rule
|
||||||
C: <ebnf-action> ebnf-action
|
C: <ebnf-action> ebnf-action
|
||||||
|
C: <ebnf-var> ebnf-var
|
||||||
C: <ebnf> ebnf
|
C: <ebnf> ebnf
|
||||||
|
|
||||||
: syntax ( string -- parser )
|
: syntax ( string -- parser )
|
||||||
|
@ -79,6 +81,7 @@ C: <ebnf> ebnf
|
||||||
[ dup CHAR: * = ]
|
[ dup CHAR: * = ]
|
||||||
[ dup CHAR: + = ]
|
[ dup CHAR: + = ]
|
||||||
[ dup CHAR: ? = ]
|
[ dup CHAR: ? = ]
|
||||||
|
[ dup CHAR: : = ]
|
||||||
} || not nip
|
} || not nip
|
||||||
] satisfy repeat1 [ >string <ebnf-non-terminal> ] action ;
|
] satisfy repeat1 [ >string <ebnf-non-terminal> ] action ;
|
||||||
|
|
||||||
|
@ -200,6 +203,7 @@ DEFER: 'choice'
|
||||||
: 'actioned-sequence' ( -- parser )
|
: 'actioned-sequence' ( -- parser )
|
||||||
[
|
[
|
||||||
[ 'sequence' , "=>" syntax , 'action' , ] seq* [ first2 <ebnf-action> ] action ,
|
[ 'sequence' , "=>" syntax , 'action' , ] seq* [ first2 <ebnf-action> ] action ,
|
||||||
|
[ 'sequence' , ":" syntax , "a-zA-Z" range-pattern repeat1 [ >string ] action , ] seq* [ first2 <ebnf-var> ] action ,
|
||||||
'sequence' ,
|
'sequence' ,
|
||||||
] choice* ;
|
] choice* ;
|
||||||
|
|
||||||
|
@ -270,6 +274,9 @@ M: ebnf-action (transform) ( ast -- parser )
|
||||||
[ parser>> (transform) ] keep
|
[ parser>> (transform) ] keep
|
||||||
code>> string-lines [ parse-lines ] with-compilation-unit action ;
|
code>> string-lines [ parse-lines ] with-compilation-unit action ;
|
||||||
|
|
||||||
|
M: ebnf-var (transform) ( ast -- parser )
|
||||||
|
parser>> (transform) ;
|
||||||
|
|
||||||
M: ebnf-terminal (transform) ( ast -- parser )
|
M: ebnf-terminal (transform) ( ast -- parser )
|
||||||
symbol>> token sp ;
|
symbol>> token sp ;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue