move AWST validation step to puya core

algorandfoundation · Sep 3, 2024 · cd4f30a · cd4f30a
1 parent 5193cf4
commit cd4f30a
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/src/puyapy/awst_build/validation/__init__.py → src/puya/awst/validation/__init__.py b/src/puyapy/awst_build/validation/__init__.py → src/puya/awst/validation/__init__.py
diff --git a/...puyapy/awst_build/validation/arc4_copy.py → src/puya/awst/validation/arc4_copy.py b/...puyapy/awst_build/validation/arc4_copy.py → src/puya/awst/validation/arc4_copy.py
@@ -1,6 +1,7 @@
 from collections.abc import Iterator
 
 import attrs
+
 from puya import log
 from puya.awst import (
     nodes as awst_nodes,

diff --git a/...apy/awst_build/validation/base_invoker.py → src/puya/awst/validation/base_invoker.py b/...apy/awst_build/validation/base_invoker.py → src/puya/awst/validation/base_invoker.py
diff --git a/...st_build/validation/inner_transactions.py → ...uya/awst/validation/inner_transactions.py b/...st_build/validation/inner_transactions.py → ...uya/awst/validation/inner_transactions.py
diff --git a/src/puyapy/awst_build/validation/labels.py → src/puya/awst/validation/labels.py b/src/puyapy/awst_build/validation/labels.py → src/puya/awst/validation/labels.py
diff --git a/src/puyapy/awst_build/validation/main.py → src/puya/awst/validation/main.py b/src/puyapy/awst_build/validation/main.py → src/puya/awst/validation/main.py
@@ -1,15 +1,14 @@
 from puya.awst import nodes as awst_nodes
-
-from puyapy.awst_build.validation.arc4_copy import ARC4CopyValidator
-from puyapy.awst_build.validation.base_invoker import BaseInvokerValidator
-from puyapy.awst_build.validation.inner_transactions import (
+from puya.awst.validation.arc4_copy import ARC4CopyValidator
+from puya.awst.validation.base_invoker import BaseInvokerValidator
+from puya.awst.validation.inner_transactions import (
     InnerTransactionsValidator,
     InnerTransactionUsedInALoopValidator,
     StaleInnerTransactionsValidator,
 )
-from puyapy.awst_build.validation.labels import LabelsValidator
-from puyapy.awst_build.validation.scratch_slots import ScratchSlotReservationValidator
-from puyapy.awst_build.validation.storage import StorageTypesValidator
+from puya.awst.validation.labels import LabelsValidator
+from puya.awst.validation.scratch_slots import ScratchSlotReservationValidator
+from puya.awst.validation.storage import StorageTypesValidator
 
 
 def validate_awst(module: awst_nodes.AWST) -> None:

diff --git a/...py/awst_build/validation/scratch_slots.py → src/puya/awst/validation/scratch_slots.py b/...py/awst_build/validation/scratch_slots.py → src/puya/awst/validation/scratch_slots.py
diff --git a/src/puyapy/awst_build/validation/storage.py → src/puya/awst/validation/storage.py b/src/puyapy/awst_build/validation/storage.py → src/puya/awst/validation/storage.py
diff --git a/src/puya/compile.py b/src/puya/compile.py
@@ -10,6 +10,7 @@
 from puya.arc32 import create_arc32_json
 from puya.artifact_sorter import ArtifactCompilationSorter
 from puya.awst.nodes import AWST
+from puya.awst.validation.main import validate_awst
 from puya.context import CompileContext
 from puya.errors import CodeError, InternalError
 from puya.ir.main import awst_to_ir, optimize_and_destructure_ir
@@ -52,6 +53,8 @@ def awst_to_teal(
     *,
     write: bool = True,
 ) -> list[CompilationArtifact]:
+    validate_awst(awst)
+    log_ctx.exit_if_errors()
     context = CompileContext(
         options=options,
         compilation_set=compilation_set,

diff --git a/src/puyapy/awst_build/module.py b/src/puyapy/awst_build/module.py
@@ -27,7 +27,6 @@
     get_decorators_by_fullname,
     get_unaliased_fullname,
 )
-from puyapy.awst_build.validation.main import validate_awst
 
 logger = log.get_logger(__name__)
 
@@ -67,7 +66,6 @@ def convert(self) -> AWST:
                 for deferred in deferrals:
                     awst_node = deferred(self.context)
                     awst.append(awst_node)
-        validate_awst(awst)  # TODO: move/split this to/with puya core
         return awst
 
     # Supported Statements