New builtin file_chunks()

Author: j-woz

turbine/code/export/files.swift

@@ -65,6 +65,12 @@
     "turbine" "0.1"
   [ "set <<s>> [ turbine::file_lines_impl <<f>> <<comment>> ] " ];
 
+@pure
+(string s[]) file_chunks(file f, string delimiter="----",
+                         string comment="#")
+    "turbine" "0.1"
+  [ "set <<s>> [ turbine::file_chunks_impl <<f>> <<delimiter>> <<comment>> ] " ];
+
 @pure
 (string d) dirname_string(string p)
 "turbine" "0.0"

turbine/code/lib/files.tcl

@@ -692,19 +692,6 @@ namespace eval turbine {
         }
     }
 
-    proc file_lines { result input comment } {
-        set src [ lindex $input 0 ]
-        rule_file_helper "file_lines-$result-$src" [ list ] \
-            [ list $comment ] [ list $src ] \
-            $::turbine::WORK \
-            [ list file_lines_body $result $src ]
-    }
-    proc file_lines_body { result input } {
-        set input_val [ retrieve_decr_file $input ]
-        set comment_val [ retrive_decr $comment ]
-        set lines_val [ file_lines_impl $input_val $comment_val ]
-        array_kv_build $result $lines_val 1 integer string
-    }
     # input_file: local file representation
     proc file_lines_impl { input_file comment } {
         set input_name [ local_file_path $input_file ]
@@ -727,6 +714,40 @@ namespace eval turbine {
         return $lines
     }
 
+    # input_file: local file representation
+    proc file_chunks_impl { input_file delimiter comment } {
+        set input_name [ local_file_path $input_file ]
+        set fp [ ::open $input_name r ]
+        set chunk_number 0
+        set chunks [ dict create ]
+        # Comments are disabled if the comment string is empty
+        #                          or just whitespace
+        set comment [ string trim $comment ]
+        set comments_enabled [ string length $comment ]
+        while { ! [ eof $fp ] } {
+            set chunk ""
+            while { [ gets $fp line ] >= 0 } {
+                if $comments_enabled {
+                    regsub "${comment}.*" $line "" line
+                }
+
+                if { $line eq $delimiter } break
+
+                if { [ string length $line ] > 0 } {
+                    if { $chunk ne "" } {
+                        append chunk "\n"
+                    }
+                    append chunk $line
+                }
+            }
+            set chunk [ string trim $chunk ]
+            dict append chunks $chunk_number $chunk
+            incr chunk_number
+        }
+        close $fp
+        return $chunks
+    }
+
     proc file_mtime_impl { filename } {
         if [ catch { set result [ file mtime $filename ] } e ] {
             turbine_error "file_mtime(): $e"