.
Add argument to a few functions.
This commit is contained in:
parent
0aed24e222
commit
be9fa3780a
|
@ -191,7 +191,7 @@ fn edit-environment _self: (addr environment), key: grapheme, data-disk: (addr d
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/ebx: (addr trace) <- address trace-storage
|
var trace/ebx: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate tmp, out-ah, nil, globals, trace, 0/no-fake-screen, 0/no-fake-keyboard, 0/call-number
|
evaluate tmp, out-ah, nil, globals, trace, 0/no-fake-screen, 0/no-fake-keyboard, 0/definitions-created, 0/call-number
|
||||||
# wait for a keypress
|
# wait for a keypress
|
||||||
{
|
{
|
||||||
var tmp/eax: byte <- read-key 0/keyboard
|
var tmp/eax: byte <- read-key 0/keyboard
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# side-effects if not in a test (screen-cell != 0):
|
# side-effects if not in a test (screen-cell != 0):
|
||||||
# prints intermediate states of the screen to real screen
|
# prints intermediate states of the screen to real screen
|
||||||
# stops if a keypress is encountered
|
# stops if a keypress is encountered
|
||||||
fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), call-number: int {
|
fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), definitions-created: (addr stream int), call-number: int {
|
||||||
# stack overflow? # disable when enabling Really-debug-print
|
# stack overflow? # disable when enabling Really-debug-print
|
||||||
check-stack
|
check-stack
|
||||||
{
|
{
|
||||||
|
@ -208,7 +208,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
#
|
#
|
||||||
trace-text trace, "eval", "backquote"
|
trace-text trace, "eval", "backquote"
|
||||||
debug-print "`(", 7/fg, 0/bg
|
debug-print "`(", 7/fg, 0/bg
|
||||||
evaluate-backquote rest-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate-backquote rest-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print ")", 7/fg, 0/bg
|
debug-print ")", 7/fg, 0/bg
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
return
|
return
|
||||||
|
@ -242,7 +242,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var second-arg-ah/edx: (addr handle cell) <- get rest, left
|
var second-arg-ah/edx: (addr handle cell) <- get rest, left
|
||||||
debug-print "P", 4/fg, 0/bg
|
debug-print "P", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate second-arg-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate second-arg-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "Q", 4/fg, 0/bg
|
debug-print "Q", 4/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -262,7 +262,14 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
stream-to-array first-arg-data, tmp-ah
|
stream-to-array first-arg-data, tmp-ah
|
||||||
var first-arg-data-string/eax: (addr array byte) <- lookup *tmp-ah
|
var first-arg-data-string/eax: (addr array byte) <- lookup *tmp-ah
|
||||||
var out-ah/edi: (addr handle cell) <- copy _out-ah
|
var out-ah/edi: (addr handle cell) <- copy _out-ah
|
||||||
var defined-index/eax: int <- assign-or-create-global globals, first-arg-data-string, *out-ah, trace
|
var defined-index: int
|
||||||
|
var defined-index-addr/ecx: (addr int) <- address defined-index
|
||||||
|
assign-or-create-global globals, first-arg-data-string, *out-ah, defined-index-addr, trace
|
||||||
|
{
|
||||||
|
compare definitions-created, 0
|
||||||
|
break-if-=
|
||||||
|
write-to-stream definitions-created, defined-index-addr
|
||||||
|
}
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -295,7 +302,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var second-arg-ah/edx: (addr handle cell) <- get rest, left
|
var second-arg-ah/edx: (addr handle cell) <- get rest, left
|
||||||
debug-print "P", 4/fg, 0/bg
|
debug-print "P", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate second-arg-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate second-arg-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "Q", 4/fg, 0/bg
|
debug-print "Q", 4/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -329,7 +336,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var first-arg-ah/ecx: (addr handle cell) <- get rest, left
|
var first-arg-ah/ecx: (addr handle cell) <- get rest, left
|
||||||
debug-print "R2", 4/fg, 0/bg
|
debug-print "R2", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate first-arg-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate first-arg-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "S2", 4/fg, 0/bg
|
debug-print "S2", 4/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -355,7 +362,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var second-ah/eax: (addr handle cell) <- get rest, left
|
var second-ah/eax: (addr handle cell) <- get rest, left
|
||||||
debug-print "T2", 4/fg, 0/bg
|
debug-print "T2", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate second-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate second-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "U2", 4/fg, 0/bg
|
debug-print "U2", 4/fg, 0/bg
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
return
|
return
|
||||||
|
@ -376,7 +383,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var first-arg-ah/ecx: (addr handle cell) <- get rest, left
|
var first-arg-ah/ecx: (addr handle cell) <- get rest, left
|
||||||
debug-print "R2", 4/fg, 0/bg
|
debug-print "R2", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate first-arg-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate first-arg-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "S2", 4/fg, 0/bg
|
debug-print "S2", 4/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -402,7 +409,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var second-ah/eax: (addr handle cell) <- get rest, left
|
var second-ah/eax: (addr handle cell) <- get rest, left
|
||||||
debug-print "T2", 4/fg, 0/bg
|
debug-print "T2", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate second-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate second-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "U2", 4/fg, 0/bg
|
debug-print "U2", 4/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -434,7 +441,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var guard-ah/esi: (addr handle cell) <- address guard-h
|
var guard-ah/esi: (addr handle cell) <- address guard-h
|
||||||
debug-print "R", 4/fg, 0/bg
|
debug-print "R", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate first-arg-ah, guard-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate first-arg-ah, guard-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "S", 4/fg, 0/bg
|
debug-print "S", 4/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -460,7 +467,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
}
|
}
|
||||||
debug-print "T", 4/fg, 0/bg
|
debug-print "T", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate branch-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate branch-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "U", 4/fg, 0/bg
|
debug-print "U", 4/fg, 0/bg
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
return
|
return
|
||||||
|
@ -496,7 +503,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
trace-text trace, "eval", "loop termination check"
|
trace-text trace, "eval", "loop termination check"
|
||||||
debug-print "V", 4/fg, 0/bg
|
debug-print "V", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate first-arg-ah, guard-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate first-arg-ah, guard-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "W", 4/fg, 0/bg
|
debug-print "W", 4/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -510,7 +517,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var done?/eax: boolean <- nil? guard-a
|
var done?/eax: boolean <- nil? guard-a
|
||||||
compare done?, 0/false
|
compare done?, 0/false
|
||||||
break-if-!=
|
break-if-!=
|
||||||
evaluate-exprs rest-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate-exprs rest-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
var error?/eax: boolean <- has-errors? trace
|
var error?/eax: boolean <- has-errors? trace
|
||||||
|
@ -556,7 +563,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var left-ah/esi: (addr handle cell) <- get curr, left
|
var left-ah/esi: (addr handle cell) <- get curr, left
|
||||||
debug-print "A", 4/fg, 0/bg
|
debug-print "A", 4/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate left-ah, left-out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate left-ah, left-out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "B", 4/fg, 0/bg
|
debug-print "B", 4/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -579,7 +586,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
var function-ah/ecx: (addr handle cell) <- get evaluated-list, left
|
var function-ah/ecx: (addr handle cell) <- get evaluated-list, left
|
||||||
var args-ah/edx: (addr handle cell) <- get evaluated-list, right
|
var args-ah/edx: (addr handle cell) <- get evaluated-list, right
|
||||||
debug-print "C", 4/fg, 0/bg
|
debug-print "C", 4/fg, 0/bg
|
||||||
apply function-ah, args-ah, _out-ah, globals, trace, screen-cell, keyboard-cell, call-number
|
apply function-ah, args-ah, _out-ah, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "Y", 4/fg, 0/bg
|
debug-print "Y", 4/fg, 0/bg
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
# trace "=> " _out-ah {{{
|
# trace "=> " _out-ah {{{
|
||||||
|
@ -600,7 +607,7 @@ fn evaluate _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (han
|
||||||
debug-print "Z", 4/fg, 0/bg
|
debug-print "Z", 4/fg, 0/bg
|
||||||
}
|
}
|
||||||
|
|
||||||
fn apply _f-ah: (addr handle cell), args-ah: (addr handle cell), out: (addr handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), call-number: int {
|
fn apply _f-ah: (addr handle cell), args-ah: (addr handle cell), out: (addr handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), definitions-created: (addr stream int), call-number: int {
|
||||||
var f-ah/eax: (addr handle cell) <- copy _f-ah
|
var f-ah/eax: (addr handle cell) <- copy _f-ah
|
||||||
var _f/eax: (addr cell) <- lookup *f-ah
|
var _f/eax: (addr cell) <- lookup *f-ah
|
||||||
var f/esi: (addr cell) <- copy _f
|
var f/esi: (addr cell) <- copy _f
|
||||||
|
@ -650,7 +657,7 @@ fn apply _f-ah: (addr handle cell), args-ah: (addr handle cell), out: (addr hand
|
||||||
var params-ah/ecx: (addr handle cell) <- get rest, left
|
var params-ah/ecx: (addr handle cell) <- get rest, left
|
||||||
var body-ah/eax: (addr handle cell) <- get rest, right
|
var body-ah/eax: (addr handle cell) <- get rest, right
|
||||||
debug-print "D", 7/fg, 0/bg
|
debug-print "D", 7/fg, 0/bg
|
||||||
apply-function params-ah, args-ah, body-ah, out, *callee-env-ah, globals, trace, screen-cell, keyboard-cell, call-number
|
apply-function params-ah, args-ah, body-ah, out, *callee-env-ah, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "Y", 7/fg, 0/bg
|
debug-print "Y", 7/fg, 0/bg
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
return
|
return
|
||||||
|
@ -658,7 +665,7 @@ fn apply _f-ah: (addr handle cell), args-ah: (addr handle cell), out: (addr hand
|
||||||
error trace, "unknown function"
|
error trace, "unknown function"
|
||||||
}
|
}
|
||||||
|
|
||||||
fn apply-function params-ah: (addr handle cell), args-ah: (addr handle cell), body-ah: (addr handle cell), out: (addr handle cell), env-h: (handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), call-number: int {
|
fn apply-function params-ah: (addr handle cell), args-ah: (addr handle cell), body-ah: (addr handle cell), out: (addr handle cell), env-h: (handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), definitions-created: (addr stream int), call-number: int {
|
||||||
# push bindings for params to env
|
# push bindings for params to env
|
||||||
var new-env-h: (handle cell)
|
var new-env-h: (handle cell)
|
||||||
var new-env-ah/esi: (addr handle cell) <- address new-env-h
|
var new-env-ah/esi: (addr handle cell) <- address new-env-h
|
||||||
|
@ -671,10 +678,10 @@ fn apply-function params-ah: (addr handle cell), args-ah: (addr handle cell), bo
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
#
|
#
|
||||||
evaluate-exprs body-ah, out, new-env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate-exprs body-ah, out, new-env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
}
|
}
|
||||||
|
|
||||||
fn evaluate-exprs _exprs-ah: (addr handle cell), out: (addr handle cell), env-h: (handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), call-number: int {
|
fn evaluate-exprs _exprs-ah: (addr handle cell), out: (addr handle cell), env-h: (handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), definitions-created: (addr stream int), call-number: int {
|
||||||
# eval all exprs, writing result to `out` each time
|
# eval all exprs, writing result to `out` each time
|
||||||
var exprs-ah/ecx: (addr handle cell) <- copy _exprs-ah
|
var exprs-ah/ecx: (addr handle cell) <- copy _exprs-ah
|
||||||
$evaluate-exprs:loop: {
|
$evaluate-exprs:loop: {
|
||||||
|
@ -690,7 +697,7 @@ fn evaluate-exprs _exprs-ah: (addr handle cell), out: (addr handle cell), env-h:
|
||||||
var curr-ah/eax: (addr handle cell) <- get exprs, left
|
var curr-ah/eax: (addr handle cell) <- get exprs, left
|
||||||
debug-print "E", 7/fg, 0/bg
|
debug-print "E", 7/fg, 0/bg
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate curr-ah, out, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate curr-ah, out, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "X", 7/fg, 0/bg
|
debug-print "X", 7/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -1415,7 +1422,7 @@ fn test-evaluate-is-well-behaved {
|
||||||
var tmp-storage: (handle cell)
|
var tmp-storage: (handle cell)
|
||||||
var tmp-ah/edx: (addr handle cell) <- address tmp-storage
|
var tmp-ah/edx: (addr handle cell) <- address tmp-storage
|
||||||
new-symbol tmp-ah, "a"
|
new-symbol tmp-ah, "a"
|
||||||
evaluate tmp-ah, tmp-ah, *env-ah, 0/no-globals, t, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp-ah, *env-ah, 0/no-globals, t, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
# doesn't die
|
# doesn't die
|
||||||
check-trace-contains t, "error", "unbound symbol: a", "F - test-evaluate-is-well-behaved"
|
check-trace-contains t, "error", "unbound symbol: a", "F - test-evaluate-is-well-behaved"
|
||||||
}
|
}
|
||||||
|
@ -1432,7 +1439,7 @@ fn test-evaluate-number {
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/edi: (addr trace) <- address trace-storage
|
var trace/edi: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate tmp-ah, tmp-ah, *env-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp-ah, *env-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
#
|
#
|
||||||
var result/eax: (addr cell) <- lookup *tmp-ah
|
var result/eax: (addr cell) <- lookup *tmp-ah
|
||||||
var result-type/edx: (addr int) <- get result, type
|
var result-type/edx: (addr int) <- get result, type
|
||||||
|
@ -1465,7 +1472,7 @@ fn test-evaluate-symbol {
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/edi: (addr trace) <- address trace-storage
|
var trace/edi: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate tmp-ah, tmp-ah, *env-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp-ah, *env-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
var result/eax: (addr cell) <- lookup *tmp-ah
|
var result/eax: (addr cell) <- lookup *tmp-ah
|
||||||
var result-type/edx: (addr int) <- get result, type
|
var result-type/edx: (addr int) <- get result, type
|
||||||
check-ints-equal *result-type, 1/number, "F - test-evaluate-symbol/0"
|
check-ints-equal *result-type, 1/number, "F - test-evaluate-symbol/0"
|
||||||
|
@ -1490,7 +1497,7 @@ fn test-evaluate-quote {
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/edi: (addr trace) <- address trace-storage
|
var trace/edi: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate tmp-ah, tmp-ah, *nil-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp-ah, *nil-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
var result/eax: (addr cell) <- lookup *tmp-ah
|
var result/eax: (addr cell) <- lookup *tmp-ah
|
||||||
var result-type/edx: (addr int) <- get result, type
|
var result-type/edx: (addr int) <- get result, type
|
||||||
check-ints-equal *result-type, 2/symbol, "F - test-evaluate-quote/0"
|
check-ints-equal *result-type, 2/symbol, "F - test-evaluate-quote/0"
|
||||||
|
@ -1514,7 +1521,7 @@ fn test-evaluate-primitive-function {
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/edx: (addr trace) <- address trace-storage
|
var trace/edx: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate add-ah, tmp-ah, *nil-ah, globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate add-ah, tmp-ah, *nil-ah, globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
#
|
#
|
||||||
var result/eax: (addr cell) <- lookup *tmp-ah
|
var result/eax: (addr cell) <- lookup *tmp-ah
|
||||||
var result-type/edx: (addr int) <- get result, type
|
var result-type/edx: (addr int) <- get result, type
|
||||||
|
@ -1549,7 +1556,7 @@ fn test-evaluate-primitive-function-call {
|
||||||
var globals/edx: (addr global-table) <- address globals-storage
|
var globals/edx: (addr global-table) <- address globals-storage
|
||||||
initialize-globals globals
|
initialize-globals globals
|
||||||
#
|
#
|
||||||
evaluate tmp-ah, tmp-ah, *nil-ah, globals, t, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp-ah, *nil-ah, globals, t, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
#? dump-trace t
|
#? dump-trace t
|
||||||
#
|
#
|
||||||
var result/eax: (addr cell) <- lookup *tmp-ah
|
var result/eax: (addr cell) <- lookup *tmp-ah
|
||||||
|
@ -1577,7 +1584,7 @@ fn test-evaluate-backquote {
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/edi: (addr trace) <- address trace-storage
|
var trace/edi: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate tmp-ah, tmp2-ah, *nil-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp2-ah, *nil-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
var result/eax: (addr cell) <- lookup *tmp2-ah
|
var result/eax: (addr cell) <- lookup *tmp2-ah
|
||||||
var result-type/edx: (addr int) <- get result, type
|
var result-type/edx: (addr int) <- get result, type
|
||||||
check-ints-equal *result-type, 2/symbol, "F - test-evaluate-backquote/0"
|
check-ints-equal *result-type, 2/symbol, "F - test-evaluate-backquote/0"
|
||||||
|
@ -1585,7 +1592,7 @@ fn test-evaluate-backquote {
|
||||||
check sym?, "F - test-evaluate-backquote/1"
|
check sym?, "F - test-evaluate-backquote/1"
|
||||||
}
|
}
|
||||||
|
|
||||||
fn evaluate-backquote _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), call-number: int {
|
fn evaluate-backquote _in-ah: (addr handle cell), _out-ah: (addr handle cell), env-h: (handle cell), globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell), definitions-created: (addr stream int), call-number: int {
|
||||||
# stack overflow? # disable when enabling Really-debug-print
|
# stack overflow? # disable when enabling Really-debug-print
|
||||||
#? dump-cell-from-cursor-over-full-screen _in-ah
|
#? dump-cell-from-cursor-over-full-screen _in-ah
|
||||||
check-stack
|
check-stack
|
||||||
|
@ -1647,7 +1654,7 @@ fn evaluate-backquote _in-ah: (addr handle cell), _out-ah: (addr handle cell), e
|
||||||
var rest-ah/eax: (addr handle cell) <- get in, right
|
var rest-ah/eax: (addr handle cell) <- get in, right
|
||||||
increment call-number
|
increment call-number
|
||||||
debug-print ",", 3/fg, 0/bg
|
debug-print ",", 3/fg, 0/bg
|
||||||
evaluate rest-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate rest-ah, _out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print ",)", 3/fg, 0/bg
|
debug-print ",)", 3/fg, 0/bg
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
return
|
return
|
||||||
|
@ -1683,7 +1690,7 @@ fn evaluate-backquote _in-ah: (addr handle cell), _out-ah: (addr handle cell), e
|
||||||
trace-text trace, "eval", "unquote-splice"
|
trace-text trace, "eval", "unquote-splice"
|
||||||
var in-unquote-payload-ah/eax: (addr handle cell) <- get in-left, right
|
var in-unquote-payload-ah/eax: (addr handle cell) <- get in-left, right
|
||||||
increment call-number
|
increment call-number
|
||||||
evaluate in-unquote-payload-ah, out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate in-unquote-payload-ah, out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
var error?/eax: boolean <- has-errors? trace
|
var error?/eax: boolean <- has-errors? trace
|
||||||
|
@ -1705,7 +1712,7 @@ fn evaluate-backquote _in-ah: (addr handle cell), _out-ah: (addr handle cell), e
|
||||||
}
|
}
|
||||||
# append result of in-right
|
# append result of in-right
|
||||||
var in-right-ah/ecx: (addr handle cell) <- get in, right
|
var in-right-ah/ecx: (addr handle cell) <- get in, right
|
||||||
evaluate-backquote in-right-ah, out-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate-backquote in-right-ah, out-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -1719,7 +1726,7 @@ fn evaluate-backquote _in-ah: (addr handle cell), _out-ah: (addr handle cell), e
|
||||||
var out/eax: (addr cell) <- lookup *out-ah
|
var out/eax: (addr cell) <- lookup *out-ah
|
||||||
var out-left-ah/edx: (addr handle cell) <- get out, left
|
var out-left-ah/edx: (addr handle cell) <- get out, left
|
||||||
debug-print "`(l", 3/fg, 0/bg
|
debug-print "`(l", 3/fg, 0/bg
|
||||||
evaluate-backquote in-left-ah, out-left-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate-backquote in-left-ah, out-left-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "`r)", 3/fg, 0/bg
|
debug-print "`r)", 3/fg, 0/bg
|
||||||
# errors? skip
|
# errors? skip
|
||||||
{
|
{
|
||||||
|
@ -1732,7 +1739,7 @@ fn evaluate-backquote _in-ah: (addr handle cell), _out-ah: (addr handle cell), e
|
||||||
var in-right-ah/ecx: (addr handle cell) <- get in, right
|
var in-right-ah/ecx: (addr handle cell) <- get in, right
|
||||||
var out-right-ah/edx: (addr handle cell) <- get out, right
|
var out-right-ah/edx: (addr handle cell) <- get out, right
|
||||||
debug-print "`r(", 3/fg, 0/bg
|
debug-print "`r(", 3/fg, 0/bg
|
||||||
evaluate-backquote in-right-ah, out-right-ah, env-h, globals, trace, screen-cell, keyboard-cell, call-number
|
evaluate-backquote in-right-ah, out-right-ah, env-h, globals, trace, screen-cell, keyboard-cell, definitions-created, call-number
|
||||||
debug-print "`r)", 3/fg, 0/bg
|
debug-print "`r)", 3/fg, 0/bg
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
}
|
}
|
||||||
|
@ -1760,7 +1767,7 @@ fn test-evaluate-backquote-list {
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/edi: (addr trace) <- address trace-storage
|
var trace/edi: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate tmp-ah, tmp-ah, *nil-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp-ah, *nil-ah, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
# result is (a b)
|
# result is (a b)
|
||||||
var result/eax: (addr cell) <- lookup *tmp-ah
|
var result/eax: (addr cell) <- lookup *tmp-ah
|
||||||
{
|
{
|
||||||
|
@ -1826,7 +1833,7 @@ fn test-evaluate-backquote-list-with-unquote {
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/edi: (addr trace) <- address trace-storage
|
var trace/edi: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate tmp-ah, tmp-ah, env-h, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp-ah, env-h, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
# result is (a 3)
|
# result is (a 3)
|
||||||
var result/eax: (addr cell) <- lookup *tmp-ah
|
var result/eax: (addr cell) <- lookup *tmp-ah
|
||||||
{
|
{
|
||||||
|
@ -1900,7 +1907,7 @@ fn test-evaluate-backquote-list-with-unquote-splice {
|
||||||
var trace-storage: trace
|
var trace-storage: trace
|
||||||
var trace/edi: (addr trace) <- address trace-storage
|
var trace/edi: (addr trace) <- address trace-storage
|
||||||
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
initialize-trace trace, 1/only-errors, 0x10/capacity, 0/visible
|
||||||
evaluate tmp-ah, tmp-ah, env-h, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
evaluate tmp-ah, tmp-ah, env-h, 0/no-globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
# result is (a a 3 b)
|
# result is (a a 3 b)
|
||||||
#? dump-cell-from-cursor-over-full-screen tmp-ah
|
#? dump-cell-from-cursor-over-full-screen tmp-ah
|
||||||
var result/eax: (addr cell) <- lookup *tmp-ah
|
var result/eax: (addr cell) <- lookup *tmp-ah
|
||||||
|
|
|
@ -292,7 +292,7 @@ fn refresh-definition _self: (addr global-table), _index: int {
|
||||||
}
|
}
|
||||||
var curr-value-ah/edi: (addr handle cell) <- get curr-global, value
|
var curr-value-ah/edi: (addr handle cell) <- get curr-global, value
|
||||||
debug-print "GL", 4/fg, 0/bg
|
debug-print "GL", 4/fg, 0/bg
|
||||||
evaluate read-result-ah, curr-value-ah, nil-h, self, trace, 0/no-screen-cell, 0/no-keyboard-cell, 1/call-number
|
evaluate read-result-ah, curr-value-ah, nil-h, self, trace, 0/no-screen-cell, 0/no-keyboard-cell, 0/definitions-created, 1/call-number
|
||||||
debug-print "GZ", 4/fg, 0/bg
|
debug-print "GZ", 4/fg, 0/bg
|
||||||
{
|
{
|
||||||
var error?/eax: boolean <- has-errors? trace
|
var error?/eax: boolean <- has-errors? trace
|
||||||
|
@ -327,7 +327,7 @@ fn refresh-definition _self: (addr global-table), _index: int {
|
||||||
stream-to-array correct-definition-name, curr-global-name-ah
|
stream-to-array correct-definition-name, curr-global-name-ah
|
||||||
}
|
}
|
||||||
|
|
||||||
fn assign-or-create-global _self: (addr global-table), name: (addr array byte), value: (handle cell), trace: (addr trace) -> _/eax: int {
|
fn assign-or-create-global _self: (addr global-table), name: (addr array byte), value: (handle cell), index-updated: (addr int), trace: (addr trace) {
|
||||||
var self/esi: (addr global-table) <- copy _self
|
var self/esi: (addr global-table) <- copy _self
|
||||||
compare self, 0
|
compare self, 0
|
||||||
{
|
{
|
||||||
|
@ -352,7 +352,8 @@ fn assign-or-create-global _self: (addr global-table), name: (addr array byte),
|
||||||
copy-array-object name, curr-name-ah
|
copy-array-object name, curr-name-ah
|
||||||
var curr-value-ah/eax: (addr handle cell) <- get curr, value
|
var curr-value-ah/eax: (addr handle cell) <- get curr, value
|
||||||
copy-handle value, curr-value-ah
|
copy-handle value, curr-value-ah
|
||||||
return curr-index
|
var index-updated/edi: (addr int) <- copy index-updated
|
||||||
|
copy-to *index-updated, curr-index
|
||||||
}
|
}
|
||||||
|
|
||||||
fn lookup-symbol-in-globals _sym: (addr cell), out: (addr handle cell), _globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell) {
|
fn lookup-symbol-in-globals _sym: (addr cell), out: (addr handle cell), _globals: (addr global-table), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell) {
|
||||||
|
|
|
@ -269,7 +269,7 @@ fn macroexpand-iter _expr-ah: (addr handle cell), globals: (addr global-table),
|
||||||
var macro-definition-ah/eax: (addr handle cell) <- get definition, right
|
var macro-definition-ah/eax: (addr handle cell) <- get definition, right
|
||||||
# TODO: check car(macro-definition) is litfn
|
# TODO: check car(macro-definition) is litfn
|
||||||
#? turn-on-debug-print
|
#? turn-on-debug-print
|
||||||
apply macro-definition-ah, rest-ah, expr-ah, globals, trace, 0/no-screen, 0/no-keyboard, 0/call-number
|
apply macro-definition-ah, rest-ah, expr-ah, globals, trace, 0/no-screen, 0/no-keyboard, 0/definitions-created, 0/call-number
|
||||||
trace-higher trace
|
trace-higher trace
|
||||||
# trace "1=> " _expr-ah {{{
|
# trace "1=> " _expr-ah {{{
|
||||||
{
|
{
|
||||||
|
|
|
@ -659,7 +659,7 @@ fn run _in-ah: (addr handle gap-buffer), out: (addr stream byte), globals: (addr
|
||||||
#? set-cursor-position 0/screen, 0 0
|
#? set-cursor-position 0/screen, 0 0
|
||||||
#? turn-on-debug-print
|
#? turn-on-debug-print
|
||||||
debug-print "^", 4/fg, 0/bg
|
debug-print "^", 4/fg, 0/bg
|
||||||
evaluate read-result-ah, eval-result-ah, *nil-ah, globals, trace, screen-cell, keyboard-cell, 1/call-number
|
evaluate read-result-ah, eval-result-ah, *nil-ah, globals, trace, screen-cell, keyboard-cell, 0/definitions-created, 1/call-number
|
||||||
debug-print "$", 4/fg, 0/bg
|
debug-print "$", 4/fg, 0/bg
|
||||||
var error?/eax: boolean <- has-errors? trace
|
var error?/eax: boolean <- has-errors? trace
|
||||||
{
|
{
|
||||||
|
@ -692,7 +692,7 @@ fn read-evaluate-and-move-to-globals _in-ah: (addr handle gap-buffer), globals:
|
||||||
var eval-result-storage: (handle cell)
|
var eval-result-storage: (handle cell)
|
||||||
var eval-result/edi: (addr handle cell) <- address eval-result-storage
|
var eval-result/edi: (addr handle cell) <- address eval-result-storage
|
||||||
debug-print "^", 4/fg, 0/bg
|
debug-print "^", 4/fg, 0/bg
|
||||||
evaluate read-result-ah, eval-result, *nil-ah, globals, trace, 0/no-screen-cell, 0/no-keyboard-cell, 1/call-number
|
evaluate read-result-ah, eval-result, *nil-ah, globals, trace, 0/no-screen-cell, 0/no-keyboard-cell, 0/definitions-created, 1/call-number
|
||||||
{
|
{
|
||||||
var error?/eax: boolean <- has-errors? trace
|
var error?/eax: boolean <- has-errors? trace
|
||||||
compare error?, 0/false
|
compare error?, 0/false
|
||||||
|
|
Loading…
Reference in New Issue
Block a user