Use new package ExtensionErrors

Author: jpthiele

Project.toml

@@ -1,7 +1,7 @@
 name = "ExtendableGrids"
 uuid = "cfc395e8-590f-11e8-1f13-43a2532b2fa8"
-authors = ["Juergen Fuhrmann <[email protected]>", "Christian Merdon  <[email protected]>", "Johannes Taraz  <[email protected]>", "Patrick Jaap <[email protected]>"]
 version = "1.14.2"
+authors = ["Juergen Fuhrmann <[email protected]>", "Christian Merdon  <[email protected]>", "Johannes Taraz  <[email protected]>", "Patrick Jaap <[email protected]>"]
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -10,6 +10,7 @@ Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 ElasticArrays = "fdbdab4c-e67f-52f5-8c3f-e7b388dad3d4"
+ExtensionErrors = "b7d44a4a-b691-4b61-aae1-e3eded184641"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -27,6 +28,9 @@ Metis = "2679e427-3c69-5b7f-982b-ece356f1e94b"
 TetGen = "c5d3f3f7-f850-59f6-8a2e-ffc6dc1317ea"
 Triangulate = "f7e6ffb2-c36d-4f8f-a77e-16e897189344"
 
+[sources]
+ExtensionErrors = {rev = "main", url = "[email protected]:jpthiele/ExtensionErrors.jl.git"}
+
 [extensions]
 ExtendableGridsGmshExt = "Gmsh"
 ExtendableGridsMetisExt = "Metis"
@@ -40,6 +44,7 @@ Compat = "4.10"
 Dates = "1.9"
 DocStringExtensions = "0.8,0.9"
 ElasticArrays = "1"
+ExtensionErrors = "1.0.0"
 Gmsh = "0.2.2,0.3"
 Graphs = "1.11.1"
 InteractiveUtils = "1.9"

src/io.jl

@@ -1,61 +1,12 @@
 using WriteVTK
-
+using ExtensionErrors
 # conversion from AbstractElementGeometry to WriteVTK.VTKCellTypes
 WriteVTK.VTKCellType(::Type{<:AbstractElementGeometry1D}) = VTKCellTypes.VTK_LINE
 WriteVTK.VTKCellType(::Type{<:Triangle2D}) = VTKCellTypes.VTK_TRIANGLE
 WriteVTK.VTKCellType(::Type{<:Quadrilateral2D}) = VTKCellTypes.VTK_QUAD
 WriteVTK.VTKCellType(::Type{<:Tetrahedron3D}) = VTKCellTypes.VTK_TETRA
 WriteVTK.VTKCellType(::Type{<:Hexahedron3D}) = VTKCellTypes.VTK_HEXAHEDRON
 
-struct ExtensionLoadError <: Exception
-    fname::Symbol
-    weakdeps::Vector{Symbol}
-end
-
-Base.showerror(io::IO, e::ExtensionLoadError) =
-    print(
-    io,
-    "ExtensionLoadError: "
-        * "The function " * String(e.fname) * " is part of an extension.\n"
-        * "Suggestion: Install and load the following modules:"
-        * mapreduce(x -> "\n" * x, *, String.(e.weakdeps))
-)
-
-struct ExtensionMethodError <: Exception
-    fn::Function
-    args::Tuple
-end
-
-
-function Base.showerror(io::IO, e::ExtensionMethodError)
-    fname = String(nameof(e.fn))
-    argtypes = typeof.(e.args)
-    println(io,
-        "ExtensionMethodError: no method matching " * fname
-            * "(" * join(map(x-> "::"*String(nameof(x)),argtypes),',')
-            * ")")
-    println(io,"The function " * fname * " exists in a loaded extension," 
-            *" but no method is defined for this combination of argument types.\n"
-            * "\nCandidates are:\n"
-    )
-    println.(io, filter(x -> x != which(e.fn, (argtypes...,)), methods(e.fn)))
-    return nothing
-end
-
-function prepare_extension_function(fname::Symbol, weakdeps::Vector{Symbol}, args::Vector{Symbol})
-    expr = quote
-        function $fname($(args...); kwargs...)
-            if mapreduce(x -> isdefined(Main, x) && isa(getfield(Main,x),Module), &, $weakdeps)
-                throw(ExtensionMethodError($fname, ($(args...),)))
-            else
-                throw(ExtensionLoadError(nameof($fname), $weakdeps))
-            end
-            return nothing
-        end
-    end
-    return eval(expr)
-end
-
 """
 $(TYPEDSIGNATURES)
 
@@ -313,14 +264,10 @@ function simplexgrid(file::String, ::Type{Val{:sg}}; kwargs...)
     return g
 end
 
-prepare_extension_function(:simplexgrid_from_gmsh, [:Gmsh], [:filename])
-# function simplexgrid_from_gmsh(filename; incomplete = false, Tc = Float32, Ti = Int32)
-#     throw(ErrorException("Missing Gmsh extension. Add Gmsh.jl to your environment and import it to read msh or geo files."))
-# end
-
+@extensionfunction simplexgrid_from_gmsh(filename;incomplete=false,Tc = Float32,Ti=Int32) Gmsh
 
 function simplexgrid_to_gmsh end
 
-function mixedgrid_from_gmsh end
+@extensionfunction mixedgrid_from_gmsh(filename;Tc = Float32, Ti = Int32)
 
 function mixedgrid_to_gmsh end