This merges all changes from Increpare up to and including 20-feb-23

[david-pfx]

See #23

[Auroriax]

• Please elaborate a bit more on decisions you made during merging and things you tested, right now I see a lot of commit names like "Merge commit 'HASH' into tomerge" that aren't clear for me.
• These are too many commits to review for a single PR. Please submit the PS release merges one-by-one as PRs, as originally discussed in https://github.com/Auroriax/PuzzleScriptPlus/issues/23#issuecomment-1443482706
• You also seem to be merging in a lot of fixes unrelated to the merge that I haven't seen reported as issues. PRs are usually feature branches, if you want to make other changes then please submit these as separate issues and PRs. Unless required, in which case please elaborate.
• Right now your "merge" commit seems to merge a lot of changes at once. I'd expect to have a merge for every 5 to 10 commits as originally discussed in https://github.com/Auroriax/PuzzleScriptPlus/issues/23#issuecomment-1443482706, but there seem to be less frequent. Did you already squash these, perhaps?

[david-pfx]

I don't think I can help there. For most of these changes I have no idea what the original issue was -- you'll have to go look at the PS issue numbers if you care. This is what you get when you want to track the parent of your fork, and you leave it such a long time between updates. This is not like a typical PR, and I don't think you can treat it as one.

I followed your suggestion and used an imerge-like process to find and resolve the merge choke points, but the merges are all mechanical, not based on any consideration of what they do. I'm not interested in why Stephen did what he did, I just want a clean final result and that's what this is. Remember: this code is his, not mine.

As you know, you were unable to help me with a mechanism for submitting PRs, given that I already had a PS fork, I came to the conclusion that leaving it in pieces and submitting them separately would have resulted in a final review load much the same, and breaking it into pieces now would add work for me and not save work for anyone.

All I can suggest is that you review the critical files (parser, compiler, etc) looking for blunders. If you find anything you don't like or understand ask me or fix it yourself. Then hopefully we reach a position where you're confident enough to merge it onto your develop branch, and in due course onto master. Your call. I'm just here to help.

[david-pfx]

This PR has been stuck here for a while. What do we have to do to get it moving?

Please accept that this is not a normal PR: it's a catch up of changes made by increpare. I am not responsible for the issues/features/bugs or whatever they address, and I am not able to debate them. If you wanted to curate individual changes you should have done that before I started. My remit was precisely as per the issue title: 'Get latest changes from increpare', and that I have done. The code works, it passes all the tests, it doesn't break anything, it does what it says on the tin.

I'm happy to put in a bit more work if it will help, but right now I just don't know what you want. It seems you've always done this yourself in the past, and it's not obvious how to deal with a big swatch of changes like this. Your call.