Skip to content

/ vyper

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.

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

Minimum Viable Grammar #1768

Merged
merged 24 commits into from Jan 2, 2020
Merged

Minimum Viable Grammar #1768

merged 24 commits into from Jan 2, 2020

Conversation

@jacqueswww
Copy link
Collaborator

jacqueswww commented Dec 15, 2019 •
edited

What I did

  • Adds lark grammar for Vyper.
  • Hooks grammar to be parsed for all get_contract_* function in testse.
  • Adds wildcard hypothesis test.

How I did it

How to verify it

Description for the changelog

Cute Animal Picture

Put a link to a cute animal picture inside the parenthesis-->
jacqueswww added 8 commits Dec 14, 2019
@jacqueswww
Add basic grammar test.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
43a6c96
@jacqueswww
Remove imaginary numbers and async statements.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
dbadc68
@jacqueswww
Add support for more distinct decorators.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
3128569
@jacqueswww
Remove semicolon statements.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
daf371f
@jacqueswww
Remove yield statement.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
d3c0d86
@jacqueswww
Remove lambda expression.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
339b712
@jacqueswww
Remove more unused statements.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
02d1560
@jacqueswww
Easy fix for struct/class hack.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
4d67e5f
@jacqueswww
Lint fixes.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
976e969
@fubuloubu
fubuloubu reviewed Dec 15, 2019
View changes
Copy link
Member

fubuloubu left a comment

This is seriously cool
tests/grammar/vyper.lark Show resolved Hide resolved
vyper/ast.py Show resolved Hide resolved
tests/grammar/test_grammar.py Show resolved Hide resolved
tests/grammar/test_decorators_grammar.py Show resolved Hide resolved
tests/grammar/test_grammar.py Outdated Show resolved Hide resolved
@fubuloubu

This comment has been minimized.

Sign in to view
Copy link
Member

fubuloubu commented Dec 15, 2019

Unsure what the py36-core failure is. Does lark work with py36?
jacqueswww added 3 commits Dec 17, 2019
@jacqueswww
Trim some operators.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
0a3d232
@jacqueswww
Simplify subscript syntax.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
2b7e8fc
@jacqueswww
Fix dict syntax.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
3fd874b
@fubuloubu
fubuloubu reviewed Dec 17, 2019
View changes
tests/grammar/test_grammar.py Show resolved Hide resolved
@fubuloubu
fubuloubu reviewed Dec 17, 2019
View changes
tests/grammar/conftest.py Show resolved Hide resolved
@fubuloubu
fubuloubu reviewed Dec 17, 2019
View changes
tests/grammar/vyper.lark Show resolved Hide resolved
jacqueswww added 2 commits Dec 18, 2019
@jacqueswww
Final fixes, grammar looks solid now.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
d5853b7
@jacqueswww
Lint fixes.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
6cd960b
jacqueswww added 2 commits Dec 18, 2019
@jacqueswww
Improve dots to between 1 and 2.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
1852ad9
@jacqueswww
Merge branch 'master' into brute_grammar
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
62b2a1c
@jacqueswww jacqueswww changed the title Minimum Viable Grammar (Bruteforce grammar) Minimum Viable Grammar Dec 18, 2019
@fubuloubu
fubuloubu reviewed Dec 18, 2019
View changes
setup.py Outdated Show resolved Hide resolved
@jacqueswww @fubuloubu
Update setup.py
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
8b5984d 
Co-Authored-By: Bryant Eisenbach <3859395+fubuloubu@users.noreply.github.com>
@lgtm-com

This comment has been minimized.

Sign in to view
Copy link

lgtm-com bot commented Dec 19, 2019

This pull request introduces 1 alert when merging 8b5984d into e0bb58d - view on LGTM.com

new alerts:

  • 1 for Implicit string concatenation in a list
