joepie91/pegjs
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix bug causing incorrect error messages

Browse source 
The bug could cause the list of expected strings in an error message to
contain strings that shouldn't be there.

Closes #2.
This commit is contained in:
David Majda 2010-05-22 17:43:32 +02:00
parent 11c67b0507
commit d1fc16c373
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/compiler.js
View file

@ -915,6 +915,10 @@ PEG.Compiler = {
" },", " },",
" ", " ",
" _matchFailed: function(failure) {", " _matchFailed: function(failure) {",
" if (this._pos < this._rightmostMatchFailuresPos) {",
" return;",
" }",
" ",
" if (this._pos > this._rightmostMatchFailuresPos) {", " if (this._pos > this._rightmostMatchFailuresPos) {",
" this._rightmostMatchFailuresPos = this._pos;", " this._rightmostMatchFailuresPos = this._pos;",
" this._rightmostMatchFailuresExpected = [];", " this._rightmostMatchFailuresExpected = [];",

4
lib/metagrammar.js
View file

@ -36,6 +36,10 @@ PEG.grammarParser = (function(){
}, },
_matchFailed: function(failure) { _matchFailed: function(failure) {
if (this._pos < this._rightmostMatchFailuresPos) {
return;
}
if (this._pos > this._rightmostMatchFailuresPos) { if (this._pos > this._rightmostMatchFailuresPos) {
this._rightmostMatchFailuresPos = this._pos; this._rightmostMatchFailuresPos = this._pos;
this._rightmostMatchFailuresExpected = []; this._rightmostMatchFailuresExpected = [];