Skip to content

Commit d33883b

Browse files
committed
Apply code review comments
Fix some names and remove unnecessary code
1 parent 503e5e2 commit d33883b

17 files changed

+36
-36
lines changed

src/Compiler/FSComp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1571,7 +1571,7 @@ featureWarningWhenCopyAndUpdateRecordChangesAllFields,"Raises warnings when an c
15711571
featureStaticMembersInInterfaces,"Static members in interfaces"
15721572
featureNonInlineLiteralsAsPrintfFormat,"String values marked as literals and IL constants as printf format"
15731573
featureNestedCopyAndUpdate,"Nested record field copy-and-update"
1574-
featureExtendedStringInterpolation,"Extended string interpolation similar to C# raw strings."
1574+
featureExtendedStringInterpolation,"Extended string interpolation similar to C# raw string literals."
15751575
3353,fsiInvalidDirective,"Invalid directive '#%s %s'"
15761576
3354,tcNotAFunctionButIndexerNamedIndexingNotYetEnabled,"This value supports indexing, e.g. '%s.[index]'. The syntax '%s[index]' requires /langversion:preview. See https://aka.ms/fsharp-index-notation."
15771577
3354,tcNotAFunctionButIndexerIndexingNotYetEnabled,"This expression supports indexing, e.g. 'expr.[index]'. The syntax 'expr[index]' requires /langversion:preview. See https://aka.ms/fsharp-index-notation."

src/Compiler/Service/FSharpCheckerResults.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2396,7 +2396,7 @@ module internal ParseAndCheckFile =
23962396
let braceOffset =
23972397
match tok with
23982398
| INTERP_STRING_BEGIN_PART (_, SynStringKind.TripleQuote, (LexerContinuation.Token (_, (_, _, dl, _) :: _))) ->
2399-
max 0 (dl - 1)
2399+
dl - 1
24002400
| _ -> 0
24012401

24022402
let m = lexbuf.LexemeRange

src/Compiler/Service/ServiceLexing.fs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ module internal LexerStateEncoding =
513513
let ifdefstackNumBits = 24 // 0 means if, 1 means else
514514
let stringKindBits = 3
515515
let nestingBits = 12
516-
let dlenBits = 3
516+
let delimLenBits = 3
517517

518518
let _ =
519519
assert
@@ -524,7 +524,7 @@ module internal LexerStateEncoding =
524524
+ ifdefstackNumBits
525525
+ stringKindBits
526526
+ nestingBits
527-
+ dlenBits
527+
+ delimLenBits
528528
<= 64)
529529

530530
let lexstateStart = 0
@@ -550,7 +550,7 @@ module internal LexerStateEncoding =
550550
+ ifdefstackNumBits
551551
+ stringKindBits
552552

553-
let dlenStart =
553+
let delimLenStart =
554554
lexstateNumBits
555555
+ ncommentsNumBits
556556
+ hardwhiteNumBits
@@ -566,7 +566,7 @@ module internal LexerStateEncoding =
566566
let ifdefstackMask = Bits.mask64 ifdefstackStart ifdefstackNumBits
567567
let stringKindMask = Bits.mask64 stringKindStart stringKindBits
568568
let nestingMask = Bits.mask64 nestingStart nestingBits
569-
let dlenMask = Bits.mask64 dlenStart dlenBits
569+
let delimLenMask = Bits.mask64 delimLenStart delimLenBits
570570

571571
let bitOfBool b = if b then 1 else 0
572572
let boolOfBit n = (n = 1L)
@@ -638,7 +638,7 @@ module internal LexerStateEncoding =
638638
||| ((kind1 <<< 2) &&& 0b000000001100)
639639
||| ((kind2 <<< 0) &&& 0b000000000011)
640640

641-
let delimLen = min delimLen (Bits.pown32 dlenBits)
641+
let delimLen = min delimLen (Bits.pown32 delimLenBits)
642642

643643
let bits =
644644
lexStateOfColorState colorState
@@ -648,7 +648,7 @@ module internal LexerStateEncoding =
648648
||| ((int64 ifdefStackBits <<< ifdefstackStart) &&& ifdefstackMask)
649649
||| ((int64 stringKindValue <<< stringKindStart) &&& stringKindMask)
650650
||| ((int64 nestingValue <<< nestingStart) &&& nestingMask)
651-
||| ((int64 delimLen <<< dlenStart) &&& dlenMask)
651+
||| ((int64 delimLen <<< delimLenStart) &&& delimLenMask)
652652

