Skip to content

Ignore commas #188

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ignore commas #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69e04a4
Remove commas when creating token
joshestein May 14, 2025
eca495d
Special handling for commas inside functions
joshestein May 14, 2025
d2e1d54
Some tests for ignoring commas
joshestein May 14, 2025
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
28 changes: 26 additions & 2 deletions src/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ function createToken(buffer: string, type: TokenType) {

if (type === TokenType.NUM) {
// This can happen if users simply type ".", which get parsed as number.
if (isNaN(+buffer)) throw ExprError.invalidExpression();
return new ExprNumber(+buffer);
const numberWithoutCommas = buffer.replace(/,/g, '');
if (isNaN(+numberWithoutCommas)) throw ExprError.invalidExpression();
return new ExprNumber(+numberWithoutCommas);
}

if (type === TokenType.VAR) {
Expand All @@ -54,9 +55,16 @@ export function tokenize(str: string) {
const tokens = [];
let buffer = '';
let type = TokenType.UNKNOWN;
let parenDepth = 0;

for (const s of str) {

if (['(', '[', '{'].includes(s)) {
parenDepth++;
} else if ([')', ']', '}'].includes(s)) {
parenDepth--;
}

// Handle Strings
if (s === '"') {
const newType: TokenType = (((type as TokenType) === TokenType.STR) ? TokenType.UNKNOWN : TokenType.STR);
Expand All @@ -70,6 +78,22 @@ export function tokenize(str: string) {
continue;
}

// Special handling for commas
if (s === ',') {
// If we're in a number and not inside parenthesis include the comma
if (type === TokenType.NUM && parenDepth === 0) {
buffer += s;
Copy link
Member

@plegner plegner May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this work if we have numbers inside brackets? For example:
10 * (a + 1,000)

continue;
}
// Otherwise treat it as an operator
const token = createToken(buffer, type);
if (token) tokens.push(token);
tokens.push(new ExprOperator(','));
buffer = '';
type = TokenType.UNKNOWN;
continue;
}

const sType = s.match(/[0-9.]/) ? TokenType.NUM :
IDENTIFIER_SYMBOLS.includes(s) ? TokenType.VAR :
OPERATOR_SYMBOLS.includes(s) ? TokenType.OP :
Expand Down
13 changes: 13 additions & 0 deletions test/parsing-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ tape('functions', (test) => {
test.end();
});

tape('commas', (test) => {
test.equal(str('1,1'), '11');
test.equal(str('1,1 + 2,2'), '11 + 22');
test.equal(str('1,000 + 2,000'), '1000 + 2000');
test.equal(str('1,'), '1'); // Trailing comma
// test.equal(str(',1'), '1'); // Leading comma TODO: failing
test.equal(str('1,2,3'), '123'); // Multiple commas
test.equal(str('1,234,567.89'), '1234567.89'); // Multiple commas with a decimal point
test.equal(str('1,,2'), '12'); // Multiple consecutive commas
test.equal(str('1,2,'), '12'); // Multiple commas with trailing
test.end();
});

tape('strings', (test) => {
test.equal(str('"A" + "B"'), '"A" + "B"');
test.equal(str('"A"_"B"'), '"A"_"B"');
Expand Down