errorout: set length of location.

4 files changed, 18 insertions, 4 deletions

diff --git a/src/vhdl/errorout.adb b/src/vhdl/errorout.adb
index 33804e1a6..6d1b03299 100644
--- a/src/vhdl/errorout.adb
+++ b/src/vhdl/errorout.adb
@@ -217,6 +217,7 @@ package body Errorout is
       Line : Natural;
       New_Id : Msgid_Type;
       Offset : Natural;
+      Loc_Length : Natural;
       Line_Pos : Source_Ptr;
       pragma Unreferenced (Line_Pos);
    begin
@@ -242,6 +243,7 @@ package body Errorout is
       File := No_Source_File_Entry;
       Line := 0;
       Offset := 0;
+      Loc_Length := 0;
 
       case Origin is
          when Option
@@ -262,10 +264,12 @@ package body Errorout is
                      File := Scanner.Get_Current_Source_File;
                      Line := Scanner.Get_Current_Line;
                      Offset  := Scanner.Get_Current_Offset;
+                     Loc_Length := 1;
                   when Parse =>
                      File := Scanner.Get_Current_Source_File;
                      Line := Scanner.Get_Current_Line;
                      Offset  := Scanner.Get_Token_Offset;
+                     Loc_Length := Scanner.Get_Current_Offset - Offset;
                   when Semantic =>
                      null;
                end case;
@@ -273,7 +277,7 @@ package body Errorout is
       end case;
 
       Report_Handler.Error_Start
-        (Err => (Origin, New_Id, Cont, File, Line, Offset));
+        (Err => (Origin, New_Id, Cont, File, Line, Offset, Loc_Length));
 
       --  Display message.
       declare
@@ -437,7 +441,7 @@ package body Errorout is
       then
          --  Limit reached.  Emit a message.
          Report_Handler.Error_Start
-           (Err => (Origin, Msgid_Error, False, File, Line, Offset));
+           (Err => (Option, Msgid_Error, False, File, Line, Offset, 0));
          Report_Handler.Message ("error limit reached");
          Report_Handler.Message_End.all;
       end if;
diff --git a/src/vhdl/errorout.ads b/src/vhdl/errorout.ads
index cdbb482a2..85ff86dc4 100644
--- a/src/vhdl/errorout.ads
+++ b/src/vhdl/errorout.ads
@@ -181,8 +181,17 @@ package Errorout is
       Id : Msgid_Type;
       Cont : Boolean;
       File : Source_File_Entry;
+
+      --  The first line is line 1, 0 can be used when line number is not
+      --  relevant.
       Line : Natural;
+
+      --  Offset in the line.  The first character is at offset 0.
       Offset : Natural;
+
+      --  Length of the location (for a range).  It is assumed to be on the
+      --  same line; use 0 when unknown.
+      Length : Natural;
    end record;
 
    type Error_Start_Handler is access procedure (Err : Error_Record);
diff --git a/src/vhdl/python/libghdl/thin.py b/src/vhdl/python/libghdl/thin.py
index 5e6f87084..250fdda71 100644
--- a/src/vhdl/python/libghdl/thin.py
+++ b/src/vhdl/python/libghdl/thin.py
@@ -253,7 +253,8 @@ class Errorout:
                     ("cont", c_int8),
                     ("file", c_int32),
                     ("line", c_int32),
-                    ("offset", c_int32)]
+                    ("offset", c_int32),
+                    ("length", c_int32)]
 
 
 class Errorout_Memory:
diff --git a/src/vhdl/scanner.ads b/src/vhdl/scanner.ads
index 176904cab..3b50a9712 100644
--- a/src/vhdl/scanner.ads
+++ b/src/vhdl/scanner.ads
@@ -118,10 +118,10 @@ package Scanner is
    function Get_Current_Source_File return Source_File_Entry;
    function Get_Current_Line return Natural;
    function Get_Current_Offset return Natural;
+   function Get_Position return Source_Ptr;
    function Get_Token_Location return Location_Type;
    function Get_Token_Offset return Natural;
    function Get_Token_Position return Source_Ptr;
-   function Get_Position return Source_Ptr;
 
    --  Convert (canonicalize) an identifier stored in name_buffer/name_length.
    --  Upper case letters are converted into lower case.