add #lang turnstile/lang; change #lang turnstile's #%module-begin

turnstile/examples/exist.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+reco+var.rkt")
 (reuse #:from "stlc+rec-iso.rkt") ; want type=?, but only need to load current-type=?
 

turnstile/examples/ext-stlc.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+lit.rkt" #:except #%datum)
 (provide ⊔ (for-syntax current-join))
 

turnstile/examples/fomega.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "sysf.rkt" #:except #%datum ∀ ~∀ ~∀* ∀? Λ inst)
 (reuse String #%datum #:from "stlc+reco+var.rkt")
 

turnstile/examples/fomega2.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "sysf.rkt" #:except #%datum ∀ ~∀ ~∀* ∀? Λ inst)
 (reuse String #%datum #:from "stlc+reco+var.rkt")
 

turnstile/examples/fomega3.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "sysf.rkt" #:except #%datum ∀ Λ inst)
 (reuse String #%datum #:from "stlc+reco+var.rkt")
 (require (only-in "fomega.rkt" current-kind? ∀★? ★? kind?))

turnstile/examples/fsub.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+reco+sub.rkt" #:except +)
 (require (rename-in (only-in "sysf.rkt" ∀? ∀ ~∀) [~∀ ~sysf:∀] [∀ sysf:∀]))
  

turnstile/examples/infer.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "ext-stlc.rkt" #:except #%app λ ann)
 (reuse inst #:from "sysf.rkt")
 (require (only-in "sysf.rkt" ∀ ~∀ ∀? Λ))

turnstile/examples/mlish.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (require racket/fixnum racket/flonum
          (for-syntax macrotypes/type-constraints macrotypes/variance-constraints))
 

turnstile/examples/rosette/bv.rkt

@@ -1,10 +1,4 @@
 #lang turnstile
-;#lang racket/base
-#;(require (except-in "../../../turnstile/turnstile.rkt"
-          #%module-begin 
-          zero? void error sub1 or and not add1 = >= <= < >  - * + boolean? integer? real? positive? string? quote pregexp
-          make-parameter equal? eq? list ~Any)
-         (for-syntax (except-in "../../../turnstile/turnstile.rkt")))
 (extends "rosette2.rkt" ; extends typed rosette
          #:except bv bveq bvslt bvult bvsle bvule bvsgt bvugt bvsge bvuge)
 (require (only-in "../stlc+lit.rkt" define-primop))

turnstile/examples/rosette/fsm.rkt

@@ -1,9 +1,4 @@
-;#lang turnstile
-#lang racket/base
-(require (except-in "../../../turnstile/turnstile.rkt" 
-          #%module-begin 
-          zero? void sub1 or and not add1 = - * + boolean? integer? string? quote pregexp make-parameter equal? list)
-         (for-syntax (except-in "../../../turnstile/turnstile.rkt")))
+#lang turnstile
 (extends "rosette.rkt" #:except #%datum #%app) ; extends typed rosette
 (require (prefix-in ro: rosette)) ; untyped 
 (require (prefix-in ro: rosette/lib/synthax))

turnstile/examples/rosette/ifc.rkt

@@ -1,9 +1,4 @@
-;#lang turnstile
-#lang racket/base
-(require (except-in "../../../turnstile/turnstile.rkt" 
-          #%module-begin 
-          zero? void sub1 or and not add1 = - * + boolean? integer? string? quote pregexp make-parameter equal? list)
-         (for-syntax (except-in "../../../turnstile/turnstile.rkt")))
+#lang turnstile
 (extends "rosette.rkt" #:except) ; extends typed rosette
 (require (prefix-in ro: rosette)) ; untyped 
 (require (prefix-in ro: rosette/lib/synthax))

turnstile/examples/rosette/rosette.rkt

@@ -1,22 +1,11 @@
-;#lang turnstile
-#lang racket/base
-;; (require racket/require)
-;; (require 
-;;  (except-in
-;;   (subtract-in "../../../turnstile/turnstile.rkt" 
-;;                (except-in "../ext-stlc.rkt" #%app #%top #%datum))))
-(require (except-in "../../../turnstile/turnstile.rkt" 
-           #%module-begin 
-           zero? void sub1 or and not add1 = - * + boolean? integer? list)
-         (for-syntax (except-in "../../../turnstile/turnstile.rkt")))
-(provide (rename-out [ro:#%module-begin #%module-begin]))
+#lang turnstile
 (extends "../stlc+union+case.rkt" #:except if #%app #%module-begin add1 sub1 +)
 (reuse List list #:from "../stlc+cons.rkt")
 (require (only-in "../stlc+reco+var.rkt" [define stlc:define]))
 ;(require (only-in "../stlc+reco+var.rkt" define-type-alias))
 (require (prefix-in ro: rosette))
 (require (prefix-in ro: rosette/lib/synthax))
-(provide BVPred)
+(provide BVPred (rename-out [ro:#%module-begin #%module-begin]))
 
 (define-simple-macro (define-rosette-primop op:id : ty)
   (begin

turnstile/examples/rosette/rosette2.rkt

@@ -1,12 +1,13 @@
 #lang turnstile
 (extends "../stlc.rkt"
-  #:except #%app →)
+  #:except #%module-begin #%app →)
 (reuse #%datum #:from "../stlc+union.rkt")
 (reuse define-type-alias #:from "../stlc+reco+var.rkt")
 (reuse define-named-type-alias #:from "../stlc+union.rkt")
 (reuse list #:from "../stlc+cons.rkt")
 
-(provide Any Nothing
+(provide (rename-out [ro:#%module-begin #%module-begin])
+         Any Nothing
          CU U
          C→ → (for-syntax ~C→ C→?)
          Ccase-> ; TODO: symbolic case-> not supported yet

turnstile/examples/stlc+box.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+cons.rkt")
 
 ;; Simply-Typed Lambda Calculus, plus mutable references

turnstile/examples/stlc+cons.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+reco+var.rkt")
 
 ;; Simply-Typed Lambda Calculus, plus cons

turnstile/examples/stlc+effect.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+box.rkt" #:except ref Ref ~Ref ~Ref* Ref? deref := #%app λ)
 
 ;; Simply-Typed Lambda Calculus, plus mutable references

turnstile/examples/stlc+lit.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc.rkt")
 (provide define-primop)
 

turnstile/examples/stlc+rec-iso.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+tup.rkt")
 (reuse ∨ var case define-type-alias define #:from "stlc+reco+var.rkt")
 

turnstile/examples/stlc+reco+sub.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+sub.rkt" #:except #%app #%datum)
 (extends "stlc+reco+var.rkt" #:except #%datum + *)
 ;;use type=? and eval-type from stlc+reco+var.rkt, not stlc+sub.rkt

turnstile/examples/stlc+reco+var.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+tup.rkt" #:except × ×? tup proj ~× ~×*)
 (require (only-in "stlc+tup.rkt" [~× ~stlc:×]))
 (provide × ∨ (for-syntax ~× ~×* ~∨ ~∨*))

turnstile/examples/stlc+sub.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+lit.rkt" #:except #%datum +)
 (reuse Bool String add1 #:from "ext-stlc.rkt")
 (require (prefix-in ext: (only-in "ext-stlc.rkt" #%datum))

turnstile/examples/stlc+tup.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "ext-stlc.rkt")
 
 (require (for-syntax racket/list))

turnstile/examples/stlc+union+case.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+union.rkt"
  #:except #%app add1 sub1)
 (provide case→)

turnstile/examples/stlc+union.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "ext-stlc.rkt" 
  #:except #%app #%datum + add1 sub1 *
           Int Int? ~Int Float Float? ~Float Bool ~Bool Bool?)

turnstile/examples/stlc.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (provide only-in (for-syntax current-type=? types=?))
 
 (begin-for-syntax

turnstile/examples/sysf.rkt

@@ -1,4 +1,4 @@
-#lang turnstile
+#lang turnstile/lang
 (extends "stlc+lit.rkt")
 (reuse #:from "stlc+rec-iso.rkt") ; want this type=?
 

turnstile/lang.rkt

@@ -0,0 +1,9 @@
+#lang racket/base
+
+(provide (all-from-out
+          "turnstile.rkt"
+          macrotypes/typecheck))
+
+(require "turnstile.rkt"
+         (only-in macrotypes/typecheck #%module-begin))
+

turnstile/lang/lang/reader.rkt

@@ -0,0 +1,2 @@
+#lang s-exp syntax/module-reader
+turnstile/lang

turnstile/lang/reader.rkt

@@ -1,2 +1,2 @@
 #lang s-exp syntax/module-reader
-turnstile/turnstile
+turnstile/main

turnstile/main.rkt

@@ -0,0 +1,6 @@
+#lang racket/base
+
+(provide #%module-begin (all-from-out "turnstile.rkt"))
+
+(require "turnstile.rkt")
+

turnstile/turnstile.rkt

@@ -4,10 +4,11 @@
          define-typed-syntax
          (for-syntax syntax-parse/typed-syntax))
 
-(require (rename-in
-          macrotypes/typecheck
-          [define-typed-syntax -define-typed-syntax]
-          ))
+(require (except-in (rename-in
+                     macrotypes/typecheck
+                     [define-typed-syntax -define-typed-syntax]
+                     )
+                    #%module-begin))
 
 (module typecheck+ racket/base
   (provide (all-defined-out))