Skip to content

Commit 1e4999f

Browse files
davidanthoffdavidanthoff
committed
Remove _internal from macro names
1 parent 7525ac4 commit 1e4999f

11 files changed

+111
-77
lines changed

‎src/QueryOperators.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ using IteratorInterfaceExtensions
77

88
export Grouping
99

10+
include("operators.jl")
11+
1012
include("enumerable/enumerable.jl")
1113
include("enumerable/enumerable_groupby.jl")
1214
include("enumerable/enumerable_join.jl")

‎src/enumerable/enumerable_count.jl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,3 @@ function count(source::Enumerable)
3030
state = start(source)
3131
return _count(source, state)
3232
end
33-
34-
macro count_internal(source, f)
35-
q = Expr(:quote, f)
36-
:(count($(esc(source)), $(esc(f)), $(esc(q))))
37-
end
38-
39-
macro count_internal(source)
40-
:(count($(esc(source))))
41-
end

‎src/enumerable/enumerable_filter.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ function filter(source::Enumerable, filter_func::Function, filter_expr::Expr)
2121
return EnumerableFilter{T,S,Q}(source, filter_func)
2222
end
2323

24-
macro filter_internal(source, f)
25-
q = Expr(:quote, f)
26-
:(QueryOperators.filter($(esc(source)), $(esc(f)), $(esc(q))))
27-
end
28-
2924
function Base.start(iter::EnumerableFilter{T,S,Q}) where {T,S,Q}
3025
s = start(iter.source)
3126
while !done(iter.source, s)

‎src/enumerable/enumerable_groupby.jl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,3 @@ function Base.done(iter::EnumerableGroupBy{T,TKey,TR,SO,ES}, state) where {T,TKe
104104
curr_index = state[2]
105105
return curr_index > length(results)
106106
end
107-
108-
macro groupby_internal(source,elementSelector,resultSelector)
109-
q_elementSelector = Expr(:quote, elementSelector)
110-
q_resultSelector = Expr(:quote, resultSelector)
111-
112-
:(groupby($(esc(source)), $(esc(elementSelector)), $(esc(q_elementSelector)), $(esc(resultSelector)), $(esc(q_resultSelector))))
113-
end
114-
115-
macro groupby_internal_simple(source,elementSelector)
116-
q_elementSelector = Expr(:quote, elementSelector)
117-
118-
:(groupby($(esc(source)), $(esc(elementSelector)), $(esc(q_elementSelector))))
119-
end

‎src/enumerable/enumerable_groupjoin.jl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,3 @@ function Base.done(iter::EnumerableGroupJoin{T,TKeyOuter,TI,SO,SI,OKS,IKS,RS},st
6969
curr_index = state[2]
7070
return curr_index > length(results)
7171
end
72-
73-
macro groupjoin_internal(outer, inner, outerKeySelector, innerKeySelector, resultSelector)
74-
q_outerKeySelector = Expr(:quote, outerKeySelector)
75-
q_innerKeySelector = Expr(:quote, innerKeySelector)
76-
q_resultSelector = Expr(:quote, resultSelector)
77-
78-
:(groupjoin($(esc(outer)), $(esc(inner)), $(esc(outerKeySelector)), $(esc(q_outerKeySelector)), $(esc(innerKeySelector)),$(esc(q_innerKeySelector)), $(esc(resultSelector)),$(esc(q_resultSelector))))
79-
end

‎src/enumerable/enumerable_join.jl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,3 @@ function Base.done(iter::EnumerableJoin{T,TKeyOuter,TI,SO,SI,OKS,IKS,RS},state)
6969
return curr_index > length(results)
7070
end
7171

72-
macro join_internal(outer, inner, outerKeySelector, innerKeySelector, resultSelector)
73-
q_outerKeySelector = Expr(:quote, outerKeySelector)
74-
q_innerKeySelector = Expr(:quote, innerKeySelector)
75-
q_resultSelector = Expr(:quote, resultSelector)
76-
77-
:(join($(esc(outer)), $(esc(inner)), $(esc(outerKeySelector)), $(esc(q_outerKeySelector)), $(esc(innerKeySelector)),$(esc(q_innerKeySelector)), $(esc(resultSelector)),$(esc(q_resultSelector))))
78-
end

‎src/enumerable/enumerable_map.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ function map(source::Enumerable, f::Function, f_expr::Expr)
1919
return EnumerableMap{T,S,Q}(source, f)
2020
end
2121

22-
macro map_internal(source, f)
23-
q = Expr(:quote, f)
24-
:(map($(esc(source)), $(esc(f)), $(esc(q))))
25-
end
26-
2722
function Base.start(iter::EnumerableMap{T,S,Q}) where {T,S,Q}
2823
s = start(iter.source)
2924
return s

‎src/enumerable/enumerable_mapmany.jl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,3 @@ function Base.done(iter::EnumerableMapMany{T,SO,CS,RS},state) where {T,SO,CS,RS}
8383
curr_index = state[2]
8484
return curr_index > length(results)
8585
end
86-
87-
macro mapmany_internal(source,collectionSelector,resultSelector)
88-
q_collectionSelector = Expr(:quote, collectionSelector)
89-
q_resultSelector = Expr(:quote, resultSelector)
90-
91-
:(mapmany($(esc(source)), $(esc(collectionSelector)), $(esc(q_collectionSelector)), $(esc(resultSelector)), $(esc(q_resultSelector))))
92-
end

‎src/enumerable/enumerable_orderby.jl

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,3 @@ function Base.next(iter::EnumerableThenBy{T,S,KS,TKS}, state) where {T,S,KS,TKS}
135135
end
136136

137137
Base.done(f::EnumerableThenBy{T,S,KS,TKS}, state) where {T,S,KS,TKS} = state[2] > length(state[1])
138-
139-
macro orderby_internal(source, f)
140-
q = Expr(:quote, f)
141-
:(orderby($(esc(source)), $(esc(f)), $(esc(q))))
142-
end
143-
144-
macro orderby_descending_internal(source, f)
145-
q = Expr(:quote, f)
146-
:(orderby_descending($(esc(source)), $(esc(f)), $(esc(q))))
147-
end
148-
149-
macro thenby_internal(source, f)
150-
q = Expr(:quote, f)
151-
:(thenby($(esc(source)), $(esc(f)), $(esc(q))))
152-
end
153-
154-
macro thenby_descending_internal(source, f)
155-
q = Expr(:quote, f)
156-
:(thenby_descending($(esc(source)), $(esc(f)), $(esc(q))))
157-
end

‎src/operators.jl

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
function count end
2+
3+
macro count(source, f)
4+
q = Expr(:quote, f)
5+
:(count($(esc(source)), $(esc(f)), $(esc(q))))
6+
end
7+
8+
macro count(source)
9+
:(count($(esc(source))))
10+
end
11+
12+
function default_if_empty end
13+
14+
macro default_if_empty(source)
15+
:(default_if_empty($(esc(source))))
16+
end
17+
18+
macro default_if_empty(source, default_value)
19+
:(default_if_empty($(esc(source)), $(esc(default_value))))
20+
end
21+
22+
function filter end
23+
24+
macro filter(source, f)
25+
q = Expr(:quote, f)
26+
:(QueryOperators.filter($(esc(source)), $(esc(f)), $(esc(q))))
27+
end
28+
29+
function groupby end
30+
31+
macro groupby(source,elementSelector,resultSelector)
32+
q_elementSelector = Expr(:quote, elementSelector)
33+
q_resultSelector = Expr(:quote, resultSelector)
34+
35+
:(groupby($(esc(source)), $(esc(elementSelector)), $(esc(q_elementSelector)), $(esc(resultSelector)), $(esc(q_resultSelector))))
36+
end
37+
38+
macro groupby_simple(source,elementSelector)
39+
q_elementSelector = Expr(:quote, elementSelector)
40+
41+
:(groupby($(esc(source)), $(esc(elementSelector)), $(esc(q_elementSelector))))
42+
end
43+
44+
function groupjoin end
45+
46+
macro groupjoin(outer, inner, outerKeySelector, innerKeySelector, resultSelector)
47+
q_outerKeySelector = Expr(:quote, outerKeySelector)
48+
q_innerKeySelector = Expr(:quote, innerKeySelector)
49+
q_resultSelector = Expr(:quote, resultSelector)
50+
51+
:(groupjoin($(esc(outer)), $(esc(inner)), $(esc(outerKeySelector)), $(esc(q_outerKeySelector)), $(esc(innerKeySelector)),$(esc(q_innerKeySelector)), $(esc(resultSelector)),$(esc(q_resultSelector))))
52+
end
53+
54+
function join end
55+
56+
macro join(outer, inner, outerKeySelector, innerKeySelector, resultSelector)
57+
q_outerKeySelector = Expr(:quote, outerKeySelector)
58+
q_innerKeySelector = Expr(:quote, innerKeySelector)
59+
q_resultSelector = Expr(:quote, resultSelector)
60+
61+
:(join($(esc(outer)), $(esc(inner)), $(esc(outerKeySelector)), $(esc(q_outerKeySelector)), $(esc(innerKeySelector)),$(esc(q_innerKeySelector)), $(esc(resultSelector)),$(esc(q_resultSelector))))
62+
end
63+
64+
function map end
65+
66+
macro map(source, f)
67+
q = Expr(:quote, f)
68+
:(map($(esc(source)), $(esc(f)), $(esc(q))))
69+
end
70+
71+
function mapmany end
72+
73+
macro mapmany(source,collectionSelector,resultSelector)
74+
q_collectionSelector = Expr(:quote, collectionSelector)
75+
q_resultSelector = Expr(:quote, resultSelector)
76+
77+
:(mapmany($(esc(source)), $(esc(collectionSelector)), $(esc(q_collectionSelector)), $(esc(resultSelector)), $(esc(q_resultSelector))))
78+
end
79+
80+
function orderby end
81+
82+
macro orderby(source, f)
83+
q = Expr(:quote, f)
84+
:(orderby($(esc(source)), $(esc(f)), $(esc(q))))
85+
end
86+
87+
function orderby_descending end
88+
89+
macro orderby_descending(source, f)
90+
q = Expr(:quote, f)
91+
:(orderby_descending($(esc(source)), $(esc(f)), $(esc(q))))
92+
end
93+
94+
function thenby end
95+
96+
macro thenby(source, f)
97+
q = Expr(:quote, f)
98+
:(thenby($(esc(source)), $(esc(f)), $(esc(q))))
99+
end
100+
101+
function thenby_descending end
102+
103+
macro thenby_descending(source, f)
104+
q = Expr(:quote, f)
105+
:(thenby_descending($(esc(source)), $(esc(f)), $(esc(q))))
106+
end

0 commit comments

Comments
 (0)