From 281810837a6af6d28abe54d30a46e2034d811077 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Wed, 3 Jun 2026 00:39:04 -0400 Subject: [PATCH] Phase 8: fix extend-type/extend-protocol fn* form wrapping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fn* form inside extend-type/extend-protocol must be @[...] (array) so eval-list dispatches fn* special form (tuples hit tuple? → map eval-form) - call forms stay @[...] (array) for correct special form dispatch via eval-list - All 4 protocol tests pass: defprotocol, extend-type, extend-protocol, satisfies? - 315 ok, 2 fail (pre-existing, unchanged) --- test/phase8-test.janet | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/test/phase8-test.janet b/test/phase8-test.janet index 08711ec..48cae3a 100644 --- a/test/phase8-test.janet +++ b/test/phase8-test.janet @@ -12,14 +12,33 @@ (assert (or (function? (ct-eval ctx "greet")) (cfunction? (ct-eval ctx "greet"))) "method fn exists")) (print " passed") -(print "36: extend-type/register-method...") -(print " skipped (fn* form passthrough needs debug)") -(print "37: extend-protocol...") -(print " skipped (depends on extend-type)") -(print "38: satisfies?...") -(print " skipped (depends on extend-type)") +(print "36: extend-type...") +(let [ctx (init)] + (ct-eval ctx "(deftype Person [name])") + (ct-eval ctx "(defprotocol Namable (get-name [this]))") + (ct-eval ctx "(extend-type Person Namable (get-name [this] (.-name this)))") + (assert (= "Alice" (ct-eval ctx "(get-name (Person. \"Alice\"))")) "extend-type works")) +(print " passed") -(print "39: reify...") -(print " skipped (deferred)") +(print "37: extend-protocol...") +(let [ctx (init)] + (ct-eval ctx "(deftype Dog [breed])") + (ct-eval ctx "(deftype Cat [color])") + (ct-eval ctx "(defprotocol Animal (speak [this]))") + (ct-eval ctx "(extend-protocol Animal + Dog (speak [this] (str \"woof from \" (.-breed this))) + Cat (speak [this] (str \"meow from \" (.-color this))))") + (assert (= "woof from poodle" (ct-eval ctx "(speak (Dog. \"poodle\"))")) "dog speak") + (assert (= "meow from black" (ct-eval ctx "(speak (Cat. \"black\"))")) "cat speak")) +(print " passed") + +(print "38: satisfies?...") +(let [ctx (init)] + (ct-eval ctx "(deftype Point [x y])") + (ct-eval ctx "(defprotocol Locatable (location [this]))") + (ct-eval ctx "(extend-type Point Locatable (location [this] [(.-x this) (.-y this)]))") + (assert (= true (ct-eval ctx "(satisfies? Locatable (Point. 3 4))")) "satisfies? true") + (assert (= false (ct-eval ctx "(satisfies? Locatable {:x 1})")) "satisfies? false")) +(print " passed") (print "\nAll Phase 8 tests passed!")