Update requirements, improve tests

Author: ScottPJones

Project.toml

@@ -1,7 +1,7 @@
 authors = [
+    "ScottPJones <scottjones@alum.mit.edu>",
     "Dahua Lin <lindahua@gmail.com>",
     "John M Kuhn <jmkuhn@starpower.net>",
-    "ScottPJones <scottjones@alum.mit.edu>",
     "Thomas Breloff <tom@breloff.com>",
     "Alex Arslan <ararslan@comcast.net>",
     "Chuan-Zheng Lee <czlee@stanford.edu>",
@@ -23,17 +23,17 @@ keywords = ["Strings", "Formatting"]
 license = "MIT"
 name = "Format"
 uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
-version = "1.2.2"
+version = "1.2.0"
 
 [deps]
-Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Random  = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [targets]
-test = ["Test", "Random"]
+test = ["Test", "Random", "Printf"]
 
 [compat]
-julia = "^1.0.0"
+julia = "1.6"

src/Format.jl

@@ -189,8 +189,6 @@ module Format
 
 import Base.show
 
-using Printf
-
 _stdout() = stdout
 _codeunits(s) = Vector{UInt8}(codeunits(s))
 m_eval(expr) = Core.eval(@__MODULE__, expr)

test/cformat.jl

@@ -38,68 +38,7 @@ end
 
 @time test_equality()
 
-println( "\nTest speed" )
-
-function native_int()
-    for i in 1:200000
-        @sprintf( "%10d", i )
-    end
-end
-function runtime_int()
-    for i in 1:200000
-        cfmt( "%10d", i )
-    end
-end
-function runtime_int_bypass()
-    f = generate_formatter( "%10d" )
-    for i in 1:200000
-        f( i )
-    end
-end
-
-println( "integer @sprintf speed")
-@time native_int()
-println( "integer sprintf speed")
-@time runtime_int()
-println( "integer sprintf speed, bypass repeated lookup")
-@time runtime_int_bypass()
-
-function native_float()
-    set_seed!( 10 )
-    for i in 1:200000
-        @sprintf( "%10.4f", _erfinv( rand() ) )
-    end
-end
-function runtime_float()
-    set_seed!( 10 )
-    for i in 1:200000
-        cfmt( "%10.4f", _erfinv( rand() ) )
-    end
-end
-function runtime_float_spec()
-    set_seed!( 10 )
-    fs = Format.FmtSpec("%10.4f")
-    for i in 1:200000
-        cfmt( fs, _erfinv( rand() ) )
-    end
-end
-function runtime_float_bypass()
-    f = generate_formatter( "%10.4f" )
-    set_seed!( 10 )
-    for i in 1:200000
-        f( _erfinv( rand() ) )
-    end
-end
-
-println()
-println( "float64 @sprintf speed")
-@time native_float()
-println( "float64 cfmt speed")
-@time runtime_float()
-println( "float64 cfmt spec speed")
-@time runtime_float_spec()
-println( "float64 cfmt speed, bypass repeated lookup")
-@time runtime_float_bypass()
+include("speedtest.jl")
 
 @testset "test commas..." begin
     @test cfmt( "%'d", 1000 ) == "1,000"

test/speedtest.jl

@@ -0,0 +1,87 @@
+println( "\nTest speed" )
+
+const BENCH_REP = 200_000
+
+function native_int()
+    for i in 1:BENCH_REP
+        @sprintf( "%10d", i )
+    end
+end
+function format_int()
+    fmt = Printf.Format( "%10d" )
+    for i in 1:BENCH_REP
+        Printf.format( fmt, i )
+    end
+end
+function runtime_int()
+    for i in 1:BENCH_REP
+        cfmt( "%10d", i )
+    end
+end
+function runtime_int_spec()
+    fs = Format.FmtSpec("%10d")
+    for i in 1:BENCH_REP
+        cfmt( fs, i )
+    end
+end
+function runtime_int_bypass()
+    f = generate_formatter( "%10d" )
+    for i in 1:BENCH_REP
+        f( i )
+    end
+end
+
+println( "integer @sprintf speed")
+@time native_int()
+println( "integer format speed")
+@time format_int()
+println( "integer cfmt speed")
+@time runtime_int()
+println( "integer cfmt spec speed")
+@time runtime_int_spec()
+println( "integer cfmt speed, bypass repeated lookup")
+@time runtime_int_bypass()
+
+set_seed!(10)
+const testflts = [ _erfinv( rand() ) for i in 1:200_000 ]
+
+function native_float()
+    for v in testflts
+        @sprintf( "%10.4f", v)
+    end
+end
+function format_float()
+    fmt = Printf.Format( "%10.4f" )
+    for v in testflts
+        Printf.format( fmt, v )
+    end
+end
+function runtime_float()
+    for v in testflts
+        cfmt( "%10.4f", v)
+    end
+end
+function runtime_float_spec()
+    fs = Format.FmtSpec("%10.4f")
+    for v in testflts
+        cfmt( fs, v )
+    end
+end
+function runtime_float_bypass()
+    f = generate_formatter( "%10.4f" )
+    for v in testflts
+        f( v )
+    end
+end
+
+println()
+println( "float64 @sprintf speed")
+@time native_float()
+println( "float64 format speed")
+@time format_float()
+println( "float64 cfmt speed")
+@time runtime_float()
+println( "float64 cfmt spec speed")
+@time runtime_float_spec()
+println( "float64 cfmt speed, bypass repeated lookup")
+@time runtime_float_bypass()