653653
{
654654
PosBits = b.Encoding
@@ -706,7 +706,7 @@ module internal LexerStateEncoding =
706706

707707
nest
708708

709-
let delimLen = int32 ((bits &&& dlenMask) >>> dlenStart)
709+
let delimLen = int32 ((bits &&& delimLenMask) >>> delimLenStart)
710710

711711
(colorState, ncomments, pos, ifDefs, hardwhite, stringKind, stringNest, delimLen)
712712

src/Compiler/lex.fsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,7 @@ and extendedInterpolatedString sargs skip = parse
16421642
if args.interpolationDelimiterLength > numBraces then
16431643
lexeme lexbuf |> addUnicodeString buf
16441644
(result())
1645-
else // numBraces >= args.interpolationDelimiterLength
1645+
else
16461646
fail args lexbuf (FSComp.SR.lexUnmatchedRBracesInTripleQuote()) (result())
16471647
}
16481648

src/Compiler/xlf/FSComp.txt.cs.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
<note />
254254
</trans-unit>
255255
<trans-unit id="featureExtendedStringInterpolation">
256-
<source>Extended string interpolation similar to C# raw strings.</source>
257-
<target state="new">Extended string interpolation similar to C# raw strings.</target>
256+
<source>Extended string interpolation similar to C# raw string literals.</source>
257+
<target state="new">Extended string interpolation similar to C# raw string literals.</target>
258258
<note />
259259
</trans-unit>
260260
<trans-unit id="featureFixedIndexSlice3d4d">

src/Compiler/xlf/FSComp.txt.de.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
<note />
254254
</trans-unit>
255255
<trans-unit id="featureExtendedStringInterpolation">
256-
<source>Extended string interpolation similar to C# raw strings.</source>
257-
<target state="new">Extended string interpolation similar to C# raw strings.</target>
256+
<source>Extended string interpolation similar to C# raw string literals.</source>
257+
<target state="new">Extended string interpolation similar to C# raw string literals.</target>
258258
<note />
259259
</trans-unit>
260260
<trans-unit id="featureFixedIndexSlice3d4d">

src/Compiler/xlf/FSComp.txt.es.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
<note />
254254
</trans-unit>
255255
<trans-unit id="featureExtendedStringInterpolation">
256-
<source>Extended string interpolation similar to C# raw strings.</source>
257-
<target state="new">Extended string interpolation similar to C# raw strings.</target>
256+
<source>Extended string interpolation similar to C# raw string literals.</source>
257+
<target state="new">Extended string interpolation similar to C# raw string literals.</target>
258258
<note />
259259
</trans-unit>
260260
<trans-unit id="featureFixedIndexSlice3d4d">

src/Compiler/xlf/FSComp.txt.fr.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
<note />
254254
</trans-unit>
255255
<trans-unit id="featureExtendedStringInterpolation">
256-
<source>Extended string interpolation similar to C# raw strings.</source>
257-
<target state="new">Extended string interpolation similar to C# raw strings.</target>
256+
<source>Extended string interpolation similar to C# raw string literals.</source>
257+
<target state="new">Extended string interpolation similar to C# raw string literals.</target>
258258
<note />
259259
</trans-unit>
260260
<trans-unit id="featureFixedIndexSlice3d4d">

src/Compiler/xlf/FSComp.txt.it.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
<note />
254254
</trans-unit>
255255
<trans-unit id="featureExtendedStringInterpolation">
256-
<source>Extended string interpolation similar to C# raw strings.</source>
257-
<target state="new">Extended string interpolation similar to C# raw strings.</target>
256+
<source>Extended string interpolation similar to C# raw string literals.</source>
257+
<target state="new">Extended string interpolation similar to C# raw string literals.</target>
258258
<note />
259259
</trans-unit>
260260
<trans-unit id="featureFixedIndexSlice3d4d">

src/Compiler/xlf/FSComp.txt.ja.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@
253253
<note />
254254
</trans-unit>
255255
<trans-unit id="featureExtendedStringInterpolation">
256-
<source>Extended string interpolation similar to C# raw strings.</source>
257-
<target state="new">Extended string interpolation similar to C# raw strings.</target>
256+
<source>Extended string interpolation similar to C# raw string literals.</source>
257+
<target state="new">Extended string interpolation similar to C# raw string literals.</target>
258258
<note />
259259
</trans-unit>
260260
<trans-unit id="featureFixedIndexSlice3d4d">

0 commit comments

Comments
 (0)