reorganize

info.rkt

@@ -0,0 +1,9 @@
+#lang info
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "sweet-exp"
+    ))
+

macrotypes/examples/exist.rkt

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

macrotypes/examples/ext-stlc.rkt

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

macrotypes/examples/fomega.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (extends "sysf.rkt" #:except #%datum ∀ Λ inst)
 (reuse String #%datum #:from "stlc+reco+var.rkt")
 

macrotypes/examples/fomega2.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (extends "sysf.rkt" #:except #%datum ∀ Λ inst);#:rename [~∀ ~sysf:∀])
 (reuse String #%datum #:from "stlc+reco+var.rkt")
 

macrotypes/examples/fomega3.rkt

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

macrotypes/examples/fsub.rkt

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

macrotypes/examples/infer.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (extends "ext-stlc.rkt" #:except #%app λ → + - void = zero? sub1 add1 not
          #:rename [~→ ~ext-stlc:→])
 (require (only-in "sysf.rkt" ∀ ~∀ ∀? Λ))
@@ -6,7 +6,7 @@
 (require (only-in "stlc+cons.rkt" ~List))
 (reuse tup × proj #:from "stlc+tup.rkt")
 (reuse define-type-alias #:from "stlc+reco+var.rkt")
-(require (for-syntax "type-constraints.rkt"))
+(require (for-syntax "../type-constraints.rkt"))
 (provide hd tl nil?)
 (provide →)
 

macrotypes/examples/mlish.rkt

@@ -1,5 +1,6 @@
-#lang s-exp "typecheck.rkt"
-(require racket/fixnum racket/flonum (for-syntax "type-constraints.rkt" "variance-constraints.rkt"))
+#lang s-exp macrotypes/typecheck
+(require racket/fixnum racket/flonum
+         (for-syntax macrotypes/type-constraints macrotypes/variance-constraints))
 
 (extends "ext-stlc.rkt" #:except #%app λ → + - void = zero? sub1 add1 not let let* and #%datum begin
           #:rename [~→ ~ext-stlc:→])

macrotypes/examples/stlc+box.rkt

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

macrotypes/examples/stlc+cons.rkt

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

macrotypes/examples/stlc+effect.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (extends "stlc+box.rkt" #:except ref deref := #%app λ)
 
 (provide (for-syntax get-new-effects))

macrotypes/examples/stlc+lit.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (extends "stlc.rkt")
 (provide define-primop)
  

macrotypes/examples/stlc+occurrence.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (extends "stlc+sub.rkt" #:except #%datum)
 (extends "stlc+cons.rkt" #:except + #%datum and tup × proj ~× list)
 (reuse tup × proj #:from "stlc+tup.rkt")

macrotypes/examples/stlc+overloading.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (reuse List cons nil #:from "stlc+cons.rkt")
 (reuse #:from "stlc+rec-iso.rkt") ; to load current-type=?
 (extends "stlc+sub.rkt" #:except #%datum)

macrotypes/examples/stlc+rec-iso.rkt

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

macrotypes/examples/stlc+reco+sub.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (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

macrotypes/examples/stlc+reco+var.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (extends "stlc+tup.rkt" #:except × ×? tup proj
                         #:rename [~× ~stlc:×])
 (provide × ∨ (for-syntax ~× ~×* ~∨ ~∨*))

macrotypes/examples/stlc+sub.rkt

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

macrotypes/examples/stlc+tup.rkt

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

macrotypes/examples/stlc.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "typecheck.rkt"
+#lang s-exp macrotypes/typecheck
 (provide (for-syntax current-type=? types=?))
 (provide (for-syntax mk-app-err-msg))
  

macrotypes/examples/sysf.rkt

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

macrotypes/examples/tests/infer-tests.rkt

@@ -1,5 +1,5 @@
 #lang s-exp "../infer.rkt"
-(require "rackunit-typechecking.rkt")
+(require typed-lang-builder/examples/tests/rackunit-typechecking)
 
 (typecheck-fail (λ (x) x) #:with-msg "could not infer type of x; add annotation\\(s\\)")
 

macrotypes/examples/tests/stlc+occurrence-tests.rkt

@@ -1,5 +1,5 @@
 #lang s-exp "../stlc+occurrence.rkt"
-(require "rackunit-typechecking.rkt")
+(require typed-lang-builder/examples/tests/rackunit-typechecking)
 
 ;; -----------------------------------------------------------------------------
 ;; basic types & syntax

macrotypes/examples/tests/stlc+overloading-tests.rkt

@@ -1,5 +1,5 @@
 #lang s-exp "../stlc+overloading.rkt"
-(require "rackunit-typechecking.rkt")
+(require typed-lang-builder/examples/tests/rackunit-typechecking)
 
 ;; -----------------------------------------------------------------------------
 ;; --- syntax for ψ types

tapl/typed-lang-builder/lang/reader.rkt

@@ -1,2 +0,0 @@
-#lang s-exp syntax/module-reader
-macrotypes/tapl/typed-lang-builder/typed-lang-builder

typed-lang-builder/examples/exist.rkt

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

typed-lang-builder/examples/ext-stlc.rkt

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

typed-lang-builder/examples/fomega.rkt

@@ -1,4 +1,4 @@
-#lang macrotypes/tapl/typed-lang-builder
+#lang typed-lang-builder
 (extends "sysf.rkt" #:except #%datum ∀ Λ inst)
 (reuse String #%datum #:from "stlc+reco+var.rkt")
 

typed-lang-builder/examples/fomega2.rkt

@@ -1,4 +1,4 @@
-#lang macrotypes/tapl/typed-lang-builder
+#lang typed-lang-builder
 (extends "sysf.rkt" #:except #%datum ∀ Λ inst);#:rename [~∀ ~sysf:∀])
 (reuse String #%datum #:from "stlc+reco+var.rkt")
 

typed-lang-builder/examples/fomega3.rkt

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

typed-lang-builder/examples/fsub.rkt

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

typed-lang-builder/examples/mlish.rkt

@@ -1,6 +1,6 @@
-#lang macrotypes/tapl/typed-lang-builder
+#lang typed-lang-builder
 (require racket/fixnum racket/flonum
-         (for-syntax "../type-constraints.rkt" "../variance-constraints.rkt"))
+         (for-syntax macrotypes/type-constraints macrotypes/variance-constraints))
 
 (extends "ext-stlc.rkt" #:except #%app λ → + - void = zero? sub1 add1 not let let* and #%datum begin
           #:rename [~→ ~ext-stlc:→])

typed-lang-builder/examples/stlc+box.rkt

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

typed-lang-builder/examples/stlc+cons.rkt

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

typed-lang-builder/examples/stlc+effect.rkt

@@ -1,4 +1,4 @@
-#lang macrotypes/tapl/typed-lang-builder
+#lang typed-lang-builder
 (extends "stlc+box.rkt" #:except ref deref := #%app λ)
 
 ;; Simply-Typed Lambda Calculus, plus mutable references

typed-lang-builder/examples/stlc+lit.rkt

@@ -1,4 +1,4 @@
-#lang macrotypes/tapl/typed-lang-builder
+#lang typed-lang-builder
 (extends "stlc.rkt")
 (provide define-primop)
 

typed-lang-builder/examples/stlc+rec-iso.rkt

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

typed-lang-builder/examples/stlc+reco+sub.rkt

@@ -1,4 +1,4 @@
-#lang macrotypes/tapl/typed-lang-builder
+#lang typed-lang-builder
 (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

typed-lang-builder/examples/stlc+reco+var.rkt

@@ -1,4 +1,4 @@
-#lang macrotypes/tapl/typed-lang-builder
+#lang typed-lang-builder
 (extends "stlc+tup.rkt" #:except × ×? tup proj
                         #:rename [~× ~stlc:×])
 (provide × ∨ (for-syntax ~× ~×* ~∨ ~∨*))

typed-lang-builder/examples/stlc+sub.rkt

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

typed-lang-builder/examples/stlc+tup.rkt

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

typed-lang-builder/examples/stlc.rkt

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

typed-lang-builder/examples/sysf.rkt

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

typed-lang-builder/examples/tests/exist-tests.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "../typed-lang-builder/exist.rkt"
+#lang s-exp "../exist.rkt"
 (require "rackunit-typechecking.rkt")
 
 (check-type (pack (Int 0) as (∃ (X) X)) : (∃ (X) X))

typed-lang-builder/examples/tests/ext-stlc-tests.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "../typed-lang-builder/ext-stlc.rkt"
+#lang s-exp "../ext-stlc.rkt"
 (require "rackunit-typechecking.rkt")
 
 ;; tests for stlc extensions

typed-lang-builder/examples/tests/fomega-tests.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "../typed-lang-builder/fomega.rkt"
+#lang s-exp "../fomega.rkt"
 (require "rackunit-typechecking.rkt")
 
 (check-type Int : ★)

typed-lang-builder/examples/tests/fomega2-tests.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "../typed-lang-builder/fomega2.rkt"
+#lang s-exp "../fomega2.rkt"
 (require "rackunit-typechecking.rkt")
 
 (check-type Int : ★)

typed-lang-builder/examples/tests/fomega3-tests.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "../typed-lang-builder/fomega3.rkt"
+#lang s-exp "../fomega3.rkt"
 (require "rackunit-typechecking.rkt")
 
 (check-type Int : ★)

typed-lang-builder/examples/tests/fsub-tests.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "../typed-lang-builder/fsub.rkt"
+#lang s-exp "../fsub.rkt"
 (require "rackunit-typechecking.rkt")
 
 ;; examples from tapl ch26, bounded quantification

typed-lang-builder/examples/tests/mlish-tests.rkt

@@ -1,4 +1,4 @@
-#lang s-exp "../typed-lang-builder/mlish.rkt"
+#lang s-exp "../mlish.rkt"
 (require "rackunit-typechecking.rkt")
 
 ;; match on tups

typed-lang-builder/examples/tests/mlish/ack.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; tests cond with else

typed-lang-builder/examples/tests/mlish/alex.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; the following function def produces error:

typed-lang-builder/examples/tests/mlish/ary.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; test vectors and for loops

typed-lang-builder/examples/tests/mlish/bg/basics-general.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../../mlish.rkt"
 
 (define-type (List X)
   Nil

typed-lang-builder/examples/tests/mlish/bg/basics.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../../mlish.rkt"
 (require "../../rackunit-typechecking.rkt")
 (require "basics-general.mlish")
 (require-typed map append fst snd member foldl foldr filter sum reverse

typed-lang-builder/examples/tests/mlish/bg/basics2.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../../mlish.rkt"
 (require "../../rackunit-typechecking.rkt")
 (require "basics-general.mlish")
 (require-typed append filter foldr foldl reverse snd member 

typed-lang-builder/examples/tests/mlish/bg/huffman.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../../mlish.rkt"
 (require "../../rackunit-typechecking.rkt")
 
 ;; Huffman trees from SICP

typed-lang-builder/examples/tests/mlish/bg/lambda.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../../mlish.rkt"
 (require "../../rackunit-typechecking.rkt")
 
 ;; Lambda Calculus interpreter

typed-lang-builder/examples/tests/mlish/bg/monad.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../../mlish.rkt"
 (require "../../rackunit-typechecking.rkt")
 
 (define-type (Option A)

typed-lang-builder/examples/tests/mlish/bg/okasaki.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../../mlish.rkt"
 (require "../../rackunit-typechecking.rkt")
 
 ;; TODO

typed-lang-builder/examples/tests/mlish/chameneos.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define-type Color Red Yellow Blue)

typed-lang-builder/examples/tests/mlish/fannkuch.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define (fannkuch [n : Int] -> Int)

typed-lang-builder/examples/tests/mlish/fasta.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define +alu+

typed-lang-builder/examples/tests/mlish/fibo.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define (fib [n : Int] -> Int)

typed-lang-builder/examples/tests/mlish/find.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define-type (List X)

typed-lang-builder/examples/tests/mlish/hash.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define (main [argv : (Vector String)] -> Int)

typed-lang-builder/examples/tests/mlish/infer-variances.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define-type T1 t1)

typed-lang-builder/examples/tests/mlish/inst.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; tests for instantiation of polymorphic functions and constructors

typed-lang-builder/examples/tests/mlish/knuc.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (require-typed mk-fasta #:from "fasta.mlish")

typed-lang-builder/examples/tests/mlish/listpats.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; pattern matching for built-in lists

typed-lang-builder/examples/tests/mlish/loop.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; datatype with no self-reference

typed-lang-builder/examples/tests/mlish/match2.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; alternate match that supports nested patterns

typed-lang-builder/examples/tests/mlish/matrix.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define-type-alias Matrix (Vector (Vector Int)))

typed-lang-builder/examples/tests/mlish/nbody.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define +pi+ 3.141592653589793)

typed-lang-builder/examples/tests/mlish/polyrecur.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; tests of polymorphic recursion

typed-lang-builder/examples/tests/mlish/queens.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; function polymorphic in list element

typed-lang-builder/examples/tests/mlish/result.mlish

@@ -1,5 +1,5 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
-(require "../rackunit-typechecking.rkt" "../../typed-lang-builder/mlish-do.rkt")
+#lang s-exp "../../mlish.rkt"
+(require "../rackunit-typechecking.rkt" "../../mlish-do.rkt")
 
 (define-type (Result A B)
   (Ok A)

typed-lang-builder/examples/tests/mlish/sweet-map.rkt

@@ -1,4 +1,4 @@
-#lang sweet-exp "../../typed-lang-builder/mlish.rkt"
+#lang sweet-exp "../../mlish.rkt"
 
 define
   sum [lst : (List Int)] → Int

typed-lang-builder/examples/tests/mlish/term.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 ;; from chap 6 of RW OCaml

typed-lang-builder/examples/tests/mlish/trees-tests.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 (require "trees.mlish")
 

typed-lang-builder/examples/tests/mlish/trees.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define-type (Tree X)

typed-lang-builder/examples/tests/mlish/value-restriction-example.mlish

@@ -1,4 +1,4 @@
-#lang s-exp "../../typed-lang-builder/mlish.rkt"
+#lang s-exp "../../mlish.rkt"
 (require "../rackunit-typechecking.rkt")
 
 (define-type (Option X)

typed-lang-builder/examples/tests/rackunit-typechecking.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require (for-syntax rackunit syntax/srcloc) rackunit "../typecheck.rkt")
+(require (for-syntax rackunit syntax/srcloc) rackunit macrotypes/typecheck)
 (provide check-type typecheck-fail check-not-type check-props check-runtime-exn)
 
 (begin-for-syntax

typed-lang-builder/examples/tests/run-all-tests.rkt

@@ -27,11 +27,11 @@
 (require "fomega2-tests.rkt")
 (require "fomega3-tests.rkt")
 
-(require "stlc+occurrence-tests.rkt")
-(require "stlc+overloading-tests.rkt")
+(require macrotypes/examples/tests/stlc+occurrence-tests)
+(require macrotypes/examples/tests/stlc+overloading-tests)
 
 ;; type inference
-(require "infer-tests.rkt")
+(require macrotypes/examples/tests/infer-tests)
 
 ;; type and effects
 (require "stlc+effect-tests.rkt")