From ba2fce22ce734a2e8b00c4517be848b1cb154fa7 Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@racket-lang.org>
Date: Thu, 1 Sep 2011 19:03:52 -0400
Subject: [PATCH] Fix language info when running 'racket -I typed/racket'.

original commit: d594e6ee491fd2b987f974c0275df9d40cf74320
---
 collects/typed-scheme/language-info.rkt       |  7 +++----
 collects/typed-scheme/main.rkt                |  3 +--
 collects/typed-scheme/minimal/lang/reader.rkt | 13 +++++++++++++
 collects/typed/racket.rkt                     |  2 +-
 collects/typed/racket/base.rkt                |  2 +-
 collects/typed/scheme.rkt                     |  2 +-
 collects/typed/scheme/base.rkt                |  2 +-
 7 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 collects/typed-scheme/minimal/lang/reader.rkt

diff --git a/collects/typed-scheme/language-info.rkt b/collects/typed-scheme/language-info.rkt
index 31b2a239..311186d5 100644
--- a/collects/typed-scheme/language-info.rkt
+++ b/collects/typed-scheme/language-info.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (require typed-scheme/typed-reader)
 (provide get-info configure)
 
@@ -9,10 +9,9 @@
 
 ;; options currently always empty
 (define (configure options)
-  (namespace-require 'scheme/base)
+  (namespace-require 'racket/base)
   (eval '(begin
-           (require (for-syntax typed-scheme/utils/tc-utils scheme/base))
+           (require (for-syntax typed-scheme/utils/tc-utils racket/base))
            (begin-for-syntax (set-box! typed-context? #t)))
         (current-namespace))
   (current-readtable (readtable)))
-
diff --git a/collects/typed-scheme/main.rkt b/collects/typed-scheme/main.rkt
index 4e9ea23a..b10050bb 100644
--- a/collects/typed-scheme/main.rkt
+++ b/collects/typed-scheme/main.rkt
@@ -1,5 +1,4 @@
-#lang racket/base
+#lang typed-scheme/minimal
 
 (require typed/scheme/base)
 (provide (all-from-out typed/scheme/base))
-
diff --git a/collects/typed-scheme/minimal/lang/reader.rkt b/collects/typed-scheme/minimal/lang/reader.rkt
new file mode 100644
index 00000000..5267b951
--- /dev/null
+++ b/collects/typed-scheme/minimal/lang/reader.rkt
@@ -0,0 +1,13 @@
+#lang s-exp syntax/module-reader
+
+typed-scheme/minimal
+
+#:language-info make-language-info
+#:info make-info
+
+(define (make-info key default use-default)
+  (case key
+    [else (use-default key default)]))
+
+(define make-language-info
+  `#(typed-scheme/language-info get-info ()))
diff --git a/collects/typed/racket.rkt b/collects/typed/racket.rkt
index 99d54c68..f108282f 100644
--- a/collects/typed/racket.rkt
+++ b/collects/typed/racket.rkt
@@ -1,4 +1,4 @@
-#lang racket/base
+#lang typed-scheme/minimal
 
 (require typed/racket/base racket/require (subtract-in racket typed/racket/base racket/contract)
 	 (for-syntax racket/base))
diff --git a/collects/typed/racket/base.rkt b/collects/typed/racket/base.rkt
index c3a319cd..24926cc6 100644
--- a/collects/typed/racket/base.rkt
+++ b/collects/typed/racket/base.rkt
@@ -1,4 +1,4 @@
-#lang s-exp typed-scheme/minimal
+#lang typed-scheme/minimal
 
 (providing (libs (except racket/base #%module-begin #%top-interaction with-handlers lambda #%app define-struct for for*))
 	   (basics #%module-begin #%top-interaction lambda #%app))
diff --git a/collects/typed/scheme.rkt b/collects/typed/scheme.rkt
index 39e626df..aa4c4d9d 100644
--- a/collects/typed/scheme.rkt
+++ b/collects/typed/scheme.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang typed-scheme/minimal
 
 (require typed/scheme/base scheme/require (subtract-in scheme typed/scheme/base scheme/contract)
 	 (for-syntax scheme/base))
diff --git a/collects/typed/scheme/base.rkt b/collects/typed/scheme/base.rkt
index 6949b79a..7fa96deb 100644
--- a/collects/typed/scheme/base.rkt
+++ b/collects/typed/scheme/base.rkt
@@ -1,4 +1,4 @@
-#lang s-exp typed-scheme/minimal
+#lang typed-scheme/minimal
 
 (providing (libs (except scheme/base #%module-begin #%top-interaction with-handlers lambda #%app define-struct for for*))
 	   (basics #%module-begin #%top-interaction lambda #%app))