diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2015-07-28 15:03:46 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2015-07-28 15:03:46 -0700 |
commit | 286ca5a4e85c2c3d4e5bd5e303990188a727131c (patch) | |
tree | 5157820360fdd44397954aa35a96d46e9dba03f5 /065duplex_list.mu | |
parent | bc6436927640603675e2e700007f53c5ab213869 (diff) | |
download | mu-286ca5a4e85c2c3d4e5bd5e303990188a727131c.tar.gz |
1869 - rename the /deref property to /lookup
Should be a little bit more mnemonic.
Diffstat (limited to '065duplex_list.mu')
-rw-r--r-- | 065duplex_list.mu | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/065duplex_list.mu b/065duplex_list.mu index b1bfb7a8..ba25e303 100644 --- a/065duplex_list.mu +++ b/065duplex_list.mu @@ -12,13 +12,13 @@ recipe push-duplex [ x:location <- next-ingredient in:address:duplex-list <- next-ingredient result:address:duplex-list <- new duplex-list:type - val:address:location <- get-address result:address:duplex-list/deref, value:offset - val:address:location/deref <- copy x:location - next:address:address:duplex-list <- get-address result:address:duplex-list/deref, next:offset - next:address:address:duplex-list/deref <- copy in:address:duplex-list + val:address:location <- get-address result:address:duplex-list/lookup, value:offset + val:address:location/lookup <- copy x:location + next:address:address:duplex-list <- get-address result:address:duplex-list/lookup, next:offset + next:address:address:duplex-list/lookup <- copy in:address:duplex-list reply-unless in:address:duplex-list, result:address:duplex-list - prev:address:address:duplex-list <- get-address in:address:duplex-list/deref, prev:offset - prev:address:address:duplex-list/deref <- copy result:address:duplex-list + prev:address:address:duplex-list <- get-address in:address:duplex-list/lookup, prev:offset + prev:address:address:duplex-list/lookup <- copy result:address:duplex-list reply result:address:duplex-list ] @@ -27,7 +27,7 @@ recipe first-duplex [ local-scope in:address:duplex-list <- next-ingredient reply-unless in:address:duplex-list, 0 - result:location <- get in:address:duplex-list/deref, value:offset + result:location <- get in:address:duplex-list/lookup, value:offset reply result:location ] @@ -36,7 +36,7 @@ recipe next-duplex [ local-scope in:address:duplex-list <- next-ingredient reply-unless in:address:duplex-list, 0 - result:address:duplex-list <- get in:address:duplex-list/deref, next:offset + result:address:duplex-list <- get in:address:duplex-list/lookup, next:offset reply result:address:duplex-list ] @@ -45,7 +45,7 @@ recipe prev-duplex [ local-scope in:address:duplex-list <- next-ingredient reply-unless in:address:duplex-list, 0 - result:address:duplex-list <- get in:address:duplex-list/deref, prev:offset + result:address:duplex-list <- get in:address:duplex-list/lookup, prev:offset reply result:address:duplex-list ] @@ -99,23 +99,23 @@ recipe insert-duplex [ x:location <- next-ingredient in:address:duplex-list <- next-ingredient new-node:address:duplex-list <- new duplex-list:type - val:address:location <- get-address new-node:address:duplex-list/deref, value:offset - val:address:location/deref <- copy x:location - next-node:address:duplex-list <- get in:address:duplex-list/deref, next:offset + val:address:location <- get-address new-node:address:duplex-list/lookup, value:offset + val:address:location/lookup <- copy x:location + next-node:address:duplex-list <- get in:address:duplex-list/lookup, next:offset # in.next = new-node - y:address:address:duplex-list <- get-address in:address:duplex-list/deref, next:offset - y:address:address:duplex-list/deref <- copy new-node:address:duplex-list + y:address:address:duplex-list <- get-address in:address:duplex-list/lookup, next:offset + y:address:address:duplex-list/lookup <- copy new-node:address:duplex-list # new-node.prev = in - y:address:address:duplex-list <- get-address new-node:address:duplex-list/deref, prev:offset - y:address:address:duplex-list/deref <- copy in:address:duplex-list + y:address:address:duplex-list <- get-address new-node:address:duplex-list/lookup, prev:offset + y:address:address:duplex-list/lookup <- copy in:address:duplex-list # new-node.next = next-node - y:address:address:duplex-list <- get-address new-node:address:duplex-list/deref, next:offset - y:address:address:duplex-list/deref <- copy next-node:address:duplex-list + y:address:address:duplex-list <- get-address new-node:address:duplex-list/lookup, next:offset + y:address:address:duplex-list/lookup <- copy next-node:address:duplex-list # if next-node is not null reply-unless next-node:address:duplex-list, new-node:address:duplex-list # next-node.prev = new-node - y:address:address:duplex-list <- get-address next-node:address:duplex-list/deref, prev:offset - y:address:address:duplex-list/deref <- copy new-node:address:duplex-list + y:address:address:duplex-list <- get-address next-node:address:duplex-list/lookup, prev:offset + y:address:address:duplex-list/lookup <- copy new-node:address:duplex-list reply new-node:address:duplex-list # just signalling something changed; don't rely on the result ] @@ -241,26 +241,26 @@ recipe remove-duplex [ in:address:duplex-list <- next-ingredient # if 'in' is null, return reply-unless in:address:duplex-list, in:address:duplex-list - next-node:address:duplex-list <- get in:address:duplex-list/deref, next:offset - prev-node:address:duplex-list <- get in:address:duplex-list/deref, prev:offset + next-node:address:duplex-list <- get in:address:duplex-list/lookup, next:offset + prev-node:address:duplex-list <- get in:address:duplex-list/lookup, prev:offset # null in's pointers - x:address:address:duplex-list <- get-address in:address:duplex-list/deref, next:offset - x:address:address:duplex-list/deref <- copy 0 - x:address:address:duplex-list <- get-address in:address:duplex-list/deref, prev:offset - x:address:address:duplex-list/deref <- copy 0 + x:address:address:duplex-list <- get-address in:address:duplex-list/lookup, next:offset + x:address:address:duplex-list/lookup <- copy 0 + x:address:address:duplex-list <- get-address in:address:duplex-list/lookup, prev:offset + x:address:address:duplex-list/lookup <- copy 0 { # if next-node is not null break-unless next-node:address:duplex-list # next-node.prev = prev-node - x:address:address:duplex-list <- get-address next-node:address:duplex-list/deref, prev:offset - x:address:address:duplex-list/deref <- copy prev-node:address:duplex-list + x:address:address:duplex-list <- get-address next-node:address:duplex-list/lookup, prev:offset + x:address:address:duplex-list/lookup <- copy prev-node:address:duplex-list } { # if prev-node is not null break-unless prev-node:address:duplex-list # prev-node.next = next-node - x:address:address:duplex-list <- get-address prev-node:address:duplex-list/deref, next:offset - x:address:address:duplex-list/deref <- copy next-node:address:duplex-list + x:address:address:duplex-list <- get-address prev-node:address:duplex-list/lookup, next:offset + x:address:address:duplex-list/lookup <- copy next-node:address:duplex-list reply prev-node:address:duplex-list } reply next-node:address:duplex-list @@ -358,8 +358,8 @@ scenario removing-from-singleton-list [ 1:address:duplex-list <- copy 0 # 1 points to singleton list 1:address:duplex-list <- push-duplex 3, 1:address:duplex-list 2:address:duplex-list <- remove-duplex 1:address:duplex-list - 3:address:duplex-list <- get 1:address:duplex-list/deref, next:offset - 4:address:duplex-list <- get 1:address:duplex-list/deref, prev:offset + 3:address:duplex-list <- get 1:address:duplex-list/lookup, next:offset + 4:address:duplex-list <- get 1:address:duplex-list/lookup, prev:offset ] memory-should-contain [ 2 <- 0 # remove returned null |