replace properties with fields in Position struct

Author: Vasily Kirichenko

src/utils/prim-lexing.fs

@@ -10,48 +10,55 @@ namespace Internal.Utilities.Text.Lexing
     open System.Collections.Generic
 
     [<Struct>]
-    type internal Position(posFileIndex: int, posLineNum: int, posOriginalLineNum: int, posStartOfLineOffset: int, posColumnOffset: int) =
-        member __.FileIndex = posFileIndex
-        member __.Line = posLineNum
-        member __.OriginalLine = posOriginalLineNum
-        member __.AbsoluteOffset = posColumnOffset
-        member __.StartOfLineAbsoluteOffset = posStartOfLineOffset
-        member __.Column = posColumnOffset - posStartOfLineOffset
-
-        member __.NextLine = 
-            Position (posFileIndex,
-                      posLineNum + 1,
-                      posOriginalLineNum + 1,
-                      posColumnOffset,
-                      posColumnOffset)
-
-        member __.EndOfToken n = 
-            Position (posFileIndex,
-                      posLineNum,
-                      posOriginalLineNum,
-                      posStartOfLineOffset,
-                      posColumnOffset + n)
-
-        member __.ShiftColumnBy by = 
-            Position (posFileIndex,
-                      posLineNum,
-                      posOriginalLineNum,
-                      posStartOfLineOffset,
-                      posColumnOffset + by)
-
-        member __.ColumnMinusOne = 
-            Position (posFileIndex,
-                      posLineNum,
-                      posOriginalLineNum,
-                      posStartOfLineOffset,
-                      posStartOfLineOffset - 1)
-
-        member __.ApplyLineDirective (fileIdx, line) =
+    type internal Position =
+        val FileIndex: int
+        val Line: int
+        val OriginalLine: int
+        val AbsoluteOffset: int
+        val StartOfLineAbsoluteOffset: int
+        member x.Column = x.AbsoluteOffset - x.StartOfLineAbsoluteOffset
+
+        new (fileIndex: int, line: int, originalLine: int, startOfLineAbsoluteOffset: int, absoluteOffset: int) =
+            { FileIndex = fileIndex
+              Line = line
+              OriginalLine = originalLine
+              AbsoluteOffset = absoluteOffset
+              StartOfLineAbsoluteOffset = startOfLineAbsoluteOffset }
+
+        member x.NextLine = 
+            Position (x.FileIndex,
+                      x.Line + 1,
+                      x.OriginalLine + 1,
+                      x.AbsoluteOffset,
+                      x.AbsoluteOffset)
+
+        member x.EndOfToken n = 
+            Position (x.FileIndex,
+                      x.Line,
+                      x.OriginalLine,
+                      x.StartOfLineAbsoluteOffset,
+                      x.AbsoluteOffset + n)
+
+        member x.ShiftColumnBy by = 
+            Position (x.FileIndex,
+                      x.Line,
+                      x.OriginalLine,
+                      x.StartOfLineAbsoluteOffset,
+                      x.AbsoluteOffset + by)
+
+        member x.ColumnMinusOne = 
+            Position (x.FileIndex,
+                      x.Line,
+                      x.OriginalLine,
+                      x.StartOfLineAbsoluteOffset,
+                      x.StartOfLineAbsoluteOffset - 1)
+
+        member x.ApplyLineDirective (fileIdx, line) =
             Position (fileIdx,
                       line,
-                      posOriginalLineNum,
-                      posColumnOffset,
-                      posColumnOffset)
+                      x.OriginalLine,
+                      x.AbsoluteOffset,
+                      x.AbsoluteOffset)
 
         static member Empty = Position ()
 

src/utils/prim-lexing.fsi

@@ -13,17 +13,17 @@ open Microsoft.FSharp.Control
 [<Struct>]
 type internal Position = 
      /// The file index for the file associated with the input stream, use fileOfFileIndex in range.fs to decode
-     member FileIndex : int
+     val FileIndex : int
      /// The line number in the input stream, assuming fresh positions have been updated 
      /// for the new line by modifying the EndPos property of the LexBuffer.
-     member Line : int
+     val Line : int
      /// The line number for the position in the input stream, assuming fresh positions have been updated 
      /// using for the new line
-     member OriginalLine : int
+     val OriginalLine : int
      /// The character number in the input stream
-     member AbsoluteOffset : int
+     val AbsoluteOffset : int
      /// Return absolute offset of the start of the line marked by the position
-     member StartOfLineAbsoluteOffset : int
+     val StartOfLineAbsoluteOffset : int
      /// Return the column number marked by the position, i.e. the difference between the AbsoluteOffset and the StartOfLineAbsoluteOffset
      member Column : int
      // Given a position just beyond the end of a line, return a position at the start of the next line