Skip to content

[libsolutil] Add new JSON helper functions. - #13579

Merged
ekpyron merged 2 commits into
developfrom
refactor-json
Nov 2, 2022
Merged

[libsolutil] Add new JSON helper functions.#13579
ekpyron merged 2 commits into
developfrom
refactor-json

Conversation

@aarlt

@aarlt aarlt commented Sep 28, 2022

Copy link
Copy Markdown
Contributor

Add new helper functions to libsolutil/JSON.h to make #12834 more readable.

Comment thread libsolutil/JSON.h Outdated
Comment thread libsolutil/JSON.h Outdated
cameel
cameel previously requested changes Oct 6, 2022
Comment thread libsolutil/JSON.h Outdated
Comment thread libsolutil/JSON.h Outdated
Comment thread libsolutil/JSON.h Outdated
Comment thread libsolutil/JSON.h Outdated
Comment thread libsolutil/JSON.h Outdated
Comment thread libsolutil/JSON.h Outdated
@axic

axic commented Oct 21, 2022

Copy link
Copy Markdown
Contributor

I wish #11967 would be merged before getting these helpers in, as it may remove the need for them.

@cameel

cameel commented Oct 21, 2022

Copy link
Copy Markdown
Collaborator

#11967 is still a draft though, isn't it?

But anyway, @aarlt Maybe you could help reviewing it?

@axic

axic commented Oct 21, 2022

Copy link
Copy Markdown
Contributor

#11967 is still a draft though, isn't it?

It was working a bunch of times, but nobody reviewed it in time and rebasing causes a bunch of work.

@cameel

cameel commented Oct 21, 2022

Copy link
Copy Markdown
Collaborator

If you're sure it will be mergeable, we could commit to reviewing it this time. We're focusing on killing off stale PRs now so yours would be a prime target :)

@axic

axic commented Oct 22, 2022

Copy link
Copy Markdown
Contributor

Need to rebase it again and finish off new failures, I can try looking at it on Monday.

@aarlt

aarlt commented Oct 25, 2022

Copy link
Copy Markdown
Contributor Author

I did a brief look on #11967. I was trying to fix some tests there - from my point of view it still needs some work to fix all tests. I think it is much easier to just merge this PR.

@cameel

cameel commented Oct 26, 2022

Copy link
Copy Markdown
Collaborator

I'm fine with merging this if #11967 is not ready. We can always just remove these helpers in that other PR if it makes them obsolete. I just want to have these merged so that we can get to the important part, i.e. the asm import.

@cameel

cameel commented Oct 26, 2022

Copy link
Copy Markdown
Collaborator

Needs rebase. gp2 is fixed on develop.

@ekpyron

ekpyron commented Nov 1, 2022

Copy link
Copy Markdown
Collaborator

Just pushed a commit to de-macro the helpers, since macros hurt my eye :-). There'd be other ways to do that, but this is probably good enough.

@ekpyron ekpyron left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Fine with me, but since I added the de-macro commit, another review may be nice.

@nikola-matic nikola-matic left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Personally, I'm good with this, and templates are always nicer than macros. Please take a look at this comment thread just in case, and if you agree, make the necessary changes. Otherwise, merge away.

@ekpyron
ekpyron dismissed cameel’s stale review November 2, 2022 09:23

Only thing left is naming of get, which should be fine.

@ekpyron
ekpyron merged commit 0c168b1 into develop Nov 2, 2022
@ekpyron
ekpyron deleted the refactor-json branch November 2, 2022 09:25
@axic

axic commented Nov 3, 2022

Copy link
Copy Markdown
Contributor

I did a brief look on #11967. I was trying to fix some tests there - from my point of view it still needs some work to fix all tests. I think it is much easier to just merge this PR.

Of course it is easier to merge this, but also makes it harder to ever complete the other one 😓

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants