From df8fb263e03ec46a7d72e4bc6bf3a86274fd8f5f Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Fri, 27 Aug 2021 09:10:29 +0200
Subject: [PATCH] Berry support for indirect members

---
 lib/libesp32/Berry/src/be_parser.c          |  7 ++
 lib/libesp32/Berry/tests/member_indirect.be | 75 +++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 lib/libesp32/Berry/tests/member_indirect.be

diff --git a/lib/libesp32/Berry/src/be_parser.c b/lib/libesp32/Berry/src/be_parser.c
index 805a85021..bb455df68 100644
--- a/lib/libesp32/Berry/src/be_parser.c
+++ b/lib/libesp32/Berry/src/be_parser.c
@@ -792,6 +792,13 @@ static void member_expr(bparser *parser, bexpdesc *e)
         init_exp(&key, ETSTRING, 0);
         key.v.s = str;
         be_code_member(parser->finfo, e, &key);
+    } else if (next_type(parser) == OptLBK) {
+        scan_next_token(parser); /* skip '(' */
+        bexpdesc key;
+        expr(parser, &key);
+        check_var(parser, &key);
+        match_token(parser, OptRBK); /* skip ')' */
+        be_code_member(parser->finfo, e, &key);
     } else {
         push_error(parser, "invalid syntax near '%s'",
             be_token2str(parser->vm, &next_token(parser)));
diff --git a/lib/libesp32/Berry/tests/member_indirect.be b/lib/libesp32/Berry/tests/member_indirect.be
new file mode 100644
index 000000000..046521acd
--- /dev/null
+++ b/lib/libesp32/Berry/tests/member_indirect.be
@@ -0,0 +1,75 @@
+#- new syntax for indirect members -#
+
+#- module accessor -#
+s_pi = 'pi'
+
+import math
+assert(math.('pi') == math.pi)
+assert(math.(s_pi) == math.pi)
+
+#- module writer -#
+m = module("m")
+
+m.('aa') = 1
+m.('a' + 'b') = 2
+s_ac = 'ac'
+m.(s_ac) = 3
+assert(m.aa == 1)
+assert(m.ab == 2)
+assert(m.ac == 3)
+assert(m.('a'+'a') == 1)
+
+#- class accessor -#
+class A1
+    static a = 1, b = 2
+    static s = "foo"
+    def f() return 0 end
+end
+assert(A1.a == 1)
+assert(A1.b == 2)
+assert(A1.s == "foo")
+assert(type(A1.f) == 'function')
+
+#- instance accessor -#
+class A2
+    var a, b
+    static s_a = 'a'
+    def init(a,b)
+        self.(self.('s_a')) = a
+        self.('b') = b
+    end
+    def f(x)
+        return x+1
+    end
+    def g(a,b)
+        return A2(a,b)
+    end
+end
+a = A2(1,2)
+
+#- reading members -#
+assert(a.a == 1)
+assert(a.b == 2)
+assert(a.(A2.s_a) == 1)
+assert(a.('b') == 2)
+
+#- writing members -#
+a.('a') = 10
+a.('bb'[0]) = 11
+assert(a.a == 10)
+assert(a.b == 11)
+
+#- calling methods -#
+assert(a.f(1) == 2)
+assert(a.('f')(2) == 3)
+
+#- mulit-level -#
+assert(a.('g')(3,4).('a') == 3)
+a.('a') = a.g(3,4)
+assert(a.a.b == 4)
+assert(a.('a').b == 4)
+assert(a.('a').('b') == 4)
+assert(a.a.('b') == 4)
+
+a.('a').('b') += 1
+assert(a.a.b == 5)