Support printing Measurement{Num}

Author: LebedevRI

src/show.jl

@@ -13,59 +13,57 @@
 #
 # This file defines the methods to represent `Measurement` objects in various places.
 #
-# FIXME: should special-handle non-AbstractFloat T's.
-#
 ### Code:
 
 import Printf
 
-function truncated_print(io::IO, m::Measurement, error_digits::Int;
+full_print(io::IO, val, err; atbeg = "", atend = "", pm = "±") =
+    print(io, atbeg, val, get(io, :compact, false) ? pm : " $pm ", err, atend)
+
+function truncated_print(io::IO, m::Measurement;
                          atbeg = "", atend = "", pm = "±")
-    val = if iszero(m.err) || !isfinite(m.err)
-        m.val
-    else
-        err_digits = -Base.hidigit(m.err, 10) + error_digits
-        digits = if isfinite(m.val)
-            max(-Base.hidigit(m.val, 10) + 2, err_digits)
+    error_digits::Int = get(io, :error_digits, 2)
+
+    val = m.val
+    err = m.err
+
+    if error_digits < 0
+        error("`error_digits` must be non-negative")
+    elseif error_digits > 0 && !SymbolicsBase.issymbollike(val)
+        val = if iszero(err) || !isfinite(err)
+            val
         else
-            err_digits
+            err_digits = -Base.hidigit(err, 10) + error_digits
+            digits = if isfinite(val)
+                max(-Base.hidigit(val, 10) + 2, err_digits)
+            else
+                err_digits
+            end
+            round(val, digits = digits)
         end
-        round(m.val, digits = digits)
-    end
-    print(io, atbeg, val,
-          get(io, :compact, false) ? pm : " $pm ",
-          round(m.err, sigdigits=error_digits), atend)
+        err = round(err, sigdigits=error_digits)
+    end # if
+    full_print(io, val, err, atbeg = atbeg, atend = atend, pm = pm)
 end
 
-full_print(io::IO, measure::Measurement) =
-    print(io, measure.val, get(io, :compact, false) ? "±" : " ± ", measure.err)
-
 function Base.show(io::IO, m::Measurement)
-    error_digits = get(io, :error_digits, 2)
-    if error_digits > 0
-            truncated_print(io, m, error_digits)
-    elseif error_digits == 0
-        full_print(io, m)
-    else
-        error("`error_digits` must be non-negative")
-    end # if
+    truncated_print(io, m)
 end
 
 function Base.show(io::IO, ::MIME"text/latex", measure::Measurement)
-    error_digits = get(io, :error_digits, 2)
-    truncated_print(io, measure, error_digits, atbeg = "\$", atend = "\$", pm = "\\pm")
+    truncated_print(io, measure, atbeg = "\$", atend = "\$", pm = "\\pm")
 end
 
 for mime in (MIME"text/x-tex", MIME"text/x-latex")
     function Base.show(io::IO, ::mime, measure::Measurement)
-        error_digits = get(io, :error_digits, 2)
-        truncated_print(io, measure, error_digits, pm = "\\pm")
+        truncated_print(io, measure, pm = "\\pm")
     end
 end
 
 # Representation of complex measurements.  Print something that is easy to
 # understand and that can be meaningfully copy-pasted into the REPL, at least
 # for standard numeric types.
+# FIXME: does this handle complex symbolic Measurements correctly?
 for mime in (MIME"text/plain", MIME"text/x-tex", MIME"text/x-latex")
     function Base.show(io::IO, mtype::mime, measure::Complex{<:Measurement})
         r, i = reim(measure)