Skip to content
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

use offset() instead of line()/column() for issue #39 #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −27
Open

use offset() instead of line()/column() for issue #39 #45

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
5 changes: 3 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ var compiler = require('./lib/compiler');

module.exports = {
parse: function(input) {
var nodes = parser.parse(input.toString());
return compiler.compile(nodes);
var normalized = String(input).replace(/\r\n/g, '\n');
var nodes = parser.parse(normalized);
return compiler.compile(nodes, normalized);
}
};
42 changes: 23 additions & 19 deletions lib/compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use strict";
function compile(nodes) {
function compile(nodes, sourceText) {
var assignedPaths = [];
var valueAssignments = [];
var currentPath = "";
Expand Down Expand Up @@ -29,18 +29,26 @@ function compile(nodes) {
return data;
}

function genError(err, line, col) {
function getLocation(node) {
var before = sourceText.substr(0, node.offset);
var line = before.match(/\n/g).length + 1;
var column = before.match(/.*\n?$/)[0].length + 1;
return { offset: node.offset, line: line, column: column };
}


function genError(node, err) {
var ex = new Error(err);
ex.line = line;
ex.column = col;
var loc = getLocation(node);
ex.offset = loc.offset;
ex.line = loc.line;
ex.column = loc.column;
throw ex;
}

function assign(node) {
var key = node.key;
var value = node.value;
var line = node.line;
var column = node.column;

var fullPath;
if (currentPath) {
Expand All @@ -49,7 +57,7 @@ function compile(nodes) {
fullPath = key;
}
if (typeof context[key] !== "undefined") {
genError("Cannot redefine existing key '" + fullPath + "'.", line, column);
genError(node, "Cannot redefine existing key '" + fullPath + "'.");
}

context[key] = reduceValueNode(value);
Expand Down Expand Up @@ -92,22 +100,18 @@ function compile(nodes) {
function setPath(node) {
var path = node.value;
var quotedPath = path.map(quoteDottedString).join(".");
var line = node.line;
var column = node.column;

if (pathAssigned(quotedPath)) {
genError("Cannot redefine existing key '" + path + "'.", line, column);
genError(node, "Cannot redefine existing key '" + path + "'.");
}
assignedPaths.push(quotedPath);
context = deepRef(data, path, {}, line, column);
context = deepRef(data, path, {}, node);
currentPath = path;
}

function addTableArray(node) {
var path = node.value;
var quotedPath = path.map(quoteDottedString).join(".");
var line = node.line;
var column = node.column;

if (!pathAssigned(quotedPath)) {
assignedPaths.push(quotedPath);
Expand All @@ -116,23 +120,23 @@ function compile(nodes) {
return p.indexOf(quotedPath) !== 0;
});
assignedPaths.push(quotedPath);
context = deepRef(data, path, [], line, column);
context = deepRef(data, path, [], node);
currentPath = quotedPath;

if (context instanceof Array) {
var newObj = {};
context.push(newObj);
context = newObj;
} else {
genError("Cannot redefine existing key '" + path + "'.", line, column);
genError(node, "Cannot redefine existing key '" + path + "'.");
}
}

// Given a path 'a.b.c', create (as necessary) `start.a`,
// `start.a.b`, and `start.a.b.c`, assigning `value` to `start.a.b.c`.
// If `a` or `b` are arrays and have items in them, the last item in the
// array is used as the context for the next sub-path.
function deepRef(start, keys, value, line, column) {
function deepRef(start, keys, value, node) {
var traversed = [];
var traversedPath = "";
var path = keys.join(".");
Expand All @@ -150,7 +154,7 @@ function compile(nodes) {
}
} else if (i !== keys.length - 1 && valueAssignments.indexOf(traversedPath) > -1) {
// already a non-object value at key, can't be used as part of a new path
genError("Cannot redefine existing key '" + traversedPath + "'.", line, column);
genError(node, "Cannot redefine existing key '" + traversedPath + "'.");
}

ctx = ctx[key];
Expand All @@ -171,8 +175,8 @@ function compile(nodes) {
firstType = node.type;
} else {
if (node.type !== firstType) {
genError("Cannot add value of type " + node.type + " to array of type " +
firstType + ".", node.line, node.column);
genError(node, "Cannot add value of type " + node.type + " to array of type " +
firstType + ".");
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions lib/parser.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions src/toml.pegjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
nodes.push(node);
}

// TODO(felix9): remove line, column args after grammar change lands
function node(type, value, line, column, key) {
var obj = { type: type, value: value, line: line(), column: column() };
if (key) obj.key = key;
return obj;
return { type: type, value: value, key: key, offset: offset() };
}

function convertCodePoint(str, line, col) {
Expand Down