Skip to content

& is a valid splitter for winset #2394

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

Open
amylizzle wants to merge 3 commits into
base: master
Choose a base branch
from
Open

& is a valid splitter for winset #2394

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f527bc
&
amylizzle Sep 14, 2025
afc8083
clean up
amylizzle Sep 14, 2025
0f3906c
Merge branch 'master' into winset_amp
amylizzle Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion OpenDreamClient/Interface/DMF/DMFLexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public Token NextToken() {
Advance();
_parsingAttributeName = true; // Still parsing an attribute name, the last one was actually an element name!
return new(TokenType.Period, c);
case '&': // & is a valid splitter as well
case ';':
Advance();
_parsingAttributeName = true;
Expand Down Expand Up @@ -126,7 +127,7 @@ public Token NextToken() {
var textBuilder = new StringBuilder();
textBuilder.Append(c);

while (!char.IsWhiteSpace(Advance()) && GetCurrent() is not ';' and not '=' and not '?' and not ':' && !(_parsingAttributeName && GetCurrent() == '.') && !AtEndOfSource)
while (!char.IsWhiteSpace(Advance()) && GetCurrent() is not ';' and not '&' and not '=' and not '?' and not ':' && !(_parsingAttributeName && GetCurrent() == '.') && !AtEndOfSource)
textBuilder.Append(GetCurrent());

var text = textBuilder.ToString();
Expand Down
Loading