Fixes several bugs with string macros, implements all pronoun/article ones #777
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wixoaGit
reviewed
Aug 24, 2022
Altoids1
force-pushed
the
welcome-to-PRONOUN-school
branch
from
efd72a2 to
2dbc7e5
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Altoids1
force-pushed
the
welcome-to-PRONOUN-school
branch
from
2dbc7e5 to
91929df
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
DMParser.cs is >2300 lines long before this change, and implementing pronouns is going to make it even longer, so I figure its time to put the helper file to some use. Marked as a separate commit so you have better diffs to look at during review :^)
A dangling \hers or \The now causes a parsing error, as it should.
We now, like BYOND, give a descriptive error message when user tries to use \her (a macro that can't exist). While I was here, I decided to be even sweeter and add some leniency with unnecessarily-capitalized macros. 😊
Storing all of our formatting bytes as 0x00FF 0x00-whatever was both breaking parity and wasting bytes, so that's been completely changed in favour of a static class that handles encoding and decoding from formatting bytes, stored passive-aggressively into a not-as-important Unicode codeblock. Various other changes were made to prepare for a wider implementation of text macros. This compiled and ran OK, so I'm committing here before I start implementing novel functionality.
I had a really strange bug recently and this helped me with debugging, so might as well commit it to master.
This gets the general pattern going for formatted strings. At first, I thought that I was going to have to do two passes on the string to actually parse it correctly (to harvest the locations of all the interp values, so I know who owns what macro). Realized that I could just push another operand to the opcode proc and save a lot of that time, so that's what's here.
Previously, they would actually cause a compiletime error were they to appear. Now the compiler treats them as it should.
I need a better place to toss all these helpers. EDIT: Accidentally left debug logging in there, whoops
Altoids1
force-pushed
the
welcome-to-PRONOUN-school
branch
from
91929df to
83601ed
Compare
…ct#720 I moved this code over into a helper proc so this new stuff has to be re-added here, awkwardly. EDIT: Also patched for some changes caused by refs becoming semi-implemented.
Altoids1
force-pushed
the
welcome-to-PRONOUN-school
branch
2 times, most recently
from
499446c to
a14c7ca
Compare
EDIT: adds StringInterpolation4.dm EDIT EDIT: and the fifth test too
Altoids1
force-pushed
the
welcome-to-PRONOUN-school
branch
from
a14c7ca to
5c55e6a
Compare
wixoaGit
requested changes
Oct 7, 2022
| } | ||
| //Suffix macros | ||
| case StringFormatEncoder.FormatSuffix.UpperSubjectPronoun: | ||
| HandleSuffixPronoun(ref formattedString, interps, prevInterpIndex, new string[] { "He", "She", "They", "Tt" }); |
There was a problem hiding this comment.
All this new string[] { ... } could be bad for allocations but I don't know the extent to which performance matters here.
wixoaGit
approved these changes
Oct 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This is a big fat redesign of how we handle string formatting.
Previously, we used to do formatting by sending two UTF16 characters, a 0x00FF and then another one to indicate the use of the interpolated value.
This has been refactored and replaced with
StringFormatEncoderand its various helper procs and enums. We now (in parity with DM, at least for the first byte) emit 0xFFxx, with the bottom byte denoting the use of the format byte.Doing this allowed me to implement \the, \The, \A, \an, \himself, and a bunch of other articles and pronouns.
Changelog