guppylang-internals 0.22.0__tar.gz → 0.23.0__tar.gz

{guppylang_internals-0.22.0 → guppylang_internals-0.23.0}/CHANGELOG.md

@@ -3,6 +3,23 @@
 First release of `guppylang_internals` package containing refactored out internal components
 from `guppylang`.
 
+## [0.23.0](https://github.com/CQCL/guppylang/compare/guppylang-internals-v0.22.0...guppylang-internals-v0.23.0) (2025-08-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* `check_rows_match` no longer takes `globals` Deleted `GlobalShadowError` and `BranchTypeError.GlobalHint`
+
+### Bug Fixes
+
+* Fix globals vs locals scoping behaviour to match Python ([#1169](https://github.com/CQCL/guppylang/issues/1169)) ([a6a91ca](https://github.com/CQCL/guppylang/commit/a6a91ca32ad7c67bf1d733eb26c016a2662256ef))
+* Fix scoping issues with comprehensions in comptime expressions ([#1218](https://github.com/CQCL/guppylang/issues/1218)) ([0b990e2](https://github.com/CQCL/guppylang/commit/0b990e2b006c31352675004aec63a857f03a0793))
+
+
+### Documentation
+
+* use results sequence protocol for simplicity ([#1208](https://github.com/CQCL/guppylang/issues/1208)) ([f9c1aee](https://github.com/CQCL/guppylang/commit/f9c1aee38776c678660ede5495989ac4d75baaeb))
+
 ## [0.22.0](https://github.com/CQCL/guppylang/compare/guppylang-internals-v0.21.2...guppylang-internals-v0.22.0) (2025-08-11)
 
 

{guppylang_internals-0.22.0 → guppylang_internals-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: guppylang-internals
-Version: 0.22.0
+Version: 0.23.0
 Summary: Compiler internals for `guppylang` package.
 Author-email: Mark Koch <mark.koch@quantinuum.com>, TKET development team <tket-support@quantinuum.com>
 Maintainer-email: Mark Koch <mark.koch@quantinuum.com>, TKET development team <tket-support@quantinuum.com>
@@ -219,7 +219,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Compilers
 Requires-Python: <4,>=3.10
-Requires-Dist: hugr<0.14,>=0.13.0rc1
+Requires-Dist: hugr~=0.13.1
 Requires-Dist: tket-exts~=0.10.0
 Requires-Dist: typing-extensions<5,>=4.9.0
 Provides-Extra: pytket
@@ -250,4 +250,4 @@ See [DEVELOPMENT.md] information on how to develop and contribute to this packag
 
 This project is licensed under Apache License, Version 2.0 ([LICENCE][] or http://www.apache.org/licenses/LICENSE-2.0).
 
-  [LICENCE]: https://github.com/CQCL/guppylang/blob/main/LICENCE
+  [LICENCE]: https://github.com/CQCL/guppylang/blob/main/LICENCE

{guppylang_internals-0.22.0 → guppylang_internals-0.23.0}/README.md

@@ -22,4 +22,4 @@ See [DEVELOPMENT.md] information on how to develop and contribute to this packag
 
 This project is licensed under Apache License, Version 2.0 ([LICENCE][] or http://www.apache.org/licenses/LICENSE-2.0).
 
-  [LICENCE]: https://github.com/CQCL/guppylang/blob/main/LICENCE
+  [LICENCE]: https://github.com/CQCL/guppylang/blob/main/LICENCE

{guppylang_internals-0.22.0 → guppylang_internals-0.23.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "guppylang-internals"
-version = "0.22.0"
+version = "0.23.0"
 requires-python = ">=3.10,<4"
 description = "Compiler internals for `guppylang` package."
 license = { file = "LICENCE" }
@@ -35,7 +35,7 @@ classifiers = [
 dependencies = [
     "typing-extensions >=4.9.0,<5",
     "tket-exts ~= 0.10.0",
-    "hugr >= 0.13.0rc1,<0.14",
+    "hugr ~= 0.13.1",
 ]
 
 [project.optional-dependencies]

{guppylang_internals-0.22.0 → guppylang_internals-0.23.0}/src/guppylang_internals/__init__.py

@@ -1,3 +1,3 @@
 # This is updated by our release-please workflow, triggered by this
 # annotation: x-release-please-version
-__version__ = "0.22.0"
+__version__ = "0.23.0"

{guppylang_internals-0.22.0 → guppylang_internals-0.23.0}/src/guppylang_internals/cfg/cfg.py

@@ -27,6 +27,9 @@ class BaseCFG(Generic[T]):
     ass_before: Result[DefAssignmentDomain[str]]
     maybe_ass_before: Result[MaybeAssignmentDomain[str]]
 
+    #: Set of variables defined in this CFG
+    assigned_somewhere: set[str]
+
     def __init__(
         self, bbs: list[T], entry_bb: T | None = None, exit_bb: T | None = None
     ):
@@ -38,6 +41,7 @@ class BaseCFG(Generic[T]):
         self.live_before = {}
         self.ass_before = {}
         self.maybe_ass_before = {}
+        self.assigned_somewhere = set()
 
     def ancestors(self, *bbs: T) -> Iterator[T]:
         """Returns an iterator over all ancestors of the given BBs in BFS order."""
@@ -101,6 +105,10 @@ class CFG(BaseCFG[BB]):
         inout_vars: list[str],
     ) -> dict[BB, VariableStats[str]]:
         stats = {bb: bb.compute_variable_stats() for bb in self.bbs}
+        # Locals are variables that are assigned somewhere inside the function
+        self.assigned_somewhere = def_ass_before.union(
+            maybe_ass_before, (x for bb in self.bbs for x in stats[bb].assigned)
+        )
         # Mark all borrowed variables as implicitly used in the exit BB
         stats[self.exit_bb].used |= {x: InoutReturnSentinel(var=x) for x in inout_vars}
         # This also means borrowed variables are always live, so we can use them as the

{guppylang_internals-0.22.0 → guppylang_internals-0.23.0}/src/guppylang_internals/checker/cfg_checker.py

@@ -8,7 +8,7 @@ import ast
 import collections
 from collections.abc import Iterator, Sequence
 from dataclasses import dataclass, field
-from typing import ClassVar, Generic, TypeVar, cast
+from typing import ClassVar, Generic, TypeVar
 
 from guppylang_internals.ast_util import line_col
 from guppylang_internals.cfg.bb import BB
@@ -23,7 +23,6 @@ from guppylang_internals.checker.core import (
 )
 from guppylang_internals.checker.expr_checker import ExprSynthesizer, to_bool
 from guppylang_internals.checker.stmt_checker import StmtChecker
-from guppylang_internals.definition.value import ValueDef
 from guppylang_internals.diagnostic import Error, Note
 from guppylang_internals.error import GuppyError
 from guppylang_internals.tys.param import Parameter
@@ -115,7 +114,7 @@ def check_cfg(
         if bb in compiled:
             # If the BB was already compiled, we just have to check that the signatures
             # match.
-            check_rows_match(input_row, compiled[bb].sig.input_row, bb, globals)
+            check_rows_match(input_row, compiled[bb].sig.input_row, bb)
         else:
             # Otherwise, check the BB and enqueue its successors
             checked_bb = check_bb(
@@ -195,21 +194,6 @@ class BranchTypeError(Error):
         span_label: ClassVar[str] = "This is of type `{ty}`"
         ty: Type
 
-    @dataclass(frozen=True)
-    class GlobalHint(Note):
-        message: ClassVar[str] = (
-            "{ident} may be shadowing a global {defn.description} definition of type "
-            "`{defn.ty}` on some branches"
-        )
-        defn: ValueDef
-
-
-@dataclass(frozen=True)
-class GlobalShadowError(Error):
-    title: ClassVar[str] = "Global variable conditionally shadowed"
-    span_label: ClassVar[str] = "{ident} may be shadowing a global variable"
-    ident: str
-
 
 def check_bb(
     bb: BB,
@@ -245,23 +229,27 @@ def check_bb(
 
     for succ in bb.successors + bb.dummy_successors:
         for x, use_bb in cfg.live_before[succ].items():
-            # Check that the variables requested by the successor are defined
-            if (
-                x not in ctx.locals
-                and x not in ctx.globals
-                and x not in ctx.generic_params
-            ):
-                # If the variable is defined on *some* paths, we can give a more
-                # informative error message
-                if x in cfg.maybe_ass_before[use_bb]:
-                    err = VarMaybeNotDefinedError(use_bb.vars.used[x], x)
-                    if bad_branch := diagnose_maybe_undefined(use_bb, x, cfg):
-                        branch_expr, truth_value = bad_branch
-                        note = VarMaybeNotDefinedError.BadBranch(
-                            branch_expr, x, truth_value
-                        )
-                        err.add_sub_diagnostic(note)
+            # Check that the variables requested by the successor are defined. If `x` is
+            # a local variable, then we must be able to find it in the context.
+            # Following Python, locals are exactly those variables that are defined
+            # somewhere in the function body.
+            if x in cfg.assigned_somewhere:
+                if x not in ctx.locals:
+                    # If the variable is defined on *some* paths, we can give a more
+                    # informative error message
+                    if x in cfg.maybe_ass_before[use_bb]:
+                        err: Error = VarMaybeNotDefinedError(use_bb.vars.used[x], x)
+                        if bad_branch := diagnose_maybe_undefined(use_bb, x, cfg):
+                            branch_expr, truth_value = bad_branch
+                            note = VarMaybeNotDefinedError.BadBranch(
+                                branch_expr, x, truth_value
+                            )
+                            err.add_sub_diagnostic(note)
+                    else:
+                        err = VarNotDefinedError(use_bb.vars.used[x], x)
                     raise GuppyError(err)
+            # If x is not a local, then it must be a global or generic param
+            elif x not in ctx.globals and x not in ctx.generic_params:
                 raise GuppyError(VarNotDefinedError(use_bb.vars.used[x], x))
 
     # Finally, we need to compute the signature of the basic block
@@ -287,9 +275,7 @@ def check_bb(
     return checked_bb
 
 
-def check_rows_match(
-    row1: Row[Variable], row2: Row[Variable], bb: BB, globals: Globals
-) -> None:
+def check_rows_match(row1: Row[Variable], row2: Row[Variable], bb: BB) -> None:
     """Checks that the types of two rows match up.
 
     Otherwise, an error is thrown, alerting the user that a variable has different
@@ -299,10 +285,7 @@ def check_rows_match(
     for x in map1.keys() | map2.keys():
         # If block signature lengths don't match but no undefined error was thrown, some
         # variables may be shadowing global variables.
-        v1 = map1.get(x) or cast(ValueDef, globals[x])
-        assert isinstance(v1, Variable | ValueDef)
-        v2 = map2.get(x) or cast(ValueDef, globals[x])
-        assert isinstance(v2, Variable | ValueDef)
+        v1, v2 = map1[x], map2[x]
         if v1.ty != v2.ty:
             # In the error message, we want to mention the variable that was first
             # defined at the start.
@@ -320,31 +303,9 @@ def check_rows_match(
             # We don't add a location to the type hint for the global variable,
             # since it could lead to cross-file diagnostics (which are not
             # supported) or refer to long function definitions.
-            sub1 = (
-                BranchTypeError.TypeHint(v1.defined_at, v1.ty)
-                if isinstance(v1, Variable)
-                else BranchTypeError.GlobalHint(None, v1)
-            )
-            sub2 = (
-                BranchTypeError.TypeHint(v2.defined_at, v2.ty)
-                if isinstance(v2, Variable)
-                else BranchTypeError.GlobalHint(None, v2)
-            )
-            err.add_sub_diagnostic(sub1)
-            err.add_sub_diagnostic(sub2)
+            err.add_sub_diagnostic(BranchTypeError.TypeHint(v1.defined_at, v1.ty))
+            err.add_sub_diagnostic(BranchTypeError.TypeHint(v2.defined_at, v2.ty))
             raise GuppyError(err)
-        else:
-            # TODO: Remove once https://github.com/CQCL/guppylang/issues/827 is done.
-            # If either is a global variable, don't allow shadowing even if types match.
-            if not (isinstance(v1, Variable) and isinstance(v2, Variable)):
-                local_var = v1 if isinstance(v1, Variable) else v2
-                ident = (
-                    "Expression"
-                    if local_var.name.startswith("%")
-                    else f"Variable `{local_var.name}`"
-                )
-                glob_err = GlobalShadowError(local_var.defined_at, ident)
-                raise GuppyError(glob_err)
 
 
 def diagnose_maybe_undefined(

{guppylang_internals-0.22.0 → guppylang_internals-0.23.0}/src/guppylang_internals/checker/expr_checker.py

@@ -1309,11 +1309,7 @@ def eval_comptime_expr(node: ComptimeExpr, ctx: Context) -> Any:
         raise GuppyError(ComptimeExprNotCPythonError(node))
 
     try:
-        python_val = eval(  # noqa: S307
-            ast.unparse(node.value),
-            None,
-            DummyEvalDict(ctx, node.value),
-        )
+        python_val = eval(ast.unparse(node.value), DummyEvalDict(ctx, node.value))  # noqa: S307
     except DummyEvalDict.GuppyVarUsedError as e:
         raise GuppyError(ComptimeExprNotStaticError(e.node or node, e.var)) from None
     except Exception as e: