From f344b250f6f062a1a1902bf69b23ebf9b565de0e Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 17 Sep 2016 15:01:51 -0700 Subject: 3395 --- html/065duplex_list.mu.html | 256 ++++++++++++++++++++++---------------------- 1 file changed, 128 insertions(+), 128 deletions(-) (limited to 'html/065duplex_list.mu.html') diff --git a/html/065duplex_list.mu.html b/html/065duplex_list.mu.html index 8dad9fc4..7cefee4d 100644 --- a/html/065duplex_list.mu.html +++ b/html/065duplex_list.mu.html @@ -36,15 +36,15 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color container duplex-list:_elem [ value:_elem - next:address:duplex-list:_elem - prev:address:duplex-list:_elem + next:&:duplex-list:_elem + prev:&:duplex-list:_elem ] # should I say in/contained-in:result, allow ingredients to refer to products? -def push x:_elem, in:address:duplex-list:_elem -> in:address:duplex-list:_elem [ +def push x:_elem, in:&:duplex-list:_elem -> in:&:duplex-list:_elem [ local-scope load-ingredients - result:address:duplex-list:_elem <- new {(duplex-list _elem): type} + result:&:duplex-list:_elem <- new {(duplex-list _elem): type} *result <- merge x, in, 0 { break-unless in @@ -53,21 +53,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color return result # needed explicitly because we need to replace 'in' with 'result' ] -def first in:address:duplex-list:_elem -> result:_elem [ +def first in:&:duplex-list:_elem -> result:_elem [ local-scope load-ingredients return-unless in, 0 result <- get *in, value:offset ] -def next in:address:duplex-list:_elem -> result:address:duplex-list:_elem/contained-in:in [ +def next in:&:duplex-list:_elem -> result:&:duplex-list:_elem/contained-in:in [ local-scope load-ingredients return-unless in, 0 result <- get *in, next:offset ] -def prev in:address:duplex-list:_elem -> result:address:duplex-list:_elem/contained-in:in [ +def prev in:&:duplex-list:_elem -> result:&:duplex-list:_elem/contained-in:in [ local-scope load-ingredients return-unless in, 0 @@ -79,26 +79,26 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color run [ local-scope # reserve locations 0-9 to check for missing null check - 10:number/raw <- copy 34 - 11:number/raw <- copy 35 - list:address:duplex-list:character <- push 3, 0 + 10:num/raw <- copy 34 + 11:num/raw <- copy 35 + list:&:duplex-list:char <- push 3, 0 list <- push 4, list list <- push 5, list - list2:address:duplex-list:character <- copy list - 20:character/raw <- first list2 + list2:&:duplex-list:char <- copy list + 20:char/raw <- first list2 list2 <- next list2 - 21:character/raw <- first list2 + 21:char/raw <- first list2 list2 <- next list2 - 22:character/raw <- first list2 - 30:address:duplex-list:character/raw <- next list2 - 31:character/raw <- first 30:address:duplex-list:character/raw - 32:address:duplex-list:character/raw <- next 30:address:duplex-list:character/raw - 33:address:duplex-list:character/raw <- prev 30:address:duplex-list:character/raw + 22:char/raw <- first list2 + 30:&:duplex-list:char/raw <- next list2 + 31:char/raw <- first 30:&:duplex-list:char/raw + 32:&:duplex-list:char/raw <- next 30:&:duplex-list:char/raw + 33:&:duplex-list:char/raw <- prev 30:&:duplex-list:char/raw list2 <- prev list2 - 40:character/raw <- first list2 + 40:char/raw <- first list2 list2 <- prev list2 - 41:character/raw <- first list2 - 50:boolean/raw <- equal list, list2 + 41:char/raw <- first list2 + 50:bool/raw <- equal list, list2 ] memory-should-contain [ 0 <- 0 # no modifications to null pointers @@ -118,13 +118,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] # insert 'x' after 'in' -def insert x:_elem, in:address:duplex-list:_elem -> in:address:duplex-list:_elem [ +def insert x:_elem, in:&:duplex-list:_elem -> in:&:duplex-list:_elem [ local-scope load-ingredients - new-node:address:duplex-list:_elem <- new {(duplex-list _elem): type} + new-node:&:duplex-list:_elem <- new {(duplex-list _elem): type} *new-node <- put *new-node, value:offset, x # save old next before changing it - next-node:address:duplex-list:_elem <- get *in, next:offset + next-node:&:duplex-list:_elem <- get *in, next:offset *in <- put *in, next:offset, new-node *new-node <- put *new-node, prev:offset, in *new-node <- put *new-node, next:offset, next-node @@ -135,27 +135,27 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario inserting-into-duplex-list [ run [ local-scope - list:address:duplex-list:character <- push 3, 0 + list:&:duplex-list:char <- push 3, 0 list <- push 4, list list <- push 5, list - list2:address:duplex-list:character <- next list # inside list + list2:&:duplex-list:char <- next list # inside list list2 <- insert 6, list2 # check structure like before list2 <- copy list - 10:character/raw <- first list2 + 10:char/raw <- first list2 list2 <- next list2 - 11:character/raw <- first list2 + 11:char/raw <- first list2 list2 <- next list2 - 12:character/raw <- first list2 + 12:char/raw <- first list2 list2 <- next list2 - 13:character/raw <- first list2 + 13:char/raw <- first list2 list2 <- prev list2 - 20:character/raw <- first list2 + 20:char/raw <- first list2 list2 <- prev list2 - 21:character/raw <- first list2 + 21:char/raw <- first list2 list2 <- prev list2 - 22:character/raw <- first list2 - 30:boolean/raw <- equal list, list2 + 22:char/raw <- first list2 + 30:bool/raw <- equal list, list2 ] memory-should-contain [ 10 <- 5 # scanning next @@ -172,28 +172,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario inserting-at-end-of-duplex-list [ run [ local-scope - list:address:duplex-list:character <- push 3, 0 + list:&:duplex-list:char <- push 3, 0 list <- push 4, list list <- push 5, list - list2:address:duplex-list:character <- next list # inside list + list2:&:duplex-list:char <- next list # inside list list2 <- next list2 # now at end of list list2 <- insert 6, list2 # check structure like before list2 <- copy list - 10:character/raw <- first list2 + 10:char/raw <- first list2 list2 <- next list2 - 11:character/raw <- first list2 + 11:char/raw <- first list2 list2 <- next list2 - 12:character/raw <- first list2 + 12:char/raw <- first list2 list2 <- next list2 - 13:character/raw <- first list2 + 13:char/raw <- first list2 list2 <- prev list2 - 20:character/raw <- first list2 + 20:char/raw <- first list2 list2 <- prev list2 - 21:character/raw <- first list2 + 21:char/raw <- first list2 list2 <- prev list2 - 22:character/raw <- first list2 - 30:boolean/raw <- equal list, list2 + 22:char/raw <- first list2 + 30:bool/raw <- equal list, list2 ] memory-should-contain [ 10 <- 5 # scanning next @@ -210,26 +210,26 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario inserting-after-start-of-duplex-list [ run [ local-scope - list:address:duplex-list:character <- push 3, 0 + list:&:duplex-list:char <- push 3, 0 list <- push 4, list list <- push 5, list list <- insert 6, list # check structure like before - list2:address:duplex-list:character <- copy list - 10:character/raw <- first list2 + list2:&:duplex-list:char <- copy list + 10:char/raw <- first list2 list2 <- next list2 - 11:character/raw <- first list2 + 11:char/raw <- first list2 list2 <- next list2 - 12:character/raw <- first list2 + 12:char/raw <- first list2 list2 <- next list2 - 13:character/raw <- first list2 + 13:char/raw <- first list2 list2 <- prev list2 - 20:character/raw <- first list2 + 20:char/raw <- first list2 list2 <- prev list2 - 21:character/raw <- first list2 + 21:char/raw <- first list2 list2 <- prev list2 - 22:character/raw <- first list2 - 30:boolean/raw <- equal list, list2 + 22:char/raw <- first list2 + 30:bool/raw <- equal list, list2 ] memory-should-contain [ 10 <- 5 # scanning next @@ -247,13 +247,13 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # # Returns null if and only if list is empty. Beware: in that case any other # pointers to the head are now invalid. -def remove x:address:duplex-list:_elem/contained-in:in, in:address:duplex-list:_elem -> in:address:duplex-list:_elem [ +def remove x:&:duplex-list:_elem/contained-in:in, in:&:duplex-list:_elem -> in:&:duplex-list:_elem [ local-scope load-ingredients # if 'x' is null, return return-unless x - next-node:address:duplex-list:_elem <- get *x, next:offset - prev-node:address:duplex-list:_elem <- get *x, prev:offset + next-node:&:duplex-list:_elem <- get *x, next:offset + prev-node:&:duplex-list:_elem <- get *x, prev:offset # null x's pointers *x <- put *x, next:offset, 0 *x <- put *x, prev:offset, 0 @@ -276,21 +276,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario removing-from-duplex-list [ run [ local-scope - list:address:duplex-list:character <- push 3, 0 + list:&:duplex-list:char <- push 3, 0 list <- push 4, list list <- push 5, list - list2:address:duplex-list:character <- next list # second element + list2:&:duplex-list:char <- next list # second element list <- remove list2, list - 10:boolean/raw <- equal list2, 0 + 10:bool/raw <- equal list2, 0 # check structure like before list2 <- copy list - 11:character/raw <- first list2 + 11:char/raw <- first list2 list2 <- next list2 - 12:character/raw <- first list2 - 20:address:duplex-list:character/raw <- next list2 + 12:char/raw <- first list2 + 20:&:duplex-list:char/raw <- next list2 list2 <- prev list2 - 30:character/raw <- first list2 - 40:boolean/raw <- equal list, list2 + 30:char/raw <- first list2 + 40:bool/raw <- equal list, list2 ] memory-should-contain [ 10 <- 0 # remove returned non-null @@ -305,19 +305,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario removing-from-start-of-duplex-list [ run [ local-scope - list:address:duplex-list:character <- push 3, 0 + list:&:duplex-list:char <- push 3, 0 list <- push 4, list list <- push 5, list list <- remove list, list # check structure like before - list2:address:duplex-list:character <- copy list - 10:character/raw <- first list2 + list2:&:duplex-list:char <- copy list + 10:char/raw <- first list2 list2 <- next list2 - 11:character/raw <- first list2 - 20:address:duplex-list:character/raw <- next list2 + 11:char/raw <- first list2 + 20:&:duplex-list:char/raw <- next list2 list2 <- prev list2 - 30:character/raw <- first list2 - 40:boolean/raw <- equal list, list2 + 30:char/raw <- first list2 + 40:bool/raw <- equal list, list2 ] memory-should-contain [ 10 <- 4 # scanning next, skipping deleted element @@ -331,23 +331,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario removing-from-end-of-duplex-list [ run [ local-scope - list:address:duplex-list:character <- push 3, 0 + list:&:duplex-list:char <- push 3, 0 list <- push 4, list list <- push 5, list # delete last element - list2:address:duplex-list:character <- next list + list2:&:duplex-list:char <- next list list2 <- next list2 list <- remove list2, list - 10:boolean/raw <- equal list2, 0 + 10:bool/raw <- equal list2, 0 # check structure like before list2 <- copy list - 11:character/raw <- first list2 + 11:char/raw <- first list2 list2 <- next list2 - 12:character/raw <- first list2 - 20:address:duplex-list:character/raw <- next list2 + 12:char/raw <- first list2 + 20:&:duplex-list:char/raw <- next list2 list2 <- prev list2 - 30:character/raw <- first list2 - 40:boolean/raw <- equal list, list2 + 30:char/raw <- first list2 + 40:bool/raw <- equal list, list2 ] memory-should-contain [ 10 <- 0 # remove returned non-null @@ -362,9 +362,9 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario removing-from-singleton-duplex-list [ run [ local-scope - list:address:duplex-list:character <- push 3, 0 + list:&:duplex-list:char <- push 3, 0 list <- remove list, list - 1:number/raw <- copy list + 1:num/raw <- copy list ] memory-should-contain [ 1 <- 0 # back to an empty list @@ -376,11 +376,11 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color # set end to 0 to delete everything past start. # can't set start to 0 to delete everything before end, because there's no # clean way to return the new head pointer. -def remove-between start:address:duplex-list:_elem, end:address:duplex-list:_elem/contained-in:start -> start:address:duplex-list:_elem [ +def remove-between start:&:duplex-list:_elem, end:&:duplex-list:_elem/contained-in:start -> start:&:duplex-list:_elem [ local-scope load-ingredients - next:address:duplex-list:_elem <- get *start, next:offset - nothing-to-delete?:boolean <- equal next, end + next:&:duplex-list:_elem <- get *start, next:offset + nothing-to-delete?:bool <- equal next, end return-if nothing-to-delete? assert next, [malformed duplex list] # start->next->prev = 0 @@ -390,7 +390,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color return-unless end # end->prev->next = 0 # end->prev = start - prev:address:duplex-list:_elem <- get *end, prev:offset + prev:&:duplex-list:_elem <- get *end, prev:offset assert prev, [malformed duplex list - 2] *prev <- put *prev, next:offset, 0 *end <- put *end, prev:offset, start @@ -399,28 +399,28 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario remove-range [ # construct a duplex list with six elements [13, 14, 15, 16, 17, 18] local-scope - list:address:duplex-list:character <- push 18, 0 + list:&:duplex-list:char <- push 18, 0 list <- push 17, list list <- push 16, list list <- push 15, list list <- push 14, list list <- push 13, list - 1:address:duplex-list:character/raw <- copy list # save list + 1:&:duplex-list:char/raw <- copy list # save list run [ local-scope - list:address:duplex-list:character <- copy 1:address:duplex-list:character/raw # restore list + list:&:duplex-list:char <- copy 1:&:duplex-list:char/raw # restore list # delete 16 onwards # first pointer: to the third element - list2:address:duplex-list:character <- next list + list2:&:duplex-list:char <- next list list2 <- next list2 list2 <- remove-between list2, 0 # now check the list - 10:character/raw <- get *list, value:offset + 10:char/raw <- get *list, value:offset list <- next list - 11:character/raw <- get *list, value:offset + 11:char/raw <- get *list, value:offset list <- next list - 12:character/raw <- get *list, value:offset - 20:address:duplex-list:character/raw <- next list + 12:char/raw <- get *list, value:offset + 20:&:duplex-list:char/raw <- next list ] memory-should-contain [ 10 <- 13 @@ -433,32 +433,32 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario remove-range-to-final [ local-scope # construct a duplex list with six elements [13, 14, 15, 16, 17, 18] - list:address:duplex-list:character <- push 18, 0 + list:&:duplex-list:char <- push 18, 0 list <- push 17, list list <- push 16, list list <- push 15, list list <- push 14, list list <- push 13, list - 1:address:duplex-list:character/raw <- copy list # save list + 1:&:duplex-list:char/raw <- copy list # save list run [ local-scope - list:address:duplex-list:character <- copy 1:address:duplex-list:character/raw # restore list + list:&:duplex-list:char <- copy 1:&:duplex-list:char/raw # restore list # delete 15, 16 and 17 # start pointer: to the second element - list2:address:duplex-list:character <- next list + list2:&:duplex-list:char <- next list # end pointer: to the last (sixth) element - end:address:duplex-list:character <- next list2 + end:&:duplex-list:char <- next list2 end <- next end end <- next end end <- next end remove-between list2, end # now check the list - 10:character/raw <- get *list, value:offset + 10:char/raw <- get *list, value:offset list <- next list - 11:character/raw <- get *list, value:offset + 11:char/raw <- get *list, value:offset list <- next list - 12:character/raw <- get *list, value:offset - 20:address:duplex-list:character/raw <- next list + 12:char/raw <- get *list, value:offset + 20:&:duplex-list:char/raw <- next list ] memory-should-contain [ 10 <- 13 @@ -471,23 +471,23 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario remove-range-empty [ local-scope # construct a duplex list with three elements [13, 14, 15] - list:address:duplex-list:character <- push 15, 0 + list:&:duplex-list:char <- push 15, 0 list <- push 14, list list <- push 13, list - 1:address:duplex-list:character/raw <- copy list # save list + 1:&:duplex-list:char/raw <- copy list # save list run [ local-scope - list:address:duplex-list:character <- copy 1:address:duplex-list:character/raw # restore list + list:&:duplex-list:char <- copy 1:&:duplex-list:char/raw # restore list # delete between first and second element (i.e. nothing) - list2:address:duplex-list:character <- next list + list2:&:duplex-list:char <- next list remove-between list, list2 # now check the list - 10:character/raw <- get *list, value:offset + 10:char/raw <- get *list, value:offset list <- next list - 11:character/raw <- get *list, value:offset + 11:char/raw <- get *list, value:offset list <- next list - 12:character/raw <- get *list, value:offset - 20:address:duplex-list:character/raw <- next list + 12:char/raw <- get *list, value:offset + 20:&:duplex-list:char/raw <- next list ] # no change memory-should-contain [ @@ -501,24 +501,24 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color scenario remove-range-to-end [ local-scope # construct a duplex list with six elements [13, 14, 15, 16, 17, 18] - list:address:duplex-list:character <- push 18, 0 + list:&:duplex-list:char <- push 18, 0 list <- push 17, list list <- push 16, list list <- push 15, list list <- push 14, list list <- push 13, list - 1:address:duplex-list:character/raw <- copy list # save list + 1:&:duplex-list:char/raw <- copy list # save list run [ local-scope - list:address:duplex-list:character <- copy 1:address:duplex-list:character/raw # restore list + list:&:duplex-list:char <- copy 1:&:duplex-list:char/raw # restore list # remove the third element and beyond - list2:address:duplex-list:character <- next list + list2:&:duplex-list:char <- next list remove-between list2, 0 # now check the list - 10:character/raw <- get *list, value:offset + 10:char/raw <- get *list, value:offset list <- next list - 11:character/raw <- get *list, value:offset - 20:address:duplex-list:character/raw <- next list + 11:char/raw <- get *list, value:offset + 20:&:duplex-list:char/raw <- next list ] memory-should-contain [ 10 <- 13 @@ -528,19 +528,19 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] # insert list beginning at 'new' after 'in' -def insert-range in:address:duplex-list:_elem, start:address:duplex-list:_elem/contained-in:in -> in:address:duplex-list:_elem [ +def insert-range in:&:duplex-list:_elem, start:&:duplex-list:_elem/contained-in:in -> in:&:duplex-list:_elem [ local-scope load-ingredients return-unless in return-unless start - end:address:duplex-list:_elem <- copy start + end:&:duplex-list:_elem <- copy start { - next:address:duplex-list:_elem <- next end/insert-range + next:&:duplex-list:_elem <- next end/insert-range break-unless next end <- copy next loop } - next:address:duplex-list:_elem <- next in + next:&:duplex-list:_elem <- next in *end <- put *end, next:offset, next { break-unless next @@ -550,21 +550,21 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color *start <- put *start, prev:offset, in ] -def append in:address:duplex-list:_elem, new:address:duplex-list:_elem/contained-in:in -> in:address:duplex-list:_elem [ +def append in:&:duplex-list:_elem, new:&:duplex-list:_elem/contained-in:in -> in:&:duplex-list:_elem [ local-scope load-ingredients - last:address:duplex-list:_elem <- last in + last:&:duplex-list:_elem <- last in *last <- put *last, next:offset, new return-unless new *new <- put *new, prev:offset, last ] -def last in:address:duplex-list:_elem -> result:address:duplex-list:_elem [ +def last in:&:duplex-list:_elem -> result:&:duplex-list:_elem [ local-scope load-ingredients result <- copy in { - next:address:duplex-list:_elem <- next result + next:&:duplex-list:_elem <- next result break-unless next result <- copy next loop @@ -572,7 +572,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color ] # helper for debugging -def dump-from x:address:duplex-list:_elem [ +def dump-from x:&:duplex-list:_elem [ local-scope load-ingredients $print x, [: ] @@ -582,7 +582,7 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color $print c, [ ] x <- next x { - is-newline?:boolean <- equal c, 10/newline + is-newline?:bool <- equal c, 10/newline break-unless is-newline? $print 10/newline $print x, [: ] -- cgit 1.4.1-2-gfad0