Revert "subparsers"

This reverts commit 11539991ec.
dev-subparser
Matthew Butterick 5 years ago
parent 6e7e8e4147
commit c792b12d71

@ -1,13 +1,11 @@
#lang racket/base #lang racket/base
(require (for-syntax racket/base (require (for-syntax racket/base
racket/list racket/list
racket/syntax
"codegen.rkt" "codegen.rkt"
"runtime.rkt" "runtime.rkt"
"flatten.rkt") "flatten.rkt")
br-parser-tools/lex br-parser-tools/lex
br-parser-tools/cfg-parser br-parser-tools/cfg-parser
racket/promise
(prefix-in bs: brag/support) (prefix-in bs: brag/support)
racket/set) racket/set)
@ -36,9 +34,8 @@
(check-all-rules-satisfiable! rules) (check-all-rules-satisfiable! rules)
(define rule-ids (map rule-id rules)) (define rule-ids (map rule-id rules))
(define rule-id-datums (map syntax-e rule-ids))
(with-syntax* ([START-ID (first rule-ids)] ; The first rule, by default, is the start rule. (with-syntax ([START-ID (first rule-ids)] ; The first rule, by default, is the start rule.
[((TOKEN-TYPE . TOKEN-TYPE-CONSTRUCTOR) ...) [((TOKEN-TYPE . TOKEN-TYPE-CONSTRUCTOR) ...)
(for/list ([tt (in-list (rules->token-types rules))]) (for/list ([tt (in-list (rules->token-types rules))])
(cons tt (string->symbol (format "token-~a" tt))))] (cons tt (string->symbol (format "token-~a" tt))))]
@ -49,20 +46,13 @@
(map (λ (sym) (datum->syntax rules-stx sym)) (map (λ (sym) (datum->syntax rules-stx sym))
'(parse parse-to-datum parse-tree make-rule-parser all-token-types))] '(parse parse-to-datum parse-tree make-rule-parser all-token-types))]
[TOKEN (datum->syntax rules-stx 'token)] ; for repl [TOKEN (datum->syntax rules-stx 'token)] ; for repl
[(RULE-ID ...) rule-id-datums] [RULE-IDS (map syntax-e rule-ids)]
[(PARSE-RULE-ID ...)
(map (λ (dat) (format-id rules-stx "parse-~a" dat)) rule-id-datums)]
[(PARSE-RULE-ID-TO-DATUM ...)
(map (λ (dat) (format-id rules-stx "parse-~a-to-datum" dat)) rule-id-datums)]
[(PARSE-START-ID . _) #'(PARSE-RULE-ID ...)]
[(PARSE-START-ID-TO-DATUM . _) #'(PARSE-RULE-ID-TO-DATUM ...)]
[RULES-STX rules-stx]) [RULES-STX rules-stx])
;; this stx object represents the top level of a #lang brag module. ;; this stx object represents the top level of a #lang brag module.
;; so any `define`s are automatically available at the repl. ;; so any `define`s are automatically available at the repl.
;; and only identifiers explicitly `provide`d are visible on import. ;; and only identifiers explicitly `provide`d are visible on import.
#'(#%module-begin #'(#%module-begin
(provide PARSE PARSE-TO-DATUM PARSE-TREE MAKE-RULE-PARSER ALL-TOKEN-TYPES (provide PARSE PARSE-TO-DATUM PARSE-TREE MAKE-RULE-PARSER ALL-TOKEN-TYPES)
PARSE-RULE-ID ... PARSE-RULE-ID-TO-DATUM ...)
;; handle brag/support `token` with special identifier ;; handle brag/support `token` with special identifier
;; so it doesn't conflict with brag's internal `token` macro ;; so it doesn't conflict with brag's internal `token` macro
@ -85,7 +75,7 @@
(syntax-case rule-id-stx () (syntax-case rule-id-stx ()
[(_ start-rule) [(_ start-rule)
(and (identifier? #'start-rule) (and (identifier? #'start-rule)
(member (syntax-e #'start-rule) '(RULE-ID ...))) (member (syntax-e #'start-rule) 'RULE-IDS))
;; The cfg-parser depends on the start-rule provided in (start ...) to have the same ;; The cfg-parser depends on the start-rule provided in (start ...) to have the same
;; context as the rest of this body. Hence RECOLORED-START-RULE ;; context as the rest of this body. Hence RECOLORED-START-RULE
(with-syntax ([RECOLORED-START-RULE (datum->syntax #'RULES-STX (syntax-e #'start-rule))]) (with-syntax ([RECOLORED-START-RULE (datum->syntax #'RULES-STX (syntax-e #'start-rule))])
@ -117,17 +107,9 @@
(format "Rule ~a is not defined in the grammar" (syntax-e #'not-a-rule-id)) (format "Rule ~a is not defined in the grammar" (syntax-e #'not-a-rule-id))
rule-id-stx)])) rule-id-stx)]))
(define PARSE-RULE-ID
(procedure-rename
(let ([func-p (delay (MAKE-RULE-PARSER RULE-ID))])
(λ args (apply (force func-p) args)))
'PARSE-RULE-ID)) ...
(define (PARSE-RULE-ID-TO-DATUM x)
(syntax->datum (PARSE-RULE-ID x))) ...
;; start-id has to be a value, not an expr, because make-rule-parser is a macro ;; start-id has to be a value, not an expr, because make-rule-parser is a macro
(define PARSE (procedure-rename PARSE-START-ID 'PARSE)) (define PARSE (procedure-rename (MAKE-RULE-PARSER START-ID) 'PARSE))
(define (PARSE-TO-DATUM x) (syntax->datum (PARSE x))) (define (PARSE-TO-DATUM x) (syntax->datum (PARSE x)))
(define PARSE-TREE PARSE-TO-DATUM))))])) (define PARSE-TREE PARSE-TO-DATUM))))]))

