add self return to TStringRange.popFront + add TStringRange.popFrontN

src/ce_libmaneditor.pas

@@ -294,9 +294,7 @@ begin
   end;
   with TStringRange.create(pge) do while not empty do
   begin
-    popUntil('"');
+    fList.Add(popUntil('"')^.popFront^.takeUntil('"').yield);
-    popFront;
-    fList.Add(takeUntil('"').yield);
     popFront;
   end;
   cbb.Items.clear;

src/ce_main.pas

@@ -2536,11 +2536,10 @@ begin
   rng.init(firstLineFlags);
   if rng.startsWith('#!') then
   begin
-    rng.popFront;
+    rng.popFrontN(2)^
-    rng.popFront;
+      .popWhile([' ', #9])^
-    rng.popWhile([' ', #9]);
+      .popUntil([' ', #9, ':'])^
-    rng.popUntil([' ', #9, ':']);
+      .popWhile([' ', #9, ':']);
-    rng.popWhile([' ', #9, ':']);
     firstlineFlags := rng.takeUntil(#0).yield;
     firstlineFlags := fSymStringExpander.expand(firstlineFlags);
     lst := TStringList.Create;

src/ce_stringrange.pas

@@ -43,7 +43,9 @@ type
     function init(const pchr: PChar; length: integer): PStringRange; {$IFNDEF DEBUG}inline;{$ENDIF}
 
     // advances.
-    procedure popFront; {$IFNDEF DEBUG}inline;{$ENDIF}
+    function popFront: PStringRange; {$IFNDEF DEBUG}inline;{$ENDIF}
+    // advances N times
+    function popFrontN(n: integer): PStringRange; {$IFNDEF DEBUG}inline;{$ENDIF}
     // returns the current element.
     function front: char; {$IFNDEF DEBUG}inline;{$ENDIF}
     // indicates wether the range is consumed.
@@ -125,9 +127,16 @@ begin
   Result := @self;
 end;
 
-procedure TStringRange.popFront;
+function TStringRange.popFront: PStringRange;
 begin
   pos += 1;
+  Result := @self;
+end;
+
+function TStringRange.popFrontN(n: integer): PStringRange;
+begin
+  pos += n;
+  Result := @self;
 end;
 
 function TStringRange.front: char;

src/ce_symstring.pas

@@ -269,8 +269,8 @@ begin
     Result += rng.takeUntil('<').yield;
     if not rng.empty and (rng.front = '<') then
     begin
-      rng.popFront;
+      ;
-      sym := rng.takeUntil('>').yield;
+      sym := rng.popFront^.takeUntil('>').yield;
       if not rng.empty and (rng.front = '>') then
       begin
         rng.popFront;