sacrifice nim-lang#23432 for now

metagn · Aug 20, 2024 · 306cd8b · 306cd8b
1 parent 8d6476d
commit 306cd8b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/compiler/sem.nim b/compiler/sem.nim
@@ -501,7 +501,7 @@ const
 
 proc semMacroExpr(c: PContext, n, nOrig: PNode, sym: PSym,
                   flags: TExprFlags = {}; expectedType: PType = nil): PNode =
-  if false and c.inGenericContext > 0 and sfAllUntyped notin sym.flags:
+  if c.inGenericContext > 0 and sfAllUntyped notin sym.flags:
     # in generic type body, typed macros can only be instantiated
     # when the generic type is instantiated
     result = semGenericStmt(c, n)

diff --git a/compiler/semcall.nim b/compiler/semcall.nim
@@ -701,7 +701,7 @@ proc semResolvedCall(c: PContext, x: var TCandidate,
       else:
         c.inheritBindings(x, expectedType)
         finalCallee = generateInstance(c, x.calleeSym, x.bindings, n.info)
-    elif true or c.inGenericContext == 0:
+    elif c.inGenericContext == 0:
       # For macros and templates, the resolved generic params
       # are added as normal params.
       # This is not done in a generic type body context, as typed macros

diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
@@ -27,7 +27,7 @@ const
 
 proc semTemplateExpr(c: PContext, n: PNode, s: PSym,
                      flags: TExprFlags = {}; expectedType: PType = nil): PNode =
-  if false and c.inGenericContext > 0 and sfAllUntyped notin s.flags:
+  if c.inGenericContext > 0 and sfAllUntyped notin s.flags:
     # in generic type body, typed templates can only be instantiated
     # when the generic type is instantiated 
     result = semGenericStmt(c, n)

diff --git a/tests/generics/tmacrotype.nim b/tests/generics/tmacrotype.nim
@@ -1,3 +1,13 @@
+discard """
+  # XXX not actually fixed
+  disabled: true # cannot instantiate: 'T'
+  # the use of `typedesc` delays the macro unlike `typed` or `untyped`
+  # but this makes it impossible for overloading to infer the type
+  # some code depends on `typedesc` needing to be resolved, e.g. tmacrogenerics
+  # so we can't change it, but maybe we can add a version of `typedesc` that allows generic params
+  # maybe something like `typed{typedesc}` so it doesn't lift to a generic param
+"""
+
 import std/[sequtils, macros]
 
 block: # issue #23432