syntax/parse: fixed conventions and literal-sets

svn: r17345
This commit is contained in:
Ryan Culpepper 2009-12-17 22:35:25 +00:00
parent 36083a71ab
commit f0b09a0842
3 changed files with 5 additions and 8 deletions

View File

@ -118,9 +118,6 @@
(define-syntax kernel-literals (define-syntax kernel-literals
(make-literalset (make-literalset
(list* (quote-syntax module) (list* (list '#%plain-module-begin (quote-syntax #%plain-module-begin))
(quote-syntax #%plain-module-begin)
(quote-syntax #%require)
(quote-syntax #%provide)
(for/list ([id (kernel-form-identifier-list)]) (for/list ([id (kernel-form-identifier-list)])
(list (syntax-e id) id))))) (list (syntax-e id) id)))))

View File

@ -40,7 +40,7 @@
|# |#
[create-aux-def [create-aux-def
(-> list? ;; DeclEntry (-> list? ;; DeclEntry
(values identifier? identifier? (listof sattr?) (listof syntax?)))] (values identifier? identifier? (listof sattr?) (listof syntax?) boolean?))]
[check-literals-list [check-literals-list
(-> syntax? syntax? (-> syntax? syntax?
(listof (list/c identifier? identifier?)))] (listof (list/c identifier? identifier?)))]
@ -202,7 +202,7 @@
(values (declenv-put-parser decls k parser description attrs splicing?) (values (declenv-put-parser decls k parser description attrs splicing?)
(append new-defs defs))))) (append new-defs defs)))))
;; create-aux-def : DeclEntry -> (values id id (listof SAttr) (listof stx)) ;; create-aux-def : DeclEntry -> (values id id (listof SAttr) (listof stx) boolean)
(define (create-aux-def entry) (define (create-aux-def entry)
(let ([sc-name (caddr entry)] (let ([sc-name (caddr entry)]
[args (cadddr entry)]) [args (cadddr entry)])

View File

@ -95,10 +95,10 @@
(let ([rx (car line)] (let ([rx (car line)]
[sc (car (cadr line))] [sc (car (cadr line))]
[args (cadr (cadr line))]) [args (cadr (cadr line))])
(let-values ([(parser description attrs defs) (let-values ([(parser description attrs defs splicing?)
(create-aux-def (list 'stxclass rx sc args))]) (create-aux-def (list 'stxclass rx sc args))])
(list #`(list (quote #,rx) (list #`(list (quote #,rx)
(list 'parser (list (quote #,(if splicing? 'splicing-parser 'parser))
(quote-syntax #,parser) (quote-syntax #,parser)
(quote-syntax #,description) (quote-syntax #,description)
(quote #,attrs))) (quote #,attrs)))