commit 22053c0e0b8592e6f73ead6459aab632b351a40c
parent ea44edde13f41943bbf11de4fb7bc31f7cc791de
Author: Georges Dupéron <georges.duperon@gmail.com>
Date: Mon, 23 Jan 2017 19:42:00 +0100
Changed syntax-case module paths to point back to racket/private/… for files which were not copied.
Diffstat:
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/case/stxcase-scheme.rkt b/case/stxcase-scheme.rkt
@@ -4,9 +4,11 @@
;; check-duplicate-identifier, and assembles everything we have so far
(module stxcase-scheme '#%kernel
- (#%require "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" "stxloc.rkt"
- (for-syntax '#%kernel "small-scheme.rkt" "stx.rkt" "stxcase.rkt"
- "stxloc.rkt"))
+ (#%require racket/private/small-scheme racket/private/stx "stxcase.rkt"
+ "with-stx.rkt" racket/private/stxloc
+ (for-syntax '#%kernel racket/private/small-scheme
+ racket/private/stx "stxcase.rkt"
+ racket/private/stxloc))
(-define (check-duplicate-identifier names)
(unless (and (list? names) (andmap identifier? names))
@@ -68,7 +70,8 @@
(syntax-arm stx #f #t)
(raise-argument-error 'syntax-protect "syntax?" stx)))
- (#%provide syntax datum (all-from "with-stx.rkt") (all-from "stxloc.rkt")
+ (#%provide syntax datum (all-from "with-stx.rkt")
+ (all-from racket/private/stxloc)
check-duplicate-identifier syntax-protect
syntax-rules syntax-id-rules
(for-syntax syntax-pattern-variable?)))
diff --git a/case/stxcase.rkt b/case/stxcase.rkt
@@ -2,10 +2,10 @@
;; syntax-case and syntax
(module stxcase '#%kernel
- (#%require "stx.rkt" "small-scheme.rkt" '#%paramz '#%unsafe
- "ellipses.rkt"
- (for-syntax "stx.rkt" "small-scheme.rkt"
- "member.rkt" "sc.rkt" '#%kernel))
+ (#%require racket/private/stx racket/private/small-scheme '#%paramz '#%unsafe
+ racket/private/ellipses
+ (for-syntax racket/private/stx racket/private/small-scheme
+ racket/private/member racket/private/sc '#%kernel))
(-define (datum->syntax/shape orig datum)
(if (syntax? datum)
@@ -600,5 +600,5 @@
(-define-syntax syntax (lambda (stx) (gen-template stx #f)))
(-define-syntax datum (lambda (stx) (gen-template stx #t)))
- (#%provide (all-from "ellipses.rkt") syntax-case** syntax datum
+ (#%provide (all-from racket/private/ellipses) syntax-case** syntax datum
(for-syntax syntax-pattern-variable?)))
diff --git a/case/stxloc.rkt b/case/stxloc.rkt
@@ -3,8 +3,8 @@
;; syntax/loc
(module stxloc '#%kernel
- (#%require "qq-and-or.rkt" "stxcase.rkt" "define-et-al.rkt"
- (for-syntax '#%kernel "stxcase.rkt" "sc.rkt"))
+ (#%require racket/private/qq-and-or "stxcase.rkt" racket/private/define-et-al
+ (for-syntax '#%kernel "stxcase.rkt" racket/private/sc))
(begin-for-syntax
(define-values (transform-to-syntax-case**)
diff --git a/case/syntax.rkt b/case/syntax.rkt
@@ -1,5 +1,6 @@
#lang racket/base
-(require (for-syntax racket/base
+(require (only-in "stxloc.rkt" syntax-case)
+ (for-syntax racket/base
racket/private/sc))
(provide define/with-syntax
diff --git a/case/with-stx.rkt b/case/with-stx.rkt
@@ -2,9 +2,10 @@
;; with-syntax, generate-temporaries
(module with-stx '#%kernel
- (#%require "stx.rkt" "small-scheme.rkt" "stxcase.rkt"
- (for-syntax '#%kernel "stx.rkt" "stxcase.rkt" "stxloc.rkt"
- "sc.rkt" "qq-and-or.rkt" "cond.rkt"))
+ (#%require racket/private/stx racket/private/small-scheme "stxcase.rkt"
+ (for-syntax '#%kernel racket/private/stx "stxcase.rkt"
+ racket/private/stxloc racket/private/sc
+ racket/private/qq-and-or racket/private/cond))
(-define (with-syntax-fail stx)
(raise-syntax-error