From ff1fc63cdc3e936079a2cc9e8f6873954a0e5133 Mon Sep 17 00:00:00 2001
From: Hang Su <hang.su@algorand.com>
Date: Mon, 12 Dec 2022 11:32:03 -0500
Subject: [PATCH] separate logic of alloc abstract var

---
 pyteal/ast/abi/type.py    | 23 ++---------------------
 pyteal/ast/abstractvar.py | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/pyteal/ast/abi/type.py b/pyteal/ast/abi/type.py
index e82853cf9..0c7951b14 100644
--- a/pyteal/ast/abi/type.py
+++ b/pyteal/ast/abi/type.py
@@ -2,9 +2,7 @@
 from abc import ABC, abstractmethod
 
 from pyteal.ast.expr import Expr
-from pyteal.ast.abstractvar import AbstractVar
-from pyteal.ast.frame import FrameVar, MAX_FRAME_LOCAL_VARS
-from pyteal.ast.scratchvar import ScratchVar
+from pyteal.ast.abstractvar import AbstractVar, alloc_abstract_var
 from pyteal.ast.seq import Seq
 from pyteal.errors import TealInputError
 from pyteal.types import TealType
@@ -77,26 +75,9 @@ class BaseType(ABC):
 
     def __init__(self, spec: TypeSpec) -> None:
         """Create a new BaseType."""
-        from pyteal.ast.subroutine import SubroutineEval
-
         super().__init__()
         self._type_spec: Final[TypeSpec] = spec
-        self._stored_value: AbstractVar
-
-        if SubroutineEval._current_proto:
-            local_types = SubroutineEval._current_proto.mem_layout.local_stack_types
-
-            # NOTE: you can have at most 128 local variables.
-            # len(local_types) + 1 computes the resulting length,
-            # should be <= 128
-            if len(local_types) + 1 <= MAX_FRAME_LOCAL_VARS:
-                local_types.append(spec.storage_type())
-                self._stored_value = FrameVar(
-                    SubroutineEval._current_proto, len(local_types) - 1
-                )
-                return
-
-        self._stored_value = ScratchVar(spec.storage_type())
+        self._stored_value: AbstractVar = alloc_abstract_var(spec.storage_type())
 
     def type_spec(self) -> TypeSpec:
         """Get the TypeSpec for this ABI type instance."""
diff --git a/pyteal/ast/abstractvar.py b/pyteal/ast/abstractvar.py
index 0ed9bf9b2..1057774a9 100644
--- a/pyteal/ast/abstractvar.py
+++ b/pyteal/ast/abstractvar.py
@@ -38,3 +38,32 @@ def storage_type(self) -> TealType:
 
 
 AbstractVar.__module__ = "pyteal"
+
+
+def alloc_abstract_var(stack_type: TealType) -> AbstractVar:
+    """Allocate abstract var over stack, or over scratch.
+
+    This unexported function takes a TealType as value type representation over stack (or scratch),
+    and generates an AbstractVar instance.
+    It infers the proto currently being used in context of subroutine evaluation,
+    and swap to FrameVar to save the use of scratch slots.
+
+    Arg:
+        stack_type: An TealType that represents stack type.
+    """
+
+    from pyteal.ast import ScratchVar
+    from pyteal.ast.subroutine import SubroutineEval
+    from pyteal.ast.frame import FrameVar, MAX_FRAME_LOCAL_VARS
+
+    if SubroutineEval._current_proto:
+        local_types = SubroutineEval._current_proto.mem_layout.local_stack_types
+
+        # NOTE: you can have at most 128 local variables.
+        # len(local_types) + 1 computes the resulting length,
+        # should be <= 128
+        if len(local_types) + 1 <= MAX_FRAME_LOCAL_VARS:
+            local_types.append(stack_type)
+            return FrameVar(SubroutineEval._current_proto, len(local_types) - 1)
+
+    return ScratchVar(stack_type)