simple-flat-file: simplify expand-ranges.

diff --git a/basis/simple-flat-file/simple-flat-file-tests.factor b/basis/simple-flat-file/simple-flat-file-tests.factor
index 292500ac47d26d3ab26b91e60ea57c27efadb062..6d8fcc4ef393cf184f454b72fb4d855d0cce6b76 100644 (file)
--- a/basis/simple-flat-file/simple-flat-file-tests.factor
+++ b/basis/simple-flat-file/simple-flat-file-tests.factor
@@ -7,7 +7,6 @@ IN: simple-flat-file.tests
 MEMO: <test1> ( -- code-table )
     "vocab:simple-flat-file/test1.txt" flat-file>biassoc ;
 
-
 { 0 } [ 0 <test1> at ] unit-test
 { 0 } [ 0 <test1> value-at ] unit-test
 
@@ -19,3 +18,6 @@ MEMO: <test1> ( -- code-table )
 
 { 0xAD31 } [ 0x8258 <test1> at ] unit-test
 { 0x8258 } [ 0xAD31 <test1> value-at ] unit-test
+
+{ 1 } [ "1" expand-range ] unit-test
+{ { 1 31 } } [ "1..1F" expand-range ] unit-test

diff --git a/basis/simple-flat-file/simple-flat-file.factor b/basis/simple-flat-file/simple-flat-file.factor
index 49630510acd6b117dff758fb779b0e9579200671..793a3fd67a3fb3189e4b3af028f1ab2ff0762e26 100644 (file)
--- a/basis/simple-flat-file/simple-flat-file.factor
+++ b/basis/simple-flat-file/simple-flat-file.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: sequences splitting kernel math.parser io.files io.encodings.utf8
-biassocs ascii namespaces arrays make assocs interval-maps sets ;
+USING: arrays ascii assocs biassocs interval-maps
+io.encodings.utf8 io.files kernel math.parser sequences
+splitting ;
 IN: simple-flat-file
 
 : drop-comments ( seq -- newseq )
@@ -31,24 +32,11 @@ IN: simple-flat-file
 : data ( filename -- data )
     utf8 file-lines drop-comments [ split-; ] map! ;
 
-SYMBOL: interned
+: expand-range ( range -- range' )
+    ".." split1 [ hex> ] bi@ [ 2array ] when* ;
 
-: range, ( value key -- )
-    swap interned get
-    [ = ] with find nip 2array , ;
-
-: expand-ranges ( assoc -- interval-map )
-    [
-        [
-            swap CHAR: . over member? [
-                ".." split1 [ hex> ] bi@ 2array
-            ] [ hex> ] if range,
-        ] assoc-each
-    ] { } make <interval-map> ;
-
-: process-interval-file ( ranges -- table )
-    dup values members interned
-    [ expand-ranges ] with-variable ;
+: expand-ranges ( ranges -- table )
+    [ [ expand-range ] dip ] assoc-map <interval-map> ;
 
 : load-interval-file ( filename -- table )
-    data process-interval-file ;
+    data expand-ranges ;