NextERP/owl
2
0
Fork 0
mirror of https://github.com/odoo/owl.git synced 2025-10-06 19:59:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] qweb: add support for "in " operator in expressions

Browse Source 
closes #603
This commit is contained in:
Géry Debongnie
2020-01-08 14:23:18 +01:00
committed by aab-odoo
parent 0af46bc123
commit 55889febd5
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qweb/expression_parser.ts
+1 -1
View File
@@ -81,7 +81,7 @@ const STATIC_TOKEN_MAP: { [key: string]: TKind } = {
// note that the space after typeof is relevant. It makes sure that the formatted // note that the space after typeof is relevant. It makes sure that the formatted
// expression has a space after typeof // expression has a space after typeof
const OPERATORS = "...,.,===,==,+,!==,!=,!,||,&&,>=,>,<=,<,?,-,*,/,%,typeof ,=>,=,;".split(","); const OPERATORS = "...,.,===,==,+,!==,!=,!,||,&&,>=,>,<=,<,?,-,*,/,%,typeof ,=>,=,;,in ".split(",");
type Tokenizer = (expr: string) => Token | false; type Tokenizer = (expr: string) => Token | false;
tests/qweb/qweb_expressions.test.ts
+7
View File
@@ -56,6 +56,12 @@ describe("tokenizer", () => {
{ type: "OPERATOR", value: "..." }, { type: "OPERATOR", value: "..." },
{ type: "VALUE", value: "1" } { type: "VALUE", value: "1" }
]); ]);
expect(tokenize("a in b")).toEqual([
{ type: "SYMBOL", value: "a" },
{ type: "OPERATOR", value: "in " },
{ type: "SYMBOL", value: "b" }
]);
}); });
test("strings", () => { test("strings", () => {
@@ -134,6 +140,7 @@ describe("expression evaluation", () => {
expect(compileExpr("color === 'black'", {})).toBe("scope['color']==='black'"); expect(compileExpr("color === 'black'", {})).toBe("scope['color']==='black'");
expect(compileExpr("'li_'+item", {})).toBe("'li_'+scope['item']"); expect(compileExpr("'li_'+item", {})).toBe("'li_'+scope['item']");
expect(compileExpr("state.val > 1", {})).toBe("scope['state'].val>1"); expect(compileExpr("state.val > 1", {})).toBe("scope['state'].val>1");
expect(compileExpr("a in b", {})).toBe("scope['a']in scope['b']");
}); });
test("boolean operations", () => { test("boolean operations", () => {