Merge pull request #343 from JuliaReach/schillic/extensions

#335 - Use package extensions

Author: schillic

Project.toml

@@ -15,10 +15,21 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 [compat]
 Espresso = "0.6"
 InteractiveUtils = "<0.0.1, 1.4"
+LazySets = "5"
 LinearAlgebra = "<0.0.1, 1.4"
 MacroTools = "0.5"
 MultivariatePolynomials = "0.3, 0.4, 0.5"
 RecipesBase = "0.6, 0.7, 0.8, 1.0, 1.1, 1.2"
 Requires = "1.3.1"
 SparseArrays = "<0.0.1, 1.4"
 julia = "1.6"
+
+[extensions]
+LazySetsExt = "LazySets"
+
+[extras]
+LazySets = "b4f0291d-fe17-52bc-9479-3d1a343d9043"
+
+[weakdeps]
+LazySets = "b4f0291d-fe17-52bc-9479-3d1a343d9043"
+Requires = "ae029012-a4dd-5104-9daa-d747884805df"

ext/LazySetsExt.jl

@@ -0,0 +1,35 @@
+module LazySetsExt
+
+import MathematicalSystems
+using MathematicalSystems: LinearParametricContinuousSystem,
+                           LinearParametricDiscreteSystem,
+                           LinearControlParametricContinuousSystem,
+                           LinearControlParametricDiscreteSystem
+
+@static if isdefined(Base, :get_extension)
+    using LazySets: MatrixZonotope
+else
+    using ..LazySets: MatrixZonotope
+end
+
+for Z in (:LinearParametricContinuousSystem, :LinearParametricDiscreteSystem)
+    BaseName = Symbol(replace(string(Z), "Parametric" => ""))
+
+    @eval begin
+        function MathematicalSystems.$(BaseName)(AS::MatrixZonotope)
+            return $Z(AS)
+        end
+    end
+end
+
+for Z in (:LinearControlParametricContinuousSystem, :LinearControlParametricDiscreteSystem)
+    BaseName = Symbol(replace(string(Z), "Parametric" => ""))
+
+    @eval begin
+        function MathematicalSystems.$(BaseName)(AS::MatrixZonotope, BS::MatrixZonotope)
+            return $Z(AS, BS)
+        end
+    end
+end
+
+end  # module

src/MathematicalSystems.jl

@@ -1,6 +1,5 @@
 module MathematicalSystems
 
-using Requires
 using LinearAlgebra, SparseArrays
 using LinearAlgebra: checksquare
 import RecipesBase
@@ -221,4 +220,6 @@ include("discretize.jl")
 
 export discretize
 
+include("init.jl")
+
 end # module

src/init.jl

@@ -0,0 +1,10 @@
+# optional dependencies
+@static if !isdefined(Base, :get_extension)
+    using Requires
+end
+
+@static if !isdefined(Base, :get_extension)
+    function __init__()
+        @require LazySets = "b4f0291d-fe17-52bc-9479-3d1a343d9043" include("../ext/LazySetsExt.jl")
+    end
+end

src/systems.jl

@@ -3482,30 +3482,3 @@ for (Z, AZ) in
         end
     end
 end
-
-function __init__()
-    @require LazySets = "b4f0291d-fe17-52bc-9479-3d1a343d9043" begin
-        using .LazySets: MatrixZonotope
-
-        for Z in (:LinearParametricContinuousSystem, :LinearParametricDiscreteSystem)
-            BaseName = Symbol(replace(string(Z), "Parametric" => ""))
-
-            @eval begin
-                function $(BaseName)(AS::MatrixZonotope)
-                    return $Z(AS)
-                end
-            end
-        end
-
-        for Z in (:LinearControlParametricContinuousSystem, :LinearControlParametricDiscreteSystem)
-            BaseName = Symbol(replace(string(Z), "Parametric" => ""))
-
-            @eval begin
-                function $(BaseName)(AS::MTA,
-                                     BS::MTB) where {MTA<:MatrixZonotope,MTB<:MatrixZonotope}
-                    return $Z(AS, BS)
-                end
-            end
-        end
-    end
-end