compression.lzw: additional refactoring

diff --git a/basis/compression/lzw/lzw.factor b/basis/compression/lzw/lzw.factor
index 72de6f828cc99a7e06b6d320fe978f8725f8ae5b..e017636009b2f1546ec4f7cf89bba98fc635836e 100644 (file)
--- a/basis/compression/lzw/lzw.factor
+++ b/basis/compression/lzw/lzw.factor
@@ -55,11 +55,10 @@ ERROR: not-in-table value ;
 
 GENERIC: code-space-full? ( lzw -- ? )
 
-M: tiff-lzw code-space-full?
-    [ table>> length ] [ code-size>> 2^ 1 - ] bi = ;
+: size-and-limit ( lzw -- m n ) [ table>> length ] [ code-size>> 2^ ] bi ;
 
-M: gif-lzw code-space-full?
-    [ table>> length ] [ code-size>> 2^ ] bi = ;
+M: tiff-lzw code-space-full? size-and-limit 1 - = ;
+M: gif-lzw code-space-full? size-and-limit = ;
 
 : maybe-increment-code-size ( lzw -- lzw )
     dup code-space-full? [ [ 1 + ] change-code-size ] when ;