From 335c19c8692086ddb845af1b840b49e306c5179b Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Wed, 25 Feb 2015 12:59:19 +0100
Subject: tester reports ignored tests and supports 'nimout'; fixes #2211

---
 tests/macros/tmacrotypes.nim             | 14 +++++++-------
 tests/macros/tnimnode_for_runtime.nim    | 12 ++++++++++++
 tests/macros/tnimrodnode_for_runtime.nim | 13 -------------
 tests/macros/tsame_name_497.nim          |  4 ++++
 tests/macros/typesapi.nim                | 17 +++++++++++++++++
 5 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 tests/macros/tnimnode_for_runtime.nim
 delete mode 100644 tests/macros/tnimrodnode_for_runtime.nim
 create mode 100644 tests/macros/typesapi.nim

(limited to 'tests/macros')

diff --git a/tests/macros/tmacrotypes.nim b/tests/macros/tmacrotypes.nim
index f19aa2ddb..991668930 100644
--- a/tests/macros/tmacrotypes.nim
+++ b/tests/macros/tmacrotypes.nim
@@ -1,16 +1,16 @@
 discard """
-  disabled: true
+  nimout: '''void
+int'''
 """
 
-import macros, typetraits
+import macros
 
-macro checkType(ex, expected: expr): stmt {.immediate.} =
-  var t = ex.typ
-  assert t.name == expected.strVal
+macro checkType(ex: stmt; expected: expr): stmt =
+  var t = ex.getType()
+  echo t
 
 proc voidProc = echo "hello"
-proc intProc(a, b): int = 10
+proc intProc(a: int, b: float): int = 10
 
 checkType(voidProc(), "void")
 checkType(intProc(10, 20.0), "int")
-checkType(noproc(10, 20.0), "Error Type")
diff --git a/tests/macros/tnimnode_for_runtime.nim b/tests/macros/tnimnode_for_runtime.nim
new file mode 100644
index 000000000..69c7aedd2
--- /dev/null
+++ b/tests/macros/tnimnode_for_runtime.nim
@@ -0,0 +1,12 @@
+discard """
+  output: "bla"
+"""
+
+import macros
+proc makeMacro: PNimrodNode =
+  result = nil
+
+var p = makeMacro()
+
+echo "bla"
+
diff --git a/tests/macros/tnimrodnode_for_runtime.nim b/tests/macros/tnimrodnode_for_runtime.nim
deleted file mode 100644
index e73c8430f..000000000
--- a/tests/macros/tnimrodnode_for_runtime.nim
+++ /dev/null
@@ -1,13 +0,0 @@
-discard """
-  output: "bla"
-  disabled: true
-"""
-
-import macros
-proc makeMacro: PNimrodNode =
-  result = nil
-
-var p = makeMacro()
-
-echo "bla"
-
diff --git a/tests/macros/tsame_name_497.nim b/tests/macros/tsame_name_497.nim
index e49f9f6d8..ed5d5c6d8 100644
--- a/tests/macros/tsame_name_497.nim
+++ b/tests/macros/tsame_name_497.nim
@@ -1,3 +1,7 @@
+discard """
+  disabled: true
+"""
+
 import macro_bug
 
 type TObj = object
diff --git a/tests/macros/typesapi.nim b/tests/macros/typesapi.nim
new file mode 100644
index 000000000..670b39c9e
--- /dev/null
+++ b/tests/macros/typesapi.nim
@@ -0,0 +1,17 @@
+discard """
+  nimout: '''proc (x: int): string => typeDesc[proc[string, int]]
+proc (x: int): void => typeDesc[proc[void, int]]
+proc (x: int) => typeDesc[proc[void, int]]'''
+"""
+
+#2211
+
+import macros
+
+macro showType(t:stmt): stmt =
+  let ty = t.getType
+  echo t.repr, " => ", ty.repr
+
+showType(proc(x:int): string)
+showType(proc(x:int): void)
+showType(proc(x:int))
-- 
cgit 1.4.1-2-gfad0