suzanne.soy/extensible-parser-specifications
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bugs in documentation and ~global-*

Browse Source
This commit is contained in:
Georges Dupéron 2016-09-19 20:23:08 +02:00
parent 0a6d040c8d
commit 9604795055
3 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
private/global.rkt
View File

@ -51,8 +51,9 @@
(make-~global #'aggregate-global-and))
(define (aggregate-global-counter . bs)
(apply + (filter identity ;; remove failed bindings
(flatten bs)))) ;; don't care about ellipsis nesting
(apply + (map unbox
(filter identity ;; remove failed bindings
(flatten bs))))) ;; don't care about ellipsis nesting
(define-eh-mixin-expander ~global-counter
(make-~global #'aggregate-global-counter #'+1))

27
scribblings/extensible-parser-specifications.scrbl
View File

@ -40,11 +40,11 @@
@tech[#:doc '(lib "syntax/scribblings/syntax.scrbl")]{ellipsis-head alternative
set}, except that it can only appear as part of a @racket[~no-order] (possibly
nested under other eh-alternative mixins), and can contain some global
constraints. The global constraints, detailed below, allow the parser to perform
checks across two or more mixins. For example, given a set of options that can
appear in any order, it is possible to specify that two of them are mutually
exclusive, or that two other must appear in a certain order, regardless of the
order of the other options.
constraints. The global constraints, detailed below, allow the parser to
perform checks across two or more mixins. For example, given a set of options
that can appear in any order, it is possible to specify that two of them are
mutually exclusive, or that two other must appear in a certain order,
regardless of the order of the other options.
The @racket[derived-or] term covers any
@tech[#:doc '(lib "syntax/scribblings/syntax.scrbl")]{pattern expander} or
@ -236,8 +236,8 @@ the notion of order irrelevant.
@defform[(~global-or attribute-name+value #,ntax-pattern ...)
#:grammar
[(attribute-name [#,tribute-name]
[#,tribute-name valueᵢ])]]{
[(attribute-name+value #,tribute-name
[#,tribute-name valueᵢ])]]{
Matches all of the given @racket[#,ntax-pattern]s, like @racket[~and] does, and
perform a global @racket[or] over all the values corresponding to successful
matches of a global pattern using the same @racket[#,tribute-name]. See above
@ -254,7 +254,7 @@ the notion of order irrelevant.
For example, the following code produces @racket['ya]:
@racketblock[
(syntax-parse #'(1 'ya (2 #f 3) 4 'yb (5 #f 6) 'yc 7)
(syntax-parse #'(1 ya (2 #f 3) 4 yb (5 #f 6) yc 7)
[(~no-order {~and x:id {~global-or [g (syntax-e #'x)]}}
{~global-or [g (syntax-e #'y)] y:number}
({~global-or [g (syntax-e #'z)] (~and z (~or :number #f))}
@ -271,9 +271,9 @@ the notion of order irrelevant.
(code:comment "no matches for w"))]
}
@defform[(~global-or attribute-name+value #,ntax-pattern ...)
@defform[(~global-and attribute-name+value #,ntax-pattern ...)
#:grammar
[(attribute-name [#,tribute-name valueᵢ])]]{
[(attribute-name+value [#,tribute-name valueᵢ])]]{
Matches all of the given @racket[#,ntax-pattern]s, like @racket[~and] does, and
perform a global @racket[and] over all the values corresponding to successful
matches of a global pattern using the same @racket[#,tribute-name]. See above
@ -289,7 +289,7 @@ the notion of order irrelevant.
For example, the following code produces @racket[6]:
@racketblock[
(syntax-parse #'(1 'ya (2 3) 4 'yb (5 6) 'yc 7)
(syntax-parse #'(1 ya (2 3) 4 yb (5 6) yc 7)
[(~no-order {~and x:id {~global-and [g (syntax-e #'x)]}}
{~global-and [g (syntax-e #'y)] y:number}
({~global-and [g (syntax-e #'z)] (~and z :number)}
@ -311,7 +311,10 @@ the notion of order irrelevant.
@racket[~no-order] or @racket[~seq-no-order], see @racket[~order-point],
@racket[order-point<] and @racket[order-point>].}
@defform[(~global-counter)]{
@defform[(~global-counter attribute-name+value #,ntax-pattern ...)
#:grammar
[(attribute-name+value #,tribute-name
[#,tribute-name valueᵢ])]]{
Matches all of the given @racket[#,ntax-pattern]s, like @racket[~and] does, and
perform a global @racket[+] over all the values corresponding to successful
matches of a global pattern using the same @racket[#,tribute-name]. See above

28
test/test-global.rkt
View File

@ -13,8 +13,8 @@
(check-equal?
(syntax-parse #'(1 "ab" #:kw "ab" 3 4 5)
[({~seq-no-order {~once {~global-counter [cnt 'occurrencea] #:kw}}
{~global-counter [cnt 'occurrenceb] :number}
[({~seq-no-order {~once {~global-counter [cnt 1] #:kw}}
{~global-counter [cnt 1] :number}
"ab"})
(attribute cnt)])
5)
@ -59,4 +59,26 @@
{~global-and [kw-not-number #f] :number}
"ab"})
(attribute kw-not-number)])
#t)
#t)
;; Tests from the documentation:
(check-equal?
(syntax-parse #'(1 ya (2 #f 3) 4 yb (5 #f 6) yc 7)
[(~no-order {~and x:id {~global-or [g (syntax-e #'x)]}}
{~global-or [g (syntax-e #'y)] y:number}
({~global-or [g (syntax-e #'z)] (~and z (~or :number #f))}
…)
{~global-or [g (syntax-e #'w)] w:str})
(attribute g)])
'ya)
(check-equal?
(syntax-parse #'(1 ya (2 3) 4 yb (5 6) yc 7)
[(~no-order {~and x:id {~global-and [g (syntax-e #'x)]}}
{~global-and [g (syntax-e #'y)] y:number}
({~global-and [g (syntax-e #'z)] (~and z :number)}
…)
{~global-and [g (syntax-e #'w)] w:str})
(attribute g)])
6)