Skip to content

crook #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dvanhorn merged 1 commit into from
Nov 1, 2025
Merged

crook #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions iniquity-plus/compile.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
(match fun
[(FunPlain xs e)
(seq (Label (symbol->label f))
;; TODO: check arity
(Cmp r8 (length xs))
(Jne 'err)
(compile-e e (reverse xs))
(Add rsp (* 8 (length xs)))
(Ret))]
Expand All @@ -74,9 +75,7 @@
[(If e1 e2 e3) (compile-if e1 e2 e3 c)]
[(Begin e1 e2) (compile-begin e1 e2 c)]
[(Let x e1 e2) (compile-let x e1 e2 c)]
[(App f es) (compile-app f es c)]
[(Apply f es e)
(compile-apply f es e c)]))
[(App f es) (compile-app f es c)]))

;; Datum -> Asm
(define (compile-datum d)
Expand Down Expand Up @@ -168,15 +167,10 @@
(seq (Lea rax r)
(Push rax)
(compile-es es (cons #f c))
;; TODO: communicate argument count to called function
(Mov r8 (length es)) ; pass arity info
(Jmp (symbol->label f))
(Label r))))

;; Id [Listof Expr] Expr CEnv -> Asm
(define (compile-apply f es e c)
;; TODO: implement apply
(seq))

;; [Listof Expr] CEnv -> Asm
(define (compile-es es c)
(match es
Expand Down
34 changes: 12 additions & 22 deletions iniquity-plus/interp.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,7 @@
(let ((vs (interp-e* es r ds)))
(match (defns-lookup ds f)
[(Defn _ fun)
(apply-fun fun vs ds)]))]
[(Apply f es e)
(let ((vs (interp-e* es r ds))
(ws (interp-e e r ds)))
(if (list? ws)
(match (defns-lookup ds f)
[(Defn _ fun)
(apply-fun fun (append vs ws) ds)])
(raise 'err)))]))
(apply-fun fun vs ds)]))]))

;; (Listof Expr) REnv Defns -> (Listof Value) { raises 'err }
(define (interp-e* es r ds)
Expand All @@ -79,32 +71,30 @@
(cons (interp-e e r ds)
(interp-e* es r ds))]))

;; Fun [Listof Values] Defns -> Answer
;; Fun [Listof Values] Defns -> Value { raises 'err }
(define (apply-fun f vs ds)
(match f
[(FunPlain xs e)
; check arity matches-arity-exactly?
(if (= (length xs) (length vs))
(interp-e e (zip xs vs) ds)
'err)]
(raise 'err))]
[(FunRest xs x e)
; check arity is acceptable
(if (< (length vs) (length xs))
'err
(interp-e e
(zip (cons x xs)
(cons (drop vs (length xs))
(take vs (length xs))))
ds))]
(raise 'err)
(interp-e e
(zip (cons x xs)
(cons (drop vs (length xs))
(take vs (length xs))))
ds))]
[(FunCase cs)
(match (select-case-lambda cs (length vs))
['err 'err]
[f (apply-fun f vs ds)])]))
(apply-fun (select-case-lambda cs (length vs)) vs ds)]))

;; [Listof FunCaseClause] Nat -> Fun | 'err
;; [Listof FunCaseClause] Nat -> Fun { raises 'err }
(define (select-case-lambda cs n)
(match cs
['() 'err]
['() (raise 'err)]
[(cons (and (FunPlain xs e) f) cs)
(if (= (length xs) n)
f
Expand Down
18 changes: 0 additions & 18 deletions iniquity-plus/parse.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,6 @@
[(list ys gs e2)
(list ys gs (Let x e1 e2))])])]
[_ (error "let: bad syntax" s)])]
['apply
(match sr
[(list-rest (? symbol? f) sr)
(parse-apply/acc sr f fs xs ys (if (memq f fs) gs (cons f gs)))])]
[_
(match (parse-es/acc sr fs xs ys gs)
[(list ys gs es)
Expand All @@ -180,20 +176,6 @@
(error "parse error" s)]))
(rec s xs ys gs))

