Separate method for parsing args to avoid type piracy

Author: brenhinkeller

Project.toml

@@ -1,7 +1,7 @@
 name = "StaticTools"
 uuid = "86c06d3c-3f03-46de-9781-57580aa96d0a"
 authors = ["C. Brenhin Keller and contributors"]
-version = "0.7.5"
+version = "0.8.0"
 
 [deps]
 ManualMemory = "d125e4d3-2237-4719-b19c-fa641b8a4667"

README.md

@@ -106,8 +106,8 @@ The `MallocArray` type is one way to do that.
 using StaticTools
 function times_table(argc::Int, argv::Ptr{Ptr{UInt8}})
     argc == 3 || return printf(c"Incorrect number of command-line arguments\n")
-    rows = parse(Int64, argv, 2)            # First command-line argument
-    cols = parse(Int64, argv, 3)            # Second command-line argument
+    rows = argparse(Int64, argv, 2)            # First command-line argument
+    cols = argparse(Int64, argv, 3)            # Second command-line argument
 
     M = MallocArray{Int64}(undef, rows, cols)
     @inbounds for i=1:rows
@@ -146,8 +146,8 @@ These `MallocArray`s can be `reshape`d and `reinterpret`ed  without causing any
 ```julia
 julia> function times_table(argc::Int, argv::Ptr{Ptr{UInt8}})
            argc == 3 || return printf(c"Incorrect number of command-line arguments\n")
-           rows = parse(Int64, argv, 2)            # First command-line argument
-           cols = parse(Int64, argv, 3)            # Second command-line argument
+           rows = argparse(Int64, argv, 2)            # First command-line argument
+           cols = argparse(Int64, argv, 3)            # Second command-line argument
 
            M = MallocArray{Int64}(undef, rows, cols)
            @inbounds for i=1:rows
@@ -211,8 +211,8 @@ shell> ./stack_times_table
 ```julia
 julia> function rand_matrix(argc::Int, argv::Ptr{Ptr{UInt8}})
           argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
-          rows = parse(Int64, argv, 2)            # First command-line argument
-          cols = parse(Int64, argv, 3)            # Second command-line argument
+          rows = argparse(Int64, argv, 2)            # First command-line argument
+          cols = argparse(Int64, argv, 3)            # Second command-line argument
 
           rng = static_rng()
 
@@ -263,8 +263,8 @@ end
 
 function loopvec_matrix(argc::Int, argv::Ptr{Ptr{UInt8}})
     argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
-    rows = parse(Int64, argv, 2)            # First command-line argument
-    cols = parse(Int64, argv, 3)            # Second command-line argument
+    rows = argparse(Int64, argv, 2)            # First command-line argument
+    cols = argparse(Int64, argv, 3)            # Second command-line argument
 
     # LHS
     A = MallocArray{Float64}(undef, rows, cols)

src/StaticTools.jl

@@ -56,6 +56,6 @@ module StaticTools
     export newline, putchar, getchar, getc, puts, gets!, readline!              # Char & String IO
     export fwrite, fread!                                                       # String and Binary IO
     export unsafe_mallocstring, strlen                                          # String management
-    export printf, printdlm, parsedlm                                           # File parsing and formatting
+    export printf, printdlm, parsedlm, argparse                                # File parsing and formatting
     export static_rng, splitmix64, xoshiro256✴︎✴︎, rand!, randn!                  # RNG functions
 end

src/llvmlibc.jl

@@ -586,8 +586,8 @@ end
 end
 @inline Base.parse(::Type{T}, s::Union{StaticString, MallocString, Ptr{UInt8}}) where {T <: Unsigned} = T(parse(UInt64, s))
 
-# Convenient parsing for argv (slight type piracy)
-@inline Base.parse(::Type{T}, argv::Ptr{Ptr{UInt8}}, n::Integer) where {T} = parse(T, MallocString(argv, n))
+# Convenient parsing for argv
+@inline argparse(::Type{T}, argv::Ptr{Ptr{UInt8}}, n::Integer) where {T} = parse(T, MallocString(argv, n))
 
 ## --- dlopen
 

test/scripts/loopvec_matrix.jl

@@ -15,8 +15,8 @@ end
 
 function loopvec_matrix(argc::Int, argv::Ptr{Ptr{UInt8}})
     argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
-    rows = parse(Int64, argv, 2)            # First command-line argument
-    cols = parse(Int64, argv, 3)            # Second command-line argument
+    rows = argparse(Int64, argv, 2)            # First command-line argument
+    cols = argparse(Int64, argv, 3)            # Second command-line argument
 
     # LHS
     A = MallocArray{Float64}(undef, rows, cols)

test/scripts/loopvec_product.jl

@@ -4,8 +4,8 @@ using LoopVectorization
 
 function loopvec_product(argc::Int, argv::Ptr{Ptr{UInt8}})
     argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
-    rows = parse(Int64, argv, 2)            # First command-line argument
-    cols = parse(Int64, argv, 3)            # Second command-line argument
+    rows = argparse(Int64, argv, 2)            # First command-line argument
+    cols = argparse(Int64, argv, 3)            # Second command-line argument
 
     s = 0
     @turbo for i=1:rows

test/scripts/rand_matrix.jl

@@ -3,8 +3,8 @@ using StaticTools
 
 function rand_matrix(argc::Int, argv::Ptr{Ptr{UInt8}})
     argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
-    rows = parse(Int64, argv, 2)            # First command-line argument
-    cols = parse(Int64, argv, 3)            # Second command-line argument
+    rows = argparse(Int64, argv, 2)            # First command-line argument
+    cols = argparse(Int64, argv, 3)            # Second command-line argument
 
     # Manually fil matrix
     M = MallocArray{Float64}(undef, rows, cols)

test/scripts/randn_matrix.jl

@@ -3,8 +3,8 @@ using StaticTools
 
 function randn_matrix(argc::Int, argv::Ptr{Ptr{UInt8}})
     argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
-    rows = parse(Int64, argv, 2)            # First command-line argument
-    cols = parse(Int64, argv, 3)            # Second command-line argument
+    rows = argparse(Int64, argv, 2)            # First command-line argument
+    cols = argparse(Int64, argv, 3)            # Second command-line argument
 
     M = MallocArray{Float64}(undef, rows, cols)
     rng = MarsagliaPolar(static_rng())

test/scripts/times_table.jl

@@ -3,8 +3,8 @@ using StaticTools
 
 function times_table(argc::Int, argv::Ptr{Ptr{UInt8}})
     argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
-    rows = parse(Int64, argv, 2)            # First command-line argument
-    cols = parse(Int64, argv, 3)            # Second command-line argument
+    rows = argparse(Int64, argv, 2)            # First command-line argument
+    cols = argparse(Int64, argv, 3)            # Second command-line argument
 
     M = MallocArray{Int64}(undef, rows, cols)
     @inbounds for i=1:rows

test/scripts/withmallocarray.jl

@@ -3,8 +3,8 @@ using StaticTools
 
 function withmallocarray(argc::Int, argv::Ptr{Ptr{UInt8}})
     argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
-    rows = parse(Int64, argv, 2)            # First command-line argument
-    cols = parse(Int64, argv, 3)            # Second command-line argument
+    rows = argparse(Int64, argv, 2)            # First command-line argument
+    cols = argparse(Int64, argv, 3)            # Second command-line argument
 
     mzeros(rows, cols) do A
         printf(A)