Merge pull request #31 from brenhinkeller/readtest

Readtest

.github/workflows/CI-integration.yml

@@ -23,7 +23,6 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.8.0-beta3'
           - '1.8'
         os:
           - macos-latest

.github/workflows/CI.yml

@@ -23,7 +23,6 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.8.0-beta3'
           - '1.8'
         os:
           - ubuntu-latest

Project.toml

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

test/scripts/readwrite.jl

@@ -0,0 +1,46 @@
+using StaticCompiler
+using StaticTools
+
+function readwrite(argc::Int, argv::Ptr{Ptr{UInt8}})
+    argc == 3 || return printf(stderrp(), c"Incorrect number of command-line arguments\n")
+    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
+        for j=1:cols
+           M[i,j] = i*j
+        end
+    end
+    # Print to file
+    fwrite(c"table.b", M)
+    printdlm(c"table.tsv", M)
+
+
+    Mb = read(c"table.b", MallocArray{Int64})
+    Mbv = ArrayView{Int64,2}(pointer(Mb), rows*cols, (rows, cols))
+    printdlm(c"tableb.tsv", Mbv)
+    printf(Mbv)
+
+    Ms = read(c"table.b", MallocString)
+    Msv = ArrayView{Int64,2}(pointer(Ms), rows*cols, (rows, cols))
+    printdlm(c"tables.tsv", Msv)
+    printf(Msv)
+
+    Mts = read(c"table.tsv", MallocString)
+    fwrite(c"tablets.tsv", Mts)
+    printf(Mts)
+
+    # Mt = parsedlm(Int64, c"table.tsv")
+
+    # match = M == Mb == Mbv == Msv
+
+    # Clean up
+    free(M), free(Mb), free(Ms), free(Mts)
+
+    # return !match % Int32
+    return Int32(0)
+end
+
+# Attempt to compile
+path = compile_executable(readwrite, (Int64, Ptr{Ptr{UInt8}}), "./")

test/teststaticcompiler.jl

@@ -38,6 +38,43 @@ let
     @test fread!(szeros(Int, 5,5), c"table.b") == (1:5)*(1:5)'
 end
 
+## --- Reading from written files
+
+let
+    # Compile...
+    status = -1
+    try
+        isfile("readwrite") && rm("readwrite")
+        status = run(`$jlpath --compile=min $testpath/scripts/readwrite.jl`)
+    catch e
+        @warn "Could not compile $testpath/scripts/readwrite.jl"
+        println(e)
+    end
+    @test isa(status, Base.Process)
+    @test isa(status, Base.Process) && status.exitcode == 0
+
+    # Run...
+    println("5x5 times table, read from file:")
+    status = -1
+    try
+        status = run(`./readwrite 5 5`)
+    catch e
+        @warn "Could not run $(scratch)/readwrite"
+        println(e)
+    end
+    @test isa(status, Base.Process)
+    @test isa(status, Base.Process) && status.exitcode == 0
+    # Test binary output
+    @test fread!(szeros(Int, 5,5), c"table.b") == (1:5)*(1:5)'
+    # Test ascii output
+    @test parsedlm(Int, c"table.tsv", '\t') == (1:5)*(1:5)'
+    @test parsedlm(Int, c"tableb.tsv", '\t') == (1:5)*(1:5)'
+    @test parsedlm(Int, c"tables.tsv", '\t') == (1:5)*(1:5)'
+    @test parsedlm(Int, c"tablets.tsv", '\t') == (1:5)*(1:5)'
+
+end
+
+
 ## --- "withmallocarray"-type do-block pattern
 let
     # Compile...