fix for bootstrap

nim-lang · Feb 7, 2020 · c0656d6 · c0656d6
1 parent 030ed05
commit c0656d6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/compiler/condsyms.nim b/compiler/condsyms.nim
@@ -103,6 +103,7 @@ proc initDefines*(symbols: StringTableRef) =
   defineSymbol("nimNewShiftOps")
   defineSymbol("nimHasCursor")
   defineSymbol("nimHasExceptionsQuery")
+  defineSymbol("nimHasIsNamedTuple")
 
   when defined(nimHasLibFFI):
     # Renaming as we can't conflate input vs output define flags; e.g. this

diff --git a/lib/system/dollars.nim b/lib/system/dollars.nim
@@ -49,7 +49,22 @@ proc `$`*(t: typedesc): string {.magic: "TypeTrait".}
   ##   doAssert $(type("Foo")) == "string"
   ##   static: doAssert $(type(@['A', 'B'])) == "seq[char]"
 
-proc isNamedTuple(T: typedesc): bool {.magic: "TypeTrait".}
+when defined(nimHasIsNamedTuple):
+  proc isNamedTuple(T: typedesc): bool {.magic: "TypeTrait".}
+else:
+  # for bootstrap; remove after release 1.2
+  proc isNamedTuple(T: typedesc): bool =
+    # Taken from typetraits.
+    when T isnot tuple: result = false
+    else:
+      var t: T
+      for name, _ in t.fieldPairs:
+        when name == "Field0":
+          return compiles(t.Field0)
+        else:
+          return true
+      return false
+
 
 proc `$`*[T: tuple|object](x: T): string =
   ## Generic ``$`` operator for tuples that is lifted from the components