removing the other planet requires

whalesong/examples/whale.rkt

@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/world)
+(require whalesong/world
-         (planet dyoo/whalesong/image))
+         whalesong/image)
 
 (define-struct world (x direction))
 

whalesong/examples/window-size.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/js))
+(require whalesong/js)
 
 (when (in-javascript-context?)
   (viewport-width))

whalesong/expand-out-images.rkt

@@ -12,7 +12,7 @@
 ;; my-image-url: (parameterof stx)
 ;;
 ;; During the dynamic extent of expand-out-images, this will be defined
-;; as the unique name for the image-url function in (planet dyoo/whalesong/image).
+;; as the unique name for the image-url function in whalesong/image.
 (define-runtime-path whalesong/image
   "image.rkt")
 (define my-image-url (make-parameter #f))
@@ -208,4 +208,4 @@
        (define-values-for-syntax ids #,(on-expr #'expr)))]
     
     [else
-     (on-expr stx)]))
+     (on-expr stx)]))

whalesong/js-assembler/check-valid-module-source.rkt

@@ -55,7 +55,7 @@
   ;; Does it look like something out of moby or js-vm?  Abort early, because if we don't do
   ;; this up front, Racket will try to install the deprecated module, and that's bad.
   (when (looks-like-old-moby-or-js-vm? module-source-path)
-    (fprintf (current-report-port) "ERROR: The program in ~e appears to be written using the deprecated project js-vm or Moby.\n\nPlease change the lang line to:\n\n    #lang planet dyoo/whalesong\n\ninstead.\n"
+    (fprintf (current-report-port) "ERROR: The program in ~e appears to be written using the deprecated project js-vm or Moby.\n\nPlease change the lang line to:\n\n    #lang whalesong\n\ninstead.\n"
             module-source-path)
     (abort-abort))
     
@@ -132,4 +132,4 @@
                     (path-only module-source-path)]
                    [current-directory
                     (path-only module-source-path)])
-      (compile stx))))
+      (compile stx))))

whalesong/js-assembler/module-knowledge.rkt

@@ -2,12 +2,14 @@
 
 ;; Provides a mapping of the core bindings in kernel, so that we know statically
 ;; if something is implemented as a primitive or a closure.
-(require planet/util)
+(require syntax/modresolve)
+
+(provide bound-procedure-names)
 
 
 (define ns (make-base-empty-namespace))
 (define bound-procedure-names
-  (let ([path (resolve-planet-path `(planet ,(this-package-version-symbol lang/kernel)))])
+  (let ([path (resolve-module-path 'whalesong/lang/kernel #f)])
     (parameterize ([current-namespace ns])
       (namespace-require path)
       (for/list ([name (namespace-mapped-symbols)]

whalesong/js/world/test-geo.rkt

@@ -1,9 +1,9 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
          "geo.rkt")
 
 
 (big-bang (list 'undefined 'undefined)
           (on-geo (lambda (w v lat lng)
-                    (list lat lng))))
+                    (list lat lng))))

whalesong/js/world/test.rkt

@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/js/world)
+(require whalesong/js/world
-         (planet dyoo/whalesong/js)
+         whalesong/js
-         (planet dyoo/whalesong/web-world))
+         whalesong/web-world)
 
 ;; Test of getting world events from arbitrary JavaScript function application.
 

whalesong/korean/lang/reader.rkt

@@ -1,5 +1,2 @@
 #lang s-exp syntax/module-reader
-#:language (lambda ()
+#:language (lambda () 'whalesong/lang/korean)
-             `(planet ,(this-package-version-symbol lang/korean)))
-
-(require planet/version)

whalesong/sandbox/cloth-simulation.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 ;; A rewrite of the cloth simulation application from the Codea project
 ;; into world form.
@@ -72,4 +72,4 @@
   (sqrt (sqr (- (point-x p1)
                 (point-x p2)))
         (sqr (- (point-y p1)
-                (point-y p2)))))
+                (point-y p2)))))

