From 3ea9fc5db008e040c8e82c105419f1df6fbea456 Mon Sep 17 00:00:00 2001 From: Stephen Chang Date: Wed, 16 Sep 2015 15:04:13 -0400 Subject: [PATCH] rec-iso: refactor requires so stlc+tup is base lang --- tapl/stlc+rec-iso.rkt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tapl/stlc+rec-iso.rkt b/tapl/stlc+rec-iso.rkt index e204578..c32717e 100644 --- a/tapl/stlc+rec-iso.rkt +++ b/tapl/stlc+rec-iso.rkt @@ -1,12 +1,11 @@ #lang racket/base (require "typecheck.rkt") -(require (prefix-in stlc: (only-in "stlc+reco+var.rkt" #%app λ)) - (except-in "stlc+reco+var.rkt" #%app λ × tup proj) - (only-in "stlc+tup.rkt" × tup proj)) ; want tuples, not records +(require (except-in "stlc+tup.rkt" #%app λ) ; import tuples, not records + (prefix-in stlc: (only-in "stlc+tup.rkt" #%app λ)) + (only-in "stlc+reco+var.rkt" ∨ var case define-type-alias define)) ; and variants (provide (rename-out [stlc:#%app #%app] [stlc:λ λ])) -(provide (except-out (all-from-out "stlc+reco+var.rkt") - stlc:#%app stlc:λ) - (all-from-out "stlc+tup.rkt")) +(provide (except-out (all-from-out "stlc+tup.rkt") stlc:#%app stlc:λ) + (all-from-out "stlc+reco+var.rkt")) (provide μ fld unfld) ;; stlc + (iso) recursive types