Merge pull request cil-project#42 from goblint/line-offset

Add column to location

Author: michael-schwarz

src/cil.ml

@@ -878,6 +878,7 @@ and location = {
     line: int;		   (** The line number. -1 means "do not know" *)
     file: string;          (** The name of the source file*)
     byte: int;             (** The byte position in the source file *)
+    column: int;           (** The column number *)
 }
 
 (* Type signatures. Two types are identical iff they have identical
@@ -892,7 +893,8 @@ and typsig =
 
 let locUnknown = { line = -1;
 		   file = "";
-		   byte = -1;}
+		   byte = -1;
+       column = -1}
 
 (* A reference to the current location *)
 let currentLoc : location ref = ref locUnknown
@@ -909,7 +911,11 @@ let compareLoc (a: location) (b: location) : int =
     let linecmp = a.line - b.line in
     if linecmp != 0
     then linecmp
-    else a.byte - b.byte
+    else
+      let columncmp = a.column - b.column in
+      if columncmp != 0
+      then columncmp
+      else a.byte - b.byte
 
 let argsToList : (string * typ * attributes) list option
                   -> (string * typ * attributes) list
@@ -3289,7 +3295,8 @@ let initMsvcBuiltins () : unit =
 (** This is used as the location of the prototypes of builtin functions. *)
 let builtinLoc: location = { line = 1;
                              file = "<compiler builtins>";
-                             byte = 0;}
+                             byte = 0;
+                             column = 0}
 
 
 

src/cil.mli

@@ -1112,6 +1112,7 @@ and location = {
     line: int;		   (** The line number. -1 means "do not know" *)
     file: string;          (** The name of the source file*)
     byte: int;             (** The byte position in the source file *)
+    column: int;           (** The column number *)
 }
 
 

src/ext/syntacticsearch/funcFunction.ml

@@ -215,7 +215,7 @@ let find_uses_in_fun_all funstrucname file =
             Some (find_uses_in_fun "" fundec.svar.vid funstrucname file)))
        file.globals
 
-let loc_default = { line = -1; file = ""; byte = -1 }
+let loc_default = { line = -1; file = ""; byte = -1; column = -1 }
 
 class fun_find_usesvar_in_fun fundec funstrucname varname varid file result :
   nopCilVisitor =

src/ext/syntacticsearch/queryMapping.ml

@@ -2,14 +2,14 @@ open Cil
 open CodeQuery
 
 (* Default output if the input-query is not supported *)
-let loc_default = { line = -1; file = ""; byte = -1 }
+let loc_default = { line = -1; file = ""; byte = -1; column = -1 }
 
 let rec delete_elem (name1, loc1, typ1, id1) list =
   match list with
   | (name2, loc2, typ2, id2) :: xs ->
       if
         String.compare name1 name2 = 0
-        && loc1.line = loc2.line && loc1.byte = loc2.byte
+        && loc1.line = loc2.line && loc1.byte = loc2.byte && loc1.column = loc2.column
         && String.compare loc1.file loc2.file = 0
         && String.compare typ1 typ2 = 0
         && id1 = id2

src/ext/zrapp/zrapp.ml

@@ -57,6 +57,10 @@ let loc_comp l1 l2 =
   then Some(1)
   else if l2.A.byteno > l1.A.byteno
   then Some(-1)
+  else if l1.A.columnno > l2.A.columnno
+  then Some(1)
+  else if l2.A.columnno > l1.A.columnno
+  then Some(-1)
   else Some(0)
 
 let simpleGaSearch l =
@@ -78,6 +82,7 @@ let get_comments l =
   let cabsl = {A.lineno = l.line;
 	       A.filename = l.file;
 	       A.byteno = l.byte;
+         A.columnno = l.column;
 	       A.ident = 0;} in
   let s = simpleGaSearch cabsl in
 

src/frontc/cabs.ml

@@ -50,6 +50,7 @@ type cabsloc = {
  lineno : int;
  filename: string;
  byteno: int;
+ columnno: int;
  ident : int;
 }
 

src/frontc/cabs2cil.ml

@@ -124,7 +124,7 @@ let attrsForCombinedArg: ((string, string) H.t ->
 let lu = locUnknown
 let cabslu = {lineno = -10;
 	      filename = "cabs lu";
-	      byteno = -10;
+	      byteno = -10; columnno = -10;
               ident = 0;}
 
 
@@ -194,8 +194,8 @@ let transparentUnionArgs : (int * typ) list ref = ref []
 let debugLoc = false
 let convLoc (l : cabsloc) =
   if debugLoc then
-    ignore (E.log "convLoc at %s: line %d, byte %d\n" l.filename l.lineno l.byteno);
-  {line = l.lineno; file = l.filename; byte = l.byteno;}
+    ignore (E.log "convLoc at %s: line %d, byte %d, column %d\n" l.filename l.lineno l.byteno l.columnno);
+  {line = l.lineno; file = l.filename; byte = l.byteno; column = l.columnno}
 
 
 let isOldStyleVarArgName n =

src/frontc/cabshelper.ml

@@ -7,15 +7,16 @@ let getident () =
     !nextident
 
 let currentLoc () = 
-  let l, f, c = Errormsg.getPosition () in
-  { lineno   = l; 
-    filename = f; 
+  let l, f, c, lc = Errormsg.getPosition () in
+  { lineno   = l;
+    filename = f;
     byteno   = c;
+    columnno = c - lc;
     ident    = getident ();}
 
 let cabslu = {lineno = -10; 
 	      filename = "cabs loc unknown"; 
-	      byteno = -10;
+	      byteno = -10; columnno = -10;
               ident = 0}
 
 (* clexer puts comments here *)

src/frontc/cabsvisit.ml

@@ -93,7 +93,7 @@ end
 
 let visitorLocation = ref { filename = "";
 			    lineno = -1;
-			    byteno = -1;
+			    byteno = -1; columnno = -1;
                             ident = 0}
 
         (* a default visitor which does nothing to the tree *)

src/frontc/cparser.mly

@@ -63,7 +63,7 @@ let getComments () =
 
 let cabslu = {lineno = -10;
 	      filename = "cabs loc unknown";
-	      byteno = -10;
+	      byteno = -10; columnno = -10;
               ident = 0;}
 
 (* cabsloc -> cabsloc *)