exprStructuralEquivalentStrictSymAndComm: Don't ignore nkType type eq…

…uality
Clyybber · Mar 15, 2024 · 06f6310 · 06f6310
1 parent 9549d7e
commit 06f6310
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/compiler/ast/trees.nim b/compiler/ast/trees.nim
@@ -98,6 +98,7 @@ makeTreeEquivalenceProc(exprStructuralEquivalentStrictSymAndComm,
   symCheck     = a.sym == b.sym,
   floatCheck   = sameFloatIgnoreNan(a.floatVal, b.floatVal),
   typeCheck    = true,
+  typeCheck    = a.typ == b.typ,
   commentCheck = a.comment == b.comment
 )
 export exprStructuralEquivalentStrictSymAndComm

diff --git a/tests/lang_callable/macros/tmacros_various.nim b/tests/lang_callable/macros/tmacros_various.nim
@@ -12,6 +12,7 @@ Infix
 macrocache ok
 CommentStmt "comment 1"
 CommentStmt "comment 2"
+false
 '''
 
   output: '''
@@ -346,3 +347,22 @@ block:
   static:
     echo treeRepr(C1[1])
     echo treeRepr(C2[1])
+
+block:
+  # Ensure nkType equality is not ignored by `==` for NimNode
+  macro checkEq(a, b: typed) =
+    echo a == b
+
+  type Exception1 = object of Exception
+  type Exception2 = object of Exception
+  checkEq (;
+    try:
+      discard
+    except Exception1:
+      discard
+  ), (;
+    try:
+      discard
+    except Exception2:
+      discard
+  )