diff --git a/Project.toml b/Project.toml index 55a2686..dcd6baa 100644 --- a/Project.toml +++ b/Project.toml @@ -4,7 +4,7 @@ authors = ["ScottPJones "] keywords = ["Strings", "Characters", "Formatting", "Intern", "Unicode", "Regex"] license = "MIT" uuid = "7bddbee9-b4ee-5d4f-bf0b-c84b4398bbf6" -version = "0.2.0" +version = "0.2.1" [deps] ModuleInterfaceTools = "5cb8414e-7aab-5a03-a681-351269c074bf" diff --git a/src/Strs.jl b/src/Strs.jl index ef53560..974f116 100644 --- a/src/Strs.jl +++ b/src/Strs.jl @@ -2,14 +2,13 @@ __precompile__(true) """ Strs package -Copyright 2017-018 Gandalf Software, Inc., Scott P. Jones +Copyright 2017-2019 Gandalf Software, Inc., Scott P. Jones Licensed under MIT License, see LICENSE.md """ module Strs using ModuleInterfaceTools -using ModuleInterfaceTools: m_eval -export @api, V6_COMPAT +export @api using PCRE2 @@ -25,12 +24,7 @@ export @i_str, @I_str, intern macro i_str(str) ; Expr(:call, :intern, interpolated_parse(str, StrBase._str)) ; end macro I_str(str) ; Expr(:call, :intern, interpolated_parse(str, StrBase._str, true)) ; end -const curmod = @static V6_COMPAT ? current_module() : @__MODULE__ - -# Need to fix ModuleInterfaceTools to do this! -for mod in (StrRegex, StrLiterals), grp in (:modules, :public, :public!) - m_eval(curmod, Expr( :export, getfield(m_eval(mod, :__api__), grp)...)) -end +@api reexport StrRegex, StrLiterals @api freeze