feat: adding Enum #2874

pandadefi · 2022-05-25T16:51:09Z

What I did

Adding enums to vyper

How I did it

How to verify it

Commit message

Commit message for the final, squashed PR. (Optional, but reviewers will appreciate it! Please see our commit message style guide for what we would ideally like to see in a commit message.)

Description for the changelog

Cute Animal Picture

lgtm-com · 2022-05-25T17:09:42Z

This pull request introduces 6 alerts when merging e5487e1 into 42a372e - view on LGTM.com

new alerts:

6 for Unused import

fubuloubu · 2022-05-25T17:37:06Z

vyper/semantics/types/user/enum.py

+        return Enum(abi["name"], abi["inputs"])
+
+    @classmethod
+    def from_EnumDef(cls, base_node: vy_ast.EventDef) -> "Enum":


Suggested change

def from_EnumDef(cls, base_node: vy_ast.EventDef) -> "Enum":

def from_EnumDef(cls, base_node: vy_ast.EnumDef) -> "Enum":

fubuloubu · 2022-05-25T17:37:12Z

vyper/semantics/types/user/enum.py

+
+        Arguments
+        ---------
+        base_node : EventDef


Suggested change

base_node : EventDef

base_node : EnumDef

fubuloubu · 2022-05-25T17:37:18Z

vyper/semantics/types/user/enum.py