jacqueswww added 3 commits Dec 19, 2019
@jacqueswww
Split hypothesis long running tests into own job.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
c61c2be
@jacqueswww
Merge branch 'brute_grammar' of github.com:jacqueswww/vyper into brut…
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
9146462 
…e_grammar
@jacqueswww
Lint fixes.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
3e46f50
@jacqueswww jacqueswww force-pushed the jacqueswww:brute_grammar branch from c72c209 to 3e46f50 Dec 19, 2019
@jacqueswww

This comment has been minimized.

Sign in to view
Copy link
Collaborator Author

jacqueswww commented Dec 19, 2019

@fubuloubu I have setup a separate hypthesis test case.
@jacqueswww jacqueswww force-pushed the jacqueswww:brute_grammar branch 3 times, most recently from 9fdc633 to 3e46f50 Dec 19, 2019
@jacqueswww
Fix hypothesis tox run.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
afb2624
@fubuloubu

This comment has been minimized.

Sign in to view
Copy link
Member

fubuloubu commented Dec 19, 2019 •
edited

@jacqueswww can you call it "fuzzing" instead of "long_run_time"?

Also, the tests still take 8 mins...
@charles-cooper

This comment has been minimized.

Sign in to view
Copy link
Collaborator

charles-cooper commented Dec 19, 2019

Seems this mainly fuzzes the grammar? Could you please update the PR description
@fubuloubu

This comment has been minimized.

Sign in to view
Copy link
Member

fubuloubu commented Dec 19, 2019

@charles-cooper correct. @jacqueswww created a vyper grammar from the python one, using the lark tool, and is using that to create a hypothesis strategy that generates source code which should be parseable by the grammar. If anything doesn't compile, the grammar is off; if anything does compile but crashes, we have an edge case in our grammar we are not handling appropiately.
@jacqueswww

This comment has been minimized.

Sign in to view
Copy link
Collaborator Author

jacqueswww commented Dec 20, 2019 •
edited

@charles-cooper Yeah so it's a fully fledged grammar now.
It started off fuzzing; but then also went further and proved that it can parse almost all of our tests (the ones that use get_contract functions) - which to me makes it a great 'official grammar' :o)
@jacqueswww
Update naming of fuzzing.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
b4af65a
@jacqueswww

This comment has been minimized.

Sign in to view
Copy link
Collaborator Author

jacqueswww commented Dec 20, 2019

@fubuloubu Alright I don't know why the tests are slower; but if you check the log output - you can clearly see hypthesis doesn't run anymore - so that's something.
@jacqueswww
Make lark grammar global, for faster testing.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
1ee5f55
@jacqueswww jacqueswww force-pushed the jacqueswww:brute_grammar branch from 8ecdbf7 to 1ee5f55 Dec 20, 2019
@jacqueswww

This comment has been minimized.

Sign in to view
Copy link
Collaborator Author

jacqueswww commented Dec 20, 2019

@fubuloubu figured it out 😸
@charles-cooper
charles-cooper approved these changes Dec 20, 2019
View changes
Copy link
Collaborator

charles-cooper left a comment

This is awesome. LGTM thanks!
@fubuloubu
fubuloubu reviewed Dec 20, 2019
View changes
.github/workflows/test.yml Show resolved Hide resolved
@jacqueswww
Revert dots.
Verified
This commit was signed with a verified signature.
jacqueswww Jacques Wagener
GPG key ID: C294D1025DA0E923 Learn about signing commits
Loading status checks…
28823ce
@fubuloubu
fubuloubu approved these changes Jan 2, 2020
View changes
@fubuloubu fubuloubu merged commit cbd9ecb into vyperlang:master Jan 2, 2020
8 checks passed
8 checks passed
lint
Details
mypy
Details
py36-core
Details
py37-core
Details
py38-core
Details
fuzzing fuzzing
Details
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python No new or fixed alerts
Details
@protolambda protolambda mentioned this pull request Jan 21, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fubuloubu fubuloubu

@charles-cooper charles-cooper

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@jacqueswww @fubuloubu @charles-cooper
You can’t perform that action at this time.