Tweak anonrex (#31)

timholy · Nov 19, 2019 · adef272 · adef272 · timholy · Nov 19, 2019
1 parent f30ab38
commit adef272
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ os:
 julia:
   - 0.7
   - 1.0
+  - 1.2
   - nightly
 notifications:
   email: false

diff --git a/Project.toml b/Project.toml
@@ -15,7 +15,8 @@ ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 JLD = "4138dd39-2aa7-5051-a626-17a0bb65d9c8"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Pkg", "ColorTypes", "Test", "FixedPointNumbers", "JLD"]
+test = ["Pkg", "ColorTypes", "Test", "FixedPointNumbers", "JLD", "SparseArrays"]
diff --git a/src/SnoopCompile.jl b/src/SnoopCompile.jl
@@ -171,7 +171,7 @@ function extract_topmod(e)
     return :unknown
 end
 
-const anonrex = r"##\d*#{1,2}\d*"   # detect anonymous functions
+const anonrex = r"#{1,2}\d+#{1,2}\d+"   # detect anonymous functions
 
 function parse_call(line; subst=Vector{Pair{String, String}}(), blacklist=String[])
     match(anonrex, line) === nothing || return false, line, :unknown, ""

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -27,7 +27,7 @@ pc = SnoopCompile.parcel(reverse!(data[2]))
 
 # issue #29
 keep, pcstring, topmod, name = SnoopCompile.parse_call("Tuple{getfield(JLD, Symbol(\"##s27#8\")), Any, Any, Any, Any, Any}")
-@test keep == true
+@test keep
 @test pcstring == "Tuple{getfield(JLD, Symbol(\"##s27#8\")), Int, Int, Int, Int, Int}"
 @test topmod == :JLD
 @test name == "##s27#8"