Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

fix[lang]: allow type expressions inside pure functions #3906

Merged
merged 2 commits into from
Apr 3, 2024
Merged

fix[lang]: allow type expressions inside pure functions #3906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84ca3cf
fix[lang]: allow type expressions inside pure functions
charles-cooper Apr 2, 2024
39c3981
Merge branch 'master' into fix/pure-access-types
charles-cooper Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions tests/functional/codegen/features/decorators/test_pure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,19 @@ def foo() -> uint256:
compile_code(code)


def test_type_in_pure(get_contract):
code = """
@pure
@external
def _convert(x: bytes32) -> uint256:
return convert(x, uint256)
"""
c = get_contract(code)
x = 123456
bs = x.to_bytes(32, "big")
assert x == c._convert(bs)


def test_invalid_conflicting_decorators():
code = """
@pure
Expand Down
9 changes: 6 additions & 3 deletions vyper/semantics/analysis/local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@ def _validate_msg_value_access(node: vy_ast.Attribute) -> None:
raise NonPayableViolation("msg.value is not allowed in non-payable functions", node)


def _validate_pure_access(node: vy_ast.Attribute | vy_ast.Name) -> None:
def _validate_pure_access(node: vy_ast.Attribute | vy_ast.Name, typ: VyperType) -> None:
if isinstance(typ, TYPE_T):
return

info = get_expr_info(node)

env_vars = CONSTANT_ENVIRONMENT_VARS
Expand Down Expand Up @@ -705,7 +708,7 @@ def visit_Attribute(self, node: vy_ast.Attribute, typ: VyperType) -> None:
_validate_msg_value_access(node)

if self.func and self.func.mutability == StateMutability.PURE:
_validate_pure_access(node)
_validate_pure_access(node, typ)

value_type = get_exact_type_from_node(node.value)

Expand Down Expand Up @@ -886,7 +889,7 @@ def visit_List(self, node: vy_ast.List, typ: VyperType) -> None:

def visit_Name(self, node: vy_ast.Name, typ: VyperType) -> None:
if self.func and self.func.mutability == StateMutability.PURE:
_validate_pure_access(node)
_validate_pure_access(node, typ)

def visit_Subscript(self, node: vy_ast.Subscript, typ: VyperType) -> None:
if isinstance(typ, TYPE_T):
Expand Down
Loading