Remove expr/stmt (#5857)

tests/typerel/temptynode.nim

@@ -10,7 +10,7 @@ import macros
 proc blah(x: proc (a, b: int): int) =
   echo x(5, 5)
 
-macro test(): stmt =
+macro test(): untyped =
   result = newNimNode(nnkEmpty)
 
 blah(test())

tests/typerel/tsymchoice_for_expr.nim

@@ -1,6 +1,6 @@
 # bug #1988
 
-template t(e: expr) = discard
+template t(e) = discard
 
 proc positive(x: int): int = +x
 proc negative(x: int): int = -x

tests/typerel/tvarargsexpr.nim

@@ -8,7 +8,7 @@ true'''
 
 import macros
 
-macro thirteen(args: varargs[expr]): expr =
+macro thirteen(args: varargs[untyped]): int =
   result = newIntLitNode(13)
 
 doAssert(13==thirteen([1,2])) # works
@@ -22,7 +22,8 @@ echo "success"
 # bug #2545
 
 import macros
-macro test(e: varargs[untyped]): expr = bindSym"true"
+macro test(e: varargs[untyped]): untyped =
+  bindSym"true"
 
 echo test(a)
 echo test(fake=90, arguments=80, also="false", possible=true)