From 358f9970652282cb69b3b85c35d00612ec2fcfef Mon Sep 17 00:00:00 2001 From: AlexKnauth Date: Tue, 28 Jun 2016 13:14:21 -0400 Subject: [PATCH] reorganize --- info.rkt | 9 +++++++++ {tapl => macrotypes/examples}/README.md | 0 {tapl => macrotypes/examples}/exist.rkt | 2 +- {tapl => macrotypes/examples}/ext-stlc.rkt | 2 +- {tapl => macrotypes/examples}/fomega.rkt | 2 +- {tapl => macrotypes/examples}/fomega2.rkt | 2 +- .../examples}/fomega3.rkt | 2 +- {tapl => macrotypes/examples}/fsub.rkt | 2 +- {tapl => macrotypes/examples}/id-expand-experiment.rkt | 0 {tapl => macrotypes/examples}/infer.rkt | 4 ++-- {tapl => macrotypes/examples}/lam-testing.rkt | 0 {tapl => macrotypes/examples}/mlish-do.rkt | 0 {tapl => macrotypes/examples}/mlish.rkt | 5 +++-- {tapl => macrotypes/examples}/notes.txt | 0 {tapl => macrotypes/examples}/stlc+box.rkt | 2 +- {tapl => macrotypes/examples}/stlc+cons.rkt | 2 +- {tapl => macrotypes/examples}/stlc+effect.rkt | 2 +- {tapl => macrotypes/examples}/stlc+lit.rkt | 2 +- {tapl => macrotypes/examples}/stlc+occurrence.rkt | 2 +- {tapl => macrotypes/examples}/stlc+overloading.rkt | 2 +- {tapl => macrotypes/examples}/stlc+rec-iso.rkt | 2 +- {tapl => macrotypes/examples}/stlc+reco+sub.rkt | 2 +- {tapl => macrotypes/examples}/stlc+reco+var.rkt | 2 +- {tapl => macrotypes/examples}/stlc+sub.rkt | 2 +- {tapl => macrotypes/examples}/stlc+tup.rkt | 2 +- {tapl => macrotypes/examples}/stlc.rkt | 2 +- {tapl => macrotypes/examples}/sysf.rkt | 2 +- {tapl => macrotypes/examples}/tests/infer-tests.rkt | 2 +- .../examples}/tests/lam-testing-tests.rkt | 0 .../examples}/tests/stlc+occurrence-tests.rkt | 2 +- .../examples}/tests/stlc+overloading-tests.rkt | 2 +- {tapl => macrotypes}/postfix-in.rkt | 0 {tapl => macrotypes}/stx-utils.rkt | 0 {tapl => macrotypes}/type-constraints.rkt | 0 {tapl => macrotypes}/typecheck.rkt | 0 {tapl => macrotypes}/variance-constraints.rkt | 0 tapl/typed-lang-builder/lang/reader.rkt | 2 -- .../examples}/exist.rkt | 2 +- .../examples}/ext-stlc.rkt | 2 +- .../examples}/fomega.rkt | 2 +- .../examples}/fomega2.rkt | 2 +- {tapl => typed-lang-builder/examples}/fomega3.rkt | 2 +- .../examples}/fsub.rkt | 2 +- .../examples}/mlish-do.rkt | 0 .../examples}/mlish.rkt | 4 ++-- .../examples}/stlc+box.rkt | 2 +- .../examples}/stlc+cons.rkt | 2 +- .../examples}/stlc+effect.rkt | 2 +- .../examples}/stlc+lit.rkt | 2 +- .../examples}/stlc+rec-iso.rkt | 2 +- .../examples}/stlc+reco+sub.rkt | 2 +- .../examples}/stlc+reco+var.rkt | 2 +- .../examples}/stlc+sub.rkt | 2 +- .../examples}/stlc+tup.rkt | 2 +- .../examples}/stlc.rkt | 2 +- .../examples}/sysf.rkt | 2 +- .../examples}/tests/exist-tests.rkt | 2 +- .../examples}/tests/ext-stlc-tests.rkt | 2 +- .../examples}/tests/fomega-tests.rkt | 2 +- .../examples}/tests/fomega2-tests.rkt | 2 +- .../examples}/tests/fomega3-tests.rkt | 2 +- .../examples}/tests/fsub-tests.rkt | 2 +- .../examples}/tests/mlish-tests.rkt | 2 +- .../examples}/tests/mlish/ack.mlish | 2 +- .../examples}/tests/mlish/alex.mlish | 2 +- .../examples}/tests/mlish/ary.mlish | 2 +- .../examples}/tests/mlish/bg/README.md | 0 .../examples}/tests/mlish/bg/basics-general.mlish | 2 +- .../examples}/tests/mlish/bg/basics.mlish | 2 +- .../examples}/tests/mlish/bg/basics2.mlish | 2 +- .../examples}/tests/mlish/bg/huffman.mlish | 2 +- .../examples}/tests/mlish/bg/lambda.mlish | 2 +- .../examples}/tests/mlish/bg/monad.mlish | 2 +- .../examples}/tests/mlish/bg/okasaki.mlish | 2 +- .../examples}/tests/mlish/chameneos.mlish | 2 +- .../examples}/tests/mlish/fannkuch.mlish | 2 +- .../examples}/tests/mlish/fasta.mlish | 2 +- .../examples}/tests/mlish/fibo.mlish | 2 +- .../examples}/tests/mlish/find.mlish | 2 +- .../examples}/tests/mlish/hash.mlish | 2 +- .../examples}/tests/mlish/infer-variances.mlish | 2 +- .../examples}/tests/mlish/inst.mlish | 2 +- .../examples}/tests/mlish/knuc.mlish | 2 +- .../examples}/tests/mlish/listpats.mlish | 2 +- .../examples}/tests/mlish/loop.mlish | 2 +- .../examples}/tests/mlish/match2.mlish | 2 +- .../examples}/tests/mlish/matrix.mlish | 2 +- .../examples}/tests/mlish/nbody.mlish | 2 +- .../examples}/tests/mlish/polyrecur.mlish | 2 +- .../examples}/tests/mlish/queens.mlish | 2 +- .../examples}/tests/mlish/result.mlish | 4 ++-- .../examples}/tests/mlish/sweet-map.rkt | 2 +- .../examples}/tests/mlish/term.mlish | 2 +- .../examples}/tests/mlish/trees-tests.mlish | 2 +- .../examples}/tests/mlish/trees.mlish | 2 +- .../tests/mlish/value-restriction-example.mlish | 2 +- .../examples}/tests/rackunit-typechecking.rkt | 2 +- .../examples}/tests/run-all-mlish-tests.rkt | 0 .../examples}/tests/run-all-tests.rkt | 6 +++--- .../examples}/tests/run-mlish-tests1.rkt | 0 .../examples}/tests/run-mlish-tests2.rkt | 0 .../examples}/tests/run-mlish-tests3.rkt | 0 .../examples}/tests/run-mlish-tests4.rkt | 0 .../examples}/tests/stlc+box-tests.rkt | 2 +- .../examples}/tests/stlc+cons-tests.rkt | 2 +- .../examples}/tests/stlc+effect-tests.rkt | 10 +++++----- .../examples}/tests/stlc+lit-tests.rkt | 2 +- .../examples}/tests/stlc+rec-iso-tests.rkt | 2 +- .../examples}/tests/stlc+reco+sub-tests.rkt | 2 +- .../examples}/tests/stlc+reco+var-tests.rkt | 2 +- .../examples}/tests/stlc+sub-tests.rkt | 2 +- .../examples}/tests/stlc+tup-tests.rkt | 2 +- .../examples}/tests/stlc-tests.rkt | 2 +- .../examples}/tests/sysf-tests.rkt | 2 +- typed-lang-builder/lang/reader.rkt | 2 ++ .../typed-lang-builder.rkt | 10 +++++----- 116 files changed, 121 insertions(+), 111 deletions(-) create mode 100644 info.rkt rename {tapl => macrotypes/examples}/README.md (100%) rename {tapl => macrotypes/examples}/exist.rkt (98%) rename {tapl => macrotypes/examples}/ext-stlc.rkt (99%) rename {tapl => macrotypes/examples}/fomega.rkt (99%) rename {tapl => macrotypes/examples}/fomega2.rkt (99%) rename {tapl/typed-lang-builder => macrotypes/examples}/fomega3.rkt (97%) rename {tapl => macrotypes/examples}/fsub.rkt (98%) rename {tapl => macrotypes/examples}/id-expand-experiment.rkt (100%) rename {tapl => macrotypes/examples}/infer.rkt (99%) rename {tapl => macrotypes/examples}/lam-testing.rkt (100%) rename {tapl => macrotypes/examples}/mlish-do.rkt (100%) rename {tapl => macrotypes/examples}/mlish.rkt (99%) rename {tapl => macrotypes/examples}/notes.txt (100%) rename {tapl => macrotypes/examples}/stlc+box.rkt (95%) rename {tapl => macrotypes/examples}/stlc+cons.rkt (99%) rename {tapl => macrotypes/examples}/stlc+effect.rkt (99%) rename {tapl => macrotypes/examples}/stlc+lit.rkt (97%) rename {tapl => macrotypes/examples}/stlc+occurrence.rkt (99%) rename {tapl => macrotypes/examples}/stlc+overloading.rkt (99%) rename {tapl => macrotypes/examples}/stlc+rec-iso.rkt (98%) rename {tapl => macrotypes/examples}/stlc+reco+sub.rkt (98%) rename {tapl => macrotypes/examples}/stlc+reco+var.rkt (99%) rename {tapl => macrotypes/examples}/stlc+sub.rkt (99%) rename {tapl => macrotypes/examples}/stlc+tup.rkt (97%) rename {tapl => macrotypes/examples}/stlc.rkt (99%) rename {tapl => macrotypes/examples}/sysf.rkt (96%) rename {tapl => macrotypes/examples}/tests/infer-tests.rkt (99%) rename {tapl => macrotypes/examples}/tests/lam-testing-tests.rkt (100%) rename {tapl => macrotypes/examples}/tests/stlc+occurrence-tests.rkt (99%) rename {tapl => macrotypes/examples}/tests/stlc+overloading-tests.rkt (97%) rename {tapl => macrotypes}/postfix-in.rkt (100%) rename {tapl => macrotypes}/stx-utils.rkt (100%) rename {tapl => macrotypes}/type-constraints.rkt (100%) rename {tapl => macrotypes}/typecheck.rkt (100%) rename {tapl => macrotypes}/variance-constraints.rkt (100%) delete mode 100644 tapl/typed-lang-builder/lang/reader.rkt rename {tapl/typed-lang-builder => typed-lang-builder/examples}/exist.rkt (98%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/ext-stlc.rkt (99%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/fomega.rkt (99%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/fomega2.rkt (98%) rename {tapl => typed-lang-builder/examples}/fomega3.rkt (98%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/fsub.rkt (98%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/mlish-do.rkt (100%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/mlish.rkt (99%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+box.rkt (94%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+cons.rkt (98%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+effect.rkt (98%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+lit.rkt (96%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+rec-iso.rkt (97%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+reco+sub.rkt (97%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+reco+var.rkt (99%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+sub.rkt (98%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc+tup.rkt (95%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/stlc.rkt (98%) rename {tapl/typed-lang-builder => typed-lang-builder/examples}/sysf.rkt (94%) rename {tapl => typed-lang-builder/examples}/tests/exist-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/ext-stlc-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/fomega-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/fomega2-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/fomega3-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/fsub-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/ack.mlish (93%) rename {tapl => typed-lang-builder/examples}/tests/mlish/alex.mlish (94%) rename {tapl => typed-lang-builder/examples}/tests/mlish/ary.mlish (94%) rename {tapl => typed-lang-builder/examples}/tests/mlish/bg/README.md (100%) rename {tapl => typed-lang-builder/examples}/tests/mlish/bg/basics-general.mlish (96%) rename {tapl => typed-lang-builder/examples}/tests/mlish/bg/basics.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/bg/basics2.mlish (98%) rename {tapl => typed-lang-builder/examples}/tests/mlish/bg/huffman.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/bg/lambda.mlish (97%) rename {tapl => typed-lang-builder/examples}/tests/mlish/bg/monad.mlish (98%) rename {tapl => typed-lang-builder/examples}/tests/mlish/bg/okasaki.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/chameneos.mlish (98%) rename {tapl => typed-lang-builder/examples}/tests/mlish/fannkuch.mlish (97%) rename {tapl => typed-lang-builder/examples}/tests/mlish/fasta.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/fibo.mlish (91%) rename {tapl => typed-lang-builder/examples}/tests/mlish/find.mlish (97%) rename {tapl => typed-lang-builder/examples}/tests/mlish/hash.mlish (91%) rename {tapl => typed-lang-builder/examples}/tests/mlish/infer-variances.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/inst.mlish (97%) rename {tapl => typed-lang-builder/examples}/tests/mlish/knuc.mlish (97%) rename {tapl => typed-lang-builder/examples}/tests/mlish/listpats.mlish (96%) rename {tapl => typed-lang-builder/examples}/tests/mlish/loop.mlish (98%) rename {tapl => typed-lang-builder/examples}/tests/mlish/match2.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/matrix.mlish (97%) rename {tapl => typed-lang-builder/examples}/tests/mlish/nbody.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/polyrecur.mlish (98%) rename {tapl => typed-lang-builder/examples}/tests/mlish/queens.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/result.mlish (96%) rename {tapl => typed-lang-builder/examples}/tests/mlish/sweet-map.rkt (84%) rename {tapl => typed-lang-builder/examples}/tests/mlish/term.mlish (99%) rename {tapl => typed-lang-builder/examples}/tests/mlish/trees-tests.mlish (96%) rename {tapl => typed-lang-builder/examples}/tests/mlish/trees.mlish (73%) rename {tapl => typed-lang-builder/examples}/tests/mlish/value-restriction-example.mlish (93%) rename {tapl => typed-lang-builder/examples}/tests/rackunit-typechecking.rkt (98%) rename {tapl => typed-lang-builder/examples}/tests/run-all-mlish-tests.rkt (100%) rename {tapl => typed-lang-builder/examples}/tests/run-all-tests.rkt (80%) rename {tapl => typed-lang-builder/examples}/tests/run-mlish-tests1.rkt (100%) rename {tapl => typed-lang-builder/examples}/tests/run-mlish-tests2.rkt (100%) rename {tapl => typed-lang-builder/examples}/tests/run-mlish-tests3.rkt (100%) rename {tapl => typed-lang-builder/examples}/tests/run-mlish-tests4.rkt (100%) rename {tapl => typed-lang-builder/examples}/tests/stlc+box-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/stlc+cons-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/stlc+effect-tests.rkt (97%) rename {tapl => typed-lang-builder/examples}/tests/stlc+lit-tests.rkt (97%) rename {tapl => typed-lang-builder/examples}/tests/stlc+rec-iso-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/stlc+reco+sub-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/stlc+reco+var-tests.rkt (99%) rename {tapl => typed-lang-builder/examples}/tests/stlc+sub-tests.rkt (98%) rename {tapl => typed-lang-builder/examples}/tests/stlc+tup-tests.rkt (98%) rename {tapl => typed-lang-builder/examples}/tests/stlc-tests.rkt (89%) rename {tapl => typed-lang-builder/examples}/tests/sysf-tests.rkt (98%) create mode 100644 typed-lang-builder/lang/reader.rkt rename {tapl/typed-lang-builder => typed-lang-builder}/typed-lang-builder.rkt (97%) diff --git a/info.rkt b/info.rkt new file mode 100644 index 0000000..b70d8a7 --- /dev/null +++ b/info.rkt @@ -0,0 +1,9 @@ +#lang info + +(define collection 'multi) + +(define deps + '("base" + "sweet-exp" + )) + diff --git a/tapl/README.md b/macrotypes/examples/README.md similarity index 100% rename from tapl/README.md rename to macrotypes/examples/README.md diff --git a/tapl/exist.rkt b/macrotypes/examples/exist.rkt similarity index 98% rename from tapl/exist.rkt rename to macrotypes/examples/exist.rkt index 81238c3..1df2a28 100644 --- a/tapl/exist.rkt +++ b/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=? diff --git a/tapl/ext-stlc.rkt b/macrotypes/examples/ext-stlc.rkt similarity index 99% rename from tapl/ext-stlc.rkt rename to macrotypes/examples/ext-stlc.rkt index 18df90f..2d9dce4 100644 --- a/tapl/ext-stlc.rkt +++ b/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)) diff --git a/tapl/fomega.rkt b/macrotypes/examples/fomega.rkt similarity index 99% rename from tapl/fomega.rkt rename to macrotypes/examples/fomega.rkt index f23fcc1..8113ab6 100644 --- a/tapl/fomega.rkt +++ b/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") diff --git a/tapl/fomega2.rkt b/macrotypes/examples/fomega2.rkt similarity index 99% rename from tapl/fomega2.rkt rename to macrotypes/examples/fomega2.rkt index 63f030b..4b14f5b 100644 --- a/tapl/fomega2.rkt +++ b/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") diff --git a/tapl/typed-lang-builder/fomega3.rkt b/macrotypes/examples/fomega3.rkt similarity index 97% rename from tapl/typed-lang-builder/fomega3.rkt rename to macrotypes/examples/fomega3.rkt index 471f71a..956f16a 100644 --- a/tapl/typed-lang-builder/fomega3.rkt +++ b/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?)) diff --git a/tapl/fsub.rkt b/macrotypes/examples/fsub.rkt similarity index 98% rename from tapl/fsub.rkt rename to macrotypes/examples/fsub.rkt index ea4b80c..d73f646 100644 --- a/tapl/fsub.rkt +++ b/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:∀])) diff --git a/tapl/id-expand-experiment.rkt b/macrotypes/examples/id-expand-experiment.rkt similarity index 100% rename from tapl/id-expand-experiment.rkt rename to macrotypes/examples/id-expand-experiment.rkt diff --git a/tapl/infer.rkt b/macrotypes/examples/infer.rkt similarity index 99% rename from tapl/infer.rkt rename to macrotypes/examples/infer.rkt index e9636d4..333e2a0 100644 --- a/tapl/infer.rkt +++ b/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 →) diff --git a/tapl/lam-testing.rkt b/macrotypes/examples/lam-testing.rkt similarity index 100% rename from tapl/lam-testing.rkt rename to macrotypes/examples/lam-testing.rkt diff --git a/tapl/mlish-do.rkt b/macrotypes/examples/mlish-do.rkt similarity index 100% rename from tapl/mlish-do.rkt rename to macrotypes/examples/mlish-do.rkt diff --git a/tapl/mlish.rkt b/macrotypes/examples/mlish.rkt similarity index 99% rename from tapl/mlish.rkt rename to macrotypes/examples/mlish.rkt index 793cba5..37ab703 100644 --- a/tapl/mlish.rkt +++ b/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:→]) diff --git a/tapl/notes.txt b/macrotypes/examples/notes.txt similarity index 100% rename from tapl/notes.txt rename to macrotypes/examples/notes.txt diff --git a/tapl/stlc+box.rkt b/macrotypes/examples/stlc+box.rkt similarity index 95% rename from tapl/stlc+box.rkt rename to macrotypes/examples/stlc+box.rkt index adf6cfb..79f155c 100644 --- a/tapl/stlc+box.rkt +++ b/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 diff --git a/tapl/stlc+cons.rkt b/macrotypes/examples/stlc+cons.rkt similarity index 99% rename from tapl/stlc+cons.rkt rename to macrotypes/examples/stlc+cons.rkt index fd04cc6..214d717 100644 --- a/tapl/stlc+cons.rkt +++ b/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 diff --git a/tapl/stlc+effect.rkt b/macrotypes/examples/stlc+effect.rkt similarity index 99% rename from tapl/stlc+effect.rkt rename to macrotypes/examples/stlc+effect.rkt index b9e71e9..68ec8e8 100644 --- a/tapl/stlc+effect.rkt +++ b/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)) diff --git a/tapl/stlc+lit.rkt b/macrotypes/examples/stlc+lit.rkt similarity index 97% rename from tapl/stlc+lit.rkt rename to macrotypes/examples/stlc+lit.rkt index 83bf537..66e4041 100644 --- a/tapl/stlc+lit.rkt +++ b/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) diff --git a/tapl/stlc+occurrence.rkt b/macrotypes/examples/stlc+occurrence.rkt similarity index 99% rename from tapl/stlc+occurrence.rkt rename to macrotypes/examples/stlc+occurrence.rkt index dcece54..756daa0 100644 --- a/tapl/stlc+occurrence.rkt +++ b/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") diff --git a/tapl/stlc+overloading.rkt b/macrotypes/examples/stlc+overloading.rkt similarity index 99% rename from tapl/stlc+overloading.rkt rename to macrotypes/examples/stlc+overloading.rkt index b6a1f0d..3b2c9e4 100644 --- a/tapl/stlc+overloading.rkt +++ b/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) diff --git a/tapl/stlc+rec-iso.rkt b/macrotypes/examples/stlc+rec-iso.rkt similarity index 98% rename from tapl/stlc+rec-iso.rkt rename to macrotypes/examples/stlc+rec-iso.rkt index f22e218..1dbe3d1 100644 --- a/tapl/stlc+rec-iso.rkt +++ b/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") diff --git a/tapl/stlc+reco+sub.rkt b/macrotypes/examples/stlc+reco+sub.rkt similarity index 98% rename from tapl/stlc+reco+sub.rkt rename to macrotypes/examples/stlc+reco+sub.rkt index eb0101d..e59b579 100644 --- a/tapl/stlc+reco+sub.rkt +++ b/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 diff --git a/tapl/stlc+reco+var.rkt b/macrotypes/examples/stlc+reco+var.rkt similarity index 99% rename from tapl/stlc+reco+var.rkt rename to macrotypes/examples/stlc+reco+var.rkt index 8571054..de9895a 100644 --- a/tapl/stlc+reco+var.rkt +++ b/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 ~× ~×* ~∨ ~∨*)) diff --git a/tapl/stlc+sub.rkt b/macrotypes/examples/stlc+sub.rkt similarity index 99% rename from tapl/stlc+sub.rkt rename to macrotypes/examples/stlc+sub.rkt index 2aa7cae..6e9c3b2 100644 --- a/tapl/stlc+sub.rkt +++ b/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)) diff --git a/tapl/stlc+tup.rkt b/macrotypes/examples/stlc+tup.rkt similarity index 97% rename from tapl/stlc+tup.rkt rename to macrotypes/examples/stlc+tup.rkt index 0ad8bf3..c742c21 100644 --- a/tapl/stlc+tup.rkt +++ b/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)) diff --git a/tapl/stlc.rkt b/macrotypes/examples/stlc.rkt similarity index 99% rename from tapl/stlc.rkt rename to macrotypes/examples/stlc.rkt index 72e2d5f..29c6e02 100644 --- a/tapl/stlc.rkt +++ b/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)) diff --git a/tapl/sysf.rkt b/macrotypes/examples/sysf.rkt similarity index 96% rename from tapl/sysf.rkt rename to macrotypes/examples/sysf.rkt index 5b030b3..0a29fcd 100644 --- a/tapl/sysf.rkt +++ b/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=? diff --git a/tapl/tests/infer-tests.rkt b/macrotypes/examples/tests/infer-tests.rkt similarity index 99% rename from tapl/tests/infer-tests.rkt rename to macrotypes/examples/tests/infer-tests.rkt index 73f304c..f48775d 100644 --- a/tapl/tests/infer-tests.rkt +++ b/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\\)") diff --git a/tapl/tests/lam-testing-tests.rkt b/macrotypes/examples/tests/lam-testing-tests.rkt similarity index 100% rename from tapl/tests/lam-testing-tests.rkt rename to macrotypes/examples/tests/lam-testing-tests.rkt diff --git a/tapl/tests/stlc+occurrence-tests.rkt b/macrotypes/examples/tests/stlc+occurrence-tests.rkt similarity index 99% rename from tapl/tests/stlc+occurrence-tests.rkt rename to macrotypes/examples/tests/stlc+occurrence-tests.rkt index cd03d9c..b4dac45 100644 --- a/tapl/tests/stlc+occurrence-tests.rkt +++ b/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 diff --git a/tapl/tests/stlc+overloading-tests.rkt b/macrotypes/examples/tests/stlc+overloading-tests.rkt similarity index 97% rename from tapl/tests/stlc+overloading-tests.rkt rename to macrotypes/examples/tests/stlc+overloading-tests.rkt index 447dfd5..2895086 100644 --- a/tapl/tests/stlc+overloading-tests.rkt +++ b/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 diff --git a/tapl/postfix-in.rkt b/macrotypes/postfix-in.rkt similarity index 100% rename from tapl/postfix-in.rkt rename to macrotypes/postfix-in.rkt diff --git a/tapl/stx-utils.rkt b/macrotypes/stx-utils.rkt similarity index 100% rename from tapl/stx-utils.rkt rename to macrotypes/stx-utils.rkt diff --git a/tapl/type-constraints.rkt b/macrotypes/type-constraints.rkt similarity index 100% rename from tapl/type-constraints.rkt rename to macrotypes/type-constraints.rkt diff --git a/tapl/typecheck.rkt b/macrotypes/typecheck.rkt similarity index 100% rename from tapl/typecheck.rkt rename to macrotypes/typecheck.rkt diff --git a/tapl/variance-constraints.rkt b/macrotypes/variance-constraints.rkt similarity index 100% rename from tapl/variance-constraints.rkt rename to macrotypes/variance-constraints.rkt diff --git a/tapl/typed-lang-builder/lang/reader.rkt b/tapl/typed-lang-builder/lang/reader.rkt deleted file mode 100644 index 0deb76e..0000000 --- a/tapl/typed-lang-builder/lang/reader.rkt +++ /dev/null @@ -1,2 +0,0 @@ -#lang s-exp syntax/module-reader -macrotypes/tapl/typed-lang-builder/typed-lang-builder diff --git a/tapl/typed-lang-builder/exist.rkt b/typed-lang-builder/examples/exist.rkt similarity index 98% rename from tapl/typed-lang-builder/exist.rkt rename to typed-lang-builder/examples/exist.rkt index a86f298..df0bd0d 100644 --- a/tapl/typed-lang-builder/exist.rkt +++ b/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=? diff --git a/tapl/typed-lang-builder/ext-stlc.rkt b/typed-lang-builder/examples/ext-stlc.rkt similarity index 99% rename from tapl/typed-lang-builder/ext-stlc.rkt rename to typed-lang-builder/examples/ext-stlc.rkt index 0a3ab46..3871aca 100644 --- a/tapl/typed-lang-builder/ext-stlc.rkt +++ b/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)) diff --git a/tapl/typed-lang-builder/fomega.rkt b/typed-lang-builder/examples/fomega.rkt similarity index 99% rename from tapl/typed-lang-builder/fomega.rkt rename to typed-lang-builder/examples/fomega.rkt index 16937b4..681a0ac 100644 --- a/tapl/typed-lang-builder/fomega.rkt +++ b/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") diff --git a/tapl/typed-lang-builder/fomega2.rkt b/typed-lang-builder/examples/fomega2.rkt similarity index 98% rename from tapl/typed-lang-builder/fomega2.rkt rename to typed-lang-builder/examples/fomega2.rkt index 93bb837..5714ac7 100644 --- a/tapl/typed-lang-builder/fomega2.rkt +++ b/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") diff --git a/tapl/fomega3.rkt b/typed-lang-builder/examples/fomega3.rkt similarity index 98% rename from tapl/fomega3.rkt rename to typed-lang-builder/examples/fomega3.rkt index 6509f2f..fac1677 100644 --- a/tapl/fomega3.rkt +++ b/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?)) diff --git a/tapl/typed-lang-builder/fsub.rkt b/typed-lang-builder/examples/fsub.rkt similarity index 98% rename from tapl/typed-lang-builder/fsub.rkt rename to typed-lang-builder/examples/fsub.rkt index 43790f9..3c6450e 100644 --- a/tapl/typed-lang-builder/fsub.rkt +++ b/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:∀])) diff --git a/tapl/typed-lang-builder/mlish-do.rkt b/typed-lang-builder/examples/mlish-do.rkt similarity index 100% rename from tapl/typed-lang-builder/mlish-do.rkt rename to typed-lang-builder/examples/mlish-do.rkt diff --git a/tapl/typed-lang-builder/mlish.rkt b/typed-lang-builder/examples/mlish.rkt similarity index 99% rename from tapl/typed-lang-builder/mlish.rkt rename to typed-lang-builder/examples/mlish.rkt index 056385c..e2b7b08 100644 --- a/tapl/typed-lang-builder/mlish.rkt +++ b/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:→]) diff --git a/tapl/typed-lang-builder/stlc+box.rkt b/typed-lang-builder/examples/stlc+box.rkt similarity index 94% rename from tapl/typed-lang-builder/stlc+box.rkt rename to typed-lang-builder/examples/stlc+box.rkt index d0ac8d7..7240f45 100644 --- a/tapl/typed-lang-builder/stlc+box.rkt +++ b/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 diff --git a/tapl/typed-lang-builder/stlc+cons.rkt b/typed-lang-builder/examples/stlc+cons.rkt similarity index 98% rename from tapl/typed-lang-builder/stlc+cons.rkt rename to typed-lang-builder/examples/stlc+cons.rkt index 39344d7..a00e1c9 100644 --- a/tapl/typed-lang-builder/stlc+cons.rkt +++ b/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 diff --git a/tapl/typed-lang-builder/stlc+effect.rkt b/typed-lang-builder/examples/stlc+effect.rkt similarity index 98% rename from tapl/typed-lang-builder/stlc+effect.rkt rename to typed-lang-builder/examples/stlc+effect.rkt index 620128e..68cd355 100644 --- a/tapl/typed-lang-builder/stlc+effect.rkt +++ b/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 diff --git a/tapl/typed-lang-builder/stlc+lit.rkt b/typed-lang-builder/examples/stlc+lit.rkt similarity index 96% rename from tapl/typed-lang-builder/stlc+lit.rkt rename to typed-lang-builder/examples/stlc+lit.rkt index d470462..726a3fb 100644 --- a/tapl/typed-lang-builder/stlc+lit.rkt +++ b/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) diff --git a/tapl/typed-lang-builder/stlc+rec-iso.rkt b/typed-lang-builder/examples/stlc+rec-iso.rkt similarity index 97% rename from tapl/typed-lang-builder/stlc+rec-iso.rkt rename to typed-lang-builder/examples/stlc+rec-iso.rkt index a673ddd..b4b87f6 100644 --- a/tapl/typed-lang-builder/stlc+rec-iso.rkt +++ b/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") diff --git a/tapl/typed-lang-builder/stlc+reco+sub.rkt b/typed-lang-builder/examples/stlc+reco+sub.rkt similarity index 97% rename from tapl/typed-lang-builder/stlc+reco+sub.rkt rename to typed-lang-builder/examples/stlc+reco+sub.rkt index 77bc910..24aca36 100644 --- a/tapl/typed-lang-builder/stlc+reco+sub.rkt +++ b/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 diff --git a/tapl/typed-lang-builder/stlc+reco+var.rkt b/typed-lang-builder/examples/stlc+reco+var.rkt similarity index 99% rename from tapl/typed-lang-builder/stlc+reco+var.rkt rename to typed-lang-builder/examples/stlc+reco+var.rkt index 2257546..3668de4 100644 --- a/tapl/typed-lang-builder/stlc+reco+var.rkt +++ b/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 ~× ~×* ~∨ ~∨*)) diff --git a/tapl/typed-lang-builder/stlc+sub.rkt b/typed-lang-builder/examples/stlc+sub.rkt similarity index 98% rename from tapl/typed-lang-builder/stlc+sub.rkt rename to typed-lang-builder/examples/stlc+sub.rkt index 5c3906f..08180f0 100644 --- a/tapl/typed-lang-builder/stlc+sub.rkt +++ b/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)) diff --git a/tapl/typed-lang-builder/stlc+tup.rkt b/typed-lang-builder/examples/stlc+tup.rkt similarity index 95% rename from tapl/typed-lang-builder/stlc+tup.rkt rename to typed-lang-builder/examples/stlc+tup.rkt index 2ccbe7a..91fbfad 100644 --- a/tapl/typed-lang-builder/stlc+tup.rkt +++ b/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)) diff --git a/tapl/typed-lang-builder/stlc.rkt b/typed-lang-builder/examples/stlc.rkt similarity index 98% rename from tapl/typed-lang-builder/stlc.rkt rename to typed-lang-builder/examples/stlc.rkt index d3efd01..4c44b01 100644 --- a/tapl/typed-lang-builder/stlc.rkt +++ b/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 diff --git a/tapl/typed-lang-builder/sysf.rkt b/typed-lang-builder/examples/sysf.rkt similarity index 94% rename from tapl/typed-lang-builder/sysf.rkt rename to typed-lang-builder/examples/sysf.rkt index 9dbc984..c209d2c 100644 --- a/tapl/typed-lang-builder/sysf.rkt +++ b/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=? diff --git a/tapl/tests/exist-tests.rkt b/typed-lang-builder/examples/tests/exist-tests.rkt similarity index 99% rename from tapl/tests/exist-tests.rkt rename to typed-lang-builder/examples/tests/exist-tests.rkt index 1e881e7..4c094b4 100644 --- a/tapl/tests/exist-tests.rkt +++ b/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)) diff --git a/tapl/tests/ext-stlc-tests.rkt b/typed-lang-builder/examples/tests/ext-stlc-tests.rkt similarity index 99% rename from tapl/tests/ext-stlc-tests.rkt rename to typed-lang-builder/examples/tests/ext-stlc-tests.rkt index 18bd763..5ea0dde 100644 --- a/tapl/tests/ext-stlc-tests.rkt +++ b/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 diff --git a/tapl/tests/fomega-tests.rkt b/typed-lang-builder/examples/tests/fomega-tests.rkt similarity index 99% rename from tapl/tests/fomega-tests.rkt rename to typed-lang-builder/examples/tests/fomega-tests.rkt index 8bb05b5..12a9b2d 100644 --- a/tapl/tests/fomega-tests.rkt +++ b/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 : ★) diff --git a/tapl/tests/fomega2-tests.rkt b/typed-lang-builder/examples/tests/fomega2-tests.rkt similarity index 99% rename from tapl/tests/fomega2-tests.rkt rename to typed-lang-builder/examples/tests/fomega2-tests.rkt index fda8324..a3eeaec 100644 --- a/tapl/tests/fomega2-tests.rkt +++ b/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 : ★) diff --git a/tapl/tests/fomega3-tests.rkt b/typed-lang-builder/examples/tests/fomega3-tests.rkt similarity index 99% rename from tapl/tests/fomega3-tests.rkt rename to typed-lang-builder/examples/tests/fomega3-tests.rkt index 898ee32..9a98ede 100644 --- a/tapl/tests/fomega3-tests.rkt +++ b/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 : ★) diff --git a/tapl/tests/fsub-tests.rkt b/typed-lang-builder/examples/tests/fsub-tests.rkt similarity index 99% rename from tapl/tests/fsub-tests.rkt rename to typed-lang-builder/examples/tests/fsub-tests.rkt index 44333ed..4b4deb6 100644 --- a/tapl/tests/fsub-tests.rkt +++ b/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 diff --git a/tapl/tests/mlish-tests.rkt b/typed-lang-builder/examples/tests/mlish-tests.rkt similarity index 99% rename from tapl/tests/mlish-tests.rkt rename to typed-lang-builder/examples/tests/mlish-tests.rkt index 5916069..5dd587e 100644 --- a/tapl/tests/mlish-tests.rkt +++ b/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 diff --git a/tapl/tests/mlish/ack.mlish b/typed-lang-builder/examples/tests/mlish/ack.mlish similarity index 93% rename from tapl/tests/mlish/ack.mlish rename to typed-lang-builder/examples/tests/mlish/ack.mlish index 1231151..b29225b 100644 --- a/tapl/tests/mlish/ack.mlish +++ b/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 diff --git a/tapl/tests/mlish/alex.mlish b/typed-lang-builder/examples/tests/mlish/alex.mlish similarity index 94% rename from tapl/tests/mlish/alex.mlish rename to typed-lang-builder/examples/tests/mlish/alex.mlish index 91a4113..9e80c23 100644 --- a/tapl/tests/mlish/alex.mlish +++ b/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: diff --git a/tapl/tests/mlish/ary.mlish b/typed-lang-builder/examples/tests/mlish/ary.mlish similarity index 94% rename from tapl/tests/mlish/ary.mlish rename to typed-lang-builder/examples/tests/mlish/ary.mlish index d100b16..16280c2 100644 --- a/tapl/tests/mlish/ary.mlish +++ b/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 diff --git a/tapl/tests/mlish/bg/README.md b/typed-lang-builder/examples/tests/mlish/bg/README.md similarity index 100% rename from tapl/tests/mlish/bg/README.md rename to typed-lang-builder/examples/tests/mlish/bg/README.md diff --git a/tapl/tests/mlish/bg/basics-general.mlish b/typed-lang-builder/examples/tests/mlish/bg/basics-general.mlish similarity index 96% rename from tapl/tests/mlish/bg/basics-general.mlish rename to typed-lang-builder/examples/tests/mlish/bg/basics-general.mlish index 0017617..d8261dc 100644 --- a/tapl/tests/mlish/bg/basics-general.mlish +++ b/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 diff --git a/tapl/tests/mlish/bg/basics.mlish b/typed-lang-builder/examples/tests/mlish/bg/basics.mlish similarity index 99% rename from tapl/tests/mlish/bg/basics.mlish rename to typed-lang-builder/examples/tests/mlish/bg/basics.mlish index 681011f..5c07d0f 100644 --- a/tapl/tests/mlish/bg/basics.mlish +++ b/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 diff --git a/tapl/tests/mlish/bg/basics2.mlish b/typed-lang-builder/examples/tests/mlish/bg/basics2.mlish similarity index 98% rename from tapl/tests/mlish/bg/basics2.mlish rename to typed-lang-builder/examples/tests/mlish/bg/basics2.mlish index 8a90e49..04fd222 100644 --- a/tapl/tests/mlish/bg/basics2.mlish +++ b/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 diff --git a/tapl/tests/mlish/bg/huffman.mlish b/typed-lang-builder/examples/tests/mlish/bg/huffman.mlish similarity index 99% rename from tapl/tests/mlish/bg/huffman.mlish rename to typed-lang-builder/examples/tests/mlish/bg/huffman.mlish index 87debf2..0e3399a 100644 --- a/tapl/tests/mlish/bg/huffman.mlish +++ b/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 diff --git a/tapl/tests/mlish/bg/lambda.mlish b/typed-lang-builder/examples/tests/mlish/bg/lambda.mlish similarity index 97% rename from tapl/tests/mlish/bg/lambda.mlish rename to typed-lang-builder/examples/tests/mlish/bg/lambda.mlish index fd29f6f..cee711e 100644 --- a/tapl/tests/mlish/bg/lambda.mlish +++ b/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 diff --git a/tapl/tests/mlish/bg/monad.mlish b/typed-lang-builder/examples/tests/mlish/bg/monad.mlish similarity index 98% rename from tapl/tests/mlish/bg/monad.mlish rename to typed-lang-builder/examples/tests/mlish/bg/monad.mlish index ba94de0..cbea739 100644 --- a/tapl/tests/mlish/bg/monad.mlish +++ b/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) diff --git a/tapl/tests/mlish/bg/okasaki.mlish b/typed-lang-builder/examples/tests/mlish/bg/okasaki.mlish similarity index 99% rename from tapl/tests/mlish/bg/okasaki.mlish rename to typed-lang-builder/examples/tests/mlish/bg/okasaki.mlish index 181e2c7..643406e 100644 --- a/tapl/tests/mlish/bg/okasaki.mlish +++ b/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 diff --git a/tapl/tests/mlish/chameneos.mlish b/typed-lang-builder/examples/tests/mlish/chameneos.mlish similarity index 98% rename from tapl/tests/mlish/chameneos.mlish rename to typed-lang-builder/examples/tests/mlish/chameneos.mlish index 5d7def8..b36a7e8 100644 --- a/tapl/tests/mlish/chameneos.mlish +++ b/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) diff --git a/tapl/tests/mlish/fannkuch.mlish b/typed-lang-builder/examples/tests/mlish/fannkuch.mlish similarity index 97% rename from tapl/tests/mlish/fannkuch.mlish rename to typed-lang-builder/examples/tests/mlish/fannkuch.mlish index 90f4cf3..27ec3ea 100644 --- a/tapl/tests/mlish/fannkuch.mlish +++ b/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) diff --git a/tapl/tests/mlish/fasta.mlish b/typed-lang-builder/examples/tests/mlish/fasta.mlish similarity index 99% rename from tapl/tests/mlish/fasta.mlish rename to typed-lang-builder/examples/tests/mlish/fasta.mlish index e800806..fe754be 100644 --- a/tapl/tests/mlish/fasta.mlish +++ b/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+ diff --git a/tapl/tests/mlish/fibo.mlish b/typed-lang-builder/examples/tests/mlish/fibo.mlish similarity index 91% rename from tapl/tests/mlish/fibo.mlish rename to typed-lang-builder/examples/tests/mlish/fibo.mlish index 9eb5c51..7857ce2 100644 --- a/tapl/tests/mlish/fibo.mlish +++ b/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) diff --git a/tapl/tests/mlish/find.mlish b/typed-lang-builder/examples/tests/mlish/find.mlish similarity index 97% rename from tapl/tests/mlish/find.mlish rename to typed-lang-builder/examples/tests/mlish/find.mlish index d5db3a6..df8b335 100644 --- a/tapl/tests/mlish/find.mlish +++ b/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) diff --git a/tapl/tests/mlish/hash.mlish b/typed-lang-builder/examples/tests/mlish/hash.mlish similarity index 91% rename from tapl/tests/mlish/hash.mlish rename to typed-lang-builder/examples/tests/mlish/hash.mlish index 4441936..87e2d3e 100644 --- a/tapl/tests/mlish/hash.mlish +++ b/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) diff --git a/tapl/tests/mlish/infer-variances.mlish b/typed-lang-builder/examples/tests/mlish/infer-variances.mlish similarity index 99% rename from tapl/tests/mlish/infer-variances.mlish rename to typed-lang-builder/examples/tests/mlish/infer-variances.mlish index b2932f9..55a72f1 100644 --- a/tapl/tests/mlish/infer-variances.mlish +++ b/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) diff --git a/tapl/tests/mlish/inst.mlish b/typed-lang-builder/examples/tests/mlish/inst.mlish similarity index 97% rename from tapl/tests/mlish/inst.mlish rename to typed-lang-builder/examples/tests/mlish/inst.mlish index 3ec0961..8a9605b 100644 --- a/tapl/tests/mlish/inst.mlish +++ b/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 diff --git a/tapl/tests/mlish/knuc.mlish b/typed-lang-builder/examples/tests/mlish/knuc.mlish similarity index 97% rename from tapl/tests/mlish/knuc.mlish rename to typed-lang-builder/examples/tests/mlish/knuc.mlish index 1d329b4..a334274 100644 --- a/tapl/tests/mlish/knuc.mlish +++ b/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") diff --git a/tapl/tests/mlish/listpats.mlish b/typed-lang-builder/examples/tests/mlish/listpats.mlish similarity index 96% rename from tapl/tests/mlish/listpats.mlish rename to typed-lang-builder/examples/tests/mlish/listpats.mlish index c3cb82d..a68e3b6 100644 --- a/tapl/tests/mlish/listpats.mlish +++ b/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 diff --git a/tapl/tests/mlish/loop.mlish b/typed-lang-builder/examples/tests/mlish/loop.mlish similarity index 98% rename from tapl/tests/mlish/loop.mlish rename to typed-lang-builder/examples/tests/mlish/loop.mlish index b97398d..7392832 100644 --- a/tapl/tests/mlish/loop.mlish +++ b/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 diff --git a/tapl/tests/mlish/match2.mlish b/typed-lang-builder/examples/tests/mlish/match2.mlish similarity index 99% rename from tapl/tests/mlish/match2.mlish rename to typed-lang-builder/examples/tests/mlish/match2.mlish index 6e080a8..96b3835 100644 --- a/tapl/tests/mlish/match2.mlish +++ b/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 diff --git a/tapl/tests/mlish/matrix.mlish b/typed-lang-builder/examples/tests/mlish/matrix.mlish similarity index 97% rename from tapl/tests/mlish/matrix.mlish rename to typed-lang-builder/examples/tests/mlish/matrix.mlish index ddda379..8bd6871 100644 --- a/tapl/tests/mlish/matrix.mlish +++ b/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))) diff --git a/tapl/tests/mlish/nbody.mlish b/typed-lang-builder/examples/tests/mlish/nbody.mlish similarity index 99% rename from tapl/tests/mlish/nbody.mlish rename to typed-lang-builder/examples/tests/mlish/nbody.mlish index a37fcc4..d5dcdc9 100644 --- a/tapl/tests/mlish/nbody.mlish +++ b/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) diff --git a/tapl/tests/mlish/polyrecur.mlish b/typed-lang-builder/examples/tests/mlish/polyrecur.mlish similarity index 98% rename from tapl/tests/mlish/polyrecur.mlish rename to typed-lang-builder/examples/tests/mlish/polyrecur.mlish index e3845fa..8854b72 100644 --- a/tapl/tests/mlish/polyrecur.mlish +++ b/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 diff --git a/tapl/tests/mlish/queens.mlish b/typed-lang-builder/examples/tests/mlish/queens.mlish similarity index 99% rename from tapl/tests/mlish/queens.mlish rename to typed-lang-builder/examples/tests/mlish/queens.mlish index a2c6a46..d45b4b4 100644 --- a/tapl/tests/mlish/queens.mlish +++ b/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 diff --git a/tapl/tests/mlish/result.mlish b/typed-lang-builder/examples/tests/mlish/result.mlish similarity index 96% rename from tapl/tests/mlish/result.mlish rename to typed-lang-builder/examples/tests/mlish/result.mlish index 2fa9fec..67153ce 100644 --- a/tapl/tests/mlish/result.mlish +++ b/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) diff --git a/tapl/tests/mlish/sweet-map.rkt b/typed-lang-builder/examples/tests/mlish/sweet-map.rkt similarity index 84% rename from tapl/tests/mlish/sweet-map.rkt rename to typed-lang-builder/examples/tests/mlish/sweet-map.rkt index f7ec410..7d6321d 100644 --- a/tapl/tests/mlish/sweet-map.rkt +++ b/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 diff --git a/tapl/tests/mlish/term.mlish b/typed-lang-builder/examples/tests/mlish/term.mlish similarity index 99% rename from tapl/tests/mlish/term.mlish rename to typed-lang-builder/examples/tests/mlish/term.mlish index 8baf35b..7c86e3d 100644 --- a/tapl/tests/mlish/term.mlish +++ b/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 diff --git a/tapl/tests/mlish/trees-tests.mlish b/typed-lang-builder/examples/tests/mlish/trees-tests.mlish similarity index 96% rename from tapl/tests/mlish/trees-tests.mlish rename to typed-lang-builder/examples/tests/mlish/trees-tests.mlish index bba9e8a..b369e49 100644 --- a/tapl/tests/mlish/trees-tests.mlish +++ b/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") diff --git a/tapl/tests/mlish/trees.mlish b/typed-lang-builder/examples/tests/mlish/trees.mlish similarity index 73% rename from tapl/tests/mlish/trees.mlish rename to typed-lang-builder/examples/tests/mlish/trees.mlish index bbd120d..893dee0 100644 --- a/tapl/tests/mlish/trees.mlish +++ b/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) diff --git a/tapl/tests/mlish/value-restriction-example.mlish b/typed-lang-builder/examples/tests/mlish/value-restriction-example.mlish similarity index 93% rename from tapl/tests/mlish/value-restriction-example.mlish rename to typed-lang-builder/examples/tests/mlish/value-restriction-example.mlish index 660aca5..dd00d5c 100644 --- a/tapl/tests/mlish/value-restriction-example.mlish +++ b/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) diff --git a/tapl/tests/rackunit-typechecking.rkt b/typed-lang-builder/examples/tests/rackunit-typechecking.rkt similarity index 98% rename from tapl/tests/rackunit-typechecking.rkt rename to typed-lang-builder/examples/tests/rackunit-typechecking.rkt index ef9a62d..9ba395f 100644 --- a/tapl/tests/rackunit-typechecking.rkt +++ b/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 diff --git a/tapl/tests/run-all-mlish-tests.rkt b/typed-lang-builder/examples/tests/run-all-mlish-tests.rkt similarity index 100% rename from tapl/tests/run-all-mlish-tests.rkt rename to typed-lang-builder/examples/tests/run-all-mlish-tests.rkt diff --git a/tapl/tests/run-all-tests.rkt b/typed-lang-builder/examples/tests/run-all-tests.rkt similarity index 80% rename from tapl/tests/run-all-tests.rkt rename to typed-lang-builder/examples/tests/run-all-tests.rkt index bbb6f14..7c1366c 100644 --- a/tapl/tests/run-all-tests.rkt +++ b/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") diff --git a/tapl/tests/run-mlish-tests1.rkt b/typed-lang-builder/examples/tests/run-mlish-tests1.rkt similarity index 100% rename from tapl/tests/run-mlish-tests1.rkt rename to typed-lang-builder/examples/tests/run-mlish-tests1.rkt diff --git a/tapl/tests/run-mlish-tests2.rkt b/typed-lang-builder/examples/tests/run-mlish-tests2.rkt similarity index 100% rename from tapl/tests/run-mlish-tests2.rkt rename to typed-lang-builder/examples/tests/run-mlish-tests2.rkt diff --git a/tapl/tests/run-mlish-tests3.rkt b/typed-lang-builder/examples/tests/run-mlish-tests3.rkt similarity index 100% rename from tapl/tests/run-mlish-tests3.rkt rename to typed-lang-builder/examples/tests/run-mlish-tests3.rkt diff --git a/tapl/tests/run-mlish-tests4.rkt b/typed-lang-builder/examples/tests/run-mlish-tests4.rkt similarity index 100% rename from tapl/tests/run-mlish-tests4.rkt rename to typed-lang-builder/examples/tests/run-mlish-tests4.rkt diff --git a/tapl/tests/stlc+box-tests.rkt b/typed-lang-builder/examples/tests/stlc+box-tests.rkt similarity index 99% rename from tapl/tests/stlc+box-tests.rkt rename to typed-lang-builder/examples/tests/stlc+box-tests.rkt index fdc6d84..d7eda17 100644 --- a/tapl/tests/stlc+box-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+box-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc+box.rkt" +#lang s-exp "../stlc+box.rkt" (require "rackunit-typechecking.rkt") (define x (ref 10)) diff --git a/tapl/tests/stlc+cons-tests.rkt b/typed-lang-builder/examples/tests/stlc+cons-tests.rkt similarity index 99% rename from tapl/tests/stlc+cons-tests.rkt rename to typed-lang-builder/examples/tests/stlc+cons-tests.rkt index 7c40cb0..d15d583 100644 --- a/tapl/tests/stlc+cons-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+cons-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc+cons.rkt" +#lang s-exp "../stlc+cons.rkt" (require "rackunit-typechecking.rkt") (typecheck-fail (cons 1 2) diff --git a/tapl/tests/stlc+effect-tests.rkt b/typed-lang-builder/examples/tests/stlc+effect-tests.rkt similarity index 97% rename from tapl/tests/stlc+effect-tests.rkt rename to typed-lang-builder/examples/tests/stlc+effect-tests.rkt index 06a29bf..a912e6b 100644 --- a/tapl/tests/stlc+effect-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+effect-tests.rkt @@ -1,10 +1,10 @@ -#lang s-exp "../typed-lang-builder/stlc+effect.rkt" +#lang s-exp "../stlc+effect.rkt" (require "rackunit-typechecking.rkt") -(check-props ν (ref 11) : '(107)) -(check-props ! (deref (ref 11)) : '(141)) -(check-props ν (deref (ref 11)) : '(190)) -(check-props ν ((λ ([x : Int]) (ref x)) 21) : '(241)) +(check-props ν (ref 11) : '(88)) +(check-props ! (deref (ref 11)) : '(121)) +(check-props ν (deref (ref 11)) : '(170)) +(check-props ν ((λ ([x : Int]) (ref x)) 21) : '(221)) (define x (ref 10)) (check-type x : (Ref Int)) diff --git a/tapl/tests/stlc+lit-tests.rkt b/typed-lang-builder/examples/tests/stlc+lit-tests.rkt similarity index 97% rename from tapl/tests/stlc+lit-tests.rkt rename to typed-lang-builder/examples/tests/stlc+lit-tests.rkt index e7ed2cb..c0afec6 100644 --- a/tapl/tests/stlc+lit-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+lit-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc+lit.rkt" +#lang s-exp "../stlc+lit.rkt" (require "rackunit-typechecking.rkt") ;; thunk diff --git a/tapl/tests/stlc+rec-iso-tests.rkt b/typed-lang-builder/examples/tests/stlc+rec-iso-tests.rkt similarity index 99% rename from tapl/tests/stlc+rec-iso-tests.rkt rename to typed-lang-builder/examples/tests/stlc+rec-iso-tests.rkt index 5f654d2..edf533a 100644 --- a/tapl/tests/stlc+rec-iso-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+rec-iso-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc+rec-iso.rkt" +#lang s-exp "../stlc+rec-iso.rkt" (require "rackunit-typechecking.rkt") (define-type-alias IntList (μ (X) (∨ [nil : Unit] [cons : (× Int X)]))) diff --git a/tapl/tests/stlc+reco+sub-tests.rkt b/typed-lang-builder/examples/tests/stlc+reco+sub-tests.rkt similarity index 99% rename from tapl/tests/stlc+reco+sub-tests.rkt rename to typed-lang-builder/examples/tests/stlc+reco+sub-tests.rkt index 7de931b..c08e02d 100644 --- a/tapl/tests/stlc+reco+sub-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+reco+sub-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc+reco+sub.rkt" +#lang s-exp "../stlc+reco+sub.rkt" (require "rackunit-typechecking.rkt") ;; record subtyping tests diff --git a/tapl/tests/stlc+reco+var-tests.rkt b/typed-lang-builder/examples/tests/stlc+reco+var-tests.rkt similarity index 99% rename from tapl/tests/stlc+reco+var-tests.rkt rename to typed-lang-builder/examples/tests/stlc+reco+var-tests.rkt index 02b5c88..822e5e3 100644 --- a/tapl/tests/stlc+reco+var-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+reco+var-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc+reco+var.rkt" +#lang s-exp "../stlc+reco+var.rkt" (require "rackunit-typechecking.rkt") ;; define-type-alias diff --git a/tapl/tests/stlc+sub-tests.rkt b/typed-lang-builder/examples/tests/stlc+sub-tests.rkt similarity index 98% rename from tapl/tests/stlc+sub-tests.rkt rename to typed-lang-builder/examples/tests/stlc+sub-tests.rkt index 0803269..752ed5c 100644 --- a/tapl/tests/stlc+sub-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+sub-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc+sub.rkt" +#lang s-exp "../stlc+sub.rkt" (require "rackunit-typechecking.rkt") ;; subtyping tests diff --git a/tapl/tests/stlc+tup-tests.rkt b/typed-lang-builder/examples/tests/stlc+tup-tests.rkt similarity index 98% rename from tapl/tests/stlc+tup-tests.rkt rename to typed-lang-builder/examples/tests/stlc+tup-tests.rkt index fe155cd..2b3f90f 100644 --- a/tapl/tests/stlc+tup-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc+tup-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc+tup.rkt" +#lang s-exp "../stlc+tup.rkt" (require "rackunit-typechecking.rkt") ;; tests for tuples diff --git a/tapl/tests/stlc-tests.rkt b/typed-lang-builder/examples/tests/stlc-tests.rkt similarity index 89% rename from tapl/tests/stlc-tests.rkt rename to typed-lang-builder/examples/tests/stlc-tests.rkt index ebdd1ca..2502b9e 100644 --- a/tapl/tests/stlc-tests.rkt +++ b/typed-lang-builder/examples/tests/stlc-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/stlc.rkt" +#lang s-exp "../stlc.rkt" (require "rackunit-typechecking.rkt") ;; cannot write any terms without base types, but can check some errors diff --git a/tapl/tests/sysf-tests.rkt b/typed-lang-builder/examples/tests/sysf-tests.rkt similarity index 98% rename from tapl/tests/sysf-tests.rkt rename to typed-lang-builder/examples/tests/sysf-tests.rkt index a2486e7..3aed40d 100644 --- a/tapl/tests/sysf-tests.rkt +++ b/typed-lang-builder/examples/tests/sysf-tests.rkt @@ -1,4 +1,4 @@ -#lang s-exp "../typed-lang-builder/sysf.rkt" +#lang s-exp "../sysf.rkt" (require "rackunit-typechecking.rkt") (check-type (Λ (X) (λ ([x : X]) x)) : (∀ (X) (→ X X))) diff --git a/typed-lang-builder/lang/reader.rkt b/typed-lang-builder/lang/reader.rkt new file mode 100644 index 0000000..0cf8380 --- /dev/null +++ b/typed-lang-builder/lang/reader.rkt @@ -0,0 +1,2 @@ +#lang s-exp syntax/module-reader +typed-lang-builder/typed-lang-builder diff --git a/tapl/typed-lang-builder/typed-lang-builder.rkt b/typed-lang-builder/typed-lang-builder.rkt similarity index 97% rename from tapl/typed-lang-builder/typed-lang-builder.rkt rename to typed-lang-builder/typed-lang-builder.rkt index 3cb83ab..e61f6f6 100644 --- a/tapl/typed-lang-builder/typed-lang-builder.rkt +++ b/typed-lang-builder/typed-lang-builder.rkt @@ -1,17 +1,17 @@ #lang racket/base -(provide (except-out (all-from-out "../typecheck.rkt") -define-typed-syntax) +(provide (except-out (all-from-out macrotypes/typecheck) -define-typed-syntax) define-typed-syntax (for-syntax syntax-parse/typed-syntax)) (require (rename-in - "../typecheck.rkt" + macrotypes/typecheck [define-typed-syntax -define-typed-syntax] )) (module typecheck+ racket/base (provide (all-defined-out)) - (require (for-meta -1 (except-in "../typecheck.rkt" #%module-begin))) + (require (for-meta -1 (except-in macrotypes/typecheck #%module-begin))) (define (raise-⇐-expected-type-error ⇐-stx body expected-type existing-type) (raise-syntax-error '⇐ @@ -27,8 +27,8 @@ (module syntax-classes racket/base (provide (all-defined-out)) (require (for-meta 0 (submod ".." typecheck+)) - (for-meta -1 (submod ".." typecheck+) (except-in "../typecheck.rkt" #%module-begin)) - (for-meta -2 (except-in "../typecheck.rkt" #%module-begin))) + (for-meta -1 (submod ".." typecheck+) (except-in macrotypes/typecheck #%module-begin)) + (for-meta -2 (except-in macrotypes/typecheck #%module-begin))) (define-syntax-class --- [pattern (~datum --------)]) (define-syntax-class elipsis