From 4f482da02d537da1624d58d2a6338916dcc22c2c Mon Sep 17 00:00:00 2001
From: pdeffebach <23196228+pdeffebach@users.noreply.github.com>
Date: Fri, 1 Mar 2024 10:14:56 -0500
Subject: [PATCH] Small macro hygiene fixes (#384)

* small hygiene fixes

* More hygiene fixes
---
 src/macros.jl          | 10 +++++-----
 src/parsing.jl         |  6 +++---
 src/parsing_astable.jl |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/macros.jl b/src/macros.jl
index d66f13e..855714e 100644
--- a/src/macros.jl
+++ b/src/macros.jl
@@ -551,7 +551,7 @@ function with_helper(d, body)
     # complicated method of fun_to_vec
     # in the case of QuoteNode
     t = fun_to_vec(Expr(:block, body); no_dest=true)
-    :(DataFramesMeta.exec($d, $t))
+    :($exec($d, $t))
 end
 
 """
@@ -2453,7 +2453,7 @@ function distinct_helper(x, args...)
     x, exprs, outer_flags, kw = get_df_args_kwargs(x, args...; wrap_byrow = false)    
     t = (fun_to_vec(ex; no_dest = true, outer_flags=outer_flags) for ex in exprs)
     quote            
-        $DataFramesMeta.make_distinct($x, $(t...); $(kw...))
+        $make_distinct($x, $(t...); $(kw...))
     end
 end
 
@@ -2560,7 +2560,7 @@ function rdistinct_helper(x, args...)
     x, exprs, outer_flags, kw = get_df_args_kwargs(x, args...; wrap_byrow = true)    
     t = (fun_to_vec(ex; no_dest = true, outer_flags=outer_flags) for ex in exprs)
     quote            
-        $DataFramesMeta.make_distinct($x, $(t...); $(kw...))
+        $make_distinct($x, $(t...); $(kw...))
     end
 end
 
@@ -2620,7 +2620,7 @@ function distinct!_helper(x, args...)
     x, exprs, outer_flags, kw = get_df_args_kwargs(x, args...; wrap_byrow = false)    
     t = (fun_to_vec(ex; no_dest = true, outer_flags=outer_flags) for ex in exprs)
     quote            
-        $DataFramesMeta.make_distinct!($x, $(t...); $(kw...))
+        $make_distinct!($x, $(t...); $(kw...))
     end
 end
 
@@ -2732,7 +2732,7 @@ function rdistinct!_helper(x, args...)
     x, exprs, outer_flags, kw = get_df_args_kwargs(x, args...; wrap_byrow = true)    
     t = (fun_to_vec(ex; no_dest = true, outer_flags=outer_flags) for ex in exprs)
     quote            
-        $DataFramesMeta.make_distinct!($x, $(t...); $(kw...))
+        $make_distinct!($x, $(t...); $(kw...))
     end
 end
 
diff --git a/src/parsing.jl b/src/parsing.jl
index e2119e8..a431ec6 100644
--- a/src/parsing.jl
+++ b/src/parsing.jl
@@ -170,7 +170,7 @@ function args_to_selectors(v)
         col
     end
 
-    :(DataFramesMeta.make_source_concrete($(Expr(:vect, t...))))
+    :($make_source_concrete($(Expr(:vect, t...))))
 end
 
 is_macro_head(ex, name) = false
@@ -280,7 +280,7 @@ function get_source_fun(function_expr; exprflags = deepcopy(DEFAULT_FLAGS))
         source = args_to_selectors(function_expr.args[2:end])
         fun_t = function_expr.args[1]
 
-        # .+ to +
+        # .+ to Expr(:., +)
         fun = fix_simple_dot(fun_t)
     elseif is_simple_broadcast_call(function_expr)
         # extract source symbols from quotenodes
@@ -296,7 +296,7 @@ function get_source_fun(function_expr; exprflags = deepcopy(DEFAULT_FLAGS))
         membernames = Dict{Any, Symbol}()
 
         body = replace_syms!(membernames, function_expr)
-        source = :(DataFramesMeta.make_source_concrete($(Expr(:vect, keys(membernames)...))))
+        source = :($make_source_concrete($(Expr(:vect, keys(membernames)...))))
         inputargs = Expr(:tuple, values(membernames)...)
         fun = quote
             $inputargs -> begin
diff --git a/src/parsing_astable.jl b/src/parsing_astable.jl
index 8952843..21d9c03 100644
--- a/src/parsing_astable.jl
+++ b/src/parsing_astable.jl
@@ -82,10 +82,10 @@ function get_source_fun_astable(ex; exprflags = deepcopy(DEFAULT_FLAGS))
             replace_syms_astable!(inputs_to_function, lhs_assignments, arg)
         end
     end
-    source = :(DataFramesMeta.make_source_concrete($(Expr(:vect, keys(inputs_to_function)...))))
+    source = :($make_source_concrete($(Expr(:vect, keys(inputs_to_function)...))))
 
     inputargs = Expr(:tuple, values(inputs_to_function)...)
-    nt_iterator = (:(DataFramesMeta.sym_or_str_to_sym($k) => $v) for (k, v) in lhs_assignments)
+    nt_iterator = (:($sym_or_str_to_sym($k) => $v) for (k, v) in lhs_assignments)
     nt_expr = Expr(:tuple, Expr(:parameters, nt_iterator...))
 
     body = Expr(:block, Expr(:block, exprs...), nt_expr)