Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small macro hygiene fixes #384

Merged
merged 2 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/macros.jl
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@
# 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

"""
Expand Down Expand Up @@ -860,7 +860,7 @@

### Examples

```jldoctest

Check failure on line 863 in src/macros.jl

View workflow job for this annotation

GitHub Actions / build

doctest failure in ~/work/DataFramesMeta.jl/DataFramesMeta.jl/src/macros.jl:863-954 ```jldoctest julia> using DataFramesMeta, Statistics julia> df = DataFrame(x = 1:3, y = [2, 1, 2]); julia> globalvar = [2, 1, 0]; julia> @subset(df, :x .> 1) 2×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 2 1 2 │ 3 2 julia> @subset(df, :x .> globalvar) 2×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 2 1 2 │ 3 2 julia> @subset df begin :x .> globalvar :y .== 3 end 0×2 DataFrame julia> df = DataFrame(n = 1:20, x = [3, 3, 3, 3, 1, 1, 1, 2, 1, 1, 2, 1, 1, 2, 2, 2, 3, 1, 1, 2]); julia> g = groupby(df, :x); julia> @subset(g, :n .> mean(:n)) 8×2 DataFrame Row │ n x │ Int64 Int64 ─────┼────────────── 1 │ 12 1 2 │ 13 1 3 │ 15 2 4 │ 16 2 5 │ 17 3 6 │ 18 1 7 │ 19 1 8 │ 20 2 julia> @subset g begin :n .> mean(:n) :n .< 20 end 7×2 DataFrame Row │ n x │ Int64 Int64 ─────┼────────────── 1 │ 12 1 2 │ 13 1 3 │ 15 2 4 │ 16 2 5 │ 17 3 6 │ 18 1 7 │ 19 1 julia> df = DataFrame(a = [1, 2, missing], b = ["x", "y", missing]); julia> @subset(df, :a .== 1) 1×2 DataFrame Row │ a b │ Int64? String? ─────┼───────────────── 1 │ 1 x julia> @subset(df, :a .< 3; view = true) 2×2 SubDataFrame Row │ a b │ Int64? String? ─────┼───────────────── 1 │ 1 x 2 │ 2 y julia> @subset df begin :a .< 3 @kwarg view = true end 2×2 SubDataFrame Row │ a b │ Int64? String? ─────┼───────────────── 1 │ 1 x 2 │ 2 y ``` Subexpression: @subset df begin :x .> globalvar :y .== 3 end Evaluated output: 0×2 DataFrame Row │ x y │ Int64 Int64 ─────┴────────────── Expected output: 0×2 DataFrame diff = Warning: Diff output requires color. 0×2 DataFrameDataFrame Row │ x y │ Int64 Int64 ─────┴──────────────
julia> using DataFramesMeta, Statistics

julia> df = DataFrame(x = 1:3, y = [2, 1, 2]);
Expand Down Expand Up @@ -976,7 +976,7 @@
Use this function as an alternative to placing the `.` to broadcast row-wise operations.

### Examples
```jldoctest

Check failure on line 979 in src/macros.jl

View workflow job for this annotation

GitHub Actions / build

doctest failure in ~/work/DataFramesMeta.jl/DataFramesMeta.jl/src/macros.jl:979-1009 ```jldoctest julia> using DataFramesMeta julia> df = DataFrame(A=1:5, B=["apple", "pear", "apple", "orange", "pear"]) 5×2 DataFrame Row │ A B │ Int64 String ─────┼─────────────── 1 │ 1 apple 2 │ 2 pear 3 │ 3 apple 4 │ 4 orange 5 │ 5 pear julia> @rsubset df :A > 3 2×2 DataFrame Row │ A B │ Int64 String ─────┼─────────────── 1 │ 4 orange 2 │ 5 pear julia> @rsubset df :A > 3 || :B == "pear" 3×2 DataFrame Row │ A B │ Int64 String ─────┼─────────────── 1 │ 2 pear 2 │ 4 orange 3 │ 5 pear ``` Subexpression: @rsubset df :A > 3 || :B == "pear" Evaluated output: 3×2 DataFrame Row │ A B │ Int64 String ─────┼─────────────── 1 │ 2 pear 2 │ 4 orange 3 │ 5 pear Expected output: 3×2 DataFrame Row │ A B │ Int64 String ─────┼─────────────── 1 │ 2 pear 2 │ 4 orange 3 │ 5 pear diff = Warning: Diff output requires color. 3×2 DataFrame DataFrame Row │ A B B │ Int64 String ─────┼─────────────── String ─────┼─────────────── 1 │ 2 pear pear 2 │ 4 orange orange 3 │ 5 pear
julia> using DataFramesMeta

julia> df = DataFrame(A=1:5, B=["apple", "pear", "apple", "orange", "pear"])
Expand Down Expand Up @@ -1128,7 +1128,7 @@

### Examples

```jldoctest

Check failure on line 1131 in src/macros.jl

View workflow job for this annotation

GitHub Actions / build

doctest failure in ~/work/DataFramesMeta.jl/DataFramesMeta.jl/src/macros.jl:1131-1205 ```jldoctest julia> using DataFramesMeta, Statistics julia> df = DataFrame(x = 1:3, y = [2, 1, 2]); julia> globalvar = [2, 1, 0]; julia> @subset!(copy(df), :x .> 1) 2×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 2 1 2 │ 3 2 julia> @subset!(copy(df), :x .> globalvar) 2×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 2 1 2 │ 3 2 julia> @subset! copy(df) begin :x .> globalvar :y .== 3 end 0×2 DataFrame julia> df = DataFrame(n = 1:20, x = [3, 3, 3, 3, 1, 1, 1, 2, 1, 1, 2, 1, 1, 2, 2, 2, 3, 1, 1, 2]); julia> g = groupby(copy(df), :x); julia> @subset!(g, :n .> mean(:n)) 8×2 DataFrame Row │ n x │ Int64 Int64 ─────┼────────────── 1 │ 12 1 2 │ 13 1 3 │ 15 2 4 │ 16 2 5 │ 17 3 6 │ 18 1 7 │ 19 1 8 │ 20 2 julia> g = groupby(copy(df), :x); julia> @subset! g begin :n .> mean(:n) :n .< 20 end 7×2 DataFrame Row │ n x │ Int64 Int64 ─────┼────────────── 1 │ 12 1 2 │ 13 1 3 │ 15 2 4 │ 16 2 5 │ 17 3 6 │ 18 1 7 │ 19 1 julia> d = DataFrame(a = [1, 2, missing], b = ["x", "y", missing]); julia> @subset!(d, :a .== 1) 1×2 DataFrame Row │ a b │ Int64? String? ─────┼───────────────── 1 │ 1 x ``` Subexpression: @subset! copy(df) begin :x .> globalvar :y .== 3 end Evaluated output: 0×2 DataFrame Row │ x y │ Int64 Int64 ─────┴────────────── Expected output: 0×2 DataFrame diff = Warning: Diff output requires color. 0×2 DataFrameDataFrame Row │ x y │ Int64 Int64 ─────┴──────────────
julia> using DataFramesMeta, Statistics

julia> df = DataFrame(x = 1:3, y = [2, 1, 2]);
Expand Down Expand Up @@ -1312,7 +1312,7 @@

### Examples

```jldoctest

Check failure on line 1315 in src/macros.jl

View workflow job for this annotation

GitHub Actions / build

doctest failure in ~/work/DataFramesMeta.jl/DataFramesMeta.jl/src/macros.jl:1315-1387 ```jldoctest julia> using DataFramesMeta, Statistics julia> d = DataFrame(x = [3, 3, 3, 2, 1, 1, 1, 2, 1, 1], n = 1:10, c = ["a", "c", "b", "e", "d", "g", "f", "i", "j", "h"]); julia> @orderby(d, -:n) 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 10 h 2 │ 1 9 j 3 │ 2 8 i 4 │ 1 7 f 5 │ 1 6 g 6 │ 1 5 d 7 │ 2 4 e 8 │ 3 3 b 9 │ 3 2 c 10 │ 3 1 a julia> @orderby(d, invperm(sortperm(:c, rev = true))) 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 9 j 2 │ 2 8 i 3 │ 1 10 h 4 │ 1 6 g 5 │ 1 7 f 6 │ 2 4 e 7 │ 1 5 d 8 │ 3 2 c 9 │ 3 3 b 10 │ 3 1 a julia> @orderby d begin :x abs.(:n .- mean(:n)) end 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 e 2 │ 1 6 f 3 │ 1 7 g 4 │ 1 9 i 5 │ 1 10 j 6 │ 2 4 d 7 │ 2 8 h 8 │ 3 3 c 9 │ 3 2 b 10 │ 3 1 a julia> @orderby d @byrow :x^2 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 e 2 │ 1 6 f 3 │ 1 7 g 4 │ 1 9 i 5 │ 1 10 j 6 │ 2 4 d 7 │ 2 8 h 8 │ 3 1 a 9 │ 3 2 b 10 │ 3 3 c ``` Subexpression: @orderby d begin :x abs.(:n .- mean(:n)) end Evaluated output: 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 d 2 │ 1 6 g 3 │ 1 7 f 4 │ 1 9 j 5 │ 1 10 h 6 │ 2 4 e 7 │ 2 8 i 8 │ 3 3 b 9 │ 3 2 c 10 │ 3 1 a Expected output: 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 e 2 │ 1 6 f 3 │ 1 7 g 4 │ 1 9 i 5 │ 1 10 j 6 │ 2 4 d 7 │ 2 8 h 8 │ 3 3 c 9 │ 3 2 b 10 │ 3 1 a diff = Warning: Diff output requires color. 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 e d 2 │ 1 6 f g 3 │ 1 7 g f 4 │ 1 9 i j 5 │ 1 10 j h 6 │ 2 4 d e 7 │ 2 8 h i 8 │ 3 3 c b 9 │ 3 2 b c 10 │ 3 1 a

Check failure on line 1315 in src/macros.jl

View workflow job for this annotation

GitHub Actions / build

doctest failure in ~/work/DataFramesMeta.jl/DataFramesMeta.jl/src/macros.jl:1315-1387 ```jldoctest julia> using DataFramesMeta, Statistics julia> d = DataFrame(x = [3, 3, 3, 2, 1, 1, 1, 2, 1, 1], n = 1:10, c = ["a", "c", "b", "e", "d", "g", "f", "i", "j", "h"]); julia> @orderby(d, -:n) 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 10 h 2 │ 1 9 j 3 │ 2 8 i 4 │ 1 7 f 5 │ 1 6 g 6 │ 1 5 d 7 │ 2 4 e 8 │ 3 3 b 9 │ 3 2 c 10 │ 3 1 a julia> @orderby(d, invperm(sortperm(:c, rev = true))) 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 9 j 2 │ 2 8 i 3 │ 1 10 h 4 │ 1 6 g 5 │ 1 7 f 6 │ 2 4 e 7 │ 1 5 d 8 │ 3 2 c 9 │ 3 3 b 10 │ 3 1 a julia> @orderby d begin :x abs.(:n .- mean(:n)) end 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 e 2 │ 1 6 f 3 │ 1 7 g 4 │ 1 9 i 5 │ 1 10 j 6 │ 2 4 d 7 │ 2 8 h 8 │ 3 3 c 9 │ 3 2 b 10 │ 3 1 a julia> @orderby d @byrow :x^2 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 e 2 │ 1 6 f 3 │ 1 7 g 4 │ 1 9 i 5 │ 1 10 j 6 │ 2 4 d 7 │ 2 8 h 8 │ 3 1 a 9 │ 3 2 b 10 │ 3 3 c ``` Subexpression: @orderby d @byrow :x^2 Evaluated output: 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 d 2 │ 1 6 g 3 │ 1 7 f 4 │ 1 9 j 5 │ 1 10 h 6 │ 2 4 e 7 │ 2 8 i 8 │ 3 1 a 9 │ 3 2 c 10 │ 3 3 b Expected output: 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 e 2 │ 1 6 f 3 │ 1 7 g 4 │ 1 9 i 5 │ 1 10 j 6 │ 2 4 d 7 │ 2 8 h 8 │ 3 1 a 9 │ 3 2 b 10 │ 3 3 c diff = Warning: Diff output requires color. 10×3 DataFrame Row │ x n c │ Int64 Int64 String ─────┼────────────────────── 1 │ 1 5 e d 2 │ 1 6 f g 3 │ 1 7 g f 4 │ 1 9 i j 5 │ 1 10 j h 6 │ 2 4 d e 7 │ 2 8 h i 8 │ 3 1 a 9 │ 3 2 b c 10 │ 3 3 cb
julia> using DataFramesMeta, Statistics

julia> d = DataFrame(x = [3, 3, 3, 2, 1, 1, 1, 2, 1, 1], n = 1:10,
Expand Down Expand Up @@ -1407,7 +1407,7 @@
Use this function as an alternative to placing the `.` to broadcast row-wise operations.

### Examples
```jldoctest

Check failure on line 1410 in src/macros.jl

View workflow job for this annotation

GitHub Actions / build

doctest failure in ~/work/DataFramesMeta.jl/DataFramesMeta.jl/src/macros.jl:1410-1447 ```jldoctest julia> using DataFramesMeta julia> df = DataFrame(x = [8,8,-8,7,7,-7], y = [-1, 1, -2, 2, -3, 3]) 6×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 8 -1 2 │ 8 1 3 │ -8 -2 4 │ 7 2 5 │ 7 -3 6 │ -7 3 julia> @rorderby df abs(:x) (:x * :y^3) Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 7 -3 2 │ -7 3 3 │ 7 2 4 │ 8 -1 5 │ 8 1 6 │ -8 -2 julia> @rorderby df :y == 2 ? -:x : :y 6×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 7 2 2 │ 7 -3 3 │ -8 -2 4 │ 8 -1 5 │ 8 1 6 │ -7 3 ``` Subexpression: @rorderby df abs(:x) (:x * :y^3) Evaluated output: 6×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 7 -3 2 │ -7 3 3 │ 7 2 4 │ 8 -1 5 │ 8 1 6 │ -8 -2 Expected output: Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 7 -3 2 │ -7 3 3 │ 7 2 4 │ 8 -1 5 │ 8 1 6 │ -8 -2 diff = Warning: Diff output requires color. 6×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 7 -3 2 │ -7 3 3 │ 7 2 4 │ 8 -1 5 │ 8 1 6 │ -8 -2
julia> using DataFramesMeta

julia> df = DataFrame(x = [8,8,-8,7,7,-7], y = [-1, 1, -2, 2, -3, 3])
Expand Down Expand Up @@ -2453,7 +2453,7 @@
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

Expand Down Expand Up @@ -2530,7 +2530,7 @@

### Examples

```jldoctest

Check failure on line 2533 in src/macros.jl

View workflow job for this annotation

GitHub Actions / build

doctest failure in ~/work/DataFramesMeta.jl/DataFramesMeta.jl/src/macros.jl:2533-2553 ```jldoctest julia> using DataFramesMeta; julia> df = DataFrame(x = 1:10, y = 10:-1:1); julia> @distinct(df, :x .+ :y) 1×2 DataFrame Row │ x y │ Int64 Int64 ─────┼─────────────── 1 │ 1 10 julia> @distinct df begin :x .+ :y end 1×2 DataFrame Row │ x y │ Int64 Int64 ─────┼─────────────── 1 │ 1 10 ``` Subexpression: @distinct(df, :x .+ :y) Evaluated output: 1×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 1 10 Expected output: 1×2 DataFrame Row │ x y │ Int64 Int64 ─────┼─────────────── 1 │ 1 10 diff = Warning: Diff output requires color. 1×2 DataFrame Row │ x y y │ Int64 Int64 ─────┼─────────────── Int64 ─────┼────────────── 1 │ 1 1 10

Check failure on line 2533 in src/macros.jl

View workflow job for this annotation

GitHub Actions / build

doctest failure in ~/work/DataFramesMeta.jl/DataFramesMeta.jl/src/macros.jl:2533-2553 ```jldoctest julia> using DataFramesMeta; julia> df = DataFrame(x = 1:10, y = 10:-1:1); julia> @distinct(df, :x .+ :y) 1×2 DataFrame Row │ x y │ Int64 Int64 ─────┼─────────────── 1 │ 1 10 julia> @distinct df begin :x .+ :y end 1×2 DataFrame Row │ x y │ Int64 Int64 ─────┼─────────────── 1 │ 1 10 ``` Subexpression: @distinct df begin :x .+ :y end Evaluated output: 1×2 DataFrame Row │ x y │ Int64 Int64 ─────┼────────────── 1 │ 1 10 Expected output: 1×2 DataFrame Row │ x y │ Int64 Int64 ─────┼─────────────── 1 │ 1 10 diff = Warning: Diff output requires color. 1×2 DataFrame Row │ x y y │ Int64 Int64 ─────┼─────────────── Int64 ─────┼────────────── 1 │ 1 1 10
julia> using DataFramesMeta;

julia> df = DataFrame(x = 1:10, y = 10:-1:1);
Expand Down Expand Up @@ -2560,7 +2560,7 @@
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

Expand Down Expand Up @@ -2620,7 +2620,7 @@
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

Expand Down Expand Up @@ -2732,7 +2732,7 @@
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

Expand Down
6 changes: 3 additions & 3 deletions src/parsing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/parsing_astable.jl
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,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)
Expand Down
Loading