diff --git a/collects/unstable/planet-syntax.rkt b/collects/unstable/planet-syntax.rkt deleted file mode 100644 index fb65cbcb16..0000000000 --- a/collects/unstable/planet-syntax.rkt +++ /dev/null @@ -1,11 +0,0 @@ -#lang racket/base - -(provide (rename-out [make-planet-require-spec make-planet-path]) - syntax-source-planet-package - syntax-source-planet-package-owner - syntax-source-planet-package-name - syntax-source-planet-package-major - syntax-source-planet-package-minor - syntax-source-planet-package-symbol) - -(require planet/util planet/syntax) diff --git a/collects/unstable/planet.rkt b/collects/unstable/planet.rkt deleted file mode 100644 index 76851cb74a..0000000000 --- a/collects/unstable/planet.rkt +++ /dev/null @@ -1,17 +0,0 @@ -#lang racket/base - -(require (for-syntax racket/base unstable/planet-syntax) - planet/version - unstable/planet-syntax - unstable/require) - -(provide this-package-version-symbol - this-package-in - define-planet-package - make-planet-path - syntax-source-planet-package - syntax-source-planet-package-owner - syntax-source-planet-package-name - syntax-source-planet-package-major - syntax-source-planet-package-minor - syntax-source-planet-package-symbol) diff --git a/collects/unstable/require.rkt b/collects/unstable/require.rkt index 540a4a6611..2b54e64eaf 100644 --- a/collects/unstable/require.rkt +++ b/collects/unstable/require.rkt @@ -5,7 +5,7 @@ racket/require-transform racket/provide-transform syntax/parse - unstable/planet-syntax) + planet/syntax) planet/version unstable/define) @@ -48,7 +48,7 @@ (expand-export (datum->syntax stx - (list #'all-from-out (make-planet-path stx #'file))) + (list #'all-from-out (make-planet-require-spec stx #'file))) modes)])))) (define-for-syntax (import->export i) diff --git a/collects/unstable/scribble.rkt b/collects/unstable/scribble.rkt deleted file mode 100644 index bdf8901639..0000000000 --- a/collects/unstable/scribble.rkt +++ /dev/null @@ -1,72 +0,0 @@ -#lang racket/base - -(require scribble/manual unstable/sandbox unstable/planet - (for-syntax racket/base unstable/planet-syntax)) - -(define-for-syntax (make-planet-paths stx ids) - (map (lambda (id) (make-planet-path stx id)) (syntax->list ids))) - -(define-syntax (defmodule/this-package stx) - - (define (make-defmodule opt-name locals others) - (quasisyntax/loc stx - (defmodule - #,(make-planet-path stx opt-name) - #:use-sources - [#,@(make-planet-paths stx locals) #,@others]))) - - (syntax-case stx () - [(_) (make-defmodule #f #'() #'())] - [(_ name) (make-defmodule #'name #'() #'())] - [(_ #:use-sources [local ...] [other ...]) - (make-defmodule #f #'(local ...) #'(other ...))] - [(_ name #:use-sources [local ...] [other ...]) - (make-defmodule #'name #'(local ...) #'(other ...))])) - -(define-syntax (defmodule*/no-declare/this-package stx) - - (define (make-defmodule*/no-declare local-mods other-mods) - (quasisyntax/loc stx - (defmodule*/no-declare - [#,@(make-planet-paths stx local-mods) #,@other-mods]))) - - (syntax-case stx () - [(_ [local-mod ...] [other-mod ...]) - (make-defmodule*/no-declare #'(local-mod ...) #'(other-mod ...))])) - -(define-syntax (declare-exporting/this-package stx) - - (define (make-declare-exporting local-mods other-mods local-srcs other-srcs) - (quasisyntax/loc stx - (declare-exporting - #,@(make-planet-paths stx local-mods) #,@other-mods - #:use-sources - [#,@(make-planet-paths stx local-srcs) #,@other-srcs]))) - - (syntax-case stx () - [(_ [local-mod ...] [other-mod ...]) - (make-declare-exporting #'(local-mod ...) #'(other-mod ...) #'() #'())] - [(_ [local-mod ...] [other-mod ...] - #:use-sources - [local-src ...] [other-src ...]) - (make-declare-exporting #'(local-mod ...) #'(other-mod ...) - #'(local-src ...) #'(other-src ...))])) - -(define-syntax (schememodname/this-package stx) - - (define (make-schememodname id/f) - (quasisyntax/loc stx - (schememodname #,(make-planet-path stx id/f)))) - - (syntax-case stx () - [(_) (make-schememodname #f)] - [(_ path) (make-schememodname #'path)])) - -(provide defmodule/this-package - defmodule*/no-declare/this-package - schememodname/this-package - declare-exporting/this-package - this-package-version-symbol - this-package-in - make-scribble-evaluator - make-scribble-module-evaluator) diff --git a/collects/unstable/scribblings/planet-syntax.scrbl b/collects/unstable/scribblings/planet-syntax.scrbl deleted file mode 100644 index 635245a443..0000000000 --- a/collects/unstable/scribblings/planet-syntax.scrbl +++ /dev/null @@ -1,68 +0,0 @@ -#lang scribble/manual -@(require scribble/eval "utils.rkt" (for-label racket unstable/planet-syntax)) - -@title{Planet Package Macros} - -@defmodule[unstable/planet-syntax] - -@unstable[@author+email["Carl Eastlund" "cce@racket-lang.org"]] - -@deftogether[( -@defproc[(syntax-source-planet-package [stx syntax?]) - (or/c (list/c string? - string? - exact-nonnegative-integer? - exact-nonnegative-integer?) - #f)] -@defproc[(syntax-source-planet-package-owner [stx syntax?]) (or/c string? #f)] -@defproc[(syntax-source-planet-package-name [stx syntax?]) (or/c string? #f)] -@defproc[(syntax-source-planet-package-major [stx syntax?]) - (or/c exact-nonnegative-integer? #f)] -@defproc[(syntax-source-planet-package-minor [stx syntax?]) - (or/c exact-nonnegative-integer? #f)] -@defproc[(syntax-source-planet-package-symbol - [stx syntax?] - [text (or/c text? #f) #f]) - (or/c symbol? #f)] -)]{ - -These functions extract the planet package with which @scheme[stx] is -associated, if any, based on its source location information and the currently -installed set of planet packages. They produce, respectively, the planet -package s-expression, its owner, name, major version number, minor version -number, or a symbol corresponding to a @scheme[planet] module path. They each -produce @scheme[#f] if @scheme[stx] is not associated with a planet package. - -@defexamples[ -#:eval (eval/require 'unstable/planet-syntax) -(define loc - (list (build-path (current-directory) "file.ss") - #f #f #f #f)) -(define stx (datum->syntax #f 'stx loc)) -(syntax-source-planet-package stx) -(syntax-source-planet-package-owner stx) -(syntax-source-planet-package-name stx) -(syntax-source-planet-package-major stx) -(syntax-source-planet-package-minor stx) -(syntax-source-planet-package-symbol stx) -(syntax-source-planet-package-symbol stx "there") -] - -} - -@defproc[(make-planet-path [stx syntax?] [id (or/c identifier? #f)]) syntax?]{ - -Constructs a syntax object representing a require spec for the planet package -from which @scheme[stx] arises, with suffix @scheme[id] (if any). - -@defexamples[ -#:eval (eval/require 'unstable/planet-syntax) -(define loc - (list (build-path (current-directory) "file.ss") - #f #f #f #f)) -(define stx (datum->syntax #f 'stx loc)) -(make-planet-path stx #f) -(make-planet-path stx #'there) -] - -} diff --git a/collects/unstable/scribblings/planet.scrbl b/collects/unstable/scribblings/planet.scrbl deleted file mode 100644 index ea2187a39c..0000000000 --- a/collects/unstable/scribblings/planet.scrbl +++ /dev/null @@ -1,37 +0,0 @@ -#lang scribble/manual -@(require scribble/eval - scribble/bnf - "utils.rkt" - (for-label racket/base - scribble/manual - unstable/planet - (except-in planet/util - this-package-version-symbol))) - -@title[#:style 'quiet #:tag "cce-planet"]{@|PLaneT| Packages} - -@defmodule[unstable/planet] - -This module provides tools relating to @|PLaneT| packages. In addition to the -binding described below, it provides @scheme[define-planet-package] and -@scheme[this-package-in] from @schememodname[unstable/require], and -@scheme[make-planet-path], @scheme[syntax-source-planet-package], -@scheme[syntax-source-planet-package-owner], -@scheme[syntax-source-planet-package-name], -@scheme[syntax-source-planet-package-major], -@scheme[syntax-source-planet-package-minor], and -@scheme[syntax-source-planet-package-symbol] from -@schememodname[unstable/planet-syntax]. - -@defform*[[ -(this-package-version-symbol) -(this-package-version-symbol path) -]]{ - -Produces a symbol corresponding to a @scheme[planet] module path for the current -planet package, possibly with a @nonterm{path} (from the grammar of -@scheme[planet] module specs) into the package. This is similar to -@scheme[this-package-version] and similar tools from -@schememodname[planet/util]. - -} diff --git a/collects/unstable/scribblings/scribble.scrbl b/collects/unstable/scribblings/scribble.scrbl deleted file mode 100644 index 97c4ebbb45..0000000000 --- a/collects/unstable/scribblings/scribble.scrbl +++ /dev/null @@ -1,76 +0,0 @@ -#lang scribble/manual -@(require scribble/eval - scribble/bnf - "utils.rkt" - (for-label racket/base scribble/manual unstable/scribble)) - -@title{Scribble Documentation} - -@defmodule[unstable/scribble] - -This module provides tools for Scribble documentation; specifically, of -@|PLaneT| packages. In addition to the bindings described below, this module -provides @scheme[this-package-version-symbol] from -@schememodname[unstable/planet], @scheme[this-package-in] from -@schememodname[unstable/require], and -@scheme[make-scribble-evaluator] and @scheme[make-scribble-module-evaluator] -from @schememodname[unstable/sandbox]. - -@defform*[[ -(defmodule/this-package) -(defmodule/this-package #:use-sources [src-path ...] [src ...]) -(defmodule/this-package path) -(defmodule/this-package path #:use-sources [src-path ...] [src ...]) -]]{ - -This Scribble form corresponds to @scheme[defmodule] within a planet package. -The displayed module path is a @scheme[planet] module path to the current planet -package, possibly with a @nonterm{path} (from the grammar of @scheme[planet] -module specs) into the package. If the @scheme[#:use-sources] option is -present, each @scheme[src-path] is similarly treated as a path into the current -planet package, while each @scheme[src] is treated normally. Both sets of paths -are concatenated and passed to the normal @scheme[defmodule]. - -} - -@defform*[[ -(defmodule*/no-declare/this-package [src-path ...] [src ...]) -]]{ - -This Scribble form corresponds to @scheme[defmodule*/no-declare] within a planet -package. The displayed module paths are @scheme[planet] module paths to the -current planet package, possibly with @nonterm{path}s (from the grammar of -@scheme[planet] module specs) into the package. Each @scheme[src-path] is -similarly treated as a path into the current planet package, while each -@scheme[src] is treated normally. Both sets of paths are concatenated and -passed to the normal @scheme[defmodule*/no-declare]. - -} - -@defform*[[ -(schememodname/this-package) -(schememodname/this-package path) -]]{ - -This Scribble form corresponds to @scheme[schememodname] much like -@scheme[defmodule/this-package] above corresponds to @scheme[defmodule]. The -@scheme[path], if present, is treated as a @nonterm{path} (from the grammar of -@scheme[planet] module specs) into the current planet package, and converted -into a @scheme[planet] module spec. - -} - -@defform*[[ -(declare-exporting/this-package [mod-path ...] [mod ...]) -(declare-exporting/this-package [mod-path ...] [mod ...] - #:use-sources [src-path ...] [src ...]) -]]{ - -This Scribble form corresponds to @scheme[declare-exporting] much like -@scheme[defmodule/this-package] above corresponds to @scheme[defmodule]. Each -@scheme[mod-path] and @scheme[src-path] is treated as a @nonterm{path} (from the -grammar of @scheme[planet] module specs) into the current package. They are -concatenated with the lists of @scheme[mod]s and @scheme[src]s, respectively, -and passed to the normal @scheme[declare-exporting]. - -} diff --git a/collects/unstable/scribblings/unstable.scrbl b/collects/unstable/scribblings/unstable.scrbl index fb168bb258..b8f49297fa 100644 --- a/collects/unstable/scribblings/unstable.scrbl +++ b/collects/unstable/scribblings/unstable.scrbl @@ -83,20 +83,17 @@ Keep documentation and tests up to date. @include-section["list.scrbl"] @include-section["net.scrbl"] @include-section["path.scrbl"] -@include-section["planet.scrbl"] @include-section["port.scrbl"] @include-section["pretty.scrbl"] @include-section["regexp.scrbl"] @include-section["require.scrbl"] @include-section["sandbox.scrbl"] -@include-section["scribble.scrbl"] @include-section["set.scrbl"] @include-section["sexp-diff.scrbl"] @include-section["srcloc.scrbl"] @include-section["string.scrbl"] @include-section["struct.scrbl"] @include-section["syntax.scrbl"] -@include-section["planet-syntax.scrbl"] @include-section["text.scrbl"] @include-section["values.scrbl"] @include-section["web.scrbl"]