Fix regression in RepeatParser

smbecker · Oct 3, 2013 · 02bc71d · 02bc71d
1 parent 1ef5230
commit 02bc71d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Eto.Parse/Parsers/RepeatParser.cs b/Eto.Parse/Parsers/RepeatParser.cs
@@ -82,6 +82,7 @@ protected override int InnerParse(ParseArgs args)
 			{
 				while (count < Maximum)
 				{
+					int curPos = scanner.Position;
 					if (Until != null && count >= Minimum)
 					{
 						int stopMatch;
@@ -100,7 +101,7 @@ protected override int InnerParse(ParseArgs args)
 							if (CaptureUntil)
 								length += stopMatch;
 							else if (!SkipUntil)
-								scanner.Position = pos + length;
+								scanner.Position = curPos;
 							return length;
 						}
 					}
@@ -123,7 +124,7 @@ protected override int InnerParse(ParseArgs args)
 					else
 					{
 						if (sepMatch > 0)
-							scanner.Position = pos + length;
+							scanner.Position = curPos;
 						break;
 					}
 
@@ -169,7 +170,7 @@ protected override int InnerParse(ParseArgs args)
 					{
 						if (sepMatch > 0)
 							length += sepMatch;
-						length ++;
+						length++;
 						count++;
 					}
 					else