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

More responsibility for building an error message into |SyntaxError|

Browse Source
redux
David Majda 12 years ago
parent 21c6d9ccd3
commit e9d8dc8eba
2 changed files with 80 additions and 68 deletions
Show Stats Download Patch File Download Diff File

74
src/emitter.js
Unescape Escape View File

@ -344,38 +344,19 @@ PEG.compiler.emitter = function(ast) {
' #block definition', ' #block definition',
' ', ' ',
' #end', ' #end',
' function buildErrorMessage() {', ' ',
' function buildExpected(failuresExpected) {', ' function cleanupExpected(expected) {',
' failuresExpected.sort();', ' expected.sort();',
' ', ' ',
' var lastFailure = null;', ' var lastExpected = null;',
' var failuresExpectedUnique = [];', ' var cleanExpected = [];',
' for (var i = 0; i < failuresExpected.length; i++) {', ' for (var i = 0; i < expected.length; i++) {',
' if (failuresExpected[i] !== lastFailure) {', ' if (expected[i] !== lastExpected) {',
' failuresExpectedUnique.push(failuresExpected[i]);', ' cleanExpected.push(expected[i]);',
' lastFailure = failuresExpected[i];', ' lastExpected = expected[i];',
' }',
' }',
' ',
' switch (failuresExpectedUnique.length) {',
' case 0:',
' return "end of input";',
' case 1:',
' return failuresExpectedUnique[0];',
' default:',
' return failuresExpectedUnique.slice(0, failuresExpectedUnique.length - 1).join(", ")',
' + " or "',
' + failuresExpectedUnique[failuresExpectedUnique.length - 1];',
' }', ' }',
' }', ' }',
' ', ' return cleanExpected;',
' var expected = buildExpected(rightmostFailuresExpected);',
' var actualPos = Math.max(pos, rightmostFailuresPos);',
' var actual = actualPos < input.length',
' ? quote(input.charAt(actualPos))',
' : "end of input";',
' ',
' return "Expected " + expected + " but " + actual + " found.";',
' }', ' }',
' ', ' ',
' function computeErrorPosition() {', ' function computeErrorPosition() {',
@ -440,10 +421,14 @@ PEG.compiler.emitter = function(ast) {
' * handle these states.', ' * handle these states.',
' */', ' */',
' if (result === null || pos !== input.length) {', ' if (result === null || pos !== input.length) {',
' var offset = Math.max(pos, rightmostFailuresPos);',
' var found = offset < input.length ? input.charAt(offset) : null;',
' var errorPosition = computeErrorPosition();', ' var errorPosition = computeErrorPosition();',
' ',
' throw new this.SyntaxError(', ' throw new this.SyntaxError(',
' buildErrorMessage(),', ' cleanupExpected(rightmostFailuresExpected),',
' Math.max(pos, rightmostFailuresPos),', ' found,',
' offset,',
' errorPosition.line,', ' errorPosition.line,',
' errorPosition.column', ' errorPosition.column',
' );', ' );',
@ -458,9 +443,30 @@ PEG.compiler.emitter = function(ast) {
' ', ' ',
' /* Thrown when a parser encounters a syntax error. */', ' /* Thrown when a parser encounters a syntax error. */',
' ', ' ',
' result.SyntaxError = function(message, offset, line, column) {', ' result.SyntaxError = function(expected, found, offset, line, column) {',
' function buildMessage(expected, found) {',
' var expectedHumanized, foundHumanized;',
' ',
' switch (expected.length) {',
' case 0:',
' expectedHumanized = "end of input";',
' break;',
' case 1:',
' expectedHumanized = expected[0];',
' break;',
' default:',
' expectedHumanized = expected.slice(0, expected.length - 1).join(", ")',
' + " or "',
' + expected[expected.length - 1];',
' }',
' ',
' foundHumanized = found ? quote(found) : "end of input";',
' ',
' return "Expected " + expectedHumanized + " but " + foundHumanized + " found.";',
' }',
' ',
' this.name = "SyntaxError";', ' this.name = "SyntaxError";',
' this.message = message;', ' this.message = buildMessage(expected, found);',
' this.offset = offset;', ' this.offset = offset;',
' this.line = line;', ' this.line = line;',
' this.column = column;', ' this.column = column;',

74
src/parser.js
Unescape Escape View File

@ -3502,38 +3502,19 @@ PEG.parser = (function(){
return result0; return result0;
} }
function buildErrorMessage() {
function buildExpected(failuresExpected) { function cleanupExpected(expected) {
failuresExpected.sort(); expected.sort();
var lastFailure = null; var lastExpected = null;
var failuresExpectedUnique = []; var cleanExpected = [];
for (var i = 0; i < failuresExpected.length; i++) { for (var i = 0; i < expected.length; i++) {
if (failuresExpected[i] !== lastFailure) { if (expected[i] !== lastExpected) {
failuresExpectedUnique.push(failuresExpected[i]); cleanExpected.push(expected[i]);
lastFailure = failuresExpected[i]; lastExpected = expected[i];
}
}
switch (failuresExpectedUnique.length) {
case 0:
return "end of input";
case 1:
return failuresExpectedUnique[0];
default:
return failuresExpectedUnique.slice(0, failuresExpectedUnique.length - 1).join(", ")
+ " or "
+ failuresExpectedUnique[failuresExpectedUnique.length - 1];
} }
} }
return cleanExpected;
var expected = buildExpected(rightmostFailuresExpected);
var actualPos = Math.max(pos, rightmostFailuresPos);
var actual = actualPos < input.length
? quote(input.charAt(actualPos))
: "end of input";
return "Expected " + expected + " but " + actual + " found.";
} }
function computeErrorPosition() { function computeErrorPosition() {
@ -3595,10 +3576,14 @@ PEG.parser = (function(){
* handle these states. * handle these states.
*/ */
if (result === null || pos !== input.length) { if (result === null || pos !== input.length) {
var offset = Math.max(pos, rightmostFailuresPos);
var found = offset < input.length ? input.charAt(offset) : null;
var errorPosition = computeErrorPosition(); var errorPosition = computeErrorPosition();
throw new this.SyntaxError( throw new this.SyntaxError(
buildErrorMessage(), cleanupExpected(rightmostFailuresExpected),
Math.max(pos, rightmostFailuresPos), found,
offset,
errorPosition.line, errorPosition.line,
errorPosition.column errorPosition.column
); );
@ -3613,9 +3598,30 @@ PEG.parser = (function(){
/* Thrown when a parser encounters a syntax error. */ /* Thrown when a parser encounters a syntax error. */
result.SyntaxError = function(message, offset, line, column) { result.SyntaxError = function(expected, found, offset, line, column) {
function buildMessage(expected, found) {
var expectedHumanized, foundHumanized;
switch (expected.length) {
case 0:
expectedHumanized = "end of input";
break;
case 1:
expectedHumanized = expected[0];
break;
default:
expectedHumanized = expected.slice(0, expected.length - 1).join(", ")
+ " or "
+ expected[expected.length - 1];
}
foundHumanized = found ? quote(found) : "end of input";
return "Expected " + expectedHumanized + " but " + foundHumanized + " found.";
}
this.name = "SyntaxError"; this.name = "SyntaxError";
this.message = message; this.message = buildMessage(expected, found);
this.offset = offset; this.offset = offset;
this.line = line; this.line = line;
this.column = column; this.column = column;

Write Preview
Loading…
Cancel
Save