From debb0f6ca2970bfdf6a40368f7b5ded5afc978d2 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Sun, 7 May 2017 22:29:58 -0400
Subject: [PATCH] Merge pull request #21715 from
 JuliaLang/jn/static-show-typemap-entries

better static printing of typemap entries

Ref #21715
(cherry picked from commit df066df8414265a624ddf767e7f55d3136a81442)
---
 base/boot.jl  |  4 ++--
 src/rtutils.c | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/base/boot.jl b/base/boot.jl
index 55721469c6867..d0a686e761bf5 100644
--- a/base/boot.jl
+++ b/base/boot.jl
@@ -370,10 +370,10 @@ end
 
 show(io::IO, x::ANY) = ccall(:jl_static_show, Void, (Ptr{Void}, Any), io_pointer(io), x)
 print(io::IO, x::Char) = ccall(:jl_uv_putc, Void, (Ptr{Void}, Char), io_pointer(io), x)
-print(io::IO, x::String) = write(io, x)
+print(io::IO, x::String) = (write(io, x); nothing)
 print(io::IO, x::ANY) = show(io, x)
 print(io::IO, x::ANY, a::ANY...) = (print(io, x); print(io, a...))
-println(io::IO) = write(io, 0x0a) # 0x0a = '\n'
+println(io::IO) = (write(io, 0x0a); nothing) # 0x0a = '\n'
 println(io::IO, x::ANY...) = (print(io, x...); println(io))
 
 show(a::ANY) = show(STDOUT, a)
diff --git a/src/rtutils.c b/src/rtutils.c
index 954c352186e52..e5b2c8d8f11f8 100644
--- a/src/rtutils.c
+++ b/src/rtutils.c
@@ -841,14 +841,16 @@ static size_t jl_static_show_x_(JL_STREAM *out, jl_value_t *v, jl_datatype_t *vt
         if (nb > 0 && tlen == 0) {
             uint8_t *data = (uint8_t*)v;
             n += jl_printf(out, "0x");
-            for(int i=nb-1; i >= 0; --i)
+            for(int i = nb - 1; i >= 0; --i)
                 n += jl_printf(out, "%02" PRIx8, data[i]);
         }
         else {
-            for (size_t i = 0; i < tlen; i++) {
+            size_t i = 0;
+            if (vt == jl_typemap_entry_type)
+                i = 1;
+            for (; i < tlen; i++) {
                 if (!istuple) {
                     n += jl_printf(out, "%s", jl_symbol_name((jl_sym_t*)jl_svecref(vt->name->names, i)));
-                    //jl_fielddesc_t f = t->fields[i];
                     n += jl_printf(out, "=");
                 }
                 size_t offs = jl_field_offset(vt, i);
@@ -861,11 +863,15 @@ static size_t jl_static_show_x_(JL_STREAM *out, jl_value_t *v, jl_datatype_t *vt
                                            (jl_datatype_t*)jl_field_type(vt, i),
                                            depth);
                 }
-                if (istuple && tlen==1)
+                if (istuple && tlen == 1)
                     n += jl_printf(out, ",");
-                else if (i != tlen-1)
+                else if (i != tlen - 1)
                     n += jl_printf(out, ", ");
             }
+            if (vt == jl_typemap_entry_type) {
+                n += jl_printf(out, ", next=↩︎\n  ");
+                n += jl_static_show_x(out, jl_fieldref(v, 0), depth);
+            }
         }
         n += jl_printf(out, ")");
     }