From 22cc9b7dc72ceea8a14dcfe58f01eff4f96034dc Mon Sep 17 00:00:00 2001
From: nmtigor <nmtigor.wang@googlemail.com>
Date: Wed, 21 Sep 2022 17:20:23 +0200
Subject: [PATCH] Fix property chain orders of Operators in isDotExpression and
 isSomPredicate

---
 src/core/xfa/formcalc_parser.js |  6 +++---
 test/unit/xfa_formcalc_spec.js  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/core/xfa/formcalc_parser.js b/src/core/xfa/formcalc_parser.js
index 72de8e0c6..81964c21c 100644
--- a/src/core/xfa/formcalc_parser.js
+++ b/src/core/xfa/formcalc_parser.js
@@ -661,14 +661,14 @@ class AstBinaryOperator extends Leaf {
   }
 
   isDotExpression() {
-    return Operators.id.dot <= this.id && this.id <= Operators.id.dotHash;
+    return Operators.dot.id <= this.id && this.id <= Operators.dotHash.id;
   }
 
   isSomPredicate() {
     return (
       this.isDotExpression() ||
-      (Operators.id.lt <= this.id &&
-        this.id <= Operators.id.or &&
+      (Operators.lt.id <= this.id &&
+        this.id <= Operators.or.id &&
         ((this.left.isDotExpression() && this.right.isConstant()) ||
           (this.left.isConstant() && this.right.isDotExpression()) ||
           (this.left.isDotExpression() && this.right.isDotExpression())))
diff --git a/test/unit/xfa_formcalc_spec.js b/test/unit/xfa_formcalc_spec.js
index 94f18d63a..cf1e357ba 100644
--- a/test/unit/xfa_formcalc_spec.js
+++ b/test/unit/xfa_formcalc_spec.js
@@ -266,7 +266,9 @@ describe("FormCalc expression parser", function () {
 
     it("should parse basic expression with dots", function () {
       const parser = new Parser("a.b.c.#d..e.f..g.*");
-      expect(parser.parse().dump()[0]).toEqual({
+      const exprlist = parser.parse();
+      expect(exprlist.expressions[0].isDotExpression()).toEqual(true);
+      expect(exprlist.dump()[0]).toEqual({
         operator: ".",
         left: { id: "a" },
         right: {
@@ -727,5 +729,12 @@ endfunc
       );
       expect(() => parser.parse()).toThrow(new Error(Errors.if));
     });
+
+    it("should parse som predicate", () => {
+      const parser = new Parser("a.b <= 3");
+      const expr = parser.parse().expressions[0];
+      expect(expr.isSomPredicate()).toEqual(true);
+      expect(expr.left.isSomPredicate()).toEqual(true);
+    });
   });
 });