From 66ce3321fe14c609544d599c1d5cea787c0a1e5b Mon Sep 17 00:00:00 2001
From: Shenghang Tsai <jackalcooper@gmail.com>
Date: Sun, 1 Dec 2024 23:05:32 +0800
Subject: [PATCH] Update expander.ex

---
 lib/charms/defm/expander.ex | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/lib/charms/defm/expander.ex b/lib/charms/defm/expander.ex
index 8000449..604e397 100644
--- a/lib/charms/defm/expander.ex
+++ b/lib/charms/defm/expander.ex
@@ -279,15 +279,13 @@ defmodule Charms.Defm.Expander do
         {l, state, env} = expand(l, state, env)
         {init, state, env} = expand(init, state, env)
         result_t = MLIR.Value.type(init)
-        {list_term_ptr, state} = uniq_mlir_var(l, state)
-        tail_ptr = uniq_mlir_var()
-        head_ptr = uniq_mlir_var()
-
-        {_, state, env} =
-          quote do
-            unquote(tail_ptr) = Charms.Pointer.allocate(Term.t())
-            Pointer.store(unquote(list_term_ptr), unquote(tail_ptr))
-            unquote(head_ptr) = Charms.Pointer.allocate(Term.t())
+
+        {{tail_ptr, head_ptr}, state, env} =
+          quote bind_quoted: [list_term_ptr: l] do
+            tail_ptr = Charms.Pointer.allocate(Term.t())
+            Pointer.store(list_term_ptr, tail_ptr)
+            head_ptr = Charms.Pointer.allocate(Term.t())
+            {tail_ptr, head_ptr}
           end
           |> expand(state, env)
 
@@ -298,13 +296,13 @@ defmodule Charms.Defm.Expander do
               state = put_in(state.mlir.blk, Beaver.Env.block())
 
               # getting the BEAM env, assuming it is a regular defm with env as the first argument
-              {env_var, state} = beam_env_from_defm!(env, state)
+              env_ptr = beam_env_from_defm!(env, state)
 
               # the condition of the while loop, consuming the list with enif_get_list_cell
               {condition, _state, _env} =
                 quote do
                   enif_get_list_cell(
-                    unquote(env_var),
+                    unquote(env_ptr),
                     Pointer.load(Term.t(), unquote(tail_ptr)),
                     unquote(head_ptr),
                     unquote(tail_ptr)
@@ -447,7 +445,7 @@ defmodule Charms.Defm.Expander do
   defp expand_get_attribute(args, state, env) do
     {args, state, env} = expand(args, state, env)
     attr = apply(Module, :__get_attribute__, args) |> :erlang.term_to_binary()
-    {env_var, state} = beam_env_from_defm!(env, state)
+    env_ptr = beam_env_from_defm!(env, state)
 
     # there is no nested do-block to expand, so it is safe to use regular variable names, as long as the updated state and env are not leaked
     quote do
@@ -461,7 +459,7 @@ defmodule Charms.Defm.Expander do
       buffer = ptr_to_memref(buffer_ptr, size)
       memref.copy(attr, buffer)
       zero = const 0 :: i32()
-      enif_binary_to_term(unquote(env_var), buffer_ptr, size, term_ptr, zero)
+      enif_binary_to_term(unquote(env_ptr), buffer_ptr, size, term_ptr, zero)
       Pointer.load(Term.t(), term_ptr)
     end
     |> expand(state, env)
@@ -1378,21 +1376,12 @@ defmodule Charms.Defm.Expander do
 
   defp beam_env_from_defm!(env, state) do
     if e = state.mlir.enif_env do
-      uniq_mlir_var(e, state)
+      e
     else
       raise_compile_error(env, "must be a defm with beam env as the first argument")
     end
   end
 
-  @var_prefix "chv"
-  defp uniq_mlir_var() do
-    Macro.var(:"#{@var_prefix}#{System.unique_integer([:positive])}", nil)
-  end
-
-  defp uniq_mlir_var(val, state) do
-    uniq_mlir_var() |> then(&{&1, put_mlir_var(state, &1, val)})
-  end
-
   @doc """
   Decomposes a call into the call part and return type.
   """