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

src/utils.js: Make |quote| escape control characters

Browse source 
Also change |quote| in src/emitter.js so both are in sync.

Fixes the following JSHint errors:

  ./src/parser.js: line 3613, col 27, Mixed spaces and tabs.
  ./src/parser.js: line 3613, col 31, Unsafe character.
  ./src/parser.js: line 3613, col 38, Control character in string: [     .
  ./src/parser.js: line 3613, col 40, Control character in string: [
This commit is contained in:
David Majda 2011-09-14 11:13:55 +02:00
parent 67afc788ad
commit ab49197ef1
3 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/emitter.js
View file

@ -162,13 +162,20 @@ PEG.compiler.emitter = function(ast) {
" * string literal except for the closing quote character, backslash,", " * string literal except for the closing quote character, backslash,",
" * carriage return, line separator, paragraph separator, and line feed.", " * carriage return, line separator, paragraph separator, and line feed.",
" * Any character may appear in the form of an escape sequence.", " * Any character may appear in the form of an escape sequence.",
" *",
" * For portability, we also escape escape all control and non-ASCII",
" * characters. Note that \"\\0\" and \"\\v\" escape sequences are not used",
" * because JSHint does not like the first and IE the second.",
" */", " */",
" return '\"' + s", " return '\"' + s",
" .replace(/\\\\/g, '\\\\\\\\') // backslash", " .replace(/\\\\/g, '\\\\\\\\') // backslash",
" .replace(/\"/g, '\\\\\"') // closing quote character", " .replace(/\"/g, '\\\\\"') // closing quote character",
" .replace(/\\r/g, '\\\\r') // carriage return", " .replace(/\\x08/g, '\\\\b') // backspace",
" .replace(/\\t/g, '\\\\t') // horizontal tab",
" .replace(/\\n/g, '\\\\n') // line feed", " .replace(/\\n/g, '\\\\n') // line feed",
" .replace(/[\\x80-\\uFFFF]/g, escape) // non-ASCII characters", " .replace(/\\f/g, '\\\\f') // form feed",
" .replace(/\\r/g, '\\\\r') // carriage return",
" .replace(/[\\x00-\\x07\\x0B\\x0E-\\x1F\\x80-\\uFFFF]/g, escape)",
" + '\"';", " + '\"';",
" }", " }",
" ", " ",

13
src/parser.js
View file

@ -114,13 +114,20 @@ PEG.parser = (function(){
* string literal except for the closing quote character, backslash, * string literal except for the closing quote character, backslash,
* carriage return, line separator, paragraph separator, and line feed. * carriage return, line separator, paragraph separator, and line feed.
* Any character may appear in the form of an escape sequence. * Any character may appear in the form of an escape sequence.
*
* For portability, we also escape escape all control and non-ASCII
* characters. Note that "\0" and "\v" escape sequences are not used
* because JSHint does not like the first and IE the second.
*/ */
return '"' + s return '"' + s
.replace(/\\/g, '\\\\') // backslash .replace(/\\/g, '\\\\') // backslash
.replace(/"/g, '\\"') // closing quote character .replace(/"/g, '\\"') // closing quote character
.replace(/\r/g, '\\r') // carriage return .replace(/\x08/g, '\\b') // backspace
.replace(/\t/g, '\\t') // horizontal tab
.replace(/\n/g, '\\n') // line feed .replace(/\n/g, '\\n') // line feed
.replace(/[\x80-\uFFFF]/g, escape) // non-ASCII characters .replace(/\f/g, '\\f') // form feed
.replace(/\r/g, '\\r') // carriage return
.replace(/[\x00-\x07\x0B\x0E-\x1F\x80-\uFFFF]/g, escape)
+ '"'; + '"';
} }
@ -3610,7 +3617,7 @@ PEG.parser = (function(){
} else { } else {
result0 = null; result0 = null;
if (reportFailures === 0) { if (reportFailures === 0) {
matchFailed("[ \\xA0\\uFEFF\\u1680\\u180E\\u2000-\\u200A\\u202F\\u205F\\u3000]"); matchFailed("[ \t\x0B\f\\xA0\\uFEFF\\u1680\\u180E\\u2000-\\u200A\\u202F\\u205F\\u3000]");
} }
} }
reportFailures--; reportFailures--;

11
src/utils.js
View file

@ -96,14 +96,19 @@ function quote(s) {
* line separator, paragraph separator, and line feed. Any character may * line separator, paragraph separator, and line feed. Any character may
* appear in the form of an escape sequence. * appear in the form of an escape sequence.
* *
* For portability, we also escape escape all non-ASCII characters. * For portability, we also escape escape all control and non-ASCII
* characters. Note that "\0" and "\v" escape sequences are not used because
* JSHint does not like the first and IE the second.
*/ */
return '"' + s return '"' + s
.replace(/\\/g, '\\\\') // backslash .replace(/\\/g, '\\\\') // backslash
.replace(/"/g, '\\"') // closing quote character .replace(/"/g, '\\"') // closing quote character
.replace(/\r/g, '\\r') // carriage return .replace(/\x08/g, '\\b') // backspace
.replace(/\t/g, '\\t') // horizontal tab
.replace(/\n/g, '\\n') // line feed .replace(/\n/g, '\\n') // line feed
.replace(/[\x80-\uFFFF]/g, escape) // non-ASCII characters .replace(/\f/g, '\\f') // form feed
.replace(/\r/g, '\\r') // carriage return
.replace(/[\x00-\x07\x0B\x0E-\x1F\x80-\uFFFF]/g, escape)
+ '"'; + '"';
} }