Merge pull request #37 from schmrlng/pull-request/2f1a3e64

Drop support for Julia 0.4

Author: jdlangs

.travis.yml

@@ -1,6 +1,5 @@
 language: julia
 julia:
-  - 0.4
   - 0.5
   - 0.6
   - nightly

REQUIRE

@@ -1,3 +1,3 @@
-julia 0.4
+julia 0.5
 PyCall 1.11.0
 Compat 0.17.0

src/gentypes.jl

@@ -101,6 +101,8 @@ macro rosimport(input)
     end
 end
 
+_get_quote_value(input::QuoteNode) = input.value
+_get_quote_value(input::Expr) = (@assert input.head == :quote; input.args[1])
 #Return the pkg and types strings for a single expression of form:
 #  pkg.[msg|srv].type or pkg.[msg|srv]:type
 function _pkgtype_import(input::Expr)
@@ -109,7 +111,7 @@ function _pkgtype_import(input::Expr)
     @assert input.args[1].head == :(.) "Improper @rosimport input"
     p = input.args[1].args[1]
     @assert isa(p, Symbol) "Package name ($(string(p))) not a symbol"
-    m_or_s = input.args[1].args[2].args[1]
+    m_or_s = _get_quote_value(input.args[1].args[2])
     @assert m_or_s in (:msg,:srv) "Improper @rosimport input"
     ps = string(p)
     msb = m_or_s == :msg
@@ -121,6 +123,10 @@ function _pkgtype_import(input::Expr)
         tsym = input.args[2].args[1]
         @assert isa(tsym, Symbol) "Type name ($(string(tsym))) not a symbol"
         ts = string(tsym)
+    elseif isa(input.args[2], QuoteNode)
+        tsym = input.args[2].value
+        @assert isa(tsym, Symbol) "Type name ($(string(tsym))) not a symbol"
+        ts = string(tsym)
     end
     return ps,msb,ts
 end
@@ -340,7 +346,7 @@ end
 function _importexprs(mod::ROSMsgModule)
     imports = Expr[Expr(:import, :RobotOS, :AbstractMsg)]
     othermods = filter(d -> d != _name(mod), mod.deps)
-    append!(imports, [Expr(:using,Symbol(m),:msg) for m in othermods])
+    append!(imports, [Expr(:using,:Main,Symbol(m),:msg) for m in othermods])
     imports
 end
 function _importexprs(mod::ROSSrvModule)
@@ -350,7 +356,7 @@ function _importexprs(mod::ROSSrvModule)
         Expr(:import, :RobotOS, :_srv_reqtype),
         Expr(:import, :RobotOS, :_srv_resptype),
     ]
-    append!(imports, [Expr(:using,Symbol(m),:msg) for m in mod.deps])
+    append!(imports, [Expr(:using,:Main,Symbol(m),:msg) for m in mod.deps])
     imports
 end
 

src/pubsub.jl

@@ -53,7 +53,7 @@ type Subscriber{MsgType<:AbstractMsg}
         @debug("Creating <$(string(MT))> subscriber on topic: '$topic'")
         rospycls = _get_rospy_class(MT)
 
-        cond = Compat.AsyncCondition()
+        cond = Base.AsyncCondition()
         mqueue = _py_ros_callbacks["MessageQueue"](CB_NOTIFY_PTR, cond.handle)
         subobj = __rospy__[:Subscriber](ascii(topic), rospycls, mqueue["storemsg"]; kwargs...)
 

src/services.jl

@@ -58,7 +58,7 @@ type Service{SrvType <: AbstractService}
         @debug("Providing <$ST> service at '$name'")
         rospycls = _get_rospy_class(ST)
 
-        cond = Compat.AsyncCondition()
+        cond = Base.AsyncCondition()
         pysrv = _py_ros_callbacks["ServiceCallback"](CB_NOTIFY_PTR, cond.handle)
 
         srvobj = try

test/pubsub.jl

@@ -2,7 +2,7 @@
 #works alongside echonode.py
 #typegeneration.jl must be run first
 
-using geometry_msgs.msg
+using .geometry_msgs.msg
 
 const Nmsgs = 10
 const rate = 20. #Hz

test/runtests.jl

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

test/services.jl

@@ -1,7 +1,7 @@
 #pubsub.jl must be run first
 
-using std_srvs.srv
-using nav_msgs.srv
+using .std_srvs.srv
+using .nav_msgs.srv
 
 #Set up services
 const srvcall = ServiceProxy("callme", SetBool)