From f588143082c2dac93320647291bf51c9f6d277e5 Mon Sep 17 00:00:00 2001 From: Sascha Matzke Date: Thu, 29 Jan 2009 13:47:33 +0100 Subject: [PATCH] changed stream>assoc to return the amount of bytes read from the stream --- bson/reader/reader.factor | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/bson/reader/reader.factor b/bson/reader/reader.factor index 5aebb4bcee..348a25b732 100644 --- a/bson/reader/reader.factor +++ b/bson/reader/reader.factor @@ -194,13 +194,7 @@ M: bson-binary-function element-binary-read ( size type -- quot ) PRIVATE> -: stream>assoc ( exemplar -- assoc ) +: stream>assoc ( exemplar -- assoc bytes-read ) dup state - [ read-int32 >>size read-elements ] with-variable - result>> ; - -: array>assoc ( array exemplar -- assoc ) - [ binary ] dip '[ _ stream>assoc ] with-byte-reader ; - -: array>hashtable ( array -- assoc ) - H{ } array>assoc ; + [ read-int32 >>size read-elements ] with-variable + [ result>> ] [ read>> ] bi ;