mbutterick
/
brag
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

correct behavior of blank curlies

Browse Source
hide-top-rule-name
Matthew Butterick 6 years ago
parent 10c399bfd7
commit b99869ca40
1 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File

94
brag/rules/parser.rkt
Unescape Escape View File

@ -168,60 +168,62 @@
[(list all min range? max) (let* ([min (if min (string->number min) 0)] [(list all min range? max) (let* ([min (if min (string->number min) 0)]
[max (cond [max (cond
[(and range? max) (string->number max)] [(and range? max) (string->number max)]
[(and (not range?) (not max)) min] ; {3} -> {3,3} [(and (not range?) (not max)) (if (zero? min)
[else #f])]) #f ; {} -> {0,}
(cons min max))]))] min))] ; {3} -> {3,3}
[else (raise-argument-error 'grammar-parse "unknown repetition operator" $2)])) [else #f])])
(pattern-repeat (position->pos $1-start-pos) (cons min max))]))]
(position->pos $2-end-pos) [else (raise-argument-error 'grammar-parse "unknown repetition operator" $2)]))
min-repeat max-repeat $1 (pattern-repeat (position->pos $1-start-pos)
#f))] (position->pos $2-end-pos)
[(atomic-pattern) min-repeat max-repeat $1
$1]] #f))]
[(atomic-pattern)
$1]]
[atomic-pattern [atomic-pattern
[(LIT) [(LIT)
(pattern-lit (position->pos $1-start-pos) (pattern-lit (position->pos $1-start-pos)
(position->pos $1-end-pos) (position->pos $1-end-pos)
(substring $1 1 (sub1 (string-length $1))) (substring $1 1 (sub1 (string-length $1)))
#f)] #f)]
[(ID) [(ID)
(if (token-id? $1) (if (token-id? $1)
(pattern-token (position->pos $1-start-pos) (pattern-token (position->pos $1-start-pos)
(position->pos $1-end-pos) (position->pos $1-end-pos)
$1 $1
#f) #f)
(pattern-id (position->pos $1-start-pos) (pattern-id (position->pos $1-start-pos)
(position->pos $1-end-pos) (position->pos $1-end-pos)
$1 $1
#f))] #f))]
[(LBRACKET pattern RBRACKET) [(LBRACKET pattern RBRACKET)
(pattern-repeat (position->pos $1-start-pos) (pattern-repeat (position->pos $1-start-pos)
(position->pos $3-end-pos) (position->pos $3-end-pos)
0 1 $2 0 1 $2
#f)] #f)]
[(LPAREN pattern RPAREN) [(LPAREN pattern RPAREN)
(relocate-pattern $2 (position->pos $1-start-pos) (position->pos $3-end-pos))] (relocate-pattern $2 (position->pos $1-start-pos) (position->pos $3-end-pos))]
[(HIDE atomic-pattern) [(HIDE atomic-pattern)
(relocate-pattern $2 (position->pos $1-start-pos) (position->pos $2-end-pos) 'hide)] (relocate-pattern $2 (position->pos $1-start-pos) (position->pos $2-end-pos) 'hide)]
[(SPLICE ID) [(SPLICE ID)
;; only works for nonterminals on the right side ;; only works for nonterminals on the right side
;; (meaningless with terminals) ;; (meaningless with terminals)
(if (token-id? $2) (if (token-id? $2)
(error 'brag "Can't use splice operator with terminal") (error 'brag "Can't use splice operator with terminal")
(pattern-id (position->pos $1-start-pos) (pattern-id (position->pos $1-start-pos)
(position->pos $2-end-pos) (position->pos $2-end-pos)
$2 $2
'splice))]]) 'splice))]])
(error (lambda (tok-ok? tok-name tok-value start-pos end-pos) (error (lambda (tok-ok? tok-name tok-value start-pos end-pos)
((current-parser-error-handler) tok-ok? tok-name tok-value (position->pos start-pos) (position->pos end-pos)))))) ((current-parser-error-handler) tok-ok? tok-name tok-value (position->pos start-pos) (position->pos end-pos))))))
;; relocate-pattern: pattern -> pattern ;; relocate-pattern: pattern -> pattern
;; Rewrites the pattern's start and end pos accordingly. ;; Rewrites the pattern's start and end pos accordingly.

Write Preview
Loading…
Cancel
Save