even crazier readAndProcessCC

kiss-lang · Dec 11, 2024 · df8edf7 · df8edf7
1 parent e09993e
commit df8edf7
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/kiss/Reader.hx b/src/kiss/Reader.hx
@@ -411,7 +411,7 @@ class Reader {
         Read all the expressions in the given stream, processing them one by one while reading.
         They can't be read all at once because some expressions change the Readtable state
     **/
-    public static function readAndProcessCC(stream:Stream, k:HasReadTables, process:(ReaderExp, cc:Void->Void) -> Void, nested = false) {
+    public static function readAndProcessCC(stream:Stream, k:HasReadTables, process:(ReaderExp, cc:Void->Void) -> Void, nested = false):Void->Void {
         if (nested) {
             nestedReadExpArrayStartPositions.push(readExpArrayStartPositions);
             readExpArrayStartPositions = [];
@@ -458,22 +458,24 @@ class Reader {
             }
         }
 
-        var startOfFileMacro = chooseReadFunction(stream, k.startOfFileReadTable);
-        if (startOfFileMacro != null) {
-            var pos = stream.position();
-            var v = startOfFileMacro(stream, k);
-            if (v != null)
-                process(v.withPos(pos), afterStartOfFile);
-        } else {
-            afterStartOfFile();
+        return () -> {
+            var startOfFileMacro = chooseReadFunction(stream, k.startOfFileReadTable);
+            if (startOfFileMacro != null) {
+                var pos = stream.position();
+                var v = startOfFileMacro(stream, k);
+                if (v != null)
+                    process(v.withPos(pos), afterStartOfFile);
+            } else {
+                afterStartOfFile();
+            }
         }
     }
 
     public static function readAndProcess(stream:Stream, k:HasReadTables, process:(ReaderExp) -> Void, nested = false) {
         readAndProcessCC(stream, k, (exp, cc) -> {
             process(exp);
             cc();
-        });
+        })();
     }
 
     public static function withPos(def:ReaderExpDef, pos:Position) {