refactor: Move side-effect commands to a separate file

codedthinking · Jul 2, 2024 · d09d84b · d09d84b
1 parent 4579c62
commit d09d84b
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 51 deletions.
diff --git a/src/Kezdi.jl b/src/Kezdi.jl
@@ -21,6 +21,7 @@ include("macros.jl")
 include("parse.jl")
 include("codegen.jl")
 include("commands.jl")
+include("side_effects.jl")
 
 include("With.jl")
 @reexport using .With: @with, @with!

diff --git a/src/commands.jl b/src/commands.jl
@@ -1,48 +1,6 @@
 # use multiple dispatch to generate code 
 rewrite(command::Command) = rewrite(Val(command.command), command)
 
-function rewrite(::Val{:tabulate}, command::Command)
-    gc = generate_command(command; options=[:variables, :ifable, :nofunction])
-    (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
-    columns = [x[1] for x in extract_variable_references.(command.arguments)]
-    quote
-        $setup
-        Kezdi.tabulate($target_df, $columns) |> $teardown
-    end |> esc
-end
-
-function rewrite(::Val{:summarize}, command::Command)
-    gc = generate_command(command; options=[:variables, :ifable, :replace_variables, :single_argument, :nofunction])
-    (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
-    column = extract_variable_references(command.arguments[1])
-    quote
-        $setup
-        Kezdi.summarize($target_df, $column[1]) |> $teardown
-    end |> esc
-end
-
-function rewrite(::Val{:regress}, command::Command)
-    gc = generate_command(command; options=[:variables, :ifable], allowed=[:robust, :cluster])
-    (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
-    if :robust in get_top_symbol.(options)
-        vcov = :(Vcov.robust())
-    elseif :cluster in get_top_symbol.(options)
-        vars = get_option(command, :cluster)
-        vars = replace_variable_references.(vars)
-        vcov = :(Vcov.cluster($(vars...)))
-    else
-        vcov = :(Vcov.simple())
-    end
-    quote
-        $setup
-        if length($(arguments[2:end])) == 1
-            reg($target_df, @formula($(arguments[1]) ~ $(arguments[2])), $vcov) |> $teardown
-        else
-            reg($target_df, @formula($(arguments[1]) ~ $(Expr(:call, :+, arguments[2:end]...))), $vcov) |> $teardown
-        end
-    end |> esc
-end
-
 function rewrite(::Val{:generate}, command::Command)
     gc = generate_command(command; options=[:single_argument, :variables, :ifable, :replace_variables, :vectorize, :assignment], allowed=[:by])
     (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
@@ -136,15 +94,6 @@ function rewrite(::Val{:egen}, command::Command)
     end |> esc
 end
 
-function rewrite(::Val{:count}, command::Command)
-    gc = generate_command(command; options=[:ifable, :nofunction], allowed=[:by])
-    (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
-    quote
-        $setup
-        Kezdi.counter($target_df) |> $teardown
-    end |> esc
-end
-
 function rewrite(::Val{:sort}, command::Command)
     gc = generate_command(command; options=[:variables, :nofunction], allowed=[:desc])
     (; df, local_copy, target_df, setup, teardown, arguments, options) = gc

diff --git a/src/side_effects.jl b/src/side_effects.jl
@@ -0,0 +1,51 @@
+function rewrite(::Val{:tabulate}, command::Command)
+    gc = generate_command(command; options=[:variables, :ifable, :nofunction])
+    (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
+    columns = [x[1] for x in extract_variable_references.(command.arguments)]
+    quote
+        $setup
+        Kezdi.tabulate($target_df, $columns) |> $teardown
+    end |> esc
+end
+
+function rewrite(::Val{:summarize}, command::Command)
+    gc = generate_command(command; options=[:variables, :ifable, :replace_variables, :single_argument, :nofunction])
+    (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
+    column = extract_variable_references(command.arguments[1])
+    quote
+        $setup
+        Kezdi.summarize($target_df, $column[1]) |> $teardown
+    end |> esc
+end
+
+function rewrite(::Val{:regress}, command::Command)
+    gc = generate_command(command; options=[:variables, :ifable], allowed=[:robust, :cluster])
+    (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
+    if :robust in get_top_symbol.(options)
+        vcov = :(Vcov.robust())
+    elseif :cluster in get_top_symbol.(options)
+        vars = get_option(command, :cluster)
+        vars = replace_variable_references.(vars)
+        vcov = :(Vcov.cluster($(vars...)))
+    else
+        vcov = :(Vcov.simple())
+    end
+    quote
+        $setup
+        if length($(arguments[2:end])) == 1
+            reg($target_df, @formula($(arguments[1]) ~ $(arguments[2])), $vcov) |> $teardown
+        else
+            reg($target_df, @formula($(arguments[1]) ~ $(Expr(:call, :+, arguments[2:end]...))), $vcov) |> $teardown
+        end
+    end |> esc
+end
+
+function rewrite(::Val{:count}, command::Command)
+    gc = generate_command(command; options=[:ifable, :nofunction], allowed=[:by])
+    (; df, local_copy, target_df, setup, teardown, arguments, options) = gc
+    quote
+        $setup
+        Kezdi.counter($target_df) |> $teardown
+    end |> esc
+end
+