AST: also store the column number in Idents (#348)

src/ast.fs

@@ -5,6 +5,8 @@ open Options.Globals
 [<RequireQualifiedAccess>]
 type VarScope = Global | Local | Parameter
 
+type Location = { line: int; col: int }
+
 type Ident(name: string) =
     let mutable newName = name
 
@@ -15,12 +17,10 @@ type Ident(name: string) =
     // This prefix disables function inlining and variable inlining.
     member this.DoNotInline = this.OldName.StartsWith("noinline_")
 
-    member val LineNb = -1 with get, set
+    member val Loc = {line = -1; col = -1} with get, set
 
-    static member WithLineNb(name, lineNb) =
-        let id = Ident(name)
-        id.LineNb <- lineNb
-        id
+    new(name, lineNb, colNb) as this = Ident(name) then
+        this.Loc <- {line = lineNb; col = colNb}
 
     //member val isVarRead: bool = false with get, set
     member val isVarWrite: bool = false with get, set

src/parse.fs

@@ -37,7 +37,7 @@ type private ParseImpl() =
     let ident =
         let nonDigit = asciiLetter <|> pchar '_'
         let p = pipe3 getPosition nonDigit (manyChars (nonDigit <|> digit <?> "")) (
-            fun pos c s -> Ast.Ident.WithLineNb (c.ToString() + s, int pos.Line))
+            fun pos c s -> Ast.Ident(c.ToString() + s, int pos.Line, int pos.Column))
         let p = p >>= (fun s -> if Builtin.keywords.Contains(s.Name) then fail "ident is a keyword" else preturn s)
         (p .>> ws) <?> "identifier"