From f0b09a084213f90684b2c3313dfd8b8ddb5af91e Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Thu, 17 Dec 2009 22:35:25 +0000 Subject: [PATCH] syntax/parse: fixed conventions and literal-sets svn: r17345 --- collects/syntax/private/stxparse/lib.ss | 5 +---- collects/syntax/private/stxparse/rep.ss | 4 ++-- collects/syntax/private/stxparse/sc.ss | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/collects/syntax/private/stxparse/lib.ss b/collects/syntax/private/stxparse/lib.ss index 0bf49c2b4a..ac911fd58d 100644 --- a/collects/syntax/private/stxparse/lib.ss +++ b/collects/syntax/private/stxparse/lib.ss @@ -118,9 +118,6 @@ (define-syntax kernel-literals (make-literalset - (list* (quote-syntax module) - (quote-syntax #%plain-module-begin) - (quote-syntax #%require) - (quote-syntax #%provide) + (list* (list '#%plain-module-begin (quote-syntax #%plain-module-begin)) (for/list ([id (kernel-form-identifier-list)]) (list (syntax-e id) id))))) diff --git a/collects/syntax/private/stxparse/rep.ss b/collects/syntax/private/stxparse/rep.ss index a907511461..e5d993b059 100644 --- a/collects/syntax/private/stxparse/rep.ss +++ b/collects/syntax/private/stxparse/rep.ss @@ -40,7 +40,7 @@ |# [create-aux-def (-> list? ;; DeclEntry - (values identifier? identifier? (listof sattr?) (listof syntax?)))] + (values identifier? identifier? (listof sattr?) (listof syntax?) boolean?))] [check-literals-list (-> syntax? syntax? (listof (list/c identifier? identifier?)))] @@ -202,7 +202,7 @@ (values (declenv-put-parser decls k parser description attrs splicing?) (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) (let ([sc-name (caddr entry)] [args (cadddr entry)]) diff --git a/collects/syntax/private/stxparse/sc.ss b/collects/syntax/private/stxparse/sc.ss index 5753da49b6..e449d5e1c6 100644 --- a/collects/syntax/private/stxparse/sc.ss +++ b/collects/syntax/private/stxparse/sc.ss @@ -95,10 +95,10 @@ (let ([rx (car line)] [sc (car (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))]) (list #`(list (quote #,rx) - (list 'parser + (list (quote #,(if splicing? 'splicing-parser 'parser)) (quote-syntax #,parser) (quote-syntax #,description) (quote #,attrs)))