From 32b8fac2799ac7cec613e84a3eb9c009141b6a3a Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 25 Apr 2016 22:27:19 -0700 Subject: 2866 --- html/074list.mu.html | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) (limited to 'html/074list.mu.html') diff --git a/html/074list.mu.html b/html/074list.mu.html index 76b64ad5..bb619f3e 100644 --- a/html/074list.mu.html +++ b/html/074list.mu.html @@ -39,27 +39,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color container list:_elem [ value:_elem - next:address:shared:list:_elem + next:address:list:_elem ] -def push x:_elem, in:address:shared:list:_elem -> in:address:shared:list:_elem [ +def push x:_elem, in:address:list:_elem -> in:address:list:_elem [ local-scope load-ingredients - result:address:shared:list:_elem <- new {(list _elem): type} - val:address:_elem <- get-address *result, value:offset - *val <- copy x - next:address:address:shared:list:_elem <- get-address *result, next:offset - *next <- copy in + result:address:list:_elem <- new {(list _elem): type} + *result <- merge x, in return result # needed explicitly because we need to replace 'in' with 'result' ] -def first in:address:shared:list:_elem -> result:_elem [ +def first in:address:list:_elem -> result:_elem [ local-scope load-ingredients result <- get *in, value:offset ] -def rest in:address:shared:list:_elem -> result:address:shared:list:_elem/contained-in:in [ +def rest in:address:list:_elem -> result:address:list:_elem/contained-in:in [ local-scope load-ingredients result <- get *in, next:offset @@ -67,15 +64,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario list-handling [ run [ - 1:address:shared:list:number <- push 3, 0 - 1:address:shared:list:number <- push 4, 1:address:shared:list:number - 1:address:shared:list:number <- push 5, 1:address:shared:list:number - 2:number <- first 1:address:shared:list:number - 1:address:shared:list:number <- rest 1:address:shared:list:number - 3:number <- first 1:address:shared:list:number - 1:address:shared:list:number <- rest 1:address:shared:list:number - 4:number <- first 1:address:shared:list:number - 1:address:shared:list:number <- rest 1:address:shared:list:number + 1:address:list:number <- push 3, 0 + 1:address:list:number <- push 4, 1:address:list:number + 1:address:list:number <- push 5, 1:address:list:number + 2:number <- first 1:address:list:number + 1:address:list:number <- rest 1:address:list:number + 3:number <- first 1:address:list:number + 1:address:list:number <- rest 1:address:list:number + 4:number <- first 1:address:list:number + 1:address:list:number <- rest 1:address:list:number ] memory-should-contain [ 1 <- 0 # empty to empty, dust to dust.. @@ -85,24 +82,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] ] -def to-text in:address:shared:list:_elem -> result:address:shared:array:character [ +def to-text in:address:list:_elem -> result:address:array:character [ local-scope load-ingredients - buf:address:shared:buffer <- new-buffer 80 + buf:address:buffer <- new-buffer 80 buf <- to-buffer in, buf result <- buffer-to-array buf ] # variant of 'to-text' which stops printing after a few elements (and so is robust to cycles) -def to-text-line in:address:shared:list:_elem -> result:address:shared:array:character [ +def to-text-line in:address:list:_elem -> result:address:array:character [ local-scope load-ingredients - buf:address:shared:buffer <- new-buffer 80 + buf:address:buffer <- new-buffer 80 buf <- to-buffer in, buf, 6 # max elements to display result <- buffer-to-array buf ] -def to-buffer in:address:shared:list:_elem, buf:address:shared:buffer -> buf:address:shared:buffer [ +def to-buffer in:address:list:_elem, buf:address:buffer -> buf:address:buffer [ local-scope load-ingredients { @@ -114,7 +111,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color val:_elem <- get *in, value:offset buf <- append buf, val # now prepare next - next:address:shared:list:_elem <- rest in + next:address:list:_elem <- rest in nextn:number <- copy next return-unless next buf <- append buf, [ -> ] -- cgit 1.4.1-2-gfad0