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.

Sign up for GitHub

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

Jump to bottom

Add a..b syntax #121

Merged
merged 10 commits into from
Jul 22, 2017
Merged

Add a..b syntax #121

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
516a2fc
Add a..b syntax
davidanthoff Jun 7, 2017
30d640a
added example and test for a..b
floswald Jun 23, 2017
80a687e
Merge pull request #127 from floswald/simple-map-syntax
davidanthoff Jun 23, 2017
e8c0f1d
added docs for dplyr
floswald Jun 25, 2017
8358384
started with datatable
floswald Jun 25, 2017
bd3dfdb
Revert "started with datatable"
floswald Jun 25, 2017
a5e250f
Merge pull request #129 from floswald/simple-map-syntax
davidanthoff Jul 22, 2017
f9a9021
Merge branch 'master' into simple-map-syntax
davidanthoff Jul 22, 2017
2c2f5d3
Run dplyr tests
davidanthoff Jul 22, 2017
083e115
Fix use of MacroTools
davidanthoff Jul 22, 2017
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
1 change: 1 addition & 0 deletions REQUIRE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Requires 0.4.3
Documenter 0.9.0
IterableTables 0.1.0
DataValues 0.0.2
MacroTools 0.3.6
1 change: 1 addition & 0 deletions src/Query.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ using NamedTuples
using DataStructures
using IterableTables
using DataValues
using MacroTools: postwalk, prewalk, @capture

import Base.start
import Base.next
Expand Down
10 changes: 10 additions & 0 deletions src/query_translation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ function query_expression_translation_phase_A(qe)
end
i+=1
end

for i in 1:length(qe)
qe[i] = postwalk(qe[i]) do x
if x isa Expr && x.head==:call && x.args[1]==:(..)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be written

if @capture(x, x_..y_)
    :(map(i->i.$y, x))
else 
    x
end

My MacroTools.jl foo isn't that strong so maybe I am wrong about this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might well be, but my MacroTools.jl foo is almost non-existent and I know the current formulation works, so I'm tempted to just leave as is ;)

return :(map(i->i.$(x.args[3]),$(x.args[2])))
else
return x
end
end
end
end

function query_expression_translation_phase_B(qe)
Expand Down