Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

feat: allow functions to be named after builtins and reserved keywords #3307

Merged
merged 23 commits into from
Apr 8, 2023
Merged

feat: allow functions to be named after builtins and reserved keywords #3307

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
58e80bd
validate internal function names
tserg Mar 5, 2023
8647e9d
add test case
tserg Mar 5, 2023
8a3122b
fix lint
tserg Mar 5, 2023
6cbf0e7
remove invalid syntax test
tserg Mar 5, 2023
6833c44
Merge branch 'master' into fix/internal_collision
tserg Apr 7, 2023
a0c32cb
split validate_identifier to namespace and name
tserg Apr 7, 2023
c42ecd1
update tests
tserg Apr 7, 2023
71188d8
fix lint
tserg Apr 7, 2023
7fc982d
separate python keywords
tserg Apr 7, 2023
6436bf2
add deleted test
tserg Apr 7, 2023
6920e74
fix order
tserg Apr 7, 2023
4a07973
fix formatting
tserg Apr 7, 2023
3777156
handle pop and append
tserg Apr 7, 2023
f5446cc
Merge branch 'master' of https://github.com/vyperlang/vyper into fix/…
tserg Apr 7, 2023
a959818
fix merge conflict
tserg Apr 7, 2023
43b4f79
apply bts suggestions
tserg Apr 8, 2023
481304e
apply bts suggestions
tserg Apr 8, 2023
1095a7d
remove duplicate keywords
tserg Apr 8, 2023
7975b3c
simplify identifier validation
charles-cooper Apr 8, 2023
dcae97e
wip - identifiers
charles-cooper Apr 8, 2023
f62c7d7
fix test
tserg Apr 8, 2023
df786eb
fix tests
tserg Apr 8, 2023
7ae2aaf
fix more tests
tserg Apr 8, 2023
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
5 changes: 5 additions & 0 deletions tests/parser/syntax/utils/test_function_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ def false(i: int128) -> int128:
temp_var : int128 = i
return temp_var
""",
"""
@external
def floor():
pass
""",
]


Expand Down
3 changes: 1 addition & 2 deletions vyper/semantics/analysis/module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,7 @@ def visit_FunctionDef(self, node):
func = ContractFunctionT.from_FunctionDef(node)

try:
# TODO sketchy elision of namespace validation
charles-cooper marked this conversation as resolved.
Show resolved Hide resolved
self.namespace["self"].typ.add_member(func.name, func, skip_namespace_validation=True)
self.namespace["self"].typ.add_member(func.name, func)
node._metadata["type"] = func
except VyperException as exc:
raise exc.with_annotation(node) from None
Expand Down