refac

brag/codegen/flatten.rkt

@@ -109,15 +109,17 @@
                               [(inferred-id NAME repeat) SUB-PAT ...]
                               MIN-REPEAT-SUB-PATS)
                       inferred-rules)))]
+           
            [(repeat MIN MAX SUB-PAT)
             ;; finite repeat
-            (let ([min (syntax-e #'MIN)]
+            (begin
-                  [max (syntax-e #'MAX)])
+              (define min (syntax-e #'MIN))
-              (recur
+              (define max (syntax-e #'MAX))
-                  (with-syntax ([(MIN-SUBPAT ...) (make-list min #'SUB-PAT)]
+              (define new-rule-stx (with-syntax ([(MIN-SUBPAT ...) (make-list min #'SUB-PAT)]
-                                [(EXTRA-SUBPAT ...) (make-list (- max min) #'SUB-PAT)])
+                                                 [(EXTRA-SUBPAT ...) (make-list (- max min) #'SUB-PAT)])
-                    #'(rule NAME (seq MIN-SUBPAT ... (maybe EXTRA-SUBPAT) ...)))
+                                     ;; has to keep the same name to work correctly
-                #f))]
+                                     #'(rule NAME (seq MIN-SUBPAT ... (maybe EXTRA-SUBPAT) ...))))
+              (recur new-rule-stx #f))]
 
            [(maybe SUB-PAT)
             (begin

brag/rules/parser.rkt

@@ -164,9 +164,9 @@
                              1 #f $1)]
             [(regexp-match #px"^\\{(\\d+)?,?(\\d+)?\\}$" $2) ; "{min,max}" with both min & max optional
              => (λ (m)
-                  (match-define (cons min-repeat max-repeat)
+                  (match-define (list min-repeat max-repeat)
                     (match m
-                      [(list _ min max) (cons (if min (string->number min) 0)
+                      [(list _ min max) (list (if min (string->number min) 0)
                                               (and max (string->number max)))]))
                   (pattern-repeat (position->pos $1-start-pos)
                                   (position->pos $2-end-pos)