Lab7: Added intermediate speciec macro.

Author: janfrancu

docs/src/lecture_07/Ecosystem.jl/src/Ecosystem.jl

@@ -6,7 +6,7 @@ using EcosystemCore
 include("./ecosystem_macros.jl")
 include("./ecosystem_agents.jl")
 
-export Grass, Sheep, Wolf, World, Mushroom
+export World
 export agent_step!, agent_count, world_step!, simulate!, every_nth
 
 function simulate!(world::World, iters::Int; cb=()->())

docs/src/lecture_07/Ecosystem.jl/src/ecosystem_agents.jl

@@ -9,6 +9,8 @@ abstract type Wolf <: AnimalSpecies end
 abstract type Mushroom <: PlantSpecies end
 abstract type Grass <: PlantSpecies end
 
+export Grass, Sheep, Wolf, Mushroom
+
 Base.show(io::IO, ::Type{Sheep}) = print(io,"🐑")
 Base.show(io::IO, ::Type{Wolf}) = print(io,"🐺")
 

docs/src/lecture_07/Ecosystem.jl/src/ecosystem_macros.jl

@@ -1,27 +1,30 @@
 ### species definition
-macro plant(name, icon)
-    return esc(_species(name, icon; animal=false))
-end
-
-macro animal(name, icon)
-    return esc(_species(name, icon; animal=true))
+macro species(typ, name, icon)
+    esc(_species(typ, name, icon))
 end
 
-function _species(name, icon; animal=false)
+function _species(typ, name, icon)
     quote
-        abstract type $name <: $(animal ? AnimalSpecies : PlantSpecies) end
+        abstract type $name <: $(typ == :Animal ? AnimalSpecies : PlantSpecies) end
         Base.show(io::IO, ::Type{$name}) = print(io, $(QuoteNode(icon)))
         export $name
     end
 end
 
+macro plant(name, icon)
+    return :(@species Plant $name $icon)
+end
 
-### eating
+macro animal(name, icon)
+    return :(@species Animal $name $icon)
+end
+
+### eating behavior
 macro eats(species::Symbol, foodlist::Expr)
     return esc(_eats(species, foodlist))
 end
 
-_parse_eats(ex) = Dict(arg.args[2] => arg.args[3] for arg in ex.args if arg.head == :call && arg.args[1] == :(=>))
+
 function _generate_eat(eater::Type{<:AnimalSpecies}, food::Type{<:PlantSpecies}, multiplier)
     quote
         EcosystemCore.eats(::Animal{$(eater)}, ::Plant{$(food)}) = true
@@ -44,6 +47,8 @@ function _generate_eat(eater::Type{<:AnimalSpecies}, food::Type{<:AnimalSpecies}
     end
 end
 
+_parse_eats(ex) = Dict(arg.args[2] => arg.args[3] for arg in ex.args if arg.head == :call && arg.args[1] == :(=>))
+
 function _eats(species, foodlist)
     cfg = _parse_eats(foodlist)
     code = Expr(:block)