Format files using DocumentFormat

github-actions[bot] · web-flow · commit 75cba9227bb5 · 2020-07-28T19:10:10.000Z
diff --git a/benchmark/Rdatatable.jl b/benchmark/Rdatatable.jl
diff --git a/benchmark/benchmarks.jl b/benchmark/benchmarks.jl
@@ -13,19 +13,19 @@ using DataTables
     @bench "one column" @from i in $dt begin
         @group i.A by i.B into g
         @select {m = mean(g)}
-        @collect 
+        @collect
     end
-    
+
     @bench "two columns" @from i in $dt begin
         @group {i.A, i.B} by i.B into g
         @select {m = mean(g.A)}
-        @collect 
+        @collect
     end
 
     @bench "three columns" @from i in $dt begin
         @group {i.A, i.B, i.C} by i.B into g
         @select {m = mean(g.A)}
-        @collect 
+        @collect
     end
 end
 
@@ -68,7 +68,7 @@ end
         @bench "IntegerTest" @from i in $dt begin
             @group i.A by i.A into g
             @select g
-            @collect 
+            @collect
         end
     end
 
diff --git a/docs/make.jl b/docs/make.jl
@@ -3,7 +3,7 @@ using Documenter, Query, DataFrames
 makedocs(
 	modules = [Query],
 	sitename = "Query.jl",
-	analytics="UA-132838790-1",
+	analytics = "UA-132838790-1",
 	pages = [
 		"Introduction" => "index.md",
 		"Getting Started" => "gettingstarted.md",
diff --git a/example/01-DataFrame.jl b/example/01-DataFrame.jl
@@ -1,11 +1,11 @@
 using Query
 using DataFrames
 
-df = DataFrame(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,5,2])
+df = DataFrame(name = ["John", "Sally", "Kirk"], age = [23., 42., 59.], children = [3,5,2])
 
 x = @from i in df begin
-    @where i.age>30. && i.children > 2
-    @select {Name=lowercase(i.name)}
+    @where i.age > 30. && i.children > 2
+    @select {Name = lowercase(i.name)}
     @collect DataFrame
 end
 
diff --git a/example/02-Dict.jl b/example/02-Dict.jl
@@ -1,20 +1,20 @@
 using Query
 using DataFrames
 
-source = Dict("John"=>34., "Sally"=>56.)
+source = Dict("John" => 34., "Sally" => 56.)
 
 result = @from i in source begin
-         @where i.second>36.
-         @select {Name=lowercase(i.first)}
-         @collect DataFrame
+    @where i.second > 36.
+    @select {Name = lowercase(i.first)}
+    @collect DataFrame
 end
 
 println(result)
 
 result = @from i in source begin
-         @where i.second>36.
-         @select {Name=lowercase(i.first)}
-         @collect
+    @where i.second > 36.
+    @select {Name = lowercase(i.first)}
+    @collect
 end
 
 println(result)
diff --git a/example/03-Array.jl b/example/03-Array.jl
@@ -11,17 +11,17 @@ push!(source, Person("John", ["Sally", "Miles", "Frank"]))
 push!(source, Person("Sally", ["Don", "Martin"]))
 
 result = @from i in source begin
-         @where length(i.Friends) > 2
-         @select {i.Name, Friendcount=length(i.Friends)}
-         @collect
+    @where length(i.Friends) > 2
+    @select {i.Name, Friendcount = length(i.Friends)}
+    @collect
 end
 
 println(result)
 
 result = @from i in source begin
-         @where length(i.Friends) > 2
-         @select {i.Name, Friendcount=length(i.Friends)}
-         @collect DataFrame
+    @where length(i.Friends) > 2
+    @select {i.Name, Friendcount = length(i.Friends)}
+    @collect DataFrame
 end
 
 println(result)
diff --git a/example/05-NA.jl b/example/05-NA.jl
@@ -1,11 +1,11 @@
 using Query
 using DataFrames
 
-df = DataFrame(name=["John", missing, "Kirk"], age=[23., 42., 59.], children=[3,5,2])
+df = DataFrame(name = ["John", missing, "Kirk"], age = [23., 42., 59.], children = [3,5,2])
 
 x = @from i in df begin
-    @where i.age>30 && i.children >2
-    @select {Name=lowercase(i.name)}
+    @where i.age > 30 && i.children > 2
+    @select {Name = lowercase(i.name)}
     @collect DataFrame
 end
 
diff --git a/example/08-join.jl b/example/08-join.jl
@@ -1,11 +1,11 @@
 using DataFrames, Query
 
-df1 = DataFrame(a=[1,2,3], b=[1.,2.,3.])
-df2 = DataFrame(c=[2.,4.,2.], d=["John", "Jim","Sally"])
+df1 = DataFrame(a = [1,2,3], b = [1.,2.,3.])
+df2 = DataFrame(c = [2.,4.,2.], d = ["John", "Jim","Sally"])
 
 x = @from i in df1 begin
-    @join j in df2 on i.a equals convert(Int,j.c)
-    @select {i.a,i.b,j.c,j.d,e="Name: $(j.d)"}
+    @join j in df2 on i.a equals convert(Int, j.c)
+    @select {i.a,i.b,j.c,j.d,e = "Name: $(j.d)"}
     @collect DataFrame
 end
 
diff --git a/example/09-let.jl b/example/09-let.jl
@@ -1,13 +1,13 @@
 using Query
 using DataFrames
 
-df = DataFrame(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,5,2])
+df = DataFrame(name = ["John", "Sally", "Kirk"], age = [23., 42., 59.], children = [3,5,2])
 
 x = @from i in df begin
     @let count = length(i.name)
     @let kids_per_year = i.children / i.age
     @where count > 4
-    @select {Name=i.name, Count=count, KidsPerYear=kids_per_year}
+    @select {Name = i.name, Count = count, KidsPerYear = kids_per_year}
     @collect DataFrame
 end
 
diff --git a/example/10-orderby.jl b/example/10-orderby.jl
@@ -1,27 +1,27 @@
 using Query
 using DataFrames
 
-df = DataFrame(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,5,2])
+df = DataFrame(name = ["John", "Sally", "Kirk"], age = [23., 42., 59.], children = [3,5,2])
 
 x = @from i in df begin
     @orderby i.age
-    @select {Name=lowercase(i.name)}
+    @select {Name = lowercase(i.name)}
     @collect DataFrame
 end
 
 println(x)
 
 x = @from i in df begin
     @orderby descending(i.age)
-    @select {Name=lowercase(i.name)}
+    @select {Name = lowercase(i.name)}
     @collect DataFrame
 end
 
 println(x)
 
 x = @from i in df begin
     @orderby ascending(i.age)
-    @select {Name=lowercase(i.name)}
+    @select {Name = lowercase(i.name)}
     @collect DataFrame
 end
 
diff --git a/example/13-selectmany.jl b/example/13-selectmany.jl
@@ -1,7 +1,7 @@
 using DataFrames, Query
 
-df1 = DataFrame(a=[1,2,3], b=[1.,2.,3.])
-df2 = DataFrame(c=[2.,4.,2.], d=["John", "Jim","Sally"])
+df1 = DataFrame(a = [1,2,3], b = [1.,2.,3.])
+df2 = DataFrame(c = [2.,4.,2.], d = ["John", "Jim","Sally"])
 
 q = @from i in df1 begin
     @from j in df2
@@ -11,11 +11,11 @@ end
 
 println(q)
 
-source_dict = Dict(:a=>[1,2,3], :b=>[4,5])
+source_dict = Dict(:a => [1,2,3], :b => [4,5])
 
 q = @from i in source_dict begin
 	@from j in i.second
-	@select {Key=i.first,Value=j}
+	@select {Key = i.first,Value = j}
 	@collect DataFrame
 end
 
