new try catch in printfmt

Author: hhaensel

src/fmtspec.jl

@@ -172,34 +172,35 @@ function printfmt(io::IO, fs::FormatSpec, x)
     cls = fs.cls
     ty = fs.typ
     if cls == 'i'
+        local ix
         try
             ix = Integer(x)
-            ty == 'd' || ty == 'n' ? _pfmt_i(io, fs, ix, _Dec()) :
-            ty == 'x' ? _pfmt_i(io, fs, ix, _Hex()) :
-            ty == 'X' ? _pfmt_i(io, fs, ix, _HEX()) :
-            ty == 'o' ? _pfmt_i(io, fs, ix, _Oct()) :
-            _pfmt_i(io, fs, ix, _Bin())
         catch
-            ty == 'd' || ty == 'n' ? _pfmt_i(io, fs, x, _Dec()) :
-            ty == 'x' ? _pfmt_i(io, fs, x, _Hex()) :
-            ty == 'X' ? _pfmt_i(io, fs, x, _HEX()) :
-            ty == 'o' ? _pfmt_i(io, fs, x, _Oct()) :
-            _pfmt_i(io, fs, x, _Bin())
+            ix = x
         end
+        ty == 'd' || ty == 'n' ? _pfmt_i(io, fs, ix, _Dec()) :
+        ty == 'x' ? _pfmt_i(io, fs, ix, _Hex()) :
+        ty == 'X' ? _pfmt_i(io, fs, ix, _HEX()) :
+        ty == 'o' ? _pfmt_i(io, fs, ix, _Oct()) :
+        _pfmt_i(io, fs, ix, _Bin())
     elseif cls == 'f'
+        local fx, nospecialf
         try
             fx = float(x)
-            if isfinite(fx)
-                ty == 'f' || ty == 'F' ? _pfmt_f(io, fs, fx) :
-                ty == 'e' || ty == 'E' ? _pfmt_e(io, fs, fx) :
-                error("format for type g or G is not supported yet (use f or e instead).")
-            else
-                _pfmt_specialf(io, fs, fx)
-            end
         catch
-            ty == 'f' || ty == 'F' ? _pfmt_f(io, fs, x) :
-            ty == 'e' || ty == 'E' ? _pfmt_e(io, fs, x) :
+            fx = x
+        end
+        try
+            nospecialf = isfinite(fx)
+        catch
+            nospecialf = true
+        end
+        if nospecialf
+            ty == 'f' || ty == 'F' ? _pfmt_f(io, fs, fx) :
+            ty == 'e' || ty == 'E' ? _pfmt_e(io, fs, fx) :
             error("format for type g or G is not supported yet (use f or e instead).")
+        else
+            _pfmt_specialf(io, fs, fx)
         end
     elseif cls == 's'
         _pfmt_s(io, fs, _srepr(x))