From b1fe95fef05b7e8d26ff82645d373c2ef0b5c449 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 12 Dec 2019 18:10:17 -0800 Subject: multiple-inheritance: super-method loose ends. * struct.c (do_super): New function. Now the common implementation for call_super_method, call_super_fun and super_method. (call_super_method, call_super_fun): Reduced to small wrappers around do_super. (super_method): Drill into the object to geet the struct_type handle, and then use do_super to get the method. * tests/012/oop-mi.tl: New tests for call-super-fun and call-super-method. * tests/012/oop-mi.expected: Updated. * txr.1: Updated. --- tests/012/oop-mi.expected | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/012/oop-mi.expected') diff --git a/tests/012/oop-mi.expected b/tests/012/oop-mi.expected index 91bc05df..301c7460 100644 --- a/tests/012/oop-mi.expected +++ b/tests/012/oop-mi.expected @@ -6,3 +6,9 @@ gs0 gs1-b1 (meth base3 b3m0) (meth der1 b3m1) +m1 +m2 +gm +m1 +m2 +gm -- cgit v1.2.3