Merge pull request #8 from quinnj/jq/0.7

staticfloat · web-flow · commit 2ad43af3f8cc · 2018-03-10T09:42:54.000-08:00
0.7 compat
diff --git a/REQUIRE b/REQUIRE
@@ -1,3 +1,4 @@
 julia 0.6
 StructIO 0.2
 Reexport
+Compat
diff --git a/src/Abstract/DynamicLink.jl b/src/Abstract/DynamicLink.jl
@@ -34,7 +34,6 @@ given below, with methods that subclasses must implement marked in emphasis:
 ### Misc.
   - *handle()*
 """
-
 abstract type DynamicLinks{H <: ObjectHandle} end
 
 @mustimplement endof(dls::DynamicLinks)
@@ -130,9 +129,9 @@ function canonical_rpaths(rpath::RPath)
         # `@loader_path`.  Do the same for `@executable_path` even though
         # that's technically incorrect, because we don't have a good way to
         # track the web of dependencies right now.
-        paths[idx] = replace(paths[idx], "\$ORIGIN", origin)
-        paths[idx] = replace(paths[idx], "@loader_path", origin)
-        paths[idx] = replace(paths[idx], "@executable_path", origin)
+        paths[idx] = replace(paths[idx], "\$ORIGIN" => origin)
+        paths[idx] = replace(paths[idx], "@loader_path" => origin)
+        paths[idx] = replace(paths[idx], "@executable_path" => origin)
         paths[idx] = abspath(paths[idx])
     end
     return paths
diff --git a/src/Abstract/ObjectHandle.jl b/src/Abstract/ObjectHandle.jl
@@ -105,7 +105,7 @@ const ObjTypes = Type[]
 Read an Object File out from an `IOStream`.  This is the first method you
 should call in order to manipulate object files.
 """
-function readmeta{T<:ObjectHandle}(io::IO, ::Type{T})
+function readmeta(io::IO, ::Type{T}) where {T<:ObjectHandle}
     # Implementing packages such as MachO.jl must explicitly override this
     error("$T must implement readmeta")
 end
@@ -135,7 +135,7 @@ function readmeta(io::IO)
     Object file is not any of $(join(ObjTypes, ", "))!
     To force one object file format use readmeta(io, T).
     """)
-    error(replace(msg, "\n", " "))
+    error(replace(msg, "\n" => " "))
 end
 
 """
diff --git a/src/Abstract/Symbol.jl b/src/Abstract/Symbol.jl
@@ -177,7 +177,6 @@ passthroughs to the underlying `SymtabEntry` API calls for ease of use.
   - symbol_value()
   - isundef()
 """
-
 abstract type SymbolRef{H<:ObjectHandle} end
 
 """
diff --git a/src/COFF/COFFHandle.jl b/src/COFF/COFFHandle.jl
@@ -52,7 +52,7 @@ function readmeta(io::IO, ::Type{H}) where {H <: COFFHandle}
         Magic Number 0x$(join(hex.(magic),"")) does not match expected PE
         magic number 0x$(join("", hex.(PE_magic)))
         """
-        throw(MagicMismatch(replace(strip(msg), "\n", " ")))
+        throw(MagicMismatch(replace(strip(msg), "\n" => " ")))
     end
 
     # Read the PE header and place the header offset just past the PE_magic
diff --git a/src/COFF/COFFSymbol.jl b/src/COFF/COFFSymbol.jl
@@ -1,8 +1,5 @@
 export COFFSymbols, COFFSymtabEntry, COFFSymbolRef
 
-# We need to import stuff from Base in order to do our tricksy Symbols stuffage
-import Base: iteratorsize, SizeUnknown
-
 """
     COFFSymbols
 
diff --git a/src/ELF/ELF.jl b/src/ELF/ELF.jl
@@ -5,6 +5,7 @@ using StructIO
 # Bring in ObjectFile definitions
 using ObjectFile
 importall ObjectFile
+using Compat
 
 # Load in imported C #define constants
 include("constants.jl")
diff --git a/src/ELF/ELFDebug.jl b/src/ELF/ELFDebug.jl
@@ -66,18 +66,18 @@ end
 struct dl_phdr_info
     dlpi_addr::UInt64
     dlpi_name::Ptr{UInt8}
-    dlpi_phdr::Ptr{Void}
+    dlpi_phdr::Ptr{Cvoid}
     dlpi_phnum::UInt16
 end
 
-function callback(info::Ptr{dl_phdr_info},size::Csize_t, data::Ptr{Void})
+function callback(info::Ptr{dl_phdr_info},size::Csize_t, data::Ptr{Cvoid})
     push!(unsafe_pointer_to_objref(data),unsafe_load(info))
     convert(Cint,0)
 end
 
 function loaded_libraries()
     x = Array(dl_phdr_info,0)
-    ccall(:dl_iterate_phdr, Cint, (Ptr{Void}, Any), cfunction(callback, Cint, (Ptr{dl_phdr_info},Csize_t,Ptr{Void})), x)
+    ccall(:dl_iterate_phdr, Cint, (Ptr{Cvoid}, Any), cfunction(callback, Cint, (Ptr{dl_phdr_info},Csize_t,Ptr{Cvoid})), x)
     x
 end
 
diff --git a/src/ELF/ELFDynEntry.jl b/src/ELF/ELFDynEntry.jl
@@ -87,7 +87,7 @@ strtab_lookup(d::ELFDynEntryRef) = strtab_lookup(StrTab(d), deref(d).d_val)
 
 
 function show(io::IO, d::DT) where {DT <: ELFDynEntry}
-    print(io, "ELFDynEntry", DT <: ELFDynEntry64 ? " (64 bit)": "")
+    print(io, "ELFDynEntry", DT <: ELFDynEntry64 ? " (64 bit)" : "")
     print(io, " $(dyn_entry_type_string(d))")
 end
 
diff --git a/src/ELF/ELFHandle.jl b/src/ELF/ELFHandle.jl
@@ -41,7 +41,7 @@ function readmeta(io::IO, ::Type{H}) where {H <: ELFHandle}
         Magic Number 0x$(join(hex.(magic),"")) does not match expected ELF
         magic number 0x$(join("", hex.(elven_magic)))
         """
-        throw(MagicMismatch(replace(strip(msg), "\n", " ")))
+        throw(MagicMismatch(replace(strip(msg), "\n" => " ")))
     end
 
     # Read the ELF Internal data, then skip its padding
diff --git a/src/ELF/ELFSegment.jl b/src/ELF/ELFSegment.jl
@@ -1,4 +1,4 @@
-export Segments, ELFSegments, ELFSegment, ELFSegment32, ELFSegment64
+export ELFSegments, ELFSegment, ELFSegment32, ELFSegment64
 
 """
     ELFSegments
diff --git a/src/ELF/ELFStrTab.jl b/src/ELF/ELFStrTab.jl
@@ -19,7 +19,7 @@ struct ELFStrTab{H <: ELFHandle} <: StrTab{H}
             Loading Section $(section_idx) as a StrTab, despite it having section
             type $(section_type_string(section)), not SHT_STRTAB.
             """)
-            warn(replace(msg, "\n", " "), key=(handle(section), section_idx))
+            Compat.@warn(replace(msg, "\n" => " "), key=(handle(section), section_idx))
         end
         
         return new(section)
diff --git a/src/MachO/MachOLoadCmd.jl b/src/MachO/MachOLoadCmd.jl
@@ -1,6 +1,5 @@
 # Export Mach-O specific stuff that is useful
 export MachOLoadCmd, MachOLoadCmdHeader, MachOLoadCmds, MachOLoadCmdRef
-export Segments
 
 
 """
diff --git a/src/MachO/MachOSegment.jl b/src/MachO/MachOSegment.jl
@@ -83,7 +83,7 @@ deref(seg::MachOSegmentRef) = seg.segment
 
 # Printing
 function show(io::IO, seg::Union{MachOSegment,MachOSegmentRef})
-    print(io, "MachO Segment", is64bit(seg) ? " (64 bit)": "")
+    print(io, "MachO Segment", is64bit(seg) ? " (64 bit)" : "")
 
     if !get(io, :compact, false)
         fsz = hex(segment_file_size(seg))
diff --git a/src/ObjectFile.jl b/src/ObjectFile.jl
@@ -1,5 +1,6 @@
 __precompile__()
 module ObjectFile
+using Compat
 using Reexport
 
 # Include base utilities
diff --git a/src/string_utils.jl b/src/string_utils.jl
@@ -21,8 +21,8 @@ Convert a `fixed_string` object to a native-Julia `String`
 """
 function unsafe_string(x::fixed_string{T}) where {T <: Integer}
     data_array = reinterpret(UInt8, [x.data])
-    zero_idx = findfirst(data_array, 0)
-    if zero_idx == 0
+    zero_idx = findfirst(equalto(0x00), data_array)
+    if zero_idx === nothing
         zero_idx = sizeof(T) + 1
     end
 
diff --git a/src/utils.jl b/src/utils.jl
@@ -99,7 +99,7 @@ macro constants(array, stripprefix, expr)
 
         # Strip out the prefix so our names are more interesting
         name = string(eq.args[1])
-        name = replace(name, stripprefix, "", 1)
+        name = replace(name, stripprefix => "", count=1)
 
         # Define the value, then slip its stripped prefix name into the name
         # lookup array right afterwards.
@@ -134,7 +134,7 @@ function read_struct(oh, type_func, size_func, name)
         Reported $(name) size ($(max_size) is smaller
         than calculated $(name) size ($(calc_size))
         """)
-        error(replace(msg, "\n", " "))
+        error(replace(msg, "\n" => " "))
     end
 
     # If it's less than or equal to, read it in, then skip past extra data we
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,5 @@
 using ObjectFile
-using Base.Test
+using Compat, Compat.Test
 
 function test_libfoo_and_fooifier(fooifier_path, libfoo_path)
     # Actually read it in
@@ -102,12 +102,12 @@ function test_libfoo_and_fooifier(fooifier_path, libfoo_path)
 
         @testset "Printing" begin
             # Print out to an IOContext that will limit long lists
-            io = IOContext(STDOUT, :limit => true)
+            io = IOContext(stdout, :limit => true)
 
             # Helper that shows the type, then the value:
             function tshow(x)
                 type_name = typeof(x).name.name
-                info(io, "Showing $(type_name)")
+                println(io, "INFO: Showing $(type_name)")
                 show(io, x)
                 print(io, "\n")
             end
