Skip to content

Apply review feedback from :mossop #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zbraniecki merged 1 commit into from
Jul 19, 2017
Merged

Apply review feedback from :mossop #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 52 additions & 88 deletions fluent/src/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

const MAX_PLACEABLES = 100;

const identifierRe = new RegExp('[a-zA-Z_][a-zA-Z0-9_-]*', 'y');

/**
* The `Parser` class is responsible for parsing FTL resources.
*
Expand Down Expand Up @@ -41,10 +43,7 @@ class RuntimeParser {
if (e instanceof SyntaxError) {
errors.push(e);

const nextEntity = this.findNextEntryStart();
this._index = nextEntity === -1
? this._length
: nextEntity;
this.skipToNextEntryStart();
} else {
throw e;
}
Expand All @@ -66,7 +65,8 @@ class RuntimeParser {
// or right after new line.
if (this._index !== 0 &&
this._source[this._index - 1] !== '\n') {
throw this.error('Expected new line and a new entry');
throw this.error(`Expected an entry to start
at the beginning of the file or on a new line.`);
}

const ch = this._source[this._index];
Expand All @@ -82,9 +82,7 @@ class RuntimeParser {
return;
}

if (ch !== '\n') {
this.getMessage();
}
this.getMessage();
}

/**
Expand All @@ -110,9 +108,6 @@ class RuntimeParser {
}

this._index += 2;

// sections are ignored in the runtime ast
return undefined;
}

/**
Expand Down Expand Up @@ -187,23 +182,21 @@ class RuntimeParser {
* @private
*/
skipWS() {
let cc = this._source.charCodeAt(this._index);
// space, \n, \t, \r
while (cc === 32 || cc === 10 || cc === 9 || cc === 13) {
cc = this._source.charCodeAt(++this._index);
let ch = this._source[this._index];
while (ch === ' ' || ch === '\n' || ch === '\t' || ch === '\r') {
ch = this._source[++this._index];
}
}

/**
* Skip whitespace except for \n.
* Skip inline whitespace (space and \t).
*
* @private
*/
skipInlineWS() {
let cc = this._source.charCodeAt(this._index);
// space, \t
while (cc === 32 || cc === 9) {
cc = this._source.charCodeAt(++this._index);
let ch = this._source[this._index];
while (ch === ' ' || ch === '\t') {
ch = this._source[++this._index];
}
}

Expand All @@ -214,25 +207,17 @@ class RuntimeParser {
* @private
*/
getIdentifier() {
const start = this._index;
let cc = this._source.charCodeAt(this._index);
identifierRe.lastIndex = this._index;

if ((cc >= 97 && cc <= 122) || // a-z
(cc >= 65 && cc <= 90) || // A-Z
cc === 95) { // _
cc = this._source.charCodeAt(++this._index);
} else {
throw this.error('Expected an identifier (starting with [a-zA-Z_])');
}
const result = identifierRe.exec(this._source);

while ((cc >= 97 && cc <= 122) || // a-z
(cc >= 65 && cc <= 90) || // A-Z
(cc >= 48 && cc <= 57) || // 0-9
cc === 95 || cc === 45) { // _-
cc = this._source.charCodeAt(++this._index);
if (result === null) {
this._index += 1;
throw this.error('Expected an identifier (starting with [a-zA-Z_])');
}

return this._source.slice(start, this._index);
this._index = identifierRe.lastIndex;
return result[0];
}

/**
Expand All @@ -249,20 +234,20 @@ class RuntimeParser {

if ((cc >= 97 && cc <= 122) || // a-z
(cc >= 65 && cc <= 90) || // A-Z
cc === 95 || cc === 32) { // _
cc === 95 || cc === 32) { // _ <space>
cc = this._source.charCodeAt(++this._index);
} else if (name.length === 0) {
} else {
throw this.error('Expected a keyword (starting with [a-zA-Z_])');
}

while ((cc >= 97 && cc <= 122) || // a-z
(cc >= 65 && cc <= 90) || // A-Z
(cc >= 48 && cc <= 57) || // 0-9
cc === 95 || cc === 45 || cc === 32) { // _-
cc === 95 || cc === 45 || cc === 32) { // _- <space>
cc = this._source.charCodeAt(++this._index);
}

// If we encountered the end of name, we want to test is the last
// If we encountered the end of name, we want to test if the last
// collected character is a space.
// If it is, we will backtrack to the last non-space character because
// the keyword cannot end with a space character.
Expand All @@ -282,7 +267,7 @@ class RuntimeParser {
* @private
*/
getString() {
let value = '';
const start = this._index + 1;

while (++this._index < this._length) {
const ch = this._source[this._index];
Expand All @@ -294,12 +279,9 @@ class RuntimeParser {
if (ch === '\n') {
break;
}

value += ch;
}

this._index++;
return value;
return this._source.substring(start, this._index++);
}

/**
Expand Down Expand Up @@ -357,19 +339,8 @@ class RuntimeParser {

let ch = this._source[this._index];

// If the string starts with \", \{ or \\ skip the first `\` and add the
// following character to the buffer without interpreting it.
if (ch === '\\' &&
(this._source[this._index + 1] === '"' ||
this._source[this._index + 1] === '{' ||
this._source[this._index + 1] === '\\')) {
buffer += this._source[this._index + 1];
this._index += 2;
ch = this._source[this._index];
}

while (this._index < this._length) {
// This block handles multi-line strings combining strings seaprated
// This block handles multi-line strings combining strings separated
// by new line and `|` character at the beginning of the next one.
if (ch === '\n') {
this._index++;
Expand All @@ -378,13 +349,11 @@ class RuntimeParser {
}
this.skipInlineWS();

if (
this._source[this._index] === '}' ||
if (this._source[this._index] === '}' ||
this._source[this._index] === '[' ||
this._source[this._index] === '*' ||
this._source[this._index] === '#' ||
this._source[this._index] === '.'
) {
this._source[this._index] === '.') {
break;
}

Expand All @@ -395,7 +364,7 @@ class RuntimeParser {
continue;
} else if (ch === '\\') {
const ch2 = this._source[this._index + 1];
if (ch2 === '"' || ch2 === '{') {
if (ch2 === '"' || ch2 === '{' || ch2 === '\\') {
ch = ch2;
this._index++;
}
Expand Down Expand Up @@ -467,39 +436,35 @@ class RuntimeParser {
this.skipInlineWS();

const selector = this.getSelectorExpression();
let variants;

this.skipWS();

const ch = this._source[this._index];

// If the expression is followed by `->` we're going to collect
// its members and return it as a select expression.
if (ch !== '}') {
if (ch !== '-' || this._source[this._index + 1] !== '>') {
throw this.error('Expected "}", "," or "->"');
}
if (ch === '}') {
return selector;
}

this._index += 2; // ->
if (ch !== '-' || this._source[this._index + 1] !== '>') {
throw this.error('Expected "}" or "->"');
}

this.skipInlineWS();
this._index += 2; // ->

if (this._source[this._index] !== '\n') {
throw this.error('Variants should be listed in a new line');
}
this.skipInlineWS();

this.skipWS();
if (this._source[this._index] !== '\n') {
throw this.error('Variants should be listed in a new line');
}

variants = this.getVariants();
this.skipWS();

if (variants[0].length === 0) {
throw this.error('Expected members for the select expression');
}
}
const variants = this.getVariants();

if (variants === undefined) {
return selector;
if (variants[0].length === 0) {
throw this.error('Expected members for the select expression');
}

return {
type: 'sel',
exp: selector,
Expand Down Expand Up @@ -888,14 +853,13 @@ class RuntimeParser {
}

/**
* Finds the beginning of a next entry after the current position.
* Skips to the beginning of a next entry after the current position.
* This is used to mark the boundary of junk entry in case of error,
* and recover from the returned position.
*
* @returns {Number}
* @private
*/
findNextEntryStart() {
skipToNextEntryStart() {
let start = this._index;

while (true) {
Expand All @@ -905,19 +869,19 @@ class RuntimeParser {
if ((cc >= 97 && cc <= 122) || // a-z
(cc >= 65 && cc <= 90) || // A-Z
cc === 95 || cc === 47 || cc === 91) { // _/[
break;
this._index = start;
return;
}
}

start = this._source.indexOf('\n', start);

if (start === -1) {
break;
this._index = this._length;
return;
}
start++;
}

return start;
}
}

Expand Down
4 changes: 2 additions & 2 deletions fluent/src/resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ function CallExpression(env, {fun, args}) {
*
* @param {Object} env
* Resolver environment object.
* @param {Object} ptn
* Pattern object.
* @param {Array} ptn
* Array of pattern elements.
* @returns {Array}
* @private
*/
Expand Down