@ -1,5 +0,0 @@
#lang brag
top : foo
foo : bar
bar : "x"

@ -19,7 +19,6 @@
"test-simple-arithmetic-grammar.rkt" "test-simple-arithmetic-grammar.rkt"
"test-simple-line-drawing.rkt" "test-simple-line-drawing.rkt"
"test-start-and-atok.rkt" "test-start-and-atok.rkt"
"test-subparser.rkt"
"test-top-level-cut.rkt" "test-top-level-cut.rkt"
"test-weird-grammar.rkt" "test-weird-grammar.rkt"
"test-whitespace.rkt" "test-whitespace.rkt"

@ -1,9 +0,0 @@
#lang racket/base
(require brag/examples/subparser
brag/support
rackunit)
(check-equal? (parse-top-to-datum "x") (parse-to-datum "x"))
(check-equal? (parse-top-to-datum "x") '(top (foo (bar "x"))))
(check-equal? (parse-foo-to-datum "x") '(foo (bar "x")))
(check-equal? (parse-bar-to-datum "x") '(bar "x"))

@ -923,9 +923,7 @@ bindings. The most important of these is @racket[parse]:
@racket[token-source]. The optional @racket[source-path] argument is used to enrich the @racket[token-source]. The optional @racket[source-path] argument is used to enrich the
syntax-location fields. syntax-location fields.
@tt{brag} also exports a function called @racket[parse-rule-id] for each @racket[_rule-id] in the grammar. So a grammar with rules called @tt{top}, @tt{foo}, and @tt{bar} would export @racket[parse-top], @racket[parse-foo], and @racket[parse-bar]. These take the same arguments as @racket[parse], but use the corresponding rule for the initial production, instead of the first rule. The @deftech{token source} can either be a sequence, or a 0-arity function that
The @deftech{token source} can either be a sequence, or a zero-arity function that
produces @tech{tokens}. produces @tech{tokens}.
A @deftech{token} in @tt{brag} can be any of the following values: A @deftech{token} in @tt{brag} can be any of the following values:
@ -976,8 +974,6 @@ Thus, it's only the presence of @tech{rule identifier}s in a rule's
(-> token))]) (-> token))])
list?]{ list?]{
Same as @racket[parse], but the result is converted into a plain datum. Useful for testing or debugging a parser. Same as @racket[parse], but the result is converted into a plain datum. Useful for testing or debugging a parser.
@tt{brag} also exports a function called @racket[parse-rule-id-to-datum] for each @racket[_rule-id] in the grammar. So a grammar with rules called @tt{top}, @tt{foo}, and @tt{bar} would export @racket[parse-top-to-datum], @racket[parse-foo-to-datum], and @racket[parse-bar-to-datum]. These take the same arguments as @racket[parse-to-datum], but use the corresponding rule for the initial production, instead of the first rule.
} }

Loading…
Cancel
Save