dane/lisp-in-small-pieces
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Utilize a library function to find list indices

Browse Source
This commit is contained in:
Dane Johnson
2025-12-14 10:35:52 -06:00
parent 0675018adb
commit 14e091f45a
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bytecode-compiler.scm
View File

@@ -88,17 +88,13 @@
(closed-environment closure-closed-environment))
;; Helpers
(define (find-indexed pred lst)
(find (lambda (kons) (pred (car kons)))
(zip lst (iota (length lst)))))
(define (local-variable env ref)
(let scan-env ([env env] [i 0])
(if (null? env)
#f
(let ([the-match (find-indexed (lambda (name) (eq? name ref)) (car env))])
(if the-match
`(local ,i . ,(cadr the-match))
(let ([j (list-index (lambda (name) (eq? name ref)) (car env))])
(if j
`(local ,i . ,j)
(scan-env (cdr env) (+ i 1)))))))
(define (global-variable env ref)

11
direct-style-interpreter.scm
View File

@@ -95,17 +95,13 @@
(closed-environment closure-closed-environment))
;; Helpers
(define (find-indexed pred lst)
(find (lambda (kons) (pred (car kons)))
(zip lst (iota (length lst)))))
(define (local-variable env ref)
(let scan-env ([env env] [i 0])
(if (null? env)
#f
(let ([the-match (find-indexed (lambda (name) (eq? name ref)) (car env))])
(if the-match
`(local ,i . ,(cadr the-match))
(let ([j (list-index (lambda (name) (eq? name ref)) (car env))])
(if j
`(local ,i . ,j)
(scan-env (cdr env) (+ i 1)))))))
(define (global-variable env ref)
@@ -151,6 +147,7 @@
(if (zero? i)
(activation-rec-ref r j)
(activation-rec-ref (activation-record-next r) (1- i) j))]))
(define (activation-rec-length r)
(vector-length (activation-record-vals r)))