terminfo: separate string-offset word.

diff --git a/extra/terminfo/terminfo.factor b/extra/terminfo/terminfo.factor
index 88734b2fd2a7011afab5aee8fd7ba1914807c39a..3372a07e8277541bca715ba555d67347be4ece36 100644 (file)
--- a/extra/terminfo/terminfo.factor
+++ b/extra/terminfo/terminfo.factor
@@ -45,10 +45,12 @@ C: <terminfo-header> terminfo-header
 : read-numbers ( header -- numbers )
     [ align-even-bytes ] [ #numbers>> read-shorts ] bi ;
 
+: string-offset ( from seq -- str )
+    0 2over index-from swap subseq >string ;
+
 : read-strings ( header -- strings )
-    [ #strings>> read-shorts ] [ string-bytes>> read ] bi '[
-        [ _ 0 2over index-from swap subseq >string ] [ f ] if*
-    ] map ;
+    [ #strings>> read-shorts ] [ string-bytes>> read ] bi
+    '[ [ _ string-offset ] [ f ] if* ] map ;
 
 TUPLE: terminfo names booleans numbers strings ;