From 86e3a640d5f785311dea52a266ef16bf290d9e0c Mon Sep 17 00:00:00 2001 From: bbbradsmith Date: Wed, 3 May 2023 05:03:11 -0400 Subject: [PATCH 1/2] Support for three line ending types: \r, \r\n, \n. #1894 --- src/ca65/scanner.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c index bf0a85183..d32939646 100644 --- a/src/ca65/scanner.c +++ b/src/ca65/scanner.c @@ -112,6 +112,7 @@ struct CharSource { CharSource* Next; /* Linked list of char sources */ token_t Tok; /* Last token */ int C; /* Last character */ + int SkipN; /* For '\r\n' line endings, skip '\n\ if next */ const CharSourceFunctions* Func; /* Pointer to function table */ union { InputFile File; /* File data */ @@ -325,6 +326,7 @@ static void UseCharSource (CharSource* S) Source = S; /* Read the first character from the new file */ + S->SkipN = 0; S->Func->NextChar (S); /* Setup the next token so it will be skipped on the next call to @@ -386,6 +388,10 @@ static void IFNextChar (CharSource* S) while (1) { int N = fgetc (S->V.File.F); + if (N == '\n' && S->SkipN) + N = fgetc (S->V.File.F); + S->SkipN = 0; + if (N == EOF) { /* End of file. Accept files without a newline at the end */ if (SB_NotEmpty (&S->V.File.Line)) { @@ -401,9 +407,12 @@ static void IFNextChar (CharSource* S) /* Check for end of line */ } else if (N == '\n') { - /* End of line */ break; + } else if (N == '\r') { + /* End of line, skip '\n' if it's the next character */ + S->SkipN = 1; + break; /* Collect other stuff */ } else { From 4e6b94de5cf3e073897c610e09c372d9ac36e57c Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Wed, 3 May 2023 12:19:05 -0400 Subject: [PATCH 2/2] braces --- src/ca65/scanner.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c index d32939646..add365e84 100644 --- a/src/ca65/scanner.c +++ b/src/ca65/scanner.c @@ -388,8 +388,9 @@ static void IFNextChar (CharSource* S) while (1) { int N = fgetc (S->V.File.F); - if (N == '\n' && S->SkipN) + if (N == '\n' && S->SkipN) { N = fgetc (S->V.File.F); + } S->SkipN = 0; if (N == EOF) {