Merge pull request #12 from co1emi11er2/Vectors

Vectors

Project.toml

@@ -1,7 +1,7 @@
 name = "Handcalcs"
 uuid = "e8a07092-c156-4455-ab8e-ed8bc81edefb"
 authors = ["Cole Miller"]
-version = "0.3.2"
+version = "0.3.3"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/Handcalcs.jl

@@ -9,7 +9,7 @@ using MacroTools
 using LaTeXStrings
 using CodeTracking, Revise
 using InteractiveUtils
-import AbstractTrees: Leaves
+import AbstractTrees: Leaves, PostOrderDFS
 using PrecompileTools: @setup_workload, @compile_workload 
 
 export @handcalc, @handcalcs, @handfunc, multiline_latex, collect_exprs

src/handcalc_marco.jl

@@ -107,6 +107,10 @@ function _walk_expr(expr::Vector, math_syms)
             count = 1
             return ex
         end
+        if Meta.isexpr(ex, :ref)
+            count = length(collect(PostOrderDFS(ex)))
+            return Expr(:$, ex)
+        end
         if (ex isa Symbol) & (ex ∉ math_syms)
             count = 1
             return numeric_sub(ex)
@@ -122,6 +126,10 @@ function _walk_expr(expr::Expr, math_syms)
             count -= 1
             return ex
         end
+        if Meta.isexpr(ex, :ref)
+            count = length(collect(PostOrderDFS(ex)))
+            return Expr(:$, ex)
+        end
         if Meta.isexpr(ex, :.) # interpolates field args
             count = length(ex.args) + 1
             return Expr(:$, ex)

test/handcalc_macro.jl

@@ -18,3 +18,47 @@ calc2 = @handcalc begin x = (-b + sqrt(b^2 - 4*a*c))/(2*a) end
 @test x == 2.0
 @test calc2 == expected
 # ***************************************************
+
+
+# foo with args and kwargs
+# ***************************************************
+# ***************************************************
+let 
+    expected = L"$x = \frac{ - b + \sqrt{b^{2} - 4 \cdot a \cdot c}}{2 \cdot a} = \frac{ + 5 + \sqrt{\left( -5 \right)^{2} - 4 \cdot 2 \cdot 2}}{2 \cdot 2} = 2.0$"
+
+    function foo(x; y, z)
+        return x + y + z
+    end
+
+    x = 5
+    y = 3
+    z = 7
+
+    expected1 = L"$\mathrm{foo}\left( y, z, x \right) = \mathrm{foo}\left( 3, 7, 5 \right) = 15$"
+    calc1 = @handcalc foo(x; y, z)
+    @test calc1 == expected1
+
+    expected2 = L"$\mathrm{foo}\left( x; y = y, z = z \right) = \mathrm{foo}\left( 5; y = 3, z = 7 \right) = 15$"
+    calc2 = @handcalc foo(x; y=y, z=z)
+    @test calc2 == expected2
+
+    expected3 = L"$\mathrm{foo}\left( x, y = y, z = z \right) = \mathrm{foo}\left( 5, y = 3, z = 7 \right) = 15$"
+    calc3 = @handcalc foo(x, y=y, z=z)
+    @test calc3 == expected3
+
+end
+# ***************************************************
+
+
+# array indexing
+# ***************************************************
+# ***************************************************
+let 
+    x = [1 2]
+
+    expected = L"$x\left[x\left[1\right]\right] + x\left[2\right] = 1 + 2 = 3$"
+    calc = @handcalc x[x[1]] + x[2]
+    @test calc == expected
+
+end
+# ***************************************************