Merge pull request #91 from TidierOrg/bugfix-package-function-escaping

Bug fix to allow `PackageName.function()` within macros to be used without escaping

Author: kdpsingh

NEWS.md

@@ -1,5 +1,8 @@
 # TidierData.jl updates
 
+## v0.14.7 - 2024-02-16
+- Bug fix to allow `PackageName.function()` within macros to be used without escaping
+
 ## v0.14.6 - 2024-02-03
 - Bug fix to ensure that data type constructors are not escaped
 

Project.toml

@@ -1,7 +1,7 @@
 name = "TidierData"
 uuid = "fe2206b3-d496-4ee9-a338-6a095c4ece80"
 authors = ["Karandeep Singh"]
-version = "0.14.6"
+version = "0.14.7"
 
 [deps]
 Chain = "8be319e6-bccf-4806-a6f7-6fae938471bc"

src/parsing.jl

@@ -353,9 +353,12 @@ function parse_escape_function(rhs_expr::Union{Expr,Symbol})
       if hasproperty(Base, variable) && !(typeof(getproperty(Base, variable)) <: Function)
         # Remove the escaping if referring to a constant value like Base.pi and Base.Int64
        return variable
-      elseif @capture(x, variable_Symbol) && hasproperty(Core, variable) && !(typeof(getproperty(Core, variable)) <: Function)
+      elseif hasproperty(Core, variable) && !(typeof(getproperty(Core, variable)) <: Function)
         # Remove the escaping if referring to a data type like Core.Int64
        return variable
+      elseif hasproperty(Statistics, variable) && !(typeof(getproperty(Statistics, variable)) <: Function)
+        # Because Statistics is re-exported
+       return variable
       elseif variable in not_escaped[]
         return variable
       elseif contains(string(variable), r"[^\W0-9]\w*$") # valid variable name
@@ -366,17 +369,17 @@ function parse_escape_function(rhs_expr::Union{Expr,Symbol})
     elseif @capture(x, fn_(args__))
       if fn in not_escaped[]
         return x
-      elseif hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Function
+      elseif fn isa Symbol && hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Function
         return x
-      elseif hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Function
+      elseif fn isa Symbol && hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Function
         return x
-      elseif hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Function
+      elseif fn isa Symbol && hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Function
         return x
-      elseif hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Type
+      elseif fn isa Symbol && hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Type
         return x
-      elseif hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Type
+      elseif fn isa Symbol && hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Type
         return x
-      elseif hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Type
+      elseif fn isa Symbol && hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Type
         return x
       elseif contains(string(fn), r"[^\W0-9]\w*$") # valid variable name
         return :($(esc(fn))($(args...)))
@@ -388,17 +391,17 @@ function parse_escape_function(rhs_expr::Union{Expr,Symbol})
       #  return x
       if fn in not_escaped[]
         return x
-      elseif hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Function
+      elseif fn isa Symbol && hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Function
         return x
-      elseif hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Function
+      elseif fn isa Symbol && hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Function
         return x
-      elseif hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Function
+      elseif fn isa Symbol && hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Function
         return x
-      elseif hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Type
+      elseif fn isa Symbol && hasproperty(Base, fn) && typeof(getproperty(Base, fn)) <: Type
         return x
-      elseif hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Type
+      elseif fn isa Symbol && hasproperty(Core, fn) && typeof(getproperty(Core, fn)) <: Type
         return x
-      elseif hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Type
+      elseif fn isa Symbol && hasproperty(Statistics, fn) && typeof(getproperty(Statistics, fn)) <: Type
         return x
       elseif contains(string(fn), r"[^\W0-9]\w*$") # valid variable name
         return :($(esc(fn)).($(args...)))