Removed parse/private/keywords.rkt, to improve compatibility with the official syntax/parse (that file defines ~optional etc.)

This commit is contained in:
Georges Dupéron 2017-01-26 17:50:10 +01:00
parent bff27464a9
commit c259afbe61
8 changed files with 9 additions and 48 deletions

View File

@ -3,7 +3,8 @@
(define deps '(("base" #:version "6.7.0.900") (define deps '(("base" #:version "6.7.0.900")
"rackunit-lib" "rackunit-lib"
;; Because scribble/example is not available on v6.3: ;; Because scribble/example is not available on v6.3:
"version-case")) "version-case"
"subtemplate")) ;; for the documentation only
(define build-deps '("scribble-lib" "racket-doc")) (define build-deps '("scribble-lib" "racket-doc"))
(define scribblings '(("scribblings/stxparse-info.scrbl" ()))) (define scribblings '(("scribblings/stxparse-info.scrbl" ())))
(define pkg-desc "Description Here") (define pkg-desc "Description Here")

View File

@ -1,5 +1,5 @@
#lang racket/base #lang racket/base
(require "../private/sc.rkt" (require "../private/sc.rkt"
"../private/keywords.rkt") syntax/parse/private/keywords)
(provide ~eh-var (provide ~eh-var
define-eh-alternative-set) define-eh-alternative-set)

View File

@ -6,7 +6,7 @@
racket/contract/base racket/contract/base
racket/contract/combinator racket/contract/combinator
syntax/parse/private/minimatch syntax/parse/private/minimatch
"../private/keywords.rkt" syntax/parse/private/keywords
"../private/runtime-reflect.rkt" "../private/runtime-reflect.rkt"
syntax/parse/private/kws) syntax/parse/private/kws)
(begin-for-syntax (begin-for-syntax

View File

@ -1,40 +0,0 @@
#lang racket/base
(require (for-syntax racket/base))
;; == Keywords
(define-for-syntax (bad-keyword-use stx)
(raise-syntax-error #f "keyword used out of context" stx))
(define-syntax-rule (define-keyword name)
(begin
(provide name)
(define-syntax name bad-keyword-use)))
(define-keyword pattern)
(define-keyword ~var)
(define-keyword ~datum)
(define-keyword ~literal)
(define-keyword ~and)
(define-keyword ~or)
(define-keyword ~not)
(define-keyword ~seq)
(define-keyword ~between)
(define-keyword ~once)
(define-keyword ~optional)
(define-keyword ~rest)
(define-keyword ~describe)
(define-keyword ~!)
(define-keyword ~bind)
(define-keyword ~fail)
(define-keyword ~parse)
(define-keyword ~do)
(define-keyword ...+)
(define-keyword ~delimit-cut)
(define-keyword ~commit)
(define-keyword ~reflect)
(define-keyword ~splicing-reflect)
(define-keyword ~post)
(define-keyword ~eh-var)
(define-keyword ~peek)
(define-keyword ~peek-not)

View File

@ -1,6 +1,6 @@
#lang racket/base #lang racket/base
(require "sc.rkt" (require "sc.rkt"
"keywords.rkt" syntax/parse/private/keywords
(for-syntax racket/base)) (for-syntax racket/base))
(provide identifier (provide identifier

View File

@ -12,7 +12,7 @@
syntax/parse/private/kws syntax/parse/private/kws
"opt.rkt" "opt.rkt"
"txlift.rkt") "txlift.rkt")
"keywords.rkt" syntax/parse/private/keywords
racket/syntax racket/syntax
racket/stxparam racket/stxparam
syntax/stx syntax/stx

View File

@ -1,6 +1,6 @@
#lang racket/base #lang racket/base
(require (for-template racket/base (require (for-template racket/base
stxparse-info/parse/private/keywords syntax/parse/private/keywords
stxparse-info/parse/private/residual ;; keep abs. path stxparse-info/parse/private/residual ;; keep abs. path
stxparse-info/parse/private/runtime) stxparse-info/parse/private/runtime)
racket/list racket/list

View File

@ -1,7 +1,7 @@
#lang racket/base #lang racket/base
(require (for-syntax racket/base (require (for-syntax racket/base
racket/lazy-require) racket/lazy-require)
"keywords.rkt") syntax/parse/private/keywords)
;; keep and keep as abs. path -- lazy-loaded macros produce references to this ;; keep and keep as abs. path -- lazy-loaded macros produce references to this
;; must be required via *absolute module path* from any disappearing module ;; must be required via *absolute module path* from any disappearing module
@ -38,7 +38,7 @@
syntax-parser syntax-parser
define/syntax-parse define/syntax-parse
(except-out (all-from-out "keywords.rkt") (except-out (all-from-out syntax/parse/private/keywords)
~reflect ~reflect
~splicing-reflect ~splicing-reflect
~eh-var) ~eh-var)