Skip to content

Conversation

@ExpHP
Copy link
Owner

@ExpHP ExpHP commented Aug 27, 2025

Contains a portion of zero's commits from #63.

This branch has been reconstructed from the common ancestor of main and #63.

  • I began from the common ancestor of main and Format improvements (WIP) #63, which is
  • The first four commits from zero are squashed (this was to facilitate merge conflict resolution)
  • Commits were then cherry-picked from main and format_improvements_test in an order that seemed easiest to resolve.
  • When I reached the point where I had included all commits up to where zero attempted to perform a merge, I cherry-picked the merge. All conflict resolutions were resolved in favor of the current code, so it's just an empty commit now that documents this fact.
  • Notice: I did not get rid of decompilation of string enums. The way I was constructing the branch, I figured it would produce much fewer conflilcts to leave it this way. If we want to do that we can do it afterwards.
  • Then, finally, and this is the big one, I merged main into it so that all of my new latest stuff is there. This branch won't be easy to rebase onto main, but it should at least be easy to merge into main now.

After working with it, I don't think there's anything in here that I am opposed to merging. I would like to fix the test suite though and maybe add some tests for new stuff.

zero318 and others added 30 commits August 26, 2025 18:37
This is a squash of zero's first four commits,
because several changes are undone between them.
Now we can get scripts with @blob and stuff
Unfortunately, the type checker assumes all enum consts are ints currently
so this breaks horribly
This also fixes a bug that I think existed already when using dot syntax
with an undefined enum.  Somehow there were no tests for this
This was zero's merge commit, but since everything on both sides up
to it has been cherry-picked, this merge is a no-op.
This is NOT just a trivial merge, some doc comments have been edited,
a function was changed to a const.
ExpHP added 3 commits August 26, 2025 23:36
This helps bring some tests to a reasonable compromise
Doing so prevents roundtripping and there's no clear solution
@ExpHP ExpHP merged commit eb2c294 into main Aug 27, 2025
2 checks passed
@ExpHP ExpHP deleted the partial-zeroing branch August 27, 2025 03:49
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.

3 participants