Skip to content

WIP: Support range with sheet name in both side #1

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

Open
ngs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Support range with sheet name in both side #1

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: 5 additions & 0 deletions .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"printWidth": 120,
"singleQuote": true,
"trailingComma": "all"
}
59 changes: 17 additions & 42 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var TOK_SUBTYPE_INTERSECT = 'intersect';
var TOK_SUBTYPE_UNION = 'union';

function createToken(value, type, subtype = '') {
return {value, type, subtype};
return { value, type, subtype };
}

class Tokens {
Expand Down Expand Up @@ -263,11 +263,7 @@ function tokenize(formula, options) {
if (inError) {
token += currentChar();
offset += 1;
if (
',#NULL!,#DIV/0!,#VALUE!,#REF!,#NAME?,#NUM!,#N/A,'.indexOf(
',' + token + ',',
) != -1
) {
if (',#NULL!,#DIV/0!,#VALUE!,#REF!,#NAME?,#NUM!,#N/A,'.indexOf(',' + token + ',') != -1) {
inError = false;
tokens.add(token, TOK_TYPE_OPERAND, TOK_SUBTYPE_ERROR);
token = '';
Expand All @@ -277,9 +273,7 @@ function tokenize(formula, options) {

if (inNumeric) {
if (
([language.decimalSeparator, 'E', '+', '-'].indexOf(currentChar()) !=
-1 &&
/[\d\.E\+\-]/.test(nextChar())) ||
([language.decimalSeparator, 'E', '+', '-'].indexOf(currentChar()) != -1 && /[\d\.E\+\-]/.test(nextChar())) ||
/\d/.test(currentChar())
) {
inNumeric = true;
Expand Down Expand Up @@ -338,11 +332,7 @@ function tokenize(formula, options) {

// establish state-dependent character evaluations

if (
/\d/.test(currentChar()) &&
isPreviousNonDigitBlank() &&
!isNextNonDigitTheRangeOperator()
) {
if (/\d/.test(currentChar()) && isPreviousNonDigitBlank() && !isNextNonDigitTheRangeOperator()) {
inNumeric = true;
token += currentChar();
offset += 1;
Expand All @@ -363,6 +353,7 @@ function tokenize(formula, options) {
if (currentChar() == "'") {
if (token.length > 0) {
// not expected
console.info(token);
tokens.add(token, TOK_TYPE_UNKNOWN);
token = '';
}
Expand Down Expand Up @@ -398,12 +389,8 @@ function tokenize(formula, options) {
tokens.add(token, TOK_TYPE_UNKNOWN);
token = '';
}
tokenStack.push(
tokens.add('ARRAY', TOK_TYPE_FUNCTION, TOK_SUBTYPE_START),
);
tokenStack.push(
tokens.add('ARRAYROW', TOK_TYPE_FUNCTION, TOK_SUBTYPE_START),
);
tokenStack.push(tokens.add('ARRAY', TOK_TYPE_FUNCTION, TOK_SUBTYPE_START));
tokenStack.push(tokens.add('ARRAYROW', TOK_TYPE_FUNCTION, TOK_SUBTYPE_START));
offset += 1;
continue;
}
Expand All @@ -415,9 +402,7 @@ function tokenize(formula, options) {
}
tokens.addRef(tokenStack.pop());
tokens.add(',', TOK_TYPE_ARGUMENT);
tokenStack.push(
tokens.add('ARRAYROW', TOK_TYPE_FUNCTION, TOK_SUBTYPE_START),
);
tokenStack.push(tokens.add('ARRAYROW', TOK_TYPE_FUNCTION, TOK_SUBTYPE_START));
offset += 1;
continue;
}
Expand Down Expand Up @@ -488,9 +473,7 @@ function tokenize(formula, options) {

if (currentChar() == '(') {
if (token.length > 0) {
tokenStack.push(
tokens.add(token, TOK_TYPE_FUNCTION, TOK_SUBTYPE_START),
);
tokenStack.push(tokens.add(token, TOK_TYPE_FUNCTION, TOK_SUBTYPE_START));
token = '';
} else {
tokenStack.push(tokens.add('', TOK_TYPE_SUBEXPR, TOK_SUBTYPE_START));
Expand Down Expand Up @@ -533,20 +516,16 @@ function tokenize(formula, options) {
// no-op
} else if (
!(
(tokens.previous().type == TOK_TYPE_FUNCTION &&
tokens.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens.previous().type == TOK_TYPE_SUBEXPR &&
tokens.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens.previous().type == TOK_TYPE_FUNCTION && tokens.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens.previous().type == TOK_TYPE_SUBEXPR && tokens.previous().subtype == TOK_SUBTYPE_STOP) ||
tokens.previous().type == TOK_TYPE_OPERAND
)
) {
// no-op
} else if (
!(
(tokens.next().type == TOK_TYPE_FUNCTION &&
tokens.next().subtype == TOK_SUBTYPE_START) ||
(tokens.next().type == TOK_TYPE_SUBEXPR &&
tokens.next().subtype == TOK_SUBTYPE_START) ||
(tokens.next().type == TOK_TYPE_FUNCTION && tokens.next().subtype == TOK_SUBTYPE_START) ||
(tokens.next().type == TOK_TYPE_SUBEXPR && tokens.next().subtype == TOK_SUBTYPE_START) ||
tokens.next().type == TOK_TYPE_OPERAND
)
) {
Expand All @@ -570,10 +549,8 @@ function tokenize(formula, options) {
if (tokens2.BOF()) {
token.type = TOK_TYPE_OP_PRE;
} else if (
(tokens2.previous().type == TOK_TYPE_FUNCTION &&
tokens2.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens2.previous().type == TOK_TYPE_SUBEXPR &&
tokens2.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens2.previous().type == TOK_TYPE_FUNCTION && tokens2.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens2.previous().type == TOK_TYPE_SUBEXPR && tokens2.previous().subtype == TOK_SUBTYPE_STOP) ||
tokens2.previous().type == TOK_TYPE_OP_POST ||
tokens2.previous().type == TOK_TYPE_OPERAND
) {
Expand All @@ -588,10 +565,8 @@ function tokenize(formula, options) {
if (tokens2.BOF()) {
token.type = TOK_TYPE_NOOP;
} else if (
(tokens2.previous().type == TOK_TYPE_FUNCTION &&
tokens2.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens2.previous().type == TOK_TYPE_SUBEXPR &&
tokens2.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens2.previous().type == TOK_TYPE_FUNCTION && tokens2.previous().subtype == TOK_SUBTYPE_STOP) ||
(tokens2.previous().type == TOK_TYPE_SUBEXPR && tokens2.previous().subtype == TOK_SUBTYPE_STOP) ||
tokens2.previous().type == TOK_TYPE_OP_POST ||
tokens2.previous().type == TOK_TYPE_OPERAND
) {
Expand Down
92 changes: 27 additions & 65 deletions test/cell-ranges-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,34 @@
const {itBlock} = require('./test-helper');
const { itBlock } = require('./test-helper');

describe('cell ranges', function () {
describe('A1 style', function () {
describe('cell ranges', function() {
describe('A1 style', function() {
[
['A1', [
['A1', 'operand', 'range']
]],
['$A$1', [
['$A$1', 'operand', 'range']
]],
['A$1', [
['A$1', 'operand', 'range']
]],
['$A1', [
['$A1', 'operand', 'range']
]],
['A10:A20', [
['A10:A20', 'operand', 'range']
]],
['A1:C1', [
['A1:C1', 'operand', 'range']
]],
['5:5', [
['5:5', 'operand', 'range']
]],
['5:10', [
['5:10', 'operand', 'range']
]],
['H:H', [
['H:H', 'operand', 'range']
]],
['H:J', [
['H:J', 'operand', 'range']
]],
['A10:E20', [
['A10:E20', 'operand', 'range']
]],
]
.forEach(itBlock);
['A1', [['A1', 'operand', 'range']]],
['$A$1', [['$A$1', 'operand', 'range']]],
['A$1', [['A$1', 'operand', 'range']]],
['$A1', [['$A1', 'operand', 'range']]],
['A10:A20', [['A10:A20', 'operand', 'range']]],
['A1:C1', [['A1:C1', 'operand', 'range']]],
['5:5', [['5:5', 'operand', 'range']]],
['5:10', [['5:10', 'operand', 'range']]],
['H:H', [['H:H', 'operand', 'range']]],
['H:J', [['H:J', 'operand', 'range']]],
['A10:E20', [['A10:E20', 'operand', 'range']]],
["'Foo ! Bar'!A10:E20", [['Foo ! Bar!A10:E20', 'operand', 'range']]],
["'Foo ! Bar'!A10:'Foo ! Bar'!E20", [['Foo ! Bar!A10:Foo ! Bar!E20', 'operand', 'range']]],
].forEach(itBlock);
});

describe('R1C1 style', function () {
describe('R1C1 style', function() {
[
['R1C1', [
['R1C1', 'operand', 'range']
]],
['R[-2]C', [
['R[-2]C', 'operand', 'range']
]],
['RC[3]', [
['RC[3]', 'operand', 'range']
]],
['R[2]C[2]', [
['R[2]C[2]', 'operand', 'range']
]],
['R[-1]', [
['R[-1]', 'operand', 'range']
]],
['C[-1]', [
['C[-1]', 'operand', 'range']
]],
['R', [
['R', 'operand', 'range']
]],
['C', [
['C', 'operand', 'range']
]]
]
.forEach(itBlock);
['R1C1', [['R1C1', 'operand', 'range']]],
['R[-2]C', [['R[-2]C', 'operand', 'range']]],
['RC[3]', [['RC[3]', 'operand', 'range']]],
['R[2]C[2]', [['R[2]C[2]', 'operand', 'range']]],
['R[-1]', [['R[-1]', 'operand', 'range']]],
['C[-1]', [['C[-1]', 'operand', 'range']]],
['R', [['R', 'operand', 'range']]],
['C', [['C', 'operand', 'range']]],
].forEach(itBlock);
});
});