occam-verify-cli 0.0.800 → 0.0.802
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -18,7 +18,7 @@ _export(exports, {
|
|
|
18
18
|
});
|
|
19
19
|
function leastLineIndexFromNodeAndTokens(node, tokens) {
|
|
20
20
|
var leastLineIndex = undefined; ///
|
|
21
|
-
var
|
|
21
|
+
var firstSignificantTokenIndex = node.getFirstSignificantTokenIndex(tokens);
|
|
22
22
|
var lineIndex = 0;
|
|
23
23
|
tokens.some(function(token, tokenIndex) {
|
|
24
24
|
if (tokenIndex === firstSignificantTokenIndex) {
|
|
@@ -34,7 +34,7 @@ function leastLineIndexFromNodeAndTokens(node, tokens) {
|
|
|
34
34
|
}
|
|
35
35
|
function greatestLineIndexFromNodeAndTokens(node, tokens) {
|
|
36
36
|
var greatestLineIndex = undefined; ///
|
|
37
|
-
var
|
|
37
|
+
var lastSignificantTokenIndex = node.getLastSignificantTokenIndex(tokens);
|
|
38
38
|
var lineIndex = 0;
|
|
39
39
|
tokens.some(function(token, tokenIndex) {
|
|
40
40
|
if (tokenIndex === lastSignificantTokenIndex) {
|
|
@@ -49,4 +49,4 @@ function greatestLineIndexFromNodeAndTokens(node, tokens) {
|
|
|
49
49
|
return greatestLineIndex;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbGluZUluZGV4LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5leHBvcnQgZnVuY3Rpb24gbGVhc3RMaW5lSW5kZXhGcm9tTm9kZUFuZFRva2Vucyhub2RlLCB0b2tlbnMpIHtcbiAgbGV0IGxlYXN0TGluZUluZGV4ID0gdW5kZWZpbmVkOyAvLy9cblxuICBjb25zdCBmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCA9IG5vZGUuZ2V0Rmlyc3RTaWduaWZpY2FudFRva2VuSW5kZXgodG9rZW5zKTtcblxuICBsZXQgbGluZUluZGV4ID0gMDtcblxuICB0b2tlbnMuc29tZSgodG9rZW4sIHRva2VuSW5kZXgpID0+IHsgIC8vL1xuICAgIGlmICh0b2tlbkluZGV4ID09PSBmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCkge1xuICAgICAgbGVhc3RMaW5lSW5kZXggPSBsaW5lSW5kZXg7ICAvLy9cblxuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuXG4gICAgY29uc3QgdG9rZW5FbmRPZkxpbmVUb2tlbiA9IHRva2VuLmlzRW5kT2ZMaW5lVG9rZW4oKTtcblxuICAgIGlmICh0b2tlbkVuZE9mTGluZVRva2VuKSB7XG4gICAgICBsaW5lSW5kZXggKz0gMTtcbiAgICB9XG4gIH0pO1xuXG4gIHJldHVybiBsZWFzdExpbmVJbmRleDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGdyZWF0ZXN0TGluZUluZGV4RnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gIGxldCBncmVhdGVzdExpbmVJbmRleCA9IHVuZGVmaW5lZDsgIC8vL1xuXG4gIGNvbnN0IGxhc3RTaWduaWZpY2FudFRva2VuSW5kZXggPSBub2RlLmdldExhc3RTaWduaWZpY2FudFRva2VuSW5kZXgodG9rZW5zKTtcblxuICBsZXQgbGluZUluZGV4ID0gMDtcblxuICB0b2tlbnMuc29tZSgodG9rZW4sIHRva2VuSW5kZXgpID0+IHsgIC8vL1xuICAgIGlmICh0b2tlbkluZGV4ID09PSBsYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4KSB7XG4gICAgICBncmVhdGVzdExpbmVJbmRleCA9IGxpbmVJbmRleDsgIC8vL1xuXG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG5cbiAgICBjb25zdCB0b2tlbkVuZE9mTGluZVRva2VuID0gdG9rZW4uaXNFbmRPZkxpbmVUb2tlbigpO1xuXG4gICAgaWYgKHRva2VuRW5kT2ZMaW5lVG9rZW4pIHtcbiAgICAgIGxpbmVJbmRleCArPSAxO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIGdyZWF0ZXN0TGluZUluZGV4O1xufVxuIl0sIm5hbWVzIjpbImdyZWF0ZXN0TGluZUluZGV4RnJvbU5vZGVBbmRUb2tlbnMiLCJsZWFzdExpbmVJbmRleEZyb21Ob2RlQW5kVG9rZW5zIiwibm9kZSIsInRva2VucyIsImxlYXN0TGluZUluZGV4IiwidW5kZWZpbmVkIiwiZmlyc3RTaWduaWZpY2FudFRva2VuSW5kZXgiLCJnZXRGaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCIsImxpbmVJbmRleCIsInNvbWUiLCJ0b2tlbiIsInRva2VuSW5kZXgiLCJ0b2tlbkVuZE9mTGluZVRva2VuIiwiaXNFbmRPZkxpbmVUb2tlbiIsImdyZWF0ZXN0TGluZUluZGV4IiwibGFzdFNpZ25pZmljYW50VG9rZW5JbmRleCIsImdldExhc3RTaWduaWZpY2FudFRva2VuSW5kZXgiXSwicmFuZ2VNYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsiLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBMEJnQkEsa0NBQWtDO2VBQWxDQTs7SUF4QkFDLCtCQUErQjtlQUEvQkE7OztBQUFULFNBQVNBLGdDQUFnQ0MsSUFBSSxFQUFFQyxNQUFNO0lBQzFELElBQUlDLGlCQUFpQkMsV0FBVyxHQUFHO0lBRW5DLElBQU1DLDZCQUE2QkosS0FBS0ssNkJBQTZCLENBQUNKO0lBRXRFLElBQUlLLFlBQVk7SUFFaEJMLE9BQU9NLElBQUksQ0FBQyxTQUFDQyxPQUFPQztRQUNsQixJQUFJQSxlQUFlTCw0QkFBNEI7WUFDN0NGLGlCQUFpQkksV0FBWSxHQUFHO1lBRWhDLE9BQU87UUFDVDtRQUVBLElBQU1JLHNCQUFzQkYsTUFBTUcsZ0JBQWdCO1FBRWxELElBQUlELHFCQUFxQjtZQUN2QkosYUFBYTtRQUNmO0lBQ0Y7SUFFQSxPQUFPSjtBQUNUO0FBRU8sU0FBU0osbUNBQW1DRSxJQUFJLEVBQUVDLE1BQU07SUFDN0QsSUFBSVcsb0JBQW9CVCxXQUFZLEdBQUc7SUFFdkMsSUFBTVUsNEJBQTRCYixLQUFLYyw0QkFBNEIsQ0FBQ2I7SUFFcEUsSUFBSUssWUFBWTtJQUVoQkwsT0FBT00sSUFBSSxDQUFDLFNBQUNDLE9BQU9DO1FBQ2xCLElBQUlBLGVBQWVJLDJCQUEyQjtZQUM1Q0Qsb0JBQW9CTixXQUFZLEdBQUc7WUFFbkMsT0FBTztRQUNUO1FBRUEsSUFBTUksc0JBQXNCRixNQUFNRyxnQkFBZ0I7UUFFbEQsSUFBSUQscUJBQXFCO1lBQ3ZCSixhQUFhO1FBQ2Y7SUFDRjtJQUVBLE9BQU9NO0FBQ1QifQ==
|
package/lib/utilities/string.js
CHANGED
|
@@ -51,7 +51,7 @@ function terminalNodeAsString(terminalNode) {
|
|
|
51
51
|
return string;
|
|
52
52
|
}
|
|
53
53
|
function nonTerminalNodeAsString(nonTerminalNode, tokens) {
|
|
54
|
-
var
|
|
54
|
+
var lastSignificantTokenIndex = nonTerminalNode.getLastSignificantTokenIndex(tokens), firstSignificantTokenIndex = nonTerminalNode.getFirstSignificantTokenIndex(tokens), start = firstSignificantTokenIndex, end = lastSignificantTokenIndex + 1;
|
|
55
55
|
tokens = tokens.slice(start, end); ///
|
|
56
56
|
var string = tokens.reduce(function(string, token) {
|
|
57
57
|
var content = token.getContent();
|
|
@@ -61,4 +61,4 @@ function nonTerminalNodeAsString(nonTerminalNode, tokens) {
|
|
|
61
61
|
return string;
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3RyaW5nLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBDT01NQSwgRU1QVFlfU1RSSU5HIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5leHBvcnQgZnVuY3Rpb24gbm9kZUFzU3RyaW5nKG5vZGUsIHRva2Vucykge1xuICBsZXQgc3RyaW5nID0gRU1QVFlfU1RSSU5HO1xuXG4gIGlmIChub2RlICE9PSBudWxsKSB7XG4gICAgY29uc3Qgbm9kZVRlcm1pbmFsTm9kZSA9IG5vZGUuaXNUZXJtaW5hbE5vZGUoKTtcblxuICAgIGlmIChub2RlVGVybWluYWxOb2RlKSB7XG4gICAgICBjb25zdCB0ZXJtaW5hbE5vZGUgPSBub2RlOyAgLy8vXG5cbiAgICAgIHN0cmluZyA9IHRlcm1pbmFsTm9kZUFzU3RyaW5nKHRlcm1pbmFsTm9kZSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IG5vZGU7IC8vL1xuXG4gICAgICBzdHJpbmcgPSBub25UZXJtaW5hbE5vZGVBc1N0cmluZyhub25UZXJtaW5hbE5vZGUsIHRva2Vucyk7XG4gICAgfVxuXG4gICAgc3RyaW5nID0gc3RyaW5nLnJlcGxhY2UoL1tcXHJcXG5dLywgRU1QVFlfU1RSSU5HKTtcbiAgfVxuXG4gIHJldHVybiBzdHJpbmc7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBub2Rlc0FzU3RyaW5nKG5vZGVzLCB0b2tlbnMpIHtcbiAgY29uc3Qgc3RyaW5nID0gbm9kZXMucmVkdWNlKChzdHJpbmcsIG5vZGUpID0+
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3RyaW5nLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBDT01NQSwgRU1QVFlfU1RSSU5HIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5leHBvcnQgZnVuY3Rpb24gbm9kZUFzU3RyaW5nKG5vZGUsIHRva2Vucykge1xuICBsZXQgc3RyaW5nID0gRU1QVFlfU1RSSU5HO1xuXG4gIGlmIChub2RlICE9PSBudWxsKSB7XG4gICAgY29uc3Qgbm9kZVRlcm1pbmFsTm9kZSA9IG5vZGUuaXNUZXJtaW5hbE5vZGUoKTtcblxuICAgIGlmIChub2RlVGVybWluYWxOb2RlKSB7XG4gICAgICBjb25zdCB0ZXJtaW5hbE5vZGUgPSBub2RlOyAgLy8vXG5cbiAgICAgIHN0cmluZyA9IHRlcm1pbmFsTm9kZUFzU3RyaW5nKHRlcm1pbmFsTm9kZSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IG5vZGU7IC8vL1xuXG4gICAgICBzdHJpbmcgPSBub25UZXJtaW5hbE5vZGVBc1N0cmluZyhub25UZXJtaW5hbE5vZGUsIHRva2Vucyk7XG4gICAgfVxuXG4gICAgc3RyaW5nID0gc3RyaW5nLnJlcGxhY2UoL1tcXHJcXG5dLywgRU1QVFlfU1RSSU5HKTtcbiAgfVxuXG4gIHJldHVybiBzdHJpbmc7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBub2Rlc0FzU3RyaW5nKG5vZGVzLCB0b2tlbnMpIHtcbiAgY29uc3Qgc3RyaW5nID0gbm9kZXMucmVkdWNlKChzdHJpbmcsIG5vZGUpID0+IHtcbiAgICBjb25zdCBub2RlU3RyaW5nID0gbm9kZUFzU3RyaW5nKG5vZGUsIHRva2Vucyk7XG5cbiAgICBzdHJpbmcgPSAoc3RyaW5nID09PSBFTVBUWV9TVFJJTkcpID9cbiAgICAgICAgICAgICAgIG5vZGVTdHJpbmcgOlxuICAgICAgICAgICAgICAgIGAke3N0cmluZ30ke0NPTU1BfSR7bm9kZVN0cmluZ31gO1xuXG4gICAgcmV0dXJuIHN0cmluZztcbiAgfSwgRU1QVFlfU1RSSU5HKTtcblxuICByZXR1cm4gc3RyaW5nO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdGVybWluYWxOb2RlQXNTdHJpbmcodGVybWluYWxOb2RlKSB7XG4gIGNvbnN0IGNvbnRlbnQgPSB0ZXJtaW5hbE5vZGUuZ2V0Q29udGVudCgpLFxuICAgICAgICBzdHJpbmcgPSBjb250ZW50OyAvLy9cblxuICByZXR1cm4gc3RyaW5nO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbm9uVGVybWluYWxOb2RlQXNTdHJpbmcobm9uVGVybWluYWxOb2RlLCB0b2tlbnMpIHtcbiAgY29uc3QgbGFzdFNpZ25pZmljYW50VG9rZW5JbmRleCA9IG5vblRlcm1pbmFsTm9kZS5nZXRMYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4KHRva2VucyksXG4gICAgICAgIGZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4ID0gbm9uVGVybWluYWxOb2RlLmdldEZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4KHRva2VucyksXG4gICAgICAgIHN0YXJ0ID0gZmlyc3RTaWduaWZpY2FudFRva2VuSW5kZXgsIC8vL1xuICAgICAgICBlbmQgPSBsYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4ICsgMTtcblxuICB0b2tlbnMgPSB0b2tlbnMuc2xpY2Uoc3RhcnQsIGVuZCk7ICAvLy9cblxuICBjb25zdCBzdHJpbmcgPSB0b2tlbnMucmVkdWNlKChzdHJpbmcsIHRva2VuKSA9PiB7XG4gICAgY29uc3QgY29udGVudCA9IHRva2VuLmdldENvbnRlbnQoKTtcblxuICAgIHN0cmluZyA9IGAke3N0cmluZ30ke2NvbnRlbnR9YDtcblxuICAgIHJldHVybiBzdHJpbmc7XG4gIH0sIEVNUFRZX1NUUklORyk7XG5cbiAgcmV0dXJuIHN0cmluZztcbn1cbiJdLCJuYW1lcyI6WyJub2RlQXNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwibm9uVGVybWluYWxOb2RlQXNTdHJpbmciLCJ0ZXJtaW5hbE5vZGVBc1N0cmluZyIsIm5vZGUiLCJ0b2tlbnMiLCJzdHJpbmciLCJFTVBUWV9TVFJJTkciLCJub2RlVGVybWluYWxOb2RlIiwiaXNUZXJtaW5hbE5vZGUiLCJ0ZXJtaW5hbE5vZGUiLCJub25UZXJtaW5hbE5vZGUiLCJyZXBsYWNlIiwibm9kZXMiLCJyZWR1Y2UiLCJub2RlU3RyaW5nIiwiQ09NTUEiLCJjb250ZW50IiwiZ2V0Q29udGVudCIsImxhc3RTaWduaWZpY2FudFRva2VuSW5kZXgiLCJnZXRMYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4IiwiZmlyc3RTaWduaWZpY2FudFRva2VuSW5kZXgiLCJnZXRGaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCIsInN0YXJ0IiwiZW5kIiwic2xpY2UiLCJ0b2tlbiJdLCJyYW5nZU1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyIsIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFJZ0JBLFlBQVk7ZUFBWkE7O0lBc0JBQyxhQUFhO2VBQWJBOztJQXFCQUMsdUJBQXVCO2VBQXZCQTs7SUFQQUMsb0JBQW9CO2VBQXBCQTs7O3lCQXRDb0I7QUFFN0IsU0FBU0gsYUFBYUksSUFBSSxFQUFFQyxNQUFNO0lBQ3ZDLElBQUlDLFNBQVNDLHVCQUFZO0lBRXpCLElBQUlILFNBQVMsTUFBTTtRQUNqQixJQUFNSSxtQkFBbUJKLEtBQUtLLGNBQWM7UUFFNUMsSUFBSUQsa0JBQWtCO1lBQ3BCLElBQU1FLGVBQWVOLE1BQU8sR0FBRztZQUUvQkUsU0FBU0gscUJBQXFCTztRQUNoQyxPQUFPO1lBQ0wsSUFBTUMsa0JBQWtCUCxNQUFNLEdBQUc7WUFFakNFLFNBQVNKLHdCQUF3QlMsaUJBQWlCTjtRQUNwRDtRQUVBQyxTQUFTQSxPQUFPTSxPQUFPLENBQUMsVUFBVUwsdUJBQVk7SUFDaEQ7SUFFQSxPQUFPRDtBQUNUO0FBRU8sU0FBU0wsY0FBY1ksS0FBSyxFQUFFUixNQUFNO0lBQ3pDLElBQU1DLFNBQVNPLE1BQU1DLE1BQU0sQ0FBQyxTQUFDUixRQUFRRjtRQUNuQyxJQUFNVyxhQUFhZixhQUFhSSxNQUFNQztRQUV0Q0MsU0FBUyxBQUFDQSxXQUFXQyx1QkFBWSxHQUN0QlEsYUFDQyxBQUFDLEdBQVdDLE9BQVRWLFFBQWlCUyxPQUFSQyxnQkFBSyxFQUFjLE9BQVhEO1FBRWhDLE9BQU9UO0lBQ1QsR0FBR0MsdUJBQVk7SUFFZixPQUFPRDtBQUNUO0FBRU8sU0FBU0gscUJBQXFCTyxZQUFZO0lBQy9DLElBQU1PLFVBQVVQLGFBQWFRLFVBQVUsSUFDakNaLFNBQVNXLFNBQVMsR0FBRztJQUUzQixPQUFPWDtBQUNUO0FBRU8sU0FBU0osd0JBQXdCUyxlQUFlLEVBQUVOLE1BQU07SUFDN0QsSUFBTWMsNEJBQTRCUixnQkFBZ0JTLDRCQUE0QixDQUFDZixTQUN6RWdCLDZCQUE2QlYsZ0JBQWdCVyw2QkFBNkIsQ0FBQ2pCLFNBQzNFa0IsUUFBUUYsNEJBQ1JHLE1BQU1MLDRCQUE0QjtJQUV4Q2QsU0FBU0EsT0FBT29CLEtBQUssQ0FBQ0YsT0FBT0MsTUFBTyxHQUFHO0lBRXZDLElBQU1sQixTQUFTRCxPQUFPUyxNQUFNLENBQUMsU0FBQ1IsUUFBUW9CO1FBQ3BDLElBQU1ULFVBQVVTLE1BQU1SLFVBQVU7UUFFaENaLFNBQVMsQUFBQyxHQUFXVyxPQUFUWCxRQUFpQixPQUFSVztRQUVyQixPQUFPWDtJQUNULEdBQUdDLHVCQUFZO0lBRWYsT0FBT0Q7QUFDVCJ9
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.802",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,10 +12,10 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.28",
|
|
14
14
|
"necessary": "^14.0.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
16
|
-
"occam-entities": "^1.0.
|
|
17
|
-
"occam-file-system": "^6.0.
|
|
18
|
-
"occam-grammar-utilities": "^8.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.706",
|
|
16
|
+
"occam-entities": "^1.0.108",
|
|
17
|
+
"occam-file-system": "^6.0.154",
|
|
18
|
+
"occam-grammar-utilities": "^8.0.197",
|
|
19
19
|
"occam-query": "^3.1.174"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
@@ -3,8 +3,7 @@
|
|
|
3
3
|
export function leastLineIndexFromNodeAndTokens(node, tokens) {
|
|
4
4
|
let leastLineIndex = undefined; ///
|
|
5
5
|
|
|
6
|
-
const
|
|
7
|
-
firstSignificantTokenIndex = tokens.indexOf(firstSignificantToken);
|
|
6
|
+
const firstSignificantTokenIndex = node.getFirstSignificantTokenIndex(tokens);
|
|
8
7
|
|
|
9
8
|
let lineIndex = 0;
|
|
10
9
|
|
|
@@ -28,8 +27,7 @@ export function leastLineIndexFromNodeAndTokens(node, tokens) {
|
|
|
28
27
|
export function greatestLineIndexFromNodeAndTokens(node, tokens) {
|
|
29
28
|
let greatestLineIndex = undefined; ///
|
|
30
29
|
|
|
31
|
-
const
|
|
32
|
-
lastSignificantTokenIndex = tokens.indexOf(lastSignificantToken);
|
|
30
|
+
const lastSignificantTokenIndex = node.getLastSignificantTokenIndex(tokens);
|
|
33
31
|
|
|
34
32
|
let lineIndex = 0;
|
|
35
33
|
|
package/src/utilities/string.js
CHANGED
|
@@ -46,10 +46,8 @@ export function terminalNodeAsString(terminalNode) {
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
export function nonTerminalNodeAsString(nonTerminalNode, tokens) {
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
lastSignificantTokenIndex = tokens.indexOf(lastSignificantToken),
|
|
52
|
-
firstSignificantTokenIndex = tokens.indexOf(firstSignificantToken),
|
|
49
|
+
const lastSignificantTokenIndex = nonTerminalNode.getLastSignificantTokenIndex(tokens),
|
|
50
|
+
firstSignificantTokenIndex = nonTerminalNode.getFirstSignificantTokenIndex(tokens),
|
|
53
51
|
start = firstSignificantTokenIndex, ///
|
|
54
52
|
end = lastSignificantTokenIndex + 1;
|
|
55
53
|
|