Changed syntax/parse module paths to stxparse-info/parse
This commit is contained in:
parent
bf2aafbdeb
commit
02a0d43d0d
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
(begin-for-syntax
|
(begin-for-syntax
|
||||||
(require racket/contract/base
|
(require racket/contract/base
|
||||||
syntax/parse/private/residual-ct)
|
stxparse-info/parse/private/residual-ct)
|
||||||
(provide pattern-expander?
|
(provide pattern-expander?
|
||||||
(contract-out
|
(contract-out
|
||||||
[pattern-expander
|
[pattern-expander
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
racket/list
|
racket/list
|
||||||
racket/pretty
|
racket/pretty
|
||||||
"../parse.rkt"
|
"../parse.rkt"
|
||||||
(except-in syntax/parse/private/residual
|
(except-in stxparse-info/parse/private/residual
|
||||||
prop:pattern-expander syntax-local-syntax-parse-pattern-introduce)
|
prop:pattern-expander syntax-local-syntax-parse-pattern-introduce)
|
||||||
"private/runtime.rkt"
|
"private/runtime.rkt"
|
||||||
"private/runtime-progress.rkt"
|
"private/runtime-progress.rkt"
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require (for-syntax racket/base
|
(require (for-syntax racket/base
|
||||||
syntax/parse
|
stxparse-info/parse
|
||||||
"private/sc.rkt"))
|
"private/sc.rkt"))
|
||||||
(provide define-simple-macro
|
(provide define-simple-macro
|
||||||
define-syntax-parser
|
define-syntax-parser
|
||||||
(for-syntax (all-from-out syntax/parse)))
|
(for-syntax (all-from-out stxparse-info/parse)))
|
||||||
|
|
||||||
(define-syntax (define-simple-macro stx)
|
(define-syntax (define-simple-macro stx)
|
||||||
(syntax-parse stx
|
(syntax-parse stx
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require syntax/parse/pre
|
(require stxparse-info/parse/pre
|
||||||
"provide.rkt"
|
"provide.rkt"
|
||||||
syntax/contract
|
syntax/contract
|
||||||
(only-in syntax/parse/private/residual ;; keep abs. path
|
(only-in stxparse-info/parse/private/residual ;; keep abs. path
|
||||||
this-context-syntax
|
this-context-syntax
|
||||||
this-role)
|
this-role)
|
||||||
racket/contract/base)
|
racket/contract/base)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require syntax/parse/private/minimatch
|
(require stxparse-info/parse/private/minimatch
|
||||||
racket/private/promise
|
racket/private/promise
|
||||||
racket/private/stx) ;; syntax/stx
|
racket/private/stx) ;; syntax/stx
|
||||||
(provide translate)
|
(provide translate)
|
||||||
|
@ -444,7 +444,7 @@ An VarRef is one of
|
||||||
[else
|
[else
|
||||||
(err/not-syntax ctx v0)]))])))
|
(err/not-syntax ctx v0)]))])))
|
||||||
|
|
||||||
;; Note: slightly different from error msg in syntax/parse/private/residual:
|
;; Note: slightly different from error msg in stxparse-info/parse/private/residual:
|
||||||
;; here says "contains" instead of "is bound to", because might be within list
|
;; here says "contains" instead of "is bound to", because might be within list
|
||||||
(define (err/not-syntax ctx v)
|
(define (err/not-syntax ctx v)
|
||||||
(raise-syntax-error #f
|
(raise-syntax-error #f
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
(for-syntax racket/base
|
(for-syntax racket/base
|
||||||
racket/syntax
|
racket/syntax
|
||||||
"../private/minimatch.rkt"
|
"../private/minimatch.rkt"
|
||||||
syntax/parse/pre
|
stxparse-info/parse/pre
|
||||||
syntax/parse/private/residual-ct ;; keep abs. path
|
stxparse-info/parse/private/residual-ct ;; keep abs. path
|
||||||
"../private/kws.rkt"
|
"../private/kws.rkt"
|
||||||
syntax/contract))
|
syntax/contract))
|
||||||
(provide provide-syntax-class/contract
|
(provide provide-syntax-class/contract
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
(require (for-syntax racket/base
|
(require (for-syntax racket/base
|
||||||
racket/lazy-require
|
racket/lazy-require
|
||||||
racket/syntax
|
racket/syntax
|
||||||
syntax/parse/private/residual-ct) ;; keep abs.path
|
stxparse-info/parse/private/residual-ct) ;; keep abs.path
|
||||||
racket/contract/base
|
racket/contract/base
|
||||||
racket/contract/combinator
|
racket/contract/combinator
|
||||||
"../private/minimatch.rkt"
|
"../private/minimatch.rkt"
|
||||||
|
@ -11,12 +11,12 @@
|
||||||
"../private/kws.rkt")
|
"../private/kws.rkt")
|
||||||
(begin-for-syntax
|
(begin-for-syntax
|
||||||
(lazy-require
|
(lazy-require
|
||||||
[syntax/parse/private/rep-data ;; keep abs. path
|
[stxparse-info/parse/private/rep-data ;; keep abs. path
|
||||||
(get-stxclass)]))
|
(get-stxclass)]))
|
||||||
;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
|
;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
|
||||||
;; Without this, dependencies don't get collected.
|
;; Without this, dependencies don't get collected.
|
||||||
(require racket/runtime-path (for-meta 2 '#%kernel))
|
(require racket/runtime-path (for-meta 2 '#%kernel))
|
||||||
(define-runtime-module-path-index _unused_ 'syntax/parse/private/rep-data)
|
(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/rep-data)
|
||||||
|
|
||||||
(define-syntax (reify-syntax-class stx)
|
(define-syntax (reify-syntax-class stx)
|
||||||
(if (eq? (syntax-local-context) 'expression)
|
(if (eq? (syntax-local-context) 'expression)
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require (for-syntax racket/base
|
(require (for-syntax racket/base
|
||||||
syntax/parse
|
stxparse-info/parse
|
||||||
racket/lazy-require
|
racket/lazy-require
|
||||||
"../private/kws.rkt")
|
"../private/kws.rkt")
|
||||||
syntax/parse/private/residual) ;; keep abs. path
|
stxparse-info/parse/private/residual) ;; keep abs. path
|
||||||
(provide define-primitive-splicing-syntax-class)
|
(provide define-primitive-splicing-syntax-class)
|
||||||
|
|
||||||
(begin-for-syntax
|
(begin-for-syntax
|
||||||
(lazy-require
|
(lazy-require
|
||||||
[syntax/parse/private/rep-attrs
|
[stxparse-info/parse/private/rep-attrs
|
||||||
(sort-sattrs)]))
|
(sort-sattrs)]))
|
||||||
;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
|
;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
|
||||||
;; Without this, dependencies don't get collected.
|
;; Without this, dependencies don't get collected.
|
||||||
(require racket/runtime-path (for-meta 2 '#%kernel))
|
(require racket/runtime-path (for-meta 2 '#%kernel))
|
||||||
(define-runtime-module-path-index _unused_ 'syntax/parse/private/rep-attrs)
|
(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/rep-attrs)
|
||||||
|
|
||||||
(define-syntax (define-primitive-splicing-syntax-class stx)
|
(define-syntax (define-primitive-splicing-syntax-class stx)
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
(require (for-syntax racket/base
|
(require (for-syntax racket/base
|
||||||
"dset.rkt"
|
"dset.rkt"
|
||||||
racket/syntax
|
racket/syntax
|
||||||
syntax/parse/private/minimatch
|
stxparse-info/parse/private/minimatch
|
||||||
racket/private/stx ;; syntax/stx
|
racket/private/stx ;; syntax/stx
|
||||||
racket/private/sc
|
racket/private/sc
|
||||||
racket/struct)
|
racket/struct)
|
||||||
syntax/parse/private/residual
|
stxparse-info/parse/private/residual
|
||||||
"private/substitute.rkt")
|
"private/substitute.rkt")
|
||||||
(provide template
|
(provide template
|
||||||
template/loc
|
template/loc
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
"lib.rkt"
|
"lib.rkt"
|
||||||
"kws.rkt"
|
"kws.rkt"
|
||||||
racket/syntax)
|
racket/syntax)
|
||||||
syntax/parse/private/residual-ct ;; keep abs. path
|
stxparse-info/parse/private/residual-ct ;; keep abs. path
|
||||||
syntax/parse/private/residual) ;; keep abs. path
|
stxparse-info/parse/private/residual) ;; keep abs. path
|
||||||
(begin-for-syntax
|
(begin-for-syntax
|
||||||
(lazy-require
|
(lazy-require
|
||||||
[syntax/private/keyword (options-select-value parse-keyword-options)]
|
[syntax/private/keyword (options-select-value parse-keyword-options)]
|
||||||
[syntax/parse/private/rep ;; keep abs. path
|
[stxparse-info/parse/private/rep ;; keep abs. path
|
||||||
(parse-kw-formals
|
(parse-kw-formals
|
||||||
check-conventions-rules
|
check-conventions-rules
|
||||||
check-datum-literals-list
|
check-datum-literals-list
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
|
;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
|
||||||
;; Without this, dependencies don't get collected.
|
;; Without this, dependencies don't get collected.
|
||||||
(require racket/runtime-path racket/syntax (for-meta 2 '#%kernel))
|
(require racket/runtime-path racket/syntax (for-meta 2 '#%kernel))
|
||||||
(define-runtime-module-path-index _unused_ 'syntax/parse/private/rep)
|
(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/rep)
|
||||||
|
|
||||||
(provide define-conventions
|
(provide define-conventions
|
||||||
define-literal-set
|
define-literal-set
|
||||||
|
@ -215,7 +215,7 @@ change between when define-literal-set is compiled and the comparison
|
||||||
involving L. For example:
|
involving L. For example:
|
||||||
|
|
||||||
(module M racket
|
(module M racket
|
||||||
(require syntax/parse)
|
(require stxparse-info/parse)
|
||||||
(define-literal-set LS (lambda))
|
(define-literal-set LS (lambda))
|
||||||
(require (only-in some-other-lang lambda))
|
(require (only-in some-other-lang lambda))
|
||||||
.... LS ....)
|
.... LS ....)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require racket/syntax
|
(require racket/syntax
|
||||||
racket/pretty
|
racket/pretty
|
||||||
syntax/parse/private/residual-ct ;; keep abs. path
|
stxparse-info/parse/private/residual-ct ;; keep abs. path
|
||||||
"minimatch.rkt"
|
"minimatch.rkt"
|
||||||
"rep-patterns.rkt"
|
"rep-patterns.rkt"
|
||||||
"kws.rkt")
|
"kws.rkt")
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
racket/syntax
|
racket/syntax
|
||||||
racket/stxparam
|
racket/stxparam
|
||||||
syntax/stx
|
syntax/stx
|
||||||
syntax/parse/private/residual ;; keep abs. path
|
stxparse-info/parse/private/residual ;; keep abs. path
|
||||||
syntax/parse/private/runtime ;; keep abs.path
|
stxparse-info/parse/private/runtime ;; keep abs.path
|
||||||
syntax/parse/private/runtime-reflect) ;; keep abs. path
|
stxparse-info/parse/private/runtime-reflect) ;; keep abs. path
|
||||||
|
|
||||||
;; ============================================================
|
;; ============================================================
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require syntax/parse/private/residual-ct ;; keep abs. path
|
(require stxparse-info/parse/private/residual-ct ;; keep abs. path
|
||||||
racket/contract/base
|
racket/contract/base
|
||||||
syntax/private/id-table
|
syntax/private/id-table
|
||||||
racket/syntax
|
racket/syntax
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
racket/dict
|
racket/dict
|
||||||
syntax/private/id-table
|
syntax/private/id-table
|
||||||
racket/syntax
|
racket/syntax
|
||||||
syntax/parse/private/residual-ct ;; keep abs. path
|
stxparse-info/parse/private/residual-ct ;; keep abs. path
|
||||||
"minimatch.rkt"
|
"minimatch.rkt"
|
||||||
"kws.rkt")
|
"kws.rkt")
|
||||||
;; from residual.rkt
|
;; from residual.rkt
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require syntax/parse/private/residual-ct ;; keep abs. path
|
(require stxparse-info/parse/private/residual-ct ;; keep abs. path
|
||||||
"rep-attrs.rkt"
|
"rep-attrs.rkt"
|
||||||
"minimatch.rkt"
|
"minimatch.rkt"
|
||||||
racket/syntax)
|
racket/syntax)
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require (for-template racket/base
|
(require (for-template racket/base
|
||||||
syntax/parse/private/keywords
|
stxparse-info/parse/private/keywords
|
||||||
syntax/parse/private/residual ;; keep abs. path
|
stxparse-info/parse/private/residual ;; keep abs. path
|
||||||
syntax/parse/private/runtime)
|
stxparse-info/parse/private/runtime)
|
||||||
racket/list
|
racket/list
|
||||||
racket/contract/base
|
racket/contract/base
|
||||||
"make.rkt"
|
"make.rkt"
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
"rep-attrs.rkt"
|
"rep-attrs.rkt"
|
||||||
"rep-data.rkt"
|
"rep-data.rkt"
|
||||||
"rep-patterns.rkt"
|
"rep-patterns.rkt"
|
||||||
syntax/parse/private/residual-ct ;; keep abs. path
|
stxparse-info/parse/private/residual-ct ;; keep abs. path
|
||||||
"kws.rkt")
|
"kws.rkt")
|
||||||
|
|
||||||
;; Error reporting
|
;; Error reporting
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
;; Compile-time
|
;; Compile-time
|
||||||
|
|
||||||
(require (for-syntax racket/private/sc
|
(require (for-syntax racket/private/sc
|
||||||
syntax/parse/private/residual-ct))
|
stxparse-info/parse/private/residual-ct))
|
||||||
(provide (for-syntax (all-from-out syntax/parse/private/residual-ct)))
|
(provide (for-syntax (all-from-out stxparse-info/parse/private/residual-ct)))
|
||||||
|
|
||||||
(begin-for-syntax
|
(begin-for-syntax
|
||||||
;; == from runtime.rkt
|
;; == from runtime.rkt
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require syntax/parse/private/residual ;; keep abs. path
|
(require stxparse-info/parse/private/residual ;; keep abs. path
|
||||||
(only-in syntax/parse/private/residual-ct ;; keep abs. path
|
(only-in stxparse-info/parse/private/residual-ct ;; keep abs. path
|
||||||
attr-name attr-depth)
|
attr-name attr-depth)
|
||||||
"kws.rkt")
|
"kws.rkt")
|
||||||
(provide reflect-parser
|
(provide reflect-parser
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
racket/struct
|
racket/struct
|
||||||
syntax/srcloc
|
syntax/srcloc
|
||||||
"minimatch.rkt"
|
"minimatch.rkt"
|
||||||
syntax/parse/private/residual
|
stxparse-info/parse/private/residual
|
||||||
"kws.rkt")
|
"kws.rkt")
|
||||||
(provide call-current-failure-handler
|
(provide call-current-failure-handler
|
||||||
current-failure-handler
|
current-failure-handler
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#lang racket/base
|
#lang racket/base
|
||||||
(require racket/stxparam
|
(require racket/stxparam
|
||||||
syntax/parse/private/residual ;; keep abs. path
|
stxparse-info/parse/private/residual ;; keep abs. path
|
||||||
(for-syntax racket/base
|
(for-syntax racket/base
|
||||||
racket/list
|
racket/list
|
||||||
syntax/kerncase
|
syntax/kerncase
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
;; 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
|
||||||
;; (so for consistency etc, require absolutely from all modules)
|
;; (so for consistency etc, require absolutely from all modules)
|
||||||
(require syntax/parse/private/residual
|
(require stxparse-info/parse/private/residual
|
||||||
racket/syntax
|
racket/syntax
|
||||||
racket/stxparam
|
racket/stxparam
|
||||||
syntax/stx)
|
syntax/stx)
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
;; load macro transformers lazily via identifier
|
;; load macro transformers lazily via identifier
|
||||||
;; This module path must also be absolute (not sure why,
|
;; This module path must also be absolute (not sure why,
|
||||||
;; but it definitely breaks on relative module path).
|
;; but it definitely breaks on relative module path).
|
||||||
[syntax/parse/private/parse-aux
|
[stxparse-info/parse/private/parse-aux
|
||||||
(id:define-syntax-class
|
(id:define-syntax-class
|
||||||
id:define-splicing-syntax-class
|
id:define-splicing-syntax-class
|
||||||
id:define-integrable-syntax-class
|
id:define-integrable-syntax-class
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
|
;; FIXME: workaround for phase>0 bug in racket/runtime-path (and thus lazy-require)
|
||||||
;; Without this, dependencies don't get collected.
|
;; Without this, dependencies don't get collected.
|
||||||
(require racket/runtime-path (for-meta 2 '#%kernel))
|
(require racket/runtime-path (for-meta 2 '#%kernel))
|
||||||
(define-runtime-module-path-index _unused_ 'syntax/parse/private/parse-aux)
|
(define-runtime-module-path-index _unused_ 'stxparse-info/parse/private/parse-aux)
|
||||||
|
|
||||||
(provide define-syntax-class
|
(provide define-syntax-class
|
||||||
define-splicing-syntax-class
|
define-splicing-syntax-class
|
||||||
|
|
Loading…
Reference in New Issue
Block a user