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.

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

Switch from solparse to solidity-parser #10

Merged
merged 1 commit into from
Dec 15, 2016
Merged

Switch from solparse to solidity-parser #10

merged 1 commit into from
Dec 15, 2016

Conversation

cgewecke
Copy link
Collaborator

It looks like solparse is getting integrated into solidity-parser (see here) and other parser fixes are being channelled there as well. For example this change to allow expressions as modifier arguments is needed to be able to run against functions like this in zeppelin-solidity where sha3 is invoked within a modifier call.

This PR:

  • replaces solparse with solidity-parser in package.json (fetching from the github master)
  • requires and runs solidity-parser in instrumentSolidity.js.
  • checks for and ignores contract-level variable declarations. Solidity-parser differs from solparse in that it groups these together in a sub-array like a block statement. Solcover currently expects the contract body to be all objects and throws an error when it hits the array. I don't think this change alters current behavior - e.g. top level var declarations aren't being instrumented.

@cgewecke cgewecke mentioned this pull request Dec 15, 2016
@area area merged commit 0ede891 into JoinColony:master Dec 15, 2016
@cgewecke cgewecke deleted the switch-to-solidity-parser branch December 15, 2016 19:58
@cgewecke cgewecke mentioned this pull request Jan 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants