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

Syntax error messages: Use Oxford comma

Browse source 
In general PEG.js uses American English, where Oxford comma is
prevalent.

Part of #371.
This commit is contained in:
David Majda 2016-07-03 18:36:15 +02:00
parent ec8ede5bbe
commit b3a90de020
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/compiler/passes/generate-js.js
View file

@ -868,11 +868,18 @@ function generateJS(ast, options) {
' descriptions.length = j;',
' }',
'',
' return descriptions.length > 1',
' ? descriptions.slice(0, -1).join(", ")',
' + " or "',
' + descriptions[descriptions.length - 1]',
' : descriptions[0];',
' switch (descriptions.length) {',
' case 1:',
' return descriptions[0];',
'',
' case 2:',
' return descriptions[0] + " or " + descriptions[1];',
'',
' default:',
' return descriptions.slice(0, -1).join(", ")',
' + ", or "',
' + descriptions[descriptions.length - 1];',
' }',
' }',
'',
' function describeFound(found) {',

4
spec/behavior/generated-parser-behavior.spec.js
View file

@ -1401,7 +1401,7 @@ describe("generated parser behavior", function() {
var parser = peg.generate('start = "a" / "b" / "c"', options);
expect(parser).toFailToParse("d", {
message: 'Expected "a", "b" or "c" but "d" found.'
message: 'Expected "a", "b", or "c" but "d" found.'
});
});
@ -1433,7 +1433,7 @@ describe("generated parser behavior", function() {
var parser = peg.generate('start = "c" / "b" / "a"', options);
expect(parser).toFailToParse("d", {
message: 'Expected "a", "b" or "c" but "d" found.'
message: 'Expected "a", "b", or "c" but "d" found.'
});
});