whalesong/sandbox/monty-hall/monty-hall.rkt

@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 (define-resource index.html)
 

whalesong/sandbox/sample-run.rkt

@@ -1,14 +1,14 @@
 #lang racket
-(require (planet dyoo/whalesong/get-module-bytecode)
+(require whalesong/get-module-bytecode
-         (planet dyoo/whalesong/parser/parse-bytecode)
+         whalesong/parser/parse-bytecode
-         (planet dyoo/whalesong/compiler/compiler)
+         whalesong/compiler/compiler
-         (planet dyoo/whalesong/compiler/compiler-structs)
+         whalesong/compiler/compiler-structs
-         (planet dyoo/whalesong/js-assembler/assemble))
+         whalesong/js-assembler/assemble)
 
 (define bytecode 
   (get-module-bytecode 
    (open-input-string 
-    (string-append "#lang planet dyoo/whalesong\n"
+    (string-append "#lang whalesong\n"
                    "(define (f x)\n"
                    "  (if (= x 0)\n"
                    "      1\n"
@@ -21,4 +21,4 @@
 
 (define op (open-output-string))
 (assemble/write-invoke stmts op)
-(define js-code (get-output-string op))
+(define js-code (get-output-string op))

whalesong/sandbox/test-storage.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/storage))
+(require whalesong/storage)
 
 (storage-length)
 (storage-ref "whalesong test")
@@ -24,4 +24,4 @@
 (storage-key 0)
 (storage-remove! "name")
 (storage-length)
-(storage-clear!)
+(storage-clear!)

whalesong/sandbox/todo-storage/todo.rkt

@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource)
+         whalesong/resource
-         (planet dyoo/whalesong/storage))
+         whalesong/storage)
 
 ;; The world is our TODO list, represented as a list of strings.
 
@@ -84,4 +84,4 @@
 (big-bang (list (new-item "milk")
                 (new-item "eggs"))
           (initial-view the-view)
-          (to-draw draw))
+          (to-draw draw))

whalesong/scribblings/cs019.scrbl

@@ -1,8 +1,5 @@
 #lang scribble/manual
