Skip to content
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
22 changes: 13 additions & 9 deletions src/geoops/macros.jl
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,23 @@ _getcolexpr(expr) = :(getproperty(geotable, $(_nameexpr(expr))))
function _colnames(expr)
colnames = []
if expr isa Expr
_colargs!(expr, colnames)
_colargs!(colnames, expr)
end
colnames
end

function _colargs!(expr, colnames)
start = Meta.isexpr(expr, [:call, :macrocall]) ? 2 : 1
for i in start:length(expr.args)
arg = expr.args[i]
if _iscolname(arg)
push!(colnames, arg)
elseif arg isa Expr
_colargs!(arg, colnames)
function _colargs!(colnames, expr)
if Meta.isexpr(expr, :., 2) && expr.args[2] isa QuoteNode # handle expressions of the form obj.field
_colargs!(colnames, expr.args[1])
else # descend on function/macro arguments
start = Meta.isexpr(expr, [:call, :macrocall]) ? 2 : 1
for i in start:length(expr.args)
arg = expr.args[i]
if _iscolname(arg)
push!(colnames, arg)
elseif arg isa Expr
_colargs!(colnames, arg)
end
end
end
end
Expand Down
4 changes: 4 additions & 0 deletions test/operations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,10 @@
ndata = @transform(sdata, :x_str = join([:x, "test"]))
@test ndata.x_str == [join([x, "test"]) for x in sdata.x]

# obj.field syntax
ndata = @transform(sdata, :cx = coords(:geometry).x)
@test ndata.cx == [coords(p).x for p in sdata.geometry]

# column replacement
table = (x=rand(10), y=rand(10), z=rand(10))
sdata = georef(table, rand(Point, 10))
Expand Down
Loading