diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2016-04-24 11:54:30 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2016-04-24 11:54:30 -0700 |
commit | b0bf5321de2ba32f3b92c2faf6b7b68a06b6b432 (patch) | |
tree | 9e0473bddd0d9a2d4aec7ac58dec8d85c2833a5d /077stream.mu | |
parent | 15936c91a9f8023dc868a021029f84b45aa50176 (diff) | |
download | mu-b0bf5321de2ba32f3b92c2faf6b7b68a06b6b432.tar.gz |
2864 - replace all address:shared with just address
Now that we no longer have non-shared addresses, we can just always track refcounts for all addresses. Phew!
Diffstat (limited to '077stream.mu')
-rw-r--r-- | 077stream.mu | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/077stream.mu b/077stream.mu index 305a150f..db7c189a 100644 --- a/077stream.mu +++ b/077stream.mu @@ -1,10 +1,10 @@ # new type to help incrementally read texts (arrays of characters) container stream [ index:number - data:address:shared:array:character + data:address:array:character ] -def new-stream s:address:shared:array:character -> result:address:shared:stream [ +def new-stream s:address:array:character -> result:address:stream [ local-scope load-ingredients result <- new stream:type @@ -12,17 +12,17 @@ def new-stream s:address:shared:array:character -> result:address:shared:stream *result <- put *result, data:offset, s ] -def rewind-stream in:address:shared:stream -> in:address:shared:stream [ +def rewind-stream in:address:stream -> in:address:stream [ local-scope load-ingredients *in <- put *in, index:offset, 0 ] -def read-line in:address:shared:stream -> result:address:shared:array:character, in:address:shared:stream [ +def read-line in:address:stream -> result:address:array:character, in:address:stream [ local-scope load-ingredients idx:number <- get *in, index:offset - s:address:shared:array:character <- get *in, data:offset + s:address:array:character <- get *in, data:offset next-idx:number <- find-next s, 10/newline, idx result <- copy-range s, idx, next-idx idx <- add next-idx, 1 # skip newline @@ -30,11 +30,11 @@ def read-line in:address:shared:stream -> result:address:shared:array:character, *in <- put *in, index:offset, idx ] -def end-of-stream? in:address:shared:stream -> result:boolean [ +def end-of-stream? in:address:stream -> result:boolean [ local-scope load-ingredients idx:number <- get *in, index:offset - s:address:shared:array:character <- get *in, data:offset + s:address:array:character <- get *in, data:offset len:number <- length *s result <- greater-or-equal idx, len ] |