-@(require planet/scribble
+@(require scribble/eval
-          planet/version
-          planet/resolver
-          scribble/eval
           scribble/bnf
           racket/sandbox
           racket/port
@@ -76,7 +73,7 @@ Run the following to create the @filepath{whalesong} launcher program in
 your current directory.
 @codeblock|{
 #lang racket/base
-(require (planet dyoo/whalesong:1:12/make-launcher))
+(require whalesong/make-launcher)
 }|
 This may take a few minutes, as Racket is compiling Whalesong, its
 dependencies, and its documentation.  When it finally finishes,
@@ -156,8 +153,8 @@ Let's look at a few of them.
 @subsection{Hello world}
 
 Let's try making a simple, standalone executable.  At the moment, the
-program should be written in the base language of @racket[(planet
+program should be written in the base language of
-dyoo/whalesong/cs019)], as it provides the language features that
+@racket[whalesong/cs019], as it provides the language features that
 you've been using in cs019 (@racket[local], @racket[shared], etc...),
 as well as support for the @racketmodname/this-package[web-world]
 package described later in this document.
@@ -166,7 +163,7 @@ package described later in this document.
 Write a @filepath{hello.rkt} with the following content
 @filebox["hello.rkt"]{
 @codeblock{
-    #lang planet dyoo/whalesong/cs019
+    #lang whalesong/cs019
     "hello world"
 }}
 This program is a regular Racket program, and can be executed normally,
@@ -242,7 +239,7 @@ Once we're happy with the statics of our program, we can inject dynamic behavior
 Write a file called @filepath{tick-tock.rkt} with the following content.
 @filebox["tick-tock.rkt"]{
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-resource index.html)
 
@@ -299,7 +296,7 @@ Finally, let's look at a program that displays our current geolocation.
 
 @filebox["where-am-i.rkt"]{
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-resource index.html)
 
@@ -438,11 +435,11 @@ wants to reset the page.
 ]
 
 These examples are written in a less featureful language level
-(@litchar{#lang planet dyoo/whalesong}), which is why it uses explicit
+(@litchar{#lang whalesong}), which is why it uses explicit
 @racket[require] statements to pull in support for
 @racketmodname/this-package[web-world] and
 @racketmodname/this-package[resource].  As long as you use
-@litchar{#lang planet dyoo/whalesong/cs019}, you shouldn't need to
+@litchar{#lang whalesong/cs019}, you shouldn't need to
 require those particular libraries.
 
 
@@ -768,7 +765,7 @@ can accept the event as an argument.
 
 You can construct events for testing purposes by using @racket[make-event].
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 ;; Synthesizing a location event
 (define my-event (make-event '((latitude 41) 
                                (longitude -71))))
@@ -794,7 +791,7 @@ Get an list of the event's keys.
 We often need to dynamically inject new dom nodes into an existing
 view.  As an example where the UI is entirely in code:
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 ;; tick: world view -> world
 (define (tick world view)
@@ -892,14 +889,14 @@ to the program.
 
 For example,
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 (define-resource my-whale-image-resource "humpback.png")
 }|
 }
 Since the name we're using will often match the filename itself,
 as a convenience, we can also write the following:
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 (define-resource humpback.png)
 }|
 which defines a variable named @racket[humpback.png] whose
@@ -933,7 +930,7 @@ Given a resource, gets its URL.
 
 For example,
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-resource my-whale-image-resource "humpback.png")
 

whalesong/tests/clipart-test/clipart.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
-(require (planet dyoo/whalesong/image)
+(require whalesong/image
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 
 ;; color-near? : Color Color Number -> Boolean

whalesong/tests/coersing/fact.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (provide fact)
 (define (fact x)
   (cond
@@ -8,4 +8,4 @@
     (* x (fact (sub1 x)))]))
 
 
-;;(printf "test: ~s\n" (fact 4))
+;;(printf "test: ~s\n" (fact 4))

whalesong/tests/more-tests/basics-cs019.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-struct f (x))
 (define-struct g (a b))

whalesong/tests/more-tests/booleans-cs019.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 
 (boolean? "t")
@@ -20,4 +20,4 @@
 true
 false
 (false? true)
-(false? false)
+(false? false)

whalesong/tests/more-tests/booleans-cs019.rkt~

@@ -1,23 +0,0 @@
-#lang planet dyoo/whalesong/base
-(require (planet dyoo/whalesong/lang/bool))
-
-(boolean? "t")
-(boolean? #t)
-(boolean? 0)
-(boolean? #\t)
-
-(char? "t")
-(char? #t)
-(char? 0)
-(char? #\t)
-
-(char=? #\a #\b)
-(char=? #\a #\a)
-(char=? #\a #\a #\b)
-(char=? #\a #\b #\a)
-(char=? #\a #\a #\a)
-
-true
-false
-(false? true)
-(false? false)

whalesong/tests/more-tests/booleans.rkt

@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
-(require (planet dyoo/whalesong/lang/bool))
+(require whalesong/lang/bool)
 
 (boolean? "t")
 (boolean? #t)
@@ -20,4 +20,4 @@
 true
 false
 (false? true)
-(false? false)
+(false? false)

whalesong/tests/more-tests/chars.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (char-upcase #\a)
 (char-upcase #\b)

whalesong/tests/more-tests/checking-cs019.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define (greet name)
   (string-append "hello " name))

whalesong/tests/more-tests/checking.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (define (greet name)
   (string-append "hello " name))

whalesong/tests/more-tests/colors.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
-(require (planet dyoo/whalesong/image))
+(require whalesong/image)
 (color 3 4 5 0)
 (make-color 3 5 7 0)
 
@@ -9,4 +9,4 @@
 (color-red c1)
 (color-green c1)
 (color-blue c1)
-(color-alpha c1)
+(color-alpha c1)

whalesong/tests/more-tests/conform.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (let ()
 
 ;; (define (caar l)
@@ -515,4 +515,4 @@
       (newline))))
 
 
-(void ((letrec ((loop (lambda (n) (if (zero? n) 'done (begin (go) (loop (- n '1))))))) loop) 1)))
+(void ((letrec ((loop (lambda (n) (if (zero? n) 'done (begin (go) (loop (- n '1))))))) loop) 1)))

whalesong/tests/more-tests/cont-marks-1.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (define (puzzle n)
   (if (= n 0)

whalesong/tests/more-tests/cont-marks-2.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (define (puzzle n)
   (if (= n 0)

whalesong/tests/more-tests/dots-should-be-syntax-error.rkt

@@ -1,3 +1,3 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 .. ;; should raise a teaching syntax error

whalesong/tests/more-tests/earley.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (begin
    (define make-parser
      (lambda (grammar lexer)

whalesong/tests/more-tests/fact.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (define (fact x)
   (cond
    [(= x 0)

whalesong/tests/more-tests/fft.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; File:         fft.cl
 ; Description:  FFT benchmark from the Gabriel tests.

whalesong/tests/more-tests/fringe.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 ;; A tree is either a symbol or a node.
 (define-struct node (l r))

whalesong/tests/more-tests/graphs.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 ; Modified 2 March 1997 by Will Clinger to add graphs-benchmark
 ; and to expand the four macros below.
 ; Modified 11 June 1997 by Will Clinger to eliminate assertions
@@ -640,4 +640,4 @@
 (fold-over-rdg 5 ;;(if input 6 1)
                2 
                cons
-               '())
+               '())

whalesong/tests/more-tests/hash-code.rkt

@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
-(require (planet dyoo/whalesong/lang/private/shared))
+(require whalesong/lang/private/shared)
 
 ;; boxes
 "boxes"

whalesong/tests/more-tests/hashes.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (hash? 1)
 (hash? "potatoes")

whalesong/tests/more-tests/hello-bf.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/bf
+#lang whalesong/bf
 +++++ +++++ [ > +++++ ++ > +++++ +++++ > +++ > + <<<< - ] > ++ .  > +
 .  +++++ ++ .  .  +++ .  > ++ .  << +++++ +++++ +++++ .  > .  +++ .
 ----- - .  ----- --- .  > + .  > .

whalesong/tests/more-tests/hello.rkt

@@ -1,8 +1,8 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (displayln "hello world")
 
 
 (displayln (format "hello ~a" "again"))
 
 (printf "hello")
-(printf "world\n")
+(printf "world\n")

whalesong/tests/more-tests/images.rkt

@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
-(require (planet dyoo/whalesong/image))
+(require whalesong/image)
 
 (image-color? "red")
 (image-color? "blue")

whalesong/tests/more-tests/isolating-bug.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (require (for-syntax racket/base
                      syntax/struct))
 

whalesong/tests/more-tests/js-binding.rkt

@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/js))
+(require whalesong/js)
 
 (define js-plus
   (js-function->procedure "function(x, y) { return x + y; }"))

whalesong/tests/more-tests/lists-cs019.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define web-colors
  (shared ([W (cons "white" G)]

whalesong/tests/more-tests/lists.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 '(1 2 3)
 (list "hello" "world")

whalesong/tests/more-tests/man-vs-boy.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 ;; Knuth's Man-or-boy-test.
 ;; http://rosettacode.org/wiki/Man_or_boy_test

whalesong/tests/more-tests/map.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (map (lambda (x y) (+ x y)) (list 1 2 3) (list 4 5 6))
 (map + (list 1 2 3) (list 4 5 6))

whalesong/tests/more-tests/module-scoping-helper.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (require (for-syntax racket/base))
 (provide x x++ x+1 x=0 get-x)
 (define x 0)
@@ -19,4 +19,4 @@
   (set! x (add1 x)))
 
 (define-syntax (x=0 stx)
-  #'(set-x 0))
+  #'(set-x 0))

whalesong/tests/more-tests/module-scoping.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (require "module-scoping-helper.rkt")
 x             ;; 0
 (get-x)       ;; 0
@@ -24,4 +24,4 @@ x
 
 x+1
 x
-(get-x)
+(get-x)

whalesong/tests/more-tests/nestedloop.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 ;; Imperative body:
 (define (loops n)

whalesong/tests/more-tests/nqueens.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 ;;; NQUEENS -- Compute number of solutions to 8-queens problem.
 ;; 2006/08 -- renamed `try' to `try-it' to avoid Bigloo collision (mflatt)
 ;; 2010/04 -- got rid of the one-armed id (stamourv)

whalesong/tests/more-tests/nucleic2.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (require (for-syntax racket/base))
 
 ; File: "nucleic2.scm"

whalesong/tests/more-tests/numbers.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 
 (number? 0)
@@ -35,4 +35,4 @@
 (positive? (expt 2 100))
 (negative? (expt 2 100))
 (positive? (expt -2 91))
-(negative? (expt -2 91))
+(negative? (expt -2 91))

whalesong/tests/more-tests/printing.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (current-print-mode "constructor")
 
@@ -23,4 +23,4 @@
 ;; This is slightly broken: we should follow DrRacket shared printing
 ;; notation.
 (shared ([a (cons 1 a)])
-  a)
+  a)

whalesong/tests/more-tests/quasi.rkt

@@ -1,2 +1,2 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 `(0 ,@(list 1 2) 4)

whalesong/tests/more-tests/ramanujan-pi.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 ;; Srinivasa Ramanujan's infinite series for approximating pi.
 
 (define (sum f a b)
@@ -32,4 +32,4 @@
   (/ 1 (1/pi-approx n)))
 
 
-(pi-approx 10)
+(pi-approx 10)

whalesong/tests/more-tests/scheme-whalesong.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 ;;; SCHEME -- A Scheme interpreter evaluating a sort, written by Marc Feeley.
 
 ; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1072,4 +1072,4 @@
 
 
 
-(scheme-eval expr1)
+(scheme-eval expr1)

whalesong/tests/more-tests/sharing-cs019.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define infinite-ones
   (shared ([a (cons 1 a)])

whalesong/tests/more-tests/sharing.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (define infinite-ones
   (shared ([a (cons 1 a)])

whalesong/tests/more-tests/sigs-cs019.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 
 (define: x : Number$ 3)

whalesong/tests/more-tests/simple-apply.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (apply + 2 3 4 5 '())
 (apply + 2 3 4 '(5))

whalesong/tests/more-tests/simple-functions.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (provide (all-defined-out))
 
@@ -10,4 +10,4 @@
 
 (f 1)
 (g 1)
-(+ (f 2) (f (g (g 2))))
+(+ (f 2) (f (g (g 2))))

whalesong/tests/more-tests/simple-loop.rkt

@@ -1,8 +1,8 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (let myloop ([i 0] [acc 0])
   (cond
    [(< i 100)
     (myloop (add1 i) (+ acc i))]
    [else
-    acc]))
+    acc]))

whalesong/tests/more-tests/simple-structs.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (define-struct pair (f r))
 (define-struct color (r g b))
@@ -14,4 +14,4 @@
 
 (color-r (make-color 3 4 5))
 (color-g (make-color 3 4 5))
-(color-b (make-color 3 4 5))
+(color-b (make-color 3 4 5))

whalesong/tests/more-tests/simple.rkt

@@ -1,5 +1,5 @@
- #lang planet dyoo/whalesong
+#lang whalesong
 ;; This should invoke the use of inline-variant from 5.2.1
 (provide f)
 (define (f x) x)
-(f 2)
+(f 2)

whalesong/tests/more-tests/sk-generator-2.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (define (make-gen gen)
  (let ([cont (box #f)])
    (lambda ()
@@ -29,4 +29,4 @@
 
 (g2)
 (g2)
-(g2)
+(g2)

whalesong/tests/more-tests/sk-generator.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (define (make-gen gen)
  (let ([cont #f])
    (lambda ()

whalesong/tests/more-tests/string-tests.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (substring "hello world" 0)
 (substring "hello world" 1)

whalesong/tests/more-tests/view.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world))
+(require whalesong/web-world)
 
 (define view (->view (xexp->dom `(html (head)
                                        (body (p "hello world, this is a test")

whalesong/tests/more-tests/weird-cc.rkt

@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (define program (lambda () (let ((y (call/cc (lambda (c) c)))) (display 1) (call/cc (lambda (c) (y c))) (display 2) (call/cc (lambda (c) (y c))) (display 3))))
 
 (program)
-(newline)
+(newline)

whalesong/web-world/DESIGN

@@ -57,8 +57,8 @@ then it should be trivial to make a program that just shows
 that page:
 
 
-    #lang planet dyoo/whalesong
+    #lang whalesong
-    (require (planet dyoo/whalesong/web-world))
+    (require whalesong/web-world)
 
     (define-resource index.html)
 
@@ -106,8 +106,8 @@ such as:
 
 and then, in the programming language, add behavior:
 
-    #lang planet dyoo/whalesong
+    #lang whalesong
-    (require (planet dyoo/whalesong/web-world))
+    (require whalesong/web-world)
 
     (define-resource index.html)
 
@@ -181,8 +181,8 @@ If index.html contains:
 with some appropriate CSS to make the DIV look good, then the program
 will be:
 
-    #lang planet dyoo/whalesong
+    #lang whalesong
-    (require (planet dyoo/whalesong/web-world))
+    (require whalesong/web-world)
 
     (define-resource index.html)
 
@@ -236,8 +236,8 @@ handler takes, not only the world, but the current view.
 
 
 
-    #lang planet dyoo/whalesong
+    #lang whalesong
-    (require (planet dyoo/whalesong/web-world))
+    (require whalesong/web-world)
 
     (define-resource index.html)
     (define-resource style.css)
@@ -290,8 +290,8 @@ hide.
     </html>
 
 
-    #lang planet dyoo/whalesong
+    #lang whalesong
-    (require (planet dyoo/whalesong/web-world))
+    (require whalesong/web-world)
     (define-resource index.html)
 
     ;; make-item: string -> view

whalesong/web-world/examples/attr-animation/attr-animation.rkt

@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/resource)
+(require whalesong/resource
-         (planet dyoo/whalesong/web-world))
+         whalesong/web-world)
 
 (define-resource index.html)
 (define-resource style.css)

whalesong/web-world/examples/attr-animation/index.html

@@ -24,10 +24,10 @@ This should be animating:
 The program for this is:
 <blockquote>
 <pre>
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/resource)
+(require whalesong/resource
-         (planet dyoo/whalesong/web-world))
+         whalesong/web-world)
 
 (define-resource index.html)
 (define-resource style.css)

whalesong/web-world/examples/boid/boid.rkt

@@ -1,9 +1,9 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/js)
+(require whalesong/js
-         (planet dyoo/whalesong/image)
+         whalesong/image
-         (planet dyoo/whalesong/web-world)
+         whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
          
 
 (define-resource index.html)
@@ -354,4 +354,4 @@
             (to-draw draw)))
 
 
-(visualize)
+(visualize)

whalesong/web-world/examples/color-buttons/color-buttons.rkt

@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 ;; The world is a string, the current color.
 (define-resource view.html)

whalesong/web-world/examples/dwarves-with-remove/dwarves-with-remove.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 (define-resource index.html)
 
 ;; The world is the set of dwarfs.

whalesong/web-world/examples/dwarves/dwarves.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 (define-resource index.html)
 
 ;; The world is the set of dwarfs.

whalesong/web-world/examples/field/field.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 (define-resource index.html)
 
@@ -28,4 +28,4 @@
 
 (big-bang "Jane Doe"
           (initial-view my-view)
-          (to-draw draw))
+          (to-draw draw))

whalesong/web-world/examples/field2/field2.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 (define-resource index.html)
 
@@ -43,4 +43,4 @@
 (big-bang (make-world "Jane Doe" 0)
           (initial-view my-view)
           (to-draw draw)
-          (on-tick tick 1))
+          (on-tick tick 1))

whalesong/web-world/examples/forward-backward/forward-backward.rkt

@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/resource)
+(require whalesong/resource
-         (planet dyoo/whalesong/web-world))
+         whalesong/web-world)
 
 (define-resource index.html)
 
@@ -65,4 +65,4 @@
 
 (big-bang 0
           (initial-view my-initial-view)
-          (to-draw draw))
+          (to-draw draw))

whalesong/web-world/examples/hello/hello.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 (define-resource index.html)
 (define-resource style.css)

whalesong/web-world/examples/hello2/hello2.rkt

@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world))
+(require whalesong/web-world)
 
-(big-bang 0 (initial-view "hello world"))
+(big-bang 0 (initial-view "hello world"))

whalesong/web-world/examples/hot-cross-buns/hot-cross-buns.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-resource index.html)
 
@@ -58,4 +58,4 @@
 
 (big-bang '()
           (initial-view view-with-buttons-and-reset)
-          (to-draw draw))
+          (to-draw draw))

whalesong/web-world/examples/phases/phases.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 (define-resource index1.html)
 (define-resource index2.html)
@@ -27,4 +27,4 @@
           (on-tick tick 1)
           (stop-when (lambda (w v)
                        (> w 10))))
-(printf "After the big bang\n")
+(printf "After the big bang\n")

whalesong/web-world/examples/redirected/redirected.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 (define-resource index.html)
 

whalesong/web-world/examples/tick-tock-2/tick-tock-2.rkt

@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world))
+(require whalesong/web-world)
 
 ;; tick: world view -> world
 (define (tick world view)

whalesong/web-world/examples/tick-tock/tick-tock.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 (define-resource index.html)
 

whalesong/web-world/examples/todo/todo.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 ;; The world is our TODO list, represented as a list of strings.
 
@@ -83,4 +83,4 @@
 (big-bang (list (new-item "milk")
                 (new-item "eggs"))
           (initial-view the-view)
-          (to-draw draw))
+          (to-draw draw))

