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.

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

(#778) Don't include line ending in single line comment token values #782

Merged
merged 3 commits into from
Nov 14, 2017

Conversation

rodjek
Copy link
Owner

@rodjek rodjek commented Nov 13, 2017

Previously, when tokenising the manifest, the value of single line comment tokens would include the line ending. Unfortunately, when the file has Windows style line endings (\r\n) and is read in as binary (which skips line ending conversion) and the tested on a host using Unix style line endings it would get tokenised as the following, throwing off the line number calculations:

<Token :COMMENT (" foo\r")>
<Token :NEWLINE ("\n")>

With this change, the :COMMENT and :SLASH_COMMENT tokens no longer include the line endings, instead they are their own tokens.

<Token :COMMENT (" foo")>
<Token :NEWLINE ("\r\n")>

Fixes #778

@rodjek rodjek added this to the 2.3.4 milestone Nov 13, 2017
@rnelson0 rnelson0 merged commit 2a850ab into master Nov 14, 2017
@rnelson0 rnelson0 deleted the issue-778 branch November 14, 2017 02:55
@glennsarti
Copy link

glennsarti commented Mar 7, 2018

@rnelson0 @rodjek Do you have an ETA for release of this yet? CRLF issues really hurt Windows users.

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