;; S-Expr Id [Listof Id] [Listof Id] [Listof Id] [Listof Id] -> (list [Listof Id] [Listof Id] Apply)
(define (parse-apply/acc s f fs xs ys gs)
(match s
[(list s)
(match (parse-e/acc s fs xs ys gs)
[(list ys gs e)
(list ys gs (Apply f '() e))])]
[(cons s sr)
(match (parse-e/acc s fs xs ys gs)
[(list ys gs e)
(match (parse-apply/acc sr f fs xs ys gs)
[(list ys gs (Apply f es e0))
(list ys gs (Apply f (cons e es) e0))])])]))

;; S-Expr [Listof Id] [Listof Id] [Listof Id] [Listof Id] -> (list [Listof Id] [Listof Id] [Listof Expr])
;; s: list of expressions shaped s-expr to be parsed
;; fs: defined function names
Expand Down
120 changes: 7 additions & 113 deletions iniquity-plus/test/test-runner.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@
'(2 3 4))
(check-equal? (run '(define (f x y) y)
'(f 1 (add1 #f)))
'err)
(check-equal? (run '(define (f x y) y)
'(f 1))
'err)
(check-equal? (run '(define (f x y) y)
'(f 1 2 3))
'err))

(begin ;; Iniquity+
Expand Down Expand Up @@ -280,36 +286,6 @@
(cons (f 1 2 3)
'()))))
'(() 2 (3)))

(check-equal? (run '(define (f) 1)
'(apply f '()))
1)
(check-equal? (run '(define (f . xs) 1)
'(apply f '()))
1)
(check-equal? (run '(define (f . xs) xs)
'(apply f '()))
'())
(check-equal? (run '(define (f . xs) xs)
'(apply f (cons 1 (cons 2 (cons 3 '())))))
'(1 2 3))
(check-equal? (run '(define (f . xs) xs)
'(apply f 1 2 (cons 3 '())))
'(1 2 3))
(check-equal? (run '(define (append . xss)
(if (empty? xss)
'()
(if (empty? (car xss))
(apply append (cdr xss))
(cons (car (car xss))
(apply append (cdr (car xss)) (cdr xss))))))
'(define (list . xs) xs)
'(define (flatten xs)
(apply append xs))
'(flatten (list (append) (append (list 1 2 3) (list 4 5) (list 6)) (list 7))))
'(1 2 3 4 5 6 7))

;; Extra tests
(check-equal? (run '(define f (case-lambda))
'(if #f (f) 1))
1)
Expand All @@ -321,67 +297,6 @@
'(let ((x (f 1 2 3)))
(f x)))
'())
(check-equal? (run '(define (f x . xs)
(let ((ys xs))
(if (empty? xs)
x
(apply f ys))))
'(let ((z 1))
(f 1 2 3)))
3)
(check-equal? (run '(define (f x . xs)
(let ((ys xs))
(if (empty? xs)
x
(apply f ys))))
'(let ((z 1))
(f (f 1 2 3))))
3)
(check-equal? (run '(define f
(case-lambda
[(x . xs)
(let ((ys xs))
(if (empty? xs)
x
(apply f xs)))]))
'(let ((z 1))
(f (f 1 2 3))))
3)
(check-equal? (run '(define f
(case-lambda
[(x) x]
[(x . xs)
(apply f xs)]))
'(f 1 2 3))
3)
(check-equal? (run '(define f
(case-lambda
[(x) x]
[(x . xs)
(apply f xs)]))
'(f))
'err)
(check-equal? (run '(define f
(case-lambda
[(x y) x]
[(x y . xs)
(apply f xs)]))
'(f 1 2 3))
'err)
(check-equal? (run '(define f
(case-lambda
[(x y) x]
[(x y . xs)
(apply f xs)]))
'(f 1 2 (cons 3 (cons 4 '()))))
'err)
(check-equal? (run '(define f
(case-lambda
[(x) (char->integer (car x))]
[(x y . xs)
(apply f xs)]))
'(f 1 2 (cons #\A 4)))
65)
(check-equal? (run '(define f
(case-lambda
[(x y) x]
Expand All @@ -390,28 +305,7 @@
[(x y z . xs)
(char->integer z)]))
'(f 1 #\a 3))
97)
(check-equal? (run '(define plus
(case-lambda
[() 0]
[(n . ns) (+ n (apply plus ns))]))
'(define (cars xss)
(if (empty? xss)
'()
(cons (car (car xss)) (cars (cdr xss)))))
'(define (cdrs xss)
(if (empty? xss)
'()
(cons (cdr (car xss)) (cdrs (cdr xss)))))
'(define (mapplus ns . nss)
(if (cons? ns)
(cons (apply plus (car ns) (cars nss))
(apply mapplus (cdr ns) (cdrs nss)))
'()))
'(mapplus (cons 1 (cons 2 '()))
(cons 3 (cons 4 '()))
(cons 5 (cons 6 '()))))
'(9 12))))
97)))

(define (test/io run)
(begin ;; Evildoer
Expand Down
4 changes: 4 additions & 0 deletions knock-plus/compile.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
(match d
[(Defn f xs e)
(seq (Label (symbol->label f))
(Cmp r8 (length xs)) ; arity check
(Jne 'err)
(compile-e e (reverse xs) #t)
(Add rsp (* 8 (length xs))) ; pop args
(Ret))]))
Expand Down Expand Up @@ -169,6 +171,7 @@
(seq (compile-es es c)
(move-args (length es) (length c))
(Add rsp (* 8 (length c)))
(Mov r8 (length es)) ; pass arity info
(Jmp (symbol->label f))))

;; Integer Integer -> Asm
Expand All @@ -185,6 +188,7 @@
(seq (Lea rax r)
(Push rax)
(compile-es es (cons #f c))
(Mov r8 (length es)) ; pass arity info
(Jmp (symbol->label f))
(Label r))))

Expand Down
6 changes: 6 additions & 0 deletions knock-plus/test/test-runner.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@
'(2 3 4))
(check-equal? (run '(define (f x y) y)
'(f 1 (add1 #f)))
'err)
(check-equal? (run '(define (f x y) y)
'(f 1))
'err)
(check-equal? (run '(define (f x y) y)
'(f 1 2 3))
'err))

(begin ;; Knock
Expand Down