test 'Char -> 'T

Author: majocha

src/Compiler/Facilities/prim-lexing.fs

@@ -241,10 +241,10 @@ type internal Position =
 
     static member FirstLine fileIdx = Position(fileIdx, 1, 0, 0)
 
-type internal LexBufferFiller<'Char> = LexBuffer<'Char> -> unit
+type internal LexBufferFiller<'T> = LexBuffer<'T> -> unit
 
-and [<Sealed>] internal LexBuffer<'Char>
-    (filler: LexBufferFiller<'Char>, reportLibraryOnlyFeatures: bool, langVersion: LanguageVersion, strictIndentation: bool option) =
+and [<Sealed>] internal LexBuffer<'T>
+    (filler: LexBufferFiller<'T>, reportLibraryOnlyFeatures: bool, langVersion: LanguageVersion, strictIndentation: bool option) =
     let context = Dictionary<string, obj>(1)
     let mutable buffer = [||]
     /// number of valid characters beyond bufferScanStart.
@@ -287,11 +287,11 @@ and [<Sealed>] internal LexBuffer<'Char>
         and set b = endPos <- b
 
     member lexbuf.LexemeView =
-        System.ReadOnlySpan<'Char>(buffer, bufferScanStart, lexemeLength)
+        System.ReadOnlySpan<'T>(buffer, bufferScanStart, lexemeLength)
 
     member lexbuf.LexemeChar n = buffer[n + bufferScanStart]
 
-    member lexbuf.LexemeContains(c: 'Char) =
+    member lexbuf.LexemeContains(c: 'T) =
         array.IndexOf(buffer, c, bufferScanStart, lexemeLength) >= 0
 
     member lexbuf.BufferLocalStore = (context :> IDictionary<_, _>)
@@ -301,7 +301,7 @@ and [<Sealed>] internal LexBuffer<'Char>
         and set v = lexemeLength <- v
 
     member lexbuf.Buffer
-        with get (): 'Char[] = buffer
+        with get (): 'T[] = buffer
         and set v = buffer <- v
 
     member lexbuf.BufferMaxScanLength
@@ -351,32 +351,32 @@ and [<Sealed>] internal LexBuffer<'Char>
         FSharp.Compiler.DiagnosticsLogger.checkLanguageFeatureAndRecover langVersion featureId range
 
     static member FromFunction
-        (reportLibraryOnlyFeatures, langVersion, strictIndentation, f: 'Char[] * int * int -> int)
-        : LexBuffer<'Char> =
+        (reportLibraryOnlyFeatures, langVersion, strictIndentation, f: 'T[] * int * int -> int)
+        : LexBuffer<'T> =
         let extension = Array.zeroCreate 4096
 
-        let filler (lexBuffer: LexBuffer<'Char>) =
+        let filler (lexBuffer: LexBuffer<'T>) =
             let n = f (extension, 0, extension.Length)
             lexBuffer.EnsureBufferSize n
             Array.blit extension 0 lexBuffer.Buffer lexBuffer.BufferScanPos n
             lexBuffer.BufferMaxScanLength <- lexBuffer.BufferScanLength + n
 
-        new LexBuffer<'Char>(filler, reportLibraryOnlyFeatures, langVersion, strictIndentation)
+        new LexBuffer<'T>(filler, reportLibraryOnlyFeatures, langVersion, strictIndentation)
 
     // Important: This method takes ownership of the array
-    static member FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, strictIndentation, buffer: 'Char[]) : LexBuffer<'Char> =
+    static member FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, strictIndentation, buffer: 'T[]) : LexBuffer<'T> =
         let lexBuffer =
-            new LexBuffer<'Char>((fun _ -> ()), reportLibraryOnlyFeatures, langVersion, strictIndentation)
+            new LexBuffer<'T>((fun _ -> ()), reportLibraryOnlyFeatures, langVersion, strictIndentation)
 
         lexBuffer.Buffer <- buffer
         lexBuffer.BufferMaxScanLength <- buffer.Length
         lexBuffer
 
     // Important: this method does copy the array
-    static member FromArray(reportLibraryOnlyFeatures, langVersion, strictIndentation, s: 'Char[]) : LexBuffer<'Char> =
+    static member FromArray(reportLibraryOnlyFeatures, langVersion, strictIndentation, s: 'T[]) : LexBuffer<'T> =
         let buffer = Array.copy s
 
-        LexBuffer<'Char>.FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, strictIndentation, buffer)
+        LexBuffer<'T>.FromArrayNoCopy(reportLibraryOnlyFeatures, langVersion, strictIndentation, buffer)
 
     // Important: This method takes ownership of the array
     static member FromChars(reportLibraryOnlyFeatures, langVersion, strictIndentation, arr: char[]) =

src/Compiler/Facilities/prim-lexing.fsi

@@ -107,21 +107,21 @@ type internal Position =
 /// The type must be generic to match the code generated by FsLex and FsYacc (if you would like to
 /// fix this, please submit a PR to the FsLexYacc repository allowing for optional emit of a non-generic type reference).
 [<Sealed>]
-type internal LexBuffer<'Char> =
+type internal LexBuffer<'T> =
     /// The start position for the lexeme.
     member StartPos: Position with get, set
 
     /// The end position for the lexeme.
     member EndPos: Position with get, set
 
     /// The currently matched text as a Span, it is only valid until the lexer is advanced
-    member LexemeView: System.ReadOnlySpan<'Char>
+    member LexemeView: System.ReadOnlySpan<'T>
 
     /// Get single character of matched string
-    member LexemeChar: int -> 'Char
+    member LexemeChar: int -> 'T
 
     /// Determine if Lexeme contains a specific character
-    member LexemeContains: 'Char -> bool
+    member LexemeContains: 'T -> bool
 
     /// Fast helper to turn the matched characters into a string, avoiding an intermediate array.
     static member LexemeString: LexBuffer<char> -> string
@@ -157,8 +157,8 @@ type internal LexBuffer<'Char> =
         reportLibraryOnlyFeatures: bool *
         langVersion: LanguageVersion *
         strictIndentation: bool option *
-        ('Char[] * int * int -> int) ->
-            LexBuffer<'Char>
+        ('T[] * int * int -> int) ->
+            LexBuffer<'T>
 
     /// Create a lex buffer backed by source text.
     static member FromSourceText: