up

Author: xieyuheng

examples/factorial-123.lisp

@@ -53,6 +53,10 @@
 (assert-equal (factorial-3 three) (mul three two))
 (assert-equal (factorial-3 four) (mul four (mul three two)))
 
+(assert-not-same factorial-1 factorial-2)
+(assert-not-same factorial-1 factorial-3)
+(assert-not-same factorial-2 factorial-3)
+
 (assert-equal factorial-1 factorial-2)
 (assert-equal factorial-1 factorial-3)
 (assert-equal factorial-2 factorial-3)

examples/fibonacci-123.lisp

@@ -62,6 +62,8 @@
 (assert-equal (fibonacci-3 four) three)
 (assert-equal (fibonacci-3 five) five)
 
+(assert-not-same fibonacci-1 fibonacci-2)
+
 ;; TODO fail:
 
 ;; (assert-equal fibonacci-1 fibonacci-2)

src/lang/equal/equalInCtx.ts

@@ -18,16 +18,17 @@ const debug = false
 export function equalInCtx(ctx: Ctx, left: Value, right: Value): boolean {
   ctx = ctxDepthAdd1(ctx)
 
+  left = Values.lazyActiveDeep(left)
+  right = Values.lazyActiveDeep(right)
+
   if (debug) {
-    console.log("[equalInCtx]", ctx.depth, "*", formatValue(left))
+    console.log("[equalInCtx]", ctx.depth, " ", formatValue(left))
     console.log("[equalInCtx]", ctx.depth, "=", formatValue(right))
+    console.log("[equalInCtx]", "same:", same(left, right))
   }
 
   if (same(left, right)) return true
 
-  left = Values.lazyActiveDeep(left)
-  right = Values.lazyActiveDeep(right)
-
   if (left.kind === "NotYet" && right.kind === "NotYet") {
     return equalNeutralInCtx(ctx, left.neutral, right.neutral)
   }