whalesong/web-world/examples/where-am-i/where-am-i.rkt

@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
-         (planet dyoo/whalesong/resource))
+         whalesong/resource)
 
 (define-resource index.html)
 
@@ -42,4 +42,4 @@
           (initial-view index.html)
           (to-draw draw)
           (on-location-change location-change)
-          (on-mock-location-change mock-location-change))
+          (on-mock-location-change mock-location-change))

whalesong/whalesong-helpers.rkt

@@ -16,7 +16,6 @@
          "logger.rkt"
          "parameters.rkt"
          "js-assembler/check-valid-module-source.rkt"
-         planet/version
          (for-syntax racket/base))
 
 (provide (all-defined-out))
@@ -284,4 +283,4 @@
 
 
 (define (print-version)
-  (fprintf (current-report-port) "~a\n" (this-package-version)))
+  (fprintf (current-report-port) "~a\n" (this-package-version)))

whalesong/whalesong.rkt

@@ -3,13 +3,13 @@
 
 (require racket/runtime-path
          racket/path
-         planet/util)
+         syntax/modresolve)
 
 ;; We do things this way to ensure that we're using the latest
 ;; version of whalesong that's installed, and that the load-relative
 ;; path is in terms of the normalized paths, to avoid a very strange
 ;; low-level bug.
 (define whalesong.cmd
-  (resolve-planet-path '(planet dyoo/whalesong/whalesong-cmd)))
+  (resolve-module-path 'whalesong/whalesong-cmd #f))
 
-(dynamic-require (normalize-path whalesong.cmd) #f)
+(dynamic-require (normalize-path whalesong.cmd) #f)