Stream.takeUntilLastAndDrop

2023-07-13 21:09:05 -06:00
parent ec73eed432
commit bbb5dcf426
1 changed files with 12 additions and 1 deletions
--- a/src/kiss/Stream.hx
+++ b/src/kiss/Stream.hx
@@ -217,7 +217,18 @@ class Stream {
    }

    public function takeUntilAndDrop(s:String, allowEOF:Bool = false):Option<String> {
-        var idx = content.indexOf(s);
+        return _takeUntilAndDrop(s, allowEOF, false);
+    }
+
+    public function takeUntilLastAndDrop(s:String, allowEOF:Bool = false):Option<String> {
+        return _takeUntilAndDrop(s, allowEOF, true);
+    }
+
+    public function _takeUntilAndDrop(s:String, allowEOF:Bool, last:Bool):Option<String> {
+        var idx = if (last)
+            content.lastIndexOf(s);
+        else
+            content.indexOf(s);

        if (idx < 0) {
            return if (allowEOF) {