[IMP] evaluation: implement curly brackets #7212
Conversation
|
|
laa-odoo
force-pushed
the
master-add-curly-brackets-laa
branch
5 times, most recently
from
df549b5 to
bb47554
Compare
Allow entering literal arrays when composing formulas using curly brackets {}.
Task: 4735250
laa-odoo
force-pushed
the
master-add-curly-brackets-laa
branch
from
bb47554 to
420ca7f
Compare
| function leftOperandNeedsParenthesis(operationAST: ASTOperation | ASTUnaryOperation): boolean { | ||
| const mainOperator = operationAST.value; | ||
| const leftOperation = "left" in operationAST ? operationAST.left : operationAST.operand; | ||
| if (leftOperation.type !== "BIN_OPERATION") { |
There was a problem hiding this comment.
Why have you changed these lines ? It does the same thing (except the assignment of leftOperator), doesn't it ?
| if (rightOperation.type !== "BIN_OPERATION") { | ||
| return false; | ||
| } | ||
| const rightPriority = OP_PRIORITY[rightOperation.value]; |
| } | ||
| if (nextToken.type === "ARRAY_ROW_SEPARATOR") { | ||
| tokens.shift(); | ||
| if (expectValue) { |
There was a problem hiding this comment.
What if we want to have an empty cell inside the row of an array ? Isn't there any case where we sohuld want it ?
| ")": { type: "RIGHT_PAREN", value: ")" }, | ||
| } as const; | ||
|
|
||
| const braces = { |
There was a problem hiding this comment.
Nitpick: Maybe we can put these just before tokenizeBraces ?
| export function extractFormulaIdFromToken(tokenAtCursor: EnrichedToken) { | ||
| const idAst = tokenAtCursor.functionContext?.args[0]; | ||
| if (!idAst || !["STRING", "NUMBER"].includes(idAst.type)) { | ||
| if (!idAst || (idAst.type !== "STRING" && idAst.type !== "NUMBER")) { |
There was a problem hiding this comment.
Nitpick: Another useless diff. If you ally want to add them, maybe make another commit ?
| } | ||
| const pivotFormulaId = extractFormulaIdFromToken(tokenAtCursor); | ||
| const pivotId = this.getters.getPivotId(pivotFormulaId); | ||
| if (pivotFormulaId === undefined) { |
There was a problem hiding this comment.
All these changes should go in another commit with all the others minor changes you made to improve the code
| expect(() => parse("={1;}")).toThrow("Unexpected empty array element"); | ||
| }); | ||
|
|
||
| test("array literal with mismatched row length not throws", () => { |
There was a problem hiding this comment.
array literal with mismatched row length DOES not throw
anhe-odoo
changed the title
3 participants
Task: 4735250