From cafd001f9b7a757f8f4bc271ba564dcd97e6a8b2 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Fri, 17 Jun 2011 16:58:21 -0400
Subject: [PATCH] using the planet-command line parsers

---
 Makefile          |  3 ++-
 make-launcher.rkt |  6 ++++--
 whalesong.rkt     | 37 ++-----------------------------------
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/Makefile b/Makefile
index a81fdc2..75779bb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@
 # 	raco make -v --disable-inline test-analyzer.rkt
 # 	racket test-analyzer.rkt
 
-launcher: whalesong
+launcher: 
+	raco make -v --disable-inline whalesong.rkt
 	racket make-launcher.rkt
 
 whalesong:
diff --git a/make-launcher.rkt b/make-launcher.rkt
index c224bb5..3b83a78 100644
--- a/make-launcher.rkt
+++ b/make-launcher.rkt
@@ -1,8 +1,10 @@
 #lang racket/base
 
 
-;; copy of launcher/launcher since it has a bug.  I'll send a bug patch
-;; upstream.
+;; copy of launcher/launcher since it has a bug in 5.1.1.
+;; The bug's fixed in later versions of Racket, but my local machine still
+;; has 5.1.1.  As soon as I switch over, this module will lose
+;; its meaning.
 
 
 (require scheme/path
diff --git a/whalesong.rkt b/whalesong.rkt
index 7d39310..0b4da29 100755
--- a/whalesong.rkt
+++ b/whalesong.rkt
@@ -27,30 +27,10 @@
 
 
 
-;; TODO: error trapping
-(define commands `((build 
-                    ,(lambda (args)
-                      (do-the-build args)))
-                   (get-runtime 
-                    ,(lambda (args)
-                      (print-the-runtime)))
-                   (get-javascript
-                    ,(lambda (args)
-                       (get-javascript-code (first args))))))
-
-
-;; listof string
-(define command-names (map (lambda (x) (symbol->string (car x)))
-                           commands))
-
-
-(define (print-expected-command)
-  (printf "Expected one of the following: [~a].\n"
-          (string-join command-names ", ")))
 
 (define (at-toplevel)
   (svn-style-command-line
-   #:program (short-program+command-name)
+   #:program "whalesong" #;(short-program+command-name)
    #:argv (current-command-line-arguments)
    "The Whalesong command-line tool for compiling Racket to JavaScript"
    ["build" "build a standalone xhtml package" 
@@ -64,20 +44,7 @@
    ["get-javascript" "Gets just the JavaScript code and prints it to standard output"
                      "Builds a racket program into JavaScript.  The outputted file depends on the runtime."
                      #:args (file)
-                     (get-javascript-code file)])
-  #;(define args (vector->list (current-command-line-arguments)))
-  #;(cond [(empty? args)
-         (print-expected-command)]
-        [else
-         (cond
-          [(assoc (string->symbol (first args))
-                  commands)
-           =>
-           (lambda (p)
-             ((cadr p) (rest args)))]
-          [else
-           (printf "Unknown command ~s.\n" (first args))
-           (print-expected-command)])]))
+                     (get-javascript-code file)]))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;