stlc+define+cons/racket-ext: cleanup
This commit is contained in:
Stephen Chang
parent
1985a987c9
commit
c3e77481ae
|
|
@ -50,32 +50,12 @@
|
|||
(match e_test [(Cons x ...) e_body ... e_result] ...))
|
||||
|
||||
;; typed forms ----------------------------------------------------------------
|
||||
#;(define-syntax (datum/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ . s:str) (⊢ (syntax/loc stx (#%datum . s)) #'String)]
|
||||
[(_ . b:boolean) (⊢ (syntax/loc stx (#%datum . b)) #'Bool)]
|
||||
[(_ . x) #'(stlc:#%datum . x)]))
|
||||
|
||||
(define-typed-syntax
|
||||
(begin e ... e_result) : τ_result
|
||||
#:where
|
||||
(e : Unit) ...
|
||||
(let τ_result := (typeof e_result)))
|
||||
|
||||
#;(define-syntax (begin/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ e ... e_result)
|
||||
#:with (e+ ... e_result+) (stx-map expand/df #'(e ... e_result))
|
||||
#:when (stx-andmap assert-Unit-type #'(e+ ...))
|
||||
(⊢ (syntax/loc stx (begin e+ ... e_result+)) (typeof #'e_result+))]))
|
||||
|
||||
#;(define-syntax (void/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_) (⊢ (syntax/loc stx (void)) #'Unit)]))
|
||||
|
||||
#;(define-simple-syntax/type-rule
|
||||
(void) : Unit)
|
||||
|
||||
#;(define-syntax (printf/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ τs str . args)
|
||||
|
|
@ -101,74 +81,18 @@
|
|||
(define-primop abs : Int → Int)
|
||||
(define-primop void : → Unit)
|
||||
|
||||
|
||||
#;(define-syntax (λ/tc stx)
|
||||
(syntax-parse stx #:datum-literals (:)
|
||||
[(_ ([x:id : τ] ...) e ... e_result)
|
||||
;; the with-extended-type-env must be outside the expand/df (instead of
|
||||
;; around just the body) bc ow the parameter will get restored to the old
|
||||
;; value before the local-expand happens
|
||||
#:with (lam xs . es+) (with-extended-type-env #'([x τ] ...)
|
||||
(expand/df #'(λ (x ...) e ... e_result)))
|
||||
;; manually handle identifiers here
|
||||
;; - since Racket has no #%var hook, ids didn't get "expanded" in the previous line
|
||||
;; and thus didn't get a type
|
||||
;; TODO: can I put this somewhere else where it's more elegant?
|
||||
#:with (e++ ... e_result++) (with-extended-type-env #'([x τ] ...)
|
||||
(stx-map (λ (e) (if (identifier? e) (expand/df e) e)) #'es+))
|
||||
;; manually handle the implicit begin
|
||||
#:when (stx-map assert-Unit-type #'(e++ ...))
|
||||
#:with τ_body (typeof #'e_result++)
|
||||
(⊢ (syntax/loc stx (lam xs e++ ... e_result++)) #'(τ ... → τ_body))]))
|
||||
|
||||
(define-typed-syntax
|
||||
(λ ([x : τ] ...) e ... e_result) : (τ ... → τ_body)
|
||||
#:where
|
||||
(e : Unit) ...
|
||||
(let τ_body := (typeof e_result)))
|
||||
|
||||
|
||||
;; #%app
|
||||
;; TODO: support varargs
|
||||
#;(define-syntax (app/tc stx)
|
||||
(syntax-parse stx #:literals (→)
|
||||
[(_ e_fn e_arg ...)
|
||||
#:with (e_fn+ e_arg+ ...) (stx-map expand/df #'(e_fn e_arg ...))
|
||||
#:with (τ ... → τ_res) (typeof #'e_fn+)
|
||||
#:when (stx-andmap assert-type #'(e_arg+ ...) #'(τ ...))
|
||||
(⊢ (syntax/loc stx (#%app e_fn+ e_arg+ ...)) #'τ_res)]
|
||||
[(_ e ...) (syntax/loc stx (stlc:#%app e ...))]))
|
||||
|
||||
#;(define-syntax (let/tc stx)
|
||||
(syntax-parse stx #:datum-literals (:)
|
||||
[(_ ([x:id e_x] ...) e ... e_result)
|
||||
#:with (e_x+ ...) (stx-map expand/df #'(e_x ...))
|
||||
#:with (τ ...) (stx-map typeof #'(e_x+ ...))
|
||||
#:with (lam (x+ ...) e+ ... e_result+)
|
||||
(with-extended-type-env #'([x τ] ...)
|
||||
(expand/df #'(λ (x ...) e ... e_result)))
|
||||
#:when (stx-andmap assert-Unit-type #'(e+ ...))
|
||||
(⊢ (syntax/loc stx (let ([x+ e_x+] ...) e+ ... e_result+)) (typeof #'e_result+))]))
|
||||
|
||||
(define-typed-syntax
|
||||
(let ([x ex] ...) e ... e_result) : τ_result
|
||||
#:where
|
||||
(e : Unit) ...
|
||||
(let τ_result := (typeof e_result)))
|
||||
|
||||
#;(define-syntax (if/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ e_test e1 e2)
|
||||
#:with e_test+ (expand/df #'e_test)
|
||||
#:when (assert-type #'e_test+ #'Bool)
|
||||
#:with e1+ (expand/df #'e1)
|
||||
#:with e2+ (expand/df #'e2)
|
||||
#:when (or (type=? (typeof #'e1+) (typeof #'e2+))
|
||||
(type-error #:src stx
|
||||
#:msg "IF branches have differing types: branch ~a has type ~a and branch ~a has type ~a"
|
||||
#'e1 (typeof #'e1+)
|
||||
#'e2 (typeof #'e2+)))
|
||||
(⊢ (syntax/loc stx (if e_test+ e1+ e2+)) (typeof #'e1+))]))
|
||||
(define-typed-syntax
|
||||
(if e_test e1 e2) : τ2
|
||||
#:where
|
||||
|
|
@ -199,166 +123,11 @@
|
|||
(rest {τ} e) : (Listof τ)
|
||||
#:where
|
||||
(e : (Listof τ)))
|
||||
|
||||
#;(define-syntax (cons/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ {T} e1 e2)
|
||||
#:with e1+ (expand/df #'e1)
|
||||
#:with e2+ (expand/df #'e2)
|
||||
#:when (assert-type #'e1+ #'T)
|
||||
#:when (assert-type #'e2+ #'(Listof T))
|
||||
(⊢ (syntax/loc stx (cons e1+ e2+)) #'(Listof T))]))
|
||||
#;(define-syntax (null/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ {T}) (⊢ (syntax/loc stx null) #'(Listof T))]))
|
||||
#;(define-syntax (list/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ {τ}) #'(null/tc {τ})]
|
||||
[(_ {τ} x . rst) #'(cons/tc {τ} x (list/tc {τ} . rst))]))
|
||||
#;(define-syntax (null?/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ {T} e)
|
||||
#:with e+ (expand/df #'e)
|
||||
#:when (assert-type #'e+ #'(Listof T))
|
||||
(⊢ (syntax/loc stx (null? e+)) #'Bool)]))
|
||||
#;(define-syntax (first/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ {T} e)
|
||||
#:with e+ (expand/df #'e)
|
||||
#:when (assert-type #'e+ #'(Listof T))
|
||||
(⊢ (syntax/loc stx (car e+)) #'T)]))
|
||||
#;(define-syntax (rest/tc stx)
|
||||
(syntax-parse stx
|
||||
[(_ {T} e)
|
||||
#:with e+ (expand/df #'e)
|
||||
#:when (assert-type #'e+ #'(Listof T))
|
||||
(⊢ (syntax/loc stx (cdr e+)) #'(Listof T))]))
|
||||
|
||||
;; define, module-begin -------------------------------------------------------
|
||||
#;(define-syntax (define/tc stx)
|
||||
(syntax-parse stx #:datum-literals (:)
|
||||
[(_ (f:id [x:id : τ] ...) : τ_result e ...)
|
||||
#:when (Γ (type-env-extend #'([f (τ ... → τ_result)])))
|
||||
#'(define f (λ/tc ([x : τ] ...) e ...))]
|
||||
[(_ x:id e) #'(define x e)]))
|
||||
|
||||
|
||||
;; define ---------------------------------------------------------------------
|
||||
(define-typed-syntax
|
||||
(define (f [x : τ] ...) : τ_result e ...) : Unit
|
||||
#:where
|
||||
(Γ-extend [f : (τ ... → τ_result)])
|
||||
#:expanded
|
||||
(define f (ext:λ ([x : τ] ...) e ...)))
|
||||
|
||||
;#;(begin-for-syntax
|
||||
; ;; EXTENSIBILITY NOTE:
|
||||
; ;; Originally, define-type was a #:literal instead of a #:datum-literal, but
|
||||
; ;; this became a problem when sysf extended define-type (but not modul-begin).
|
||||
; ;; Putting define-type in the #:literals list makes it always expect the stlc
|
||||
; ;; version of define-type, so it wasnt getting properly parsed in sysf.
|
||||
; ;;
|
||||
; ;; Similarly, I had to define the define-type pattern below to avoid explicitly
|
||||
; ;; mentioning define-type on the rhs, otherwise it would again lock in the stlc
|
||||
; ;; version of define-type.
|
||||
; (define-syntax-class maybe-def #:datum-literals (define variant define-type)
|
||||
; (pattern define-fn
|
||||
; #:with (define (f x ...) body ...) #'define-fn
|
||||
; #:attr fndef #'(define-fn)
|
||||
; #:attr e #'() #:attr tydecl #'())
|
||||
; (pattern define-variant-type-decl
|
||||
; #:with (define-type TypeName (variant (Cons fieldτ ...) ...))
|
||||
; #'define-variant-type-decl
|
||||
; #:attr tydecl #'(define-variant-type-decl)
|
||||
; #:attr fndef #'() #:attr e #'())
|
||||
; (pattern define-type-decl
|
||||
; #:with (define-type TypeName:id (Cons:id fieldτ ...) ...)
|
||||
; #'define-type-decl
|
||||
; #:attr tydecl #'(define-type-decl)
|
||||
; #:attr fndef #'() #:attr e #'())
|
||||
; (pattern exp:expr
|
||||
; #:attr tydecl #'() #:attr fndef #'()
|
||||
; #:attr e #'(exp)))
|
||||
; (define-syntax-class strct #:literals (begin define-values define-syntaxes)
|
||||
; (pattern
|
||||
; (begin
|
||||
; (define-values (x ...) mk-strct-type-def)
|
||||
; (define-syntaxes (y) strct-info-def))
|
||||
; #:attr def-val #'(define-values (x ...) mk-strct-type-def)
|
||||
; #:attr def-syn #'(define-syntaxes (y) strct-info-def)))
|
||||
; (define-syntax-class def-val #:literals (define-values)
|
||||
; (pattern (define-values (x ...) vals)
|
||||
; #:attr lhs #'(x ...)
|
||||
; #:attr rhs #'vals))
|
||||
; (define-syntax-class def-syn #:literals (define-syntaxes)
|
||||
; (pattern (define-syntaxes (x) stxs)
|
||||
; #:attr lhs #'x
|
||||
; #:attr rhs #'stxs))
|
||||
; )
|
||||
|
||||
;#;(define-syntax (module-begin/tc stx)
|
||||
; (syntax-parse stx #:literals (begin)
|
||||
; [(_ mb-form:maybe-def ...)
|
||||
; ;; handle define-type
|
||||
; #:with (deftype ...) (template ((?@ . mb-form.tydecl) ...))
|
||||
; #:with ((begin deftype+ ...) ...) (stx-map expand/df/module-ctx #'(deftype ...))
|
||||
; #:with (structdef ...) (stx-flatten #'((deftype+ ...) ...))
|
||||
; #:with (structdef+:strct ...) (stx-map expand/df/module-ctx #'(structdef ...))
|
||||
; #:with (def-val:def-val ...) #'(structdef+.def-val ...)
|
||||
; #:with (def-val-lhs ...) #'(def-val.lhs ...)
|
||||
; #:with (def-val-rhs ...) #'(def-val.rhs ...)
|
||||
; #:with (def-syn:def-syn ...) #'(structdef+.def-syn ...)
|
||||
; #:with (def-syn-lhs ...) #'(def-syn.lhs ...)
|
||||
; #:with (def-syn-rhs ...) #'(def-syn.rhs ...)
|
||||
; ;; handle defines
|
||||
; #:with (deffn ...) (template ((?@ . mb-form.fndef) ...))
|
||||
; #:with (deffn+:def-val ...) (stx-map expand/df/module-ctx #'(deffn ...))
|
||||
; #:with (f ...) #'(deffn+.lhs ...)
|
||||
; #:with (v ...) #'(deffn+.rhs ...)
|
||||
; #:with (e ...) (template ((?@ . mb-form.e) ...))
|
||||
; ;; base type env
|
||||
; ; #:when (Γ (type-env-extend #'((+ (Int Int → Int)))))
|
||||
;;; NOTE: for struct def, define-values *must* come before define-syntaxes
|
||||
;;; ow, error: "Just10: unbound identifier; also, no #%top syntax transformer is bound"
|
||||
; (quasisyntax/loc stx
|
||||
; (#%module-begin
|
||||
; #,(expand/df #'(let-values ([def-val-lhs def-val-rhs] ...)
|
||||
; (let-syntax ([def-syn-lhs def-syn-rhs] ...)
|
||||
; (letrec-values ([f v] ...) e ... (void)))))
|
||||
; (define #,(datum->syntax stx 'runtime-env)
|
||||
; (for/hash ([x:τ '#,(map (λ (xτ) (cons (car xτ) (syntax->datum (cdr xτ))))
|
||||
; (hash->list (Γ)))])
|
||||
; (values (car x:τ) (cdr x:τ))))
|
||||
; ))]))
|
||||
|
||||
;; type checking testing: -----------------------------------------------------
|
||||
;(require rackunit)
|
||||
;(require (for-syntax rackunit "typecheck.rkt"))
|
||||
;(provide check-equal?)
|
||||
;(provide check-type-error check-type check-type-and-result check-not-type)
|
||||
|
||||
#;(define-syntax (check-type-error stx)
|
||||
(syntax-parse stx
|
||||
[(_ e)
|
||||
#:when (check-exn exn:fail? (λ () (expand/df #'e)))
|
||||
#'(void)]))
|
||||
|
||||
#;(define-syntax (check-type stx)
|
||||
(syntax-parse stx #:datum-literals (:)
|
||||
[(_ e : τ)
|
||||
#:with e+ (expand/df #'e)
|
||||
#:when (check-true (assert-type #'e+ #'τ)
|
||||
(format "Expected type ~a but got type ~a" #'τ (typeof #'e)))
|
||||
#'(void)]))
|
||||
|
||||
#;(define-syntax (check-not-type stx)
|
||||
(syntax-parse stx #:datum-literals (:)
|
||||
[(_ e : τ)
|
||||
#:with e+ (expand/df #'e)
|
||||
#:when (check-false (type=? (typeof #'e+) #'τ)
|
||||
(format "Expected type to not be ~a but got type ~a" #'τ (typeof #'e)))
|
||||
#'(void)]))
|
||||
|
||||
#;(define-syntax (check-type-and-result stx)
|
||||
(syntax-parse stx #:datum-literals (: =>)
|
||||
[(_ e : τ => v)
|
||||
#'(begin (check-type e : τ)
|
||||
(check-equal? e v))]))
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user