Fix caret bug #333 (#347)

* fix problem * Fix #328 parsing bug try 2 (#346) * simpler diff * hygiene * better fix * update versions * improve subsetting explanations (#345) * Update TagBot.yml (#350) * update news and version (#353) * add tests --------- Co-authored-by: Bogumił Kamiński <[email protected]> Co-authored-by: Carlo Lucibello <[email protected]>
JuliaData · Feb 6, 2023 · 03d5d98 · 03d5d98
1 parent 3c5ba5f
commit 03d5d98
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/parsing.jl b/src/parsing.jl
@@ -82,6 +82,8 @@ function is_nested_fun(x::Expr)
     x.head === :call &&
     length(x.args) == 2 &&
     is_call(x.args[2]) &&
+    # Don't count `^(x)`
+    onearg(x, :^) == false &&
     # AsTable(:x) or `$(:x)`
     return get_column_expr(x.args[2]) === nothing
 end
@@ -134,6 +136,7 @@ is_simple_non_broadcast_call(x) = false
 function is_simple_non_broadcast_call(expr::Expr)
     expr.head == :call &&
         length(expr.args) >= 2 &&
+        onearg(expr, :^) == false &&
         composed_or_symbol(expr.args[1]) &&
         all(a -> get_column_expr(a) !== nothing, expr.args[2:end])
 end

diff --git a/test/parsing.jl b/test/parsing.jl
@@ -109,4 +109,24 @@ end
 
 end
 
+@testset "caret bug #333" begin
+    df = DataFrame(a = 1)
+    res = DataFrame(a = 1, b_sym = :xxx)
+    df2 = @transform df :b_sym = ^(:xxx)
+    @test df2 == res
+    df2 = @select df begin
+        :a
+        :b_sym = ^(:xxx)
+    end
+    @test df2 == res
+    df2 = @rsubset df begin ^(true) end
+    @test df2 == df
+    @eval df = DataFrame(a = 1)
+    # Some errors when we dont have keyword arguments, since
+    # the following gets parsed as (a^b) and we want
+    # (a, b...) in @subset and (a, b) in @with
+    @test_throws MethodError @eval @rsubset df ^(true)
+    @test_throws LoadError @eval @with df ^(true)
+end
+
 end # module