Add row-wise macros

docs/src/index.md

@@ -13,6 +13,8 @@ In addition, DataFramesMeta provides
 
 * `@orderby`, for sorting data frames
 * `@subset` and `@subset!`, for keeping rows of a data frame matching a given condition
+* Row-wise versions of the above macros in the form of `@rtransform`, `@rtransform!`,
+  `@rselect`, `@rselect!`, `@rorderby`, `@rsubset`, and `@rsubset!`.
 * `@by`, for grouping and combining a data frame in a single step
 * `@with`, for working with the columns of a data frame with high performance and 
   convenient syntax
@@ -272,15 +274,17 @@ df2 = @eachrow df begin
 end
 ```
 
-## Row-wise transformations with `@byrow`
+## Row-wise transformations with `@byrow` and `@rtransform`/`@rselect`/etc.
 
 `@byrow` provides a convenient syntax to apply operations by-row,
-without having to vectorize manually.  
+without having to vectorize manually. Additionally, the macros
+`@rtransform`, `@rtransform!`, `@rselect`, `@rselect!`, 
+`@rorderby`, `@rsubset`, and `@rsubset!` use `@byrow` by default.
 
 DataFrames.jl provides the function wrapper `ByRow`. `ByRow(f)(x, y)`
 is roughly equivalent to `f.(x, y)`. DataFramesMeta.jl allows users 
 to construct expressions using `ByRow` function wrapper with the 
-syntax `@byrow`. 
+syntax `@byrow` or the row-wise macros `@rtransform`, etc.
 
 `@byrow` is not a "real" macro and cannot be used outside of 
 DataFramesMeta.jl macros. However its behavior within DataFramesMeta.jl

src/DataFramesMeta.jl

@@ -10,10 +10,11 @@ using MacroTools
 
 # Basics:
 export @with,
-       @subset, @subset!,
-       @orderby,
+       @subset, @subset!, @rsubset, @rsubset!,
+       @orderby, @rorderby,
        @by, @combine,
        @transform, @select, @transform!, @select!,
+       @rtransform, @rselect, @rtransform!, @rselect!,
        @eachrow, @eachrow!,
        @byrow,
        @based_on, @where # deprecated

src/macros.jl

@@ -577,6 +577,26 @@ macro subset(x, args...)
     esc(subset_helper(x, args...))
 end
 
+function rsubset_helper(x, args...)
+    exprs, outer_flags = create_args_vector(args...; wrap_byrow = true)
+    t = (fun_to_vec(ex; no_dest=true, outer_flags=outer_flags) for ex in exprs)
+    quote
+        $subset($x, $(t...); skipmissing=true)
+    end
+end
+
+
+"""
+    @rsubset(d, i...)
+
+Row-wise version of `@subset`, i.e. all operations use `@byrow` by
+default. See [`@subset`](@ref) for details.
+"""
+macro rsubset(x, args...)
+    esc(rsubset_helper(x, args...))
+end
+
+
 """
     @where(x, args...)
 
@@ -595,6 +615,15 @@ function subset!_helper(x, args...)
     end
 end
 
+function rsubset!_helper(x, args...)
+    exprs, outer_flags = create_args_vector(args...; wrap_byrow=true)
+    t = (fun_to_vec(ex; no_dest=true, outer_flags=outer_flags) for ex in exprs)
+    quote
+        $subset!($x, $(t...); skipmissing=true)
+    end
+end
+
+
 """
     @subset!(d, i...)
 
@@ -737,6 +766,17 @@ macro subset!(x, args...)
 end
 
 
+"""
+    @rsubset!(d, i...)
+
+Row-wise version of `@subset!`, i.e. all opertaions use `@byrow` by
+default. See [`@subset!`](@ref) for details.
+"""
+macro rsubset!(x, args...)
+    esc(rsubset!_helper(x, args...))
+end
+
+
 ##############################################################################
 ##
 ## @orderby
@@ -899,6 +939,24 @@ macro orderby(d, args...)
     esc(orderby_helper(d, args...))
 end
 
+function rorderby_helper(x, args...)
+    exprs, outer_flags = create_args_vector(args...; wrap_byrow=true)
+    t = (fun_to_vec(ex; gensym_names = true, outer_flags = outer_flags) for ex in exprs)
+    quote
+        $DataFramesMeta.orderby($x, $(t...))
+    end
+end
+
+"""
+    rorderby(d, args...)
+
+Row-wise version of `@orderby`, i.e. all opertaions use `@byrow` by
+default. See [`@orderby`](@ref)for details.
+"""
+macro rorderby(d, args...)
+    esc(rorderby_helper(d, args...))
+end
+
 
 ##############################################################################
 ##
@@ -1017,6 +1075,24 @@ macro transform(x, args...)
     esc(transform_helper(x, args...))
 end
 
+function rtransform_helper(x, args...)
+    exprs, outer_flags = create_args_vector(args...; wrap_byrow=true)
+
+    t = (fun_to_vec(ex; gensym_names = false, outer_flags = outer_flags) for ex in exprs)
+    quote
+        $DataFrames.transform($x, $(t...))
+    end
+end
+
+"""
+    @rtransform(x, args...)
+
+Row-wise version of `@transform`, i.e. all opertaions use `@byrow` by
+default. See [`@transform`](@ref) for details.
+"""
+macro rtransform(x, args...)
+    esc(rtransform_helper(x, args...))
+end
 
 ##############################################################################
 ##
@@ -1113,6 +1189,23 @@ macro transform!(x, args...)
     esc(transform!_helper(x, args...))
 end
 
+function rtransform!_helper(x, args...)
+    exprs, outer_flags = create_args_vector(args...; wrap_byrow=true)
+
+    t = (fun_to_vec(ex; gensym_names = false, outer_flags = outer_flags) for ex in exprs)
+    quote
+        $DataFrames.transform!($x, $(t...))
+    end
+end
+
+"""
+    @rtransform!(x, args...)
+
+Row-wise version of `@transform!`, i.e. all opertaions use `@byrow` by
+default. See [`@transform!`](@ref) for details."""
+macro rtransform!(x, args...)
+    esc(rtransform_helper(x, args...))
+end
 
 ##############################################################################
 ##
@@ -1227,6 +1320,25 @@ macro select(x, args...)
     esc(select_helper(x, args...))
 end
 
+function rselect_helper(x, args...)
+    exprs, outer_flags = create_args_vector(args...; wrap_byrow=true)
+
+    t = (fun_to_vec(ex; gensym_names = false, outer_flags = outer_flags) for ex in exprs)
+    quote
+        $DataFrames.select($x, $(t...))
+    end
+end
+
+"""
+    @rselect(x, args...)
+
+Row-wise version of `@select`, i.e. all opertaions use `@byrow` by
+default. See [`@select`](@ref)for details.
+"""
+macro rselect(x, args...)
+    esc(rselect_helper(x, args...))
+end
+
 
 ##############################################################################
 ##
@@ -1336,6 +1448,24 @@ macro select!(x, args...)
     esc(select!_helper(x, args...))
 end
 
+function rselect!_helper(x, args...)
+    exprs, outer_flags = create_args_vector(args...; wrap_byrow=true)
+
+    t = (fun_to_vec(ex; gensym_names = false, outer_flags = outer_flags) for ex in exprs)
+    quote
+        $DataFrames.select($x, $(t...))
+    end
+end
+
+"""
+    @rselect!(x, args...)
+
+Row-wise version of `@select!`, i.e. all opertaions use `@byrow` by
+default. See [`@select!`](@ref)for details.
+"""
+macro rselect!(x, args...)
+    esc(rselect_helper(x, args...))
+end
 
 ##############################################################################
 ##

src/parsing.jl

@@ -361,14 +361,22 @@ If a `:block` expression, return the `args` of
 the block as an array. If a simple expression,
 wrap the expression in a one-element vector.
 """
-function create_args_vector(arg)
+function create_args_vector(arg; wrap_byrow::Bool=false)
     arg, outer_flags = extract_macro_flags(MacroTools.unblock(arg))
 
+    if wrap_byrow
+        if outer_flags[Symbol("@byrow")][]
+            throw(ArgumentError("Redundant @byrow calls"))
+        end
+
+        outer_flags[Symbol("@byrow")][] = true
+    end
+
     if arg isa Expr && arg.head == :block
         x = MacroTools.rmlines(arg).args
     else
         x = Any[arg]
     end
 
     return x, outer_flags
-end
+end