@@ -320,8 +320,8 @@ extension Lexer {
320
320
/// If `tokenKind` is `.keyword`, the kind of keyword produced, otherwise
321
321
/// `nil`.
322
322
let keywordKind : Keyword ?
323
- /// Indicates whether the lexed token text contains a newline.
324
- let newlinePresence : Lexer . Cursor . NewlinePresence
323
+ /// Indicates whether the end of the lexed token text contains a newline.
324
+ let trailingNewlinePresence : Lexer . Cursor . NewlinePresence
325
325
326
326
private init (
327
327
_ tokenKind: RawTokenKind ,
@@ -330,15 +330,15 @@ extension Lexer {
330
330
stateTransition: StateTransition ? ,
331
331
trailingTriviaLexingMode: Lexer . Cursor . TriviaLexingMode ? ,
332
332
keywordKind: Keyword ? ,
333
- newlinePresence : Lexer . Cursor . NewlinePresence
333
+ trailingNewlinePresence : Lexer . Cursor . NewlinePresence
334
334
) {
335
335
self . tokenKind = tokenKind
336
336
self . flags = flags
337
337
self . error = error
338
338
self . stateTransition = stateTransition
339
339
self . trailingTriviaLexingMode = trailingTriviaLexingMode
340
340
self . keywordKind = keywordKind
341
- self . newlinePresence = newlinePresence
341
+ self . trailingNewlinePresence = trailingNewlinePresence
342
342
}
343
343
344
344
/// Create a lexer result. Note that keywords should use `Result.keyword`
@@ -349,7 +349,7 @@ extension Lexer {
349
349
error: Cursor . LexingDiagnostic ? = nil ,
350
350
stateTransition: StateTransition ? = nil ,
351
351
trailingTriviaLexingMode: Lexer . Cursor . TriviaLexingMode ? = nil ,
352
- newlinePresence : Lexer . Cursor . NewlinePresence = . absent
352
+ trailingNewlinePresence : Lexer . Cursor . NewlinePresence = . absent
353
353
) {
354
354
precondition ( tokenKind != . keyword, " Use Result.keyword instead " )
355
355
self . init (
@@ -359,7 +359,7 @@ extension Lexer {
359
359
stateTransition: stateTransition,
360
360
trailingTriviaLexingMode: trailingTriviaLexingMode,
361
361
keywordKind: nil ,
362
- newlinePresence : newlinePresence
362
+ trailingNewlinePresence : trailingNewlinePresence
363
363
)
364
364
}
365
365
@@ -372,7 +372,7 @@ extension Lexer {
372
372
stateTransition: nil ,
373
373
trailingTriviaLexingMode: nil ,
374
374
keywordKind: kind,
375
- newlinePresence : . absent
375
+ trailingNewlinePresence : . absent
376
376
)
377
377
}
378
378
}
@@ -448,7 +448,7 @@ extension Lexer.Cursor {
448
448
flags. insert ( . isAtStartOfLine)
449
449
}
450
450
451
- self . previousLexemeTrailingNewlinePresence = result. newlinePresence
451
+ self . previousLexemeTrailingNewlinePresence = result. trailingNewlinePresence
452
452
453
453
if let stateTransition = result. stateTransition {
454
454
self . stateStack. perform ( stateTransition: stateTransition, stateAllocator: stateAllocator)
@@ -1905,7 +1905,7 @@ extension Lexer.Cursor {
1905
1905
if character == UInt8 ( ascii: " \r " ) {
1906
1906
_ = self . advance ( matching: " \n " )
1907
1907
}
1908
- return Lexer . Result ( . stringSegment, error: error, newlinePresence : . present)
1908
+ return Lexer . Result ( . stringSegment, error: error, trailingNewlinePresence : . present)
1909
1909
} else {
1910
1910
// Single line literals cannot span multiple lines.
1911
1911
// Terminate the string here and go back to normal lexing (instead of `afterStringLiteral`)
0 commit comments