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

Jump to bottom

Template code for disallowing options in input modes that do not support them (handles --error-recovery) #11909

Merged
merged 1 commit into from
Oct 20, 2021
Merged

Template code for disallowing options in input modes that do not support them (handles --error-recovery) #11909

merged 1 commit into from
Oct 20, 2021

Conversation

Midhun07
Copy link
Contributor

@Midhun07 Midhun07 commented Sep 7, 2021

I have disallowed --error-recovery option with input modes Standard json, Assembly and Linker modes. Also this is a template for all the other invalid options mentioned in the issue #11629.

cameel
cameel requested changes Sep 8, 2021
View reviewed changes
Copy link
Member

@cameel cameel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some changes are needed.

Also, please remember about the changelog entry. Since the previous PR has not been released yet, I'd just update the previous entry and list the new option here.

solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
test/solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
test/solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
@cameel cameel changed the title Template fix for all options in issue #11629: Disallowed --error-recovery in Standard json, Assembly and Linker inp… Template code for disallowing options in input modes that do not support them (handles --error-recovery) Sep 8, 2021
@cameel
Copy link
Member

cameel commented Oct 4, 2021

@Midhun07 Are you working on this? Do you need help?

We have a ton of pending PRs right now and we'd like trim that number down a bit. If you don't have time for it, I can take over and finish it.

@Midhun07
Copy link
Contributor Author

Midhun07 commented Oct 6, 2021

@cameel Sorry was caught up due to personal reasons I will start working on this and submit the changes by today

@Midhun07
Copy link
Contributor Author

Midhun07 commented Oct 6, 2021

Hi @cameel I have made the requested changes. Please review.

cameel
cameel reviewed Oct 6, 2021
View reviewed changes
Copy link
Member

@cameel cameel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more changes needed but it already looks pretty good.

Please also add a changelog entry.

solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
test/solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
@Midhun07
Copy link
Contributor Author

Midhun07 commented Oct 8, 2021

@cameel I have added the latest suggestions please review.

@Midhun07 Midhun07 requested a review from cameel October 8, 2021 13:52
@Midhun07
Copy link
Contributor Author

Midhun07 commented Oct 8, 2021

Some issues with b_osx which I don't seem to understand. I'm not sure if it is originating from my changes.

@cameel
Copy link
Member

cameel commented Oct 8, 2021

Some issues with b_osx which I don't seem to understand. I'm not sure if it is originating from my changes.

It's unrelated to your changes. We're getting this in external PRs lately and I'm not sure why. Tried to fix it in #12106 but that did not help. In one PR creating a branch on our side helped so I'll try to do it here too.

cameel
cameel reviewed Oct 8, 2021
View reviewed changes
Copy link
Member

@cameel cameel left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's good now, just formatting is a bit off.

Also, please add a changelog entry (in the bugfix section).

test/solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
test/solc/CommandLineParser.cpp Outdated Show resolved Hide resolved
@Midhun07
Copy link
Contributor Author

@cameel I have added the changelog for the current update

@Midhun07
Copy link
Contributor Author

@cameel Shall I start pushing further fixes to this branch?

cameel
cameel reviewed Oct 11, 2021
View reviewed changes
Changelog.md Outdated Show resolved Hide resolved
@cameel
Copy link
Member

cameel commented Oct 11, 2021

It's fine. The changelog entry needs some tweaking but other than that the PR is ready.

If you want the tests to pass, you can rebase it on #12106 but it's probably going to be merged pretty quickly anyway.

@cameel
Copy link
Member

cameel commented Oct 11, 2021 •
edited
Loading

I mean, if you want to build on this PR, my suggestion would be to open a new one on top of it.

cameel
cameel previously approved these changes Oct 15, 2021
View reviewed changes
Copy link
Member

@cameel cameel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed the changelog entry and rebased it on latest develop so that it can pass tests.

Please submit any further changes in a new PR.

@cameel cameel merged commit 72b88da into ethereum:develop Oct 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cameel cameel cameel approved these changes

Assignees
No one assigned
Labels
external contribution ⭐
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Midhun07 @cameel