fix expected string length bug

skoppe · skoppe · commit c6d1a03faae1 · 2020-02-05T17:40:21.000+01:00
diff --git a/pegged/peg.d b/pegged/peg.d
@@ -1656,15 +1656,15 @@ template or(rules...) if (rules.length > 0)
                 failedLength[i] = temp.end;
                 if (temp.end >= longestFail.end)
                 {
+                    if (temp.end == longestFail.end)
+                        errorStringChars += (temp.matches.length > 0 ? temp.matches[$-1].length : 0) + errName.length + 4;
+                    else
+                        errorStringChars = (temp.matches.length > 0 ? temp.matches[$-1].length : 0) + errName.length + 4;
                     maxFailedLength = temp.end;
                     longestFail = temp;
                     names[i] = errName;
                     results[i] = temp;
 
-                    if (temp.end == longestFail.end)
-                        errorStringChars += (temp.matches.length > 0 ? temp.matches[$-1].length : 0) + errName.length + 4;
-                    else
-                        errorStringChars = (temp.matches.length > 0 ? temp.matches[$-1].length : 0) + errName.length + 4;
                 }
                 // Else, this error parsed less input than another one: we discard it.
             }

Original file line number	Diff line number	Diff line change
`@@ -1656,15 +1656,15 @@ template or(rules...) if (rules.length > 0)`
`1656`	`1656`	`failedLength[i] = temp.end;`
`1657`	`1657`	`if (temp.end >= longestFail.end)`
`1658`	`1658`	`{`
	`1659`	`+ if (temp.end == longestFail.end)`
	`1660`	`+ errorStringChars += (temp.matches.length > 0 ? temp.matches[$-1].length : 0) + errName.length + 4;`
	`1661`	`+ else`
	`1662`	`+ errorStringChars = (temp.matches.length > 0 ? temp.matches[$-1].length : 0) + errName.length + 4;`
`1659`	`1663`	`maxFailedLength = temp.end;`
`1660`	`1664`	`longestFail = temp;`
`1661`	`1665`	`names[i] = errName;`
`1662`	`1666`	`results[i] = temp;`
`1663`	`1667`
`1664`		`- if (temp.end == longestFail.end)`
`1665`		`- errorStringChars += (temp.matches.length > 0 ? temp.matches[$-1].length : 0) + errName.length + 4;`
`1666`		`- else`
`1667`		`- errorStringChars = (temp.matches.length > 0 ? temp.matches[$-1].length : 0) + errName.length + 4;`
`1668`	`1668`	`}`
`1669`	`1669`	`// Else, this error parsed less input than another one: we discard it.`
`1670`	`1670`	`}`