update parametrized functions

Author: BenLauwens

src/resources/containers.jl

@@ -26,7 +26,7 @@ function Resource(env::Environment, capacity::Int=1; level::Int=0) :: Resource
   Resource(env, capacity, level)
 end
 
-function Put{N<:Number}(con::Container{N}, amount::N; priority::Int=0) :: Put
+function Put(con::Container{N}, amount::N; priority::Int=0) where N<:Number
   put_ev = Put(con.env)
   con.put_queue[put_ev] = ContainerKey(priority, con.seid+=one(UInt), amount)
   @callback trigger_get(put_ev, con)
@@ -63,7 +63,7 @@ function request(func::Function, res::Resource; priority::Int=0)
   end
 end
 
-function Get{N<:Number}(con::Container{N}, amount::N; priority::Int=0) :: Get
+function Get(con::Container{N}, amount::N; priority::Int=0) where N<:Number
   get_ev = Get(con.env)
   con.get_queue[get_ev] = ContainerKey(priority, con.seid+=one(UInt), amount)
   @callback trigger_put(get_ev, con)
@@ -75,14 +75,14 @@ const Release = Get
 
 Release(res::Resource; priority::Int=0) = Get(res, 1; priority=priority)
 
-function do_put{N<:Number}(con::Container{N}, put_ev::Put, key::ContainerKey{N}) :: Bool
+function do_put(con::Container{N}, put_ev::Put, key::ContainerKey{N}) where N<:Number
   con.level + key.amount > con.capacity && return false
   schedule(put_ev)
   con.level += key.amount
   true
 end
 
-function do_get{N<:Number}(con::Container{N}, get_ev::Get, key::ContainerKey{N}) :: Bool
+function do_get(con::Container{N}, get_ev::Get, key::ContainerKey{N}) where N<:Number
   con.level - key.amount < zero(N) && return false
   schedule(get_ev)
   con.level -= key.amount

src/resources/stores.jl

@@ -27,35 +27,35 @@ function Store(t::Type, env::Environment, capacity::UInt=typemax(UInt))
   Store{t}(env, capacity)
 end
 
-function Put{T}(sto::Store{T}, item::T; priority::Int=0) :: Put
+function Put(sto::Store{T}, item::T; priority::Int=0) where T
   put_ev = Put(sto.env)
   sto.put_queue[put_ev] = StorePutKey{T}(priority, sto.seid+=one(UInt), item)
   @callback trigger_get(put_ev, sto)
   trigger_put(put_ev, sto)
   return put_ev
 end
 
-function get_any_item{T}(::T) :: Bool
+function get_any_item(::T) where T
   return true
 end
 
-function Get{T}(sto::Store{T}, filter::Function=get_any_item; priority::Int=0) :: Get
+function Get(sto::Store{T}, filter::Function=get_any_item; priority::Int=0) where T
   get_ev = Get(sto.env)
   sto.get_queue[get_ev] = StoreGetKey(priority, sto.seid+=one(UInt), filter)
   @callback trigger_put(get_ev, sto)
   trigger_get(get_ev, sto)
   return get_ev
 end
 
-function do_put{T}(sto::Store{T}, put_ev::Put, key::StorePutKey{T}) :: Bool
+function do_put(sto::Store{T}, put_ev::Put, key::StorePutKey{T}) where {T}
   if length(sto.items) < sto.capacity
     push!(sto.items, key.item)
     schedule(put_ev)
   end
   return false
 end
 
-function do_get{T}(sto::Store{T}, get_ev::Get, key::StoreGetKey) :: Bool
+function do_get(sto::Store{T}, get_ev::Get, key::StoreGetKey) where {T}
   for item in sto.items
     if key.filter(item)
       delete!(sto.items, item)