7854 - shell: symbol lookup

This commit is contained in:
Kartik K. Agaram 2021-03-05 06:19:21 -08:00
parent 275a652402
commit 2454f72c8a
2 changed files with 46 additions and 17 deletions

View File

@ -290,3 +290,47 @@ fn cell-isomorphic? _a: (addr cell), _b: (addr cell), trace: (addr trace) -> _/e
var result/eax: boolean <- cell-isomorphic? a-tmp, b-tmp, trace
return result
}
fn test-evaluate-is-well-behaved {
var t-storage: trace
var t/esi: (addr trace) <- address t-storage
initialize-trace t, 0x10, 0/visible # we don't use trace UI
#
var tmp-storage: (handle cell)
var tmp-ah/edx: (addr handle cell) <- address tmp-storage
# eval sym(a), nil env
allocate-pair tmp-ah
var env/eax: (addr cell) <- lookup *tmp-ah
new-symbol tmp-ah, "a"
evaluate tmp-ah, tmp-ah, env, t
# doesn't die
check-trace-contains t, "error", "unbound symbol: a", "F - test-evaluate-is-well-behaved"
}
fn test-evaluate {
# tmp = (a . 3)
var val-storage: (handle cell)
var val-ah/ecx: (addr handle cell) <- address val-storage
new-integer val-ah, 3
var key-storage: (handle cell)
var key-ah/edx: (addr handle cell) <- address key-storage
new-symbol key-ah, "a"
var tmp-storage: (handle cell)
var tmp-ah/ebx: (addr handle cell) <- address tmp-storage
new-pair tmp-ah, *key-ah, *val-ah
# env = ((a . 3))
var nil-storage: (handle cell)
var nil-ah/ecx: (addr handle cell) <- address nil-storage
allocate-pair nil-ah
new-pair tmp-ah, *tmp-ah, *nil-ah
var env/eax: (addr cell) <- lookup *tmp-ah
# eval sym(a), env
new-symbol tmp-ah, "a"
evaluate tmp-ah, tmp-ah, env, 0/no-trace
var result/eax: (addr cell) <- lookup *tmp-ah
var result-type/edx: (addr int) <- get result, type
check-ints-equal *result-type, 1/number, "F - test-evaluate/0"
var result-value-addr/eax: (addr float) <- get result, number-data
var result-value/eax: int <- convert *result-value-addr
check-ints-equal result-value, 3, "F - test-evaluate/1"
}

View File

@ -175,24 +175,9 @@ fn run in: (addr gap-buffer), out: (addr stream byte), trace: (addr trace) {
return
}
var nil-storage: (handle cell)
var nil-ah/ecx: (addr handle cell) <- address nil-storage
var nil-ah/eax: (addr handle cell) <- address nil-storage
allocate-pair nil-ah
# HERE
var tmp-storage: (handle cell)
var tmp-ah/edx: (addr handle cell) <- address tmp-storage
# tmp = a
new-symbol tmp-ah, "a"
# tmp = (a)
new-pair tmp-ah, *tmp-ah, *nil-ah
# tmp = (a . (a)) = (a a)
var tmp/eax: (addr cell) <- lookup *tmp-ah
{
var new-ah/ecx: (addr handle cell) <- get tmp, left
new-pair tmp-ah, *new-ah, *tmp-ah
}
# env = tmp = ((a a))
new-pair tmp-ah, *tmp-ah, *nil-ah
var env/eax: (addr cell) <- lookup *tmp-ah
var env/eax: (addr cell) <- lookup *nil-ah
var eval-result-storage: (handle cell)
var eval-result/edi: (addr handle cell) <- address eval-result-storage
evaluate read-result, eval-result, env, trace