+    @classmethod
+    def from_EnumDef(cls, base_node: vy_ast.EventDef) -> "Enum":
+        """
+        Generate an `Event` object from a Vyper ast node.


Suggested change

Generate an `Event` object from a Vyper ast node.

Generate an `Enum` object from a Vyper ast node.

lgtm-com · 2022-05-26T08:56:59Z

This pull request introduces 6 alerts when merging 612d2bd into 67bb98a - view on LGTM.com

new alerts:

6 for Unused import

lgtm-com · 2022-05-26T09:52:06Z

This pull request introduces 5 alerts when merging 4f07fa6 into 67bb98a - view on LGTM.com

new alerts:

5 for Unused import

codecov-commenter · 2022-05-26T09:58:06Z

Codecov Report

Merging #2874 (277fdb7) into master (457a8b6) will increase coverage by 0.26%.
The diff coverage is 85.48%.

@@            Coverage Diff             @@
##           master    #2874      +/-   ##
==========================================
+ Coverage   87.69%   87.95%   +0.26%     
==========================================
  Files          94       95       +1     
  Lines       10196    10355     +159     
  Branches     2504     2498       -6     
==========================================
+ Hits         8941     9108     +167     
- Misses        790      792       +2     
+ Partials      465      455      -10

Impacted Files	Coverage Δ
vyper/ast/pre_parser.py	`96.82% <ø> (ø)`
vyper/semantics/types/bases.py	`84.34% <0.00%> (-0.36%)`	⬇️
vyper/codegen/types/convert.py	`94.73% <75.00%> (+0.61%)`	⬆️
vyper/semantics/types/user/enum.py	`80.70% <80.70%> (ø)`
vyper/codegen/types/types.py	`88.34% <86.20%> (-0.09%)`	⬇️
vyper/codegen/expr.py	`79.43% <87.50%> (-1.30%)`	⬇️
vyper/ast/nodes.py	`94.08% <100.00%> (-0.16%)`	⬇️
vyper/ast/signatures/function_signature.py	`89.39% <100.00%> (+1.33%)`	⬆️
vyper/ast/signatures/interface.py	`81.48% <100.00%> (ø)`
vyper/codegen/global_context.py	`74.78% <100.00%> (+0.87%)`	⬆️
... and 27 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 457a8b6...277fdb7. Read the comment docs.

lgtm-com · 2022-05-26T10:17:30Z

This pull request introduces 10 alerts when merging af12e16 into 67bb98a - view on LGTM.com

new alerts:

5 for Unused import
3 for Wrong number of arguments in a call
2 for Wrong name for an argument in a call

lgtm-com · 2022-05-26T11:11:11Z

This pull request introduces 10 alerts when merging de0717a into 67bb98a - view on LGTM.com

new alerts:

5 for Unused import
3 for Wrong number of arguments in a call
2 for Wrong name for an argument in a call

lgtm-com · 2022-05-26T11:51:52Z

This pull request introduces 10 alerts when merging 843b19d into 67bb98a - view on LGTM.com

new alerts:

5 for Unused import
3 for Wrong number of arguments in a call
2 for Wrong name for an argument in a call

lgtm-com · 2022-05-27T09:11:46Z

This pull request introduces 9 alerts when merging 61cedc7 into 67bb98a - view on LGTM.com

new alerts:

5 for Unused import
2 for Wrong name for an argument in a call
2 for Wrong number of arguments in a call

lgtm-com · 2022-05-27T13:29:27Z

This pull request introduces 9 alerts when merging f2dd34a into 67bb98a - view on LGTM.com

new alerts:

6 for Unused import
2 for Wrong name for an argument in a call
1 for Wrong number of arguments in a call

lgtm-com · 2022-05-28T09:06:50Z

This pull request introduces 8 alerts and fixes 5 when merging 4fb2ede into f5051e1 - view on LGTM.com

new alerts:

5 for Unused import
2 for Wrong name for an argument in a call
1 for Syntax error

fixed alerts:

4 for `__eq__` not overridden when adding attributes
1 for 'import *' may pollute namespace

charles-cooper · 2022-05-28T09:16:34Z

whoops, re-requested review but maybe needs some more tests. still in draft mode

lgtm-com · 2022-05-28T09:31:41Z

This pull request introduces 2 alerts when merging 2593c62 into f5051e1 - view on LGTM.com

new alerts:

2 for Wrong name for an argument in a call

charles-cooper · 2022-05-30T17:10:00Z

lgtm, but i contributed some work to this and so we should get a review from @fubuloubu as well.

charles-cooper · 2022-05-30T17:11:22Z

one q i have is whether we should introduce any conventions around naming of enum members. options:

enum Action:
    buy
    sell

enum Action:
    Buy
    Sell

enum Action:
    BUY
    SELL

fubuloubu · 2022-05-30T22:53:41Z

one q i have is whether we should introduce any conventions around naming of enum members.

Typically this is the way enums are usually specified

enum Action:
    BUY
    SELL

fubuloubu

Some nits on naming

docs/types.rst

Co-authored-by: El De-dog-lo <3859395+fubuloubu@users.noreply.github.com>

feat: adding Enum

e5487e1

pandadefi marked this pull request as draft May 25, 2022 16:51

fubuloubu reviewed May 25, 2022

View reviewed changes

fix: names

612d2bd

pandadefi force-pushed the add_enum branch from 8b8362e to 612d2bd Compare May 26, 2022 08:41

add EnumDefinition and rename Enum to EnumPrimitive

4f07fa6

add codegen for enum type

af12e16

tserg mentioned this pull request May 26, 2022

feat: rewrite ZoneInteraction in Vyper ProjectOpenSea/seaport#299

Merged

test: function return enum

de0717a

chore: format

843b19d

pandadefi added 2 commits May 27, 2022 10:46

use enums in struct

9e7d9c2

get members from enum list

61cedc7

fix parse_type in AnnAssign

f2dd34a

charles-cooper added 2 commits May 28, 2022 10:49

fix recursion in parse_type

4fb2ede

clean up some code in type parsing

680209d

charles-cooper added 2 commits May 28, 2022 11:12

fix mypy

24a901e

change runtime representation of enums

2593c62

charles-cooper requested a review from fubuloubu May 28, 2022 09:16

charles-cooper and others added 4 commits May 28, 2022 11:36

fix some LGTM warnings

6dfb68d

add missing case to new_type_to_old_type

bbbb5c1

fix missing case in new_type_to_old_type

af11993

add lark

ce95955

pandadefi force-pushed the add_enum branch from ecd5748 to ce95955 Compare May 30, 2022 07:13

pandadefi and others added 8 commits May 30, 2022 09:16

test: test returned values

27dcdec

test: add failling test

85f8dc0

add missing f-string

7ebfeaa

add docs

bd4a30e

docs: update enum value

ebc2d00

test: add failling test

5f6d803

test: max number of enum types

f6b9a5f

fix lint

87a92c8

charles-cooper marked this pull request as ready for review May 30, 2022 17:08

charles-cooper approved these changes May 30, 2022

View reviewed changes

fubuloubu approved these changes May 30, 2022

View reviewed changes

docs/types.rst Outdated Show resolved Hide resolved

docs/types.rst Outdated Show resolved Hide resolved

charles-cooper and others added 2 commits May 30, 2022 18:14

Apply suggestions from code review

61f2b7b

Co-authored-by: El De-dog-lo <3859395+fubuloubu@users.noreply.github.com>

capitalize enum members in tests

277fdb7

charles-cooper enabled auto-merge (squash) May 31, 2022 01:21

charles-cooper merged commit a8a23b8 into vyperlang:master May 31, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: adding Enum #2874

feat: adding Enum #2874

pandadefi commented May 25, 2022 •

edited

Loading

lgtm-com bot commented May 25, 2022

fubuloubu May 25, 2022

fubuloubu May 25, 2022

fubuloubu May 25, 2022

lgtm-com bot commented May 26, 2022

lgtm-com bot commented May 26, 2022

codecov-commenter commented May 26, 2022 •

edited

Loading

lgtm-com bot commented May 26, 2022

lgtm-com bot commented May 26, 2022

lgtm-com bot commented May 26, 2022

lgtm-com bot commented May 27, 2022

lgtm-com bot commented May 27, 2022

lgtm-com bot commented May 28, 2022

charles-cooper commented May 28, 2022

lgtm-com bot commented May 28, 2022

charles-cooper commented May 30, 2022

charles-cooper commented May 30, 2022 •

edited

Loading

fubuloubu commented May 30, 2022

fubuloubu left a comment

	def from_EnumDef(cls, base_node: vy_ast.EventDef) -> "Enum":
	def from_EnumDef(cls, base_node: vy_ast.EnumDef) -> "Enum":

	Generate an `Event` object from a Vyper ast node.
	Generate an `Enum` object from a Vyper ast node.

feat: adding Enum #2874

feat: adding Enum #2874

Conversation

pandadefi commented May 25, 2022 • edited Loading

What I did

How I did it

How to verify it

Commit message

Description for the changelog

Cute Animal Picture

lgtm-com bot commented May 25, 2022

fubuloubu May 25, 2022

Choose a reason for hiding this comment

fubuloubu May 25, 2022

Choose a reason for hiding this comment

fubuloubu May 25, 2022

Choose a reason for hiding this comment

lgtm-com bot commented May 26, 2022

lgtm-com bot commented May 26, 2022

codecov-commenter commented May 26, 2022 • edited Loading

Codecov Report

lgtm-com bot commented May 26, 2022

lgtm-com bot commented May 26, 2022

lgtm-com bot commented May 26, 2022

lgtm-com bot commented May 27, 2022

lgtm-com bot commented May 27, 2022

lgtm-com bot commented May 28, 2022

charles-cooper commented May 28, 2022

lgtm-com bot commented May 28, 2022

charles-cooper commented May 30, 2022

charles-cooper commented May 30, 2022 • edited Loading

fubuloubu commented May 30, 2022

fubuloubu left a comment

Choose a reason for hiding this comment

pandadefi commented May 25, 2022 •

edited

Loading

codecov-commenter commented May 26, 2022 •

edited

Loading

charles-cooper commented May 30, 2022 •

edited

Loading