diff --git a/example/14-groupby.jl b/example/14-groupby.jl
@@ -1,7 +1,7 @@
 using Query
 using DataFrames
 
-df = DataFrame(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,2,2])
+df = DataFrame(name = ["John", "Sally", "Kirk"], age = [23., 42., 59.], children = [3,2,2])
 
 x = @from i in df begin
     @group i.name by i.children
diff --git a/example/15-groupinto.jl b/example/15-groupinto.jl
@@ -1,11 +1,11 @@
 using Query
 using DataFrames
 
-df = DataFrame(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,2,2])
+df = DataFrame(name = ["John", "Sally", "Kirk"], age = [23., 42., 59.], children = [3,2,2])
 
 x = @from i in df begin
     @group i by i.children into g
-    @select {Key=key(g),Count=length(g)}
+    @select {Key = key(g),Count = length(g)}
     @collect DataFrame
 end
 
diff --git a/example/16-selectinto.jl b/example/16-selectinto.jl
@@ -1,7 +1,7 @@
 using Query
 using DataFrames
 
-df = DataFrame(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,2,2])
+df = DataFrame(name = ["John", "Sally", "Kirk"], age = [23., 42., 59.], children = [3,2,2])
 
 x = @from i in df begin
     @select i into j
diff --git a/example/17-groupjoin.jl b/example/17-groupjoin.jl
@@ -1,12 +1,12 @@
 using DataFrames, Query
 
-df1 = DataFrame(a=[1,2,3], b=[1.,2.,3.])
-df2 = DataFrame(c=[2.,4.,2.], d=["John", "Jim","Sally"])
+df1 = DataFrame(a = [1,2,3], b = [1.,2.,3.])
+df2 = DataFrame(c = [2.,4.,2.], d = ["John", "Jim","Sally"])
 
 x = @from i in df1 begin
-    @join j in df2 on i.a equals convert(Int,j.c) into k
-    @where i.a>1
-    @select {t1=i,t2=k}
+    @join j in df2 on i.a equals convert(Int, j.c) into k
+    @where i.a > 1
+    @select {t1 = i,t2 = k}
     @collect DataFrame
 end
 
diff --git a/example/18-orderby-nested.jl b/example/18-orderby-nested.jl
@@ -1,7 +1,7 @@
 using Query
 using DataFrames
 
-df = DataFrame(a=[2,1,1,2,1,3],b=[2,2,1,1,3,2])
+df = DataFrame(a = [2,1,1,2,1,3], b = [2,2,1,1,3,2])
 
 x = @from i in df begin
     @orderby descending(i.a), i.b
diff --git a/example/23-dict-sink.jl b/example/23-dict-sink.jl
@@ -1,10 +1,10 @@
 using Query
 using DataFrames
 
-df = DataFrame(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,5,2])
+df = DataFrame(name = ["John", "Sally", "Kirk"], age = [23., 42., 59.], children = [3,5,2])
 
 q = @from i in df begin
-    @select i.name=>i.children
+    @select i.name => i.children
     @collect Dict
 end
 
diff --git a/example/25-ab-syntax.jl b/example/25-ab-syntax.jl
@@ -2,13 +2,13 @@ using Query
 using DataFrames
 using Statistics
 
-df = DataFrame(name=repeat(["John", "Sally", "Kirk"],inner=[1],outer=[2]), 
-     age=vcat([10., 20., 30.],[10., 20., 30.].+3), 
-     children=repeat([3,2,2],inner=[1],outer=[2]),state=[:a,:a,:a,:b,:b,:b])
+df = DataFrame(name = repeat(["John", "Sally", "Kirk"], inner = [1], outer = [2]),
+     age = vcat([10., 20., 30.], [10., 20., 30.] .+ 3),
+     children = repeat([3,2,2], inner = [1], outer = [2]),state = [:a,:a,:a,:b,:b,:b])
 
 x = @from i in df begin
     @group i by i.state into g
-    @select {group=key(g),mage=mean(g.age), oldest=maximum(g.age), youngest=minimum(g.age)}
+    @select {group = key(g),mage = mean(g.age), oldest = maximum(g.age), youngest = minimum(g.age)}
     @collect DataFrame
 end
 
diff --git a/example/prep_data.jl b/example/prep_data.jl
@@ -1,14 +1,14 @@
 using DataFrames
 
-n=10_000_000
+n = 10_000_000
 
 # Right now things only work columns of type Array, so
 # we need this slighlty cumbersome DataFrame construction
 # to prevent DataArray or NullableArray creation
 # We are also skipping all Strings because of #14955 (I think)
-data_friends = fill(4,n)
-data_age = fill(38.2,n)
-data_children = fill(2,n)
+data_friends = fill(4, n)
+data_age = fill(38.2, n)
+data_children = fill(2, n)
 
 columns = []
 push!(columns, data_friends)
diff --git a/src/Query.jl b/src/Query.jl
@@ -20,30 +20,30 @@ include("standalone_query_macros.jl")
 include("table_query_macros.jl")
 
 macro from(range::Expr, body::Expr)
-	if range.head!=:call || (range.args[1]!=:in && range.args[1]!=in)
+	if range.head != :call || (range.args[1] != :in && range.args[1] != in)
 		error()
 	end
 
-	if body.head!=:block
+	if body.head != :block
 		error()
 	end
 
-	body.args = filter(i->!isa(i, LineNumberNode),body.args)
+	body.args = filter(i->!isa(i, LineNumberNode), body.args)
 
-	insert!(body.args,1,:( @from $(range.args[2]) in $(range.args[3]) ))
+	insert!(body.args, 1, :( @from $(range.args[2]) in $(range.args[3]) ))
 
 	translate_query(body)
 
 	return body.args[1]
 end
 
 macro query(range::Symbol, body::Expr)
-	if body.head!=:block
+	if body.head != :block
 		error()
 	end
 
 	f_arg = gensym()
-	x = x = esc(:($f_arg -> $Query.@from $in($range, $f_arg) $body))
+	x = x = esc(:($f_arg->$Query.@from $in($range, $f_arg) $body))
 	return x
 end
 
diff --git a/src/query_utils.jl b/src/query_utils.jl
@@ -1,8 +1,8 @@
-ismacro(ex, name::Symbol, nargs::Integer=-1) =
-    isa(ex, Expr) && ex.head==:macrocall && ex.args[1]==name &&
-    (nargs == -1 || length(ex.args) == nargs+1)
-ismacro(ex, name::String, nargs::Integer=-1) = ismacro(ex, Symbol(name), nargs)
+ismacro(ex, name::Symbol, nargs::Integer = -1) =
+    isa(ex, Expr) && ex.head == :macrocall && ex.args[1] == name &&
+    (nargs == -1 || length(ex.args) == nargs + 1)
+ismacro(ex, name::String, nargs::Integer = -1) = ismacro(ex, Symbol(name), nargs)
 
-iscall(ex, name::Symbol, nargs::Integer=-1) =
-    isa(ex, Expr) && ex.head==:call && ex.args[1]==name &&
-    (nargs == -1 || length(ex.args) == nargs+1)
+iscall(ex, name::Symbol, nargs::Integer = -1) =
+    isa(ex, Expr) && ex.head == :call && ex.args[1] == name &&
+    (nargs == -1 || length(ex.args) == nargs + 1)
diff --git a/src/standalone_query_macros.jl b/src/standalone_query_macros.jl
diff --git a/src/table_query_macros.jl b/src/table_query_macros.jl
diff --git a/test/runtests.jl b/test/runtests.jl
diff --git a/test/test_dplyr-syntax.jl b/test/test_dplyr-syntax.jl
diff --git a/test/test_pipesyntax.jl b/test/test_pipesyntax.jl
diff --git a/test/test_standalone.jl b/test/test_standalone.jl
