Skip to content
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

Jump to bottom

Handle lone-carriage-return line endings #1493

Merged
merged 8 commits into from
Nov 3, 2023
Merged

Handle lone-carriage-return line endings #1493

merged 8 commits into from
Nov 3, 2023

Conversation

wixoaGit
Copy link
Member

@wixoaGit wixoaGit commented Oct 15, 2023 •
edited
Loading

Lines ending with just \r are treated as newlines.
Multiple consecutive \r characters are also handled now.

Also some general cleanup in the preprocessor, especially in the lexer which no longer inherits TextLexer

Fixes #1492

@Cyberboss
Copy link
Contributor

Note the problem was lines actually being

ghjkjfdslg\r\n
asdf\r\r\n
fdsa\r\r\n
ghjkjfdslg\r\n

Not sure if this is BYOND-like behaviour

@Cyberboss
Copy link
Contributor

Related #1492

@wixoaGit
Fix handling of line endings in the preprocessor
cbdaf95 
Also remove use of `TextLexer`
@wixoaGit
Fix some bugs
22cf6a9
@wixoaGit
Use a stream when preprocessing a file
189adce 
Rather than read & allocate all the text in every file
@wixoaGit
Handle EOF after an object statement
e2e4943
@wixoaGit
Fix infinite loop & non-ASCII
e8e9e45 
A line comment directly before the EOF could end up in an infinite loop
Switched from ASCII to UTF8 encoding
@wixoaGit
Fix a relative file path
8cdf158
@wixoaGit
Use file-scoped namespaces in the preprocessor
c0c2387
@wixoaGit wixoaGit merged commit 6570a8c into OpenDreamProject:master Nov 3, 2023
4 checks passed
@wixoaGit wixoaGit deleted the lone_carriage_return branch November 3, 2023 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Mixed line endings error in OD
2 participants
@wixoaGit @Cyberboss