Resolve deprecation: abstract type ... end

Author: BenLauwens

REQUIRE

@@ -1,2 +1,3 @@
 julia 0.5
 DataStructures
+Compat

src/base.jl

@@ -1,4 +1,6 @@
-abstract Environment
+using Compat
+
+@compat abstract type Environment end
 
 """
 The parent type for all events.
@@ -15,7 +17,7 @@ Once the events is scheduled, it has a value.
 
 An event has also a list of callbacks. A callback can be any function as long as it accepts an instance of a subtype of `AbstractEvent` as its first argument. Once an event gets triggered, all callbacks will be invoked. Callbacks can do further processing with the value it has produced.
 """
-abstract AbstractEvent{E<:Environment}
+@compat abstract type AbstractEvent{E<:Environment} end
 
 @enum EVENT_STATE idle=0 scheduled=1 triggered=2
 
@@ -43,6 +45,18 @@ function BaseEvent{E<:Environment}(env::E) :: BaseEvent
   BaseEvent{E}(env)
 end
 
+  # type BaseEvent{E<:Environment}
+  #   env :: E
+  #   id :: UInt
+  #   cid :: UInt
+  #   callbacks :: DataStructures.PriorityQueue{Function, UInt}
+  #   state :: EVENT_STATE
+  #   value :: Any
+  #   function BaseEvent{E}(env::E) where E<:Environment
+  #     new(env, env.eid+=one(UInt), zero(UInt), DataStructures.PriorityQueue(Function, UInt), idle, nothing)
+  #   end
+  # end
+
 function show(io::IO, ev::AbstractEvent)
   print(io, "$(typeof(ev)) $(ev.bev.id)")
 end

src/resources/base.jl

@@ -1,8 +1,10 @@
-abstract ResourceKey
+using Compat
 
-abstract AbstractResource{E<:Environment}
+@compat abstract type ResourceKey end
 
-abstract ResourceEvent{E<:Environment} <: AbstractEvent{E}
+@compat abstract type AbstractResource{E<:Environment} end
+
+@compat abstract type ResourceEvent{E<:Environment} <: AbstractEvent{E} end
 
 type Put{E<:Environment} <: ResourceEvent{E}
   bev :: BaseEvent{E}

src/resources/containers.jl

@@ -1,3 +1,5 @@
+using Compat
+
 type ContainerKey{N<:Number} <: ResourceKey
   priority :: Int
   id :: UInt
@@ -20,7 +22,7 @@ function Container{N<:Number, E<:Environment}(env::E, capacity::N; level::N=zero
   Container{N, E}(env, capacity, level)
 end
 
-typealias Resource{E<:Environment} Container{Int, E}
+@compat const Resource{E<:Environment} = Container{Int, E}
 
 function Resource{E<:Environment}(env::E, capacity::Int=1; level::Int=0) :: Resource{E}
   Resource{E}(env, capacity, level)
@@ -34,7 +36,7 @@ function Put{N<:Number, E<:Environment}(con::Container{N, E}, amount::N; priorit
   return put_ev
 end
 
-typealias Request Put
+const Request = Put
 
 Request{E<:Environment}(res::Resource{E}; priority::Int=0) = Put(res, 1, priority=priority)
 
@@ -59,7 +61,7 @@ function Get{N<:Number, E<:Environment}(con::Container{N, E}, amount::N; priorit
   return get_ev
 end
 
-typealias Release Get
+const Release = Get
 
 Release{E<:Environment}(res::Resource{E}; priority::Int=0) = Get(res, 1, priority=priority)