FemtoCleaner fixes for 0.7

Author: schmrlng

src/RobotOS.jl

@@ -1,4 +1,5 @@
-isdefined(Base, :__precompile__) && __precompile__()
+__precompile__()
+
 
 module RobotOS
 
@@ -16,7 +17,7 @@ function __init__()
 
     #Fill in empty PyObjects
     if ! (dirname(@__FILE__) in _py_sys["path"])
-        unshift!(_py_sys["path"], dirname(@__FILE__))
+        pushfirst!(_py_sys["path"], dirname(@__FILE__))
     end
     copy!(_py_ros_callbacks, pyimport("ros_callbacks"))
 
@@ -32,7 +33,7 @@ function __init__()
     end
 
     #Compile the callback notify function, see callbacks.jl
-    CB_NOTIFY_PTR[] = cfunction(_callback_notify, Cint, Tuple{Ptr{Void}})
+    CB_NOTIFY_PTR[] = cfunction(_callback_notify, Cint, Tuple{Ptr{Cvoid}})
 end
 
 include("debug.jl")

src/callbacks.jl

@@ -1,12 +1,12 @@
 #This function will run in a new python thread created by rospy.
 #No julia allocation allowed.
-function _callback_notify(handle::Ptr{Void})
-    ccall(:uv_async_send, Cint, (Ptr{Void},), handle)
+function _callback_notify(handle::Ptr{Cvoid})
+    ccall(:uv_async_send, Cint, (Ptr{Cvoid},), handle)
 end
 
 #The pointer to the compiled notify function. This can't be precompiled so it gets initialized in
 #the module __init__ function.
-const CB_NOTIFY_PTR = Ref{Ptr{Void}}()
+const CB_NOTIFY_PTR = Ref{Ptr{Cvoid}}()
 
 function _callback_async_loop(rosobj, cond)
     @debug("Spinning up callback loop...")

src/gentypes.jl

@@ -609,7 +609,7 @@ function _splittypestr(typestr::String)
 end
 #Valid ROS type string is all word chars split by a single forward slash, with
 #optional square brackets for array types
-_isrostype(s::String) = ismatch(r"^\w+/\w+(?:\[\d*\])?$", s)
+_isrostype(s::String) = occursin(r"^\w+/\w+(?:\[\d*\])?$", s)
 
 #Sanitize a string by checking for and removing brackets if they are present
 #Return the sanitized type and the number inside the brackets if it is a fixed

test/runtests.jl

@@ -1,4 +1,4 @@
-using Compat.Test
+using Test
 using PyCall
 using RobotOS
 RobotOS.debug(true)