[asl] Improve an error location for declare_type

Following suggestion by @HadrienRenaud

Author: hrutvik

asllib/Typing.ml

@@ -3903,7 +3903,7 @@ module Annotate (C : ANNOTATE_CONFIG) : S = struct
     let here x = add_pos_from ~loc:ty x in
     let+ () = check_var_not_in_genv ~loc genv name in
     let env = with_empty_local genv in
-    let t1, ses_t = annotate_type ~decl:true ~loc env ty in
+    let t1, ses_t = annotate_type ~decl:true ~loc:(to_pos ty) env ty in
     let env1, t2, s' =
       match s with
       (* AnnotateExtraFields( *)

asllib/tests/ASLTypingReference.t/run.t

@@ -189,9 +189,9 @@ ASL Typing Tests / annotating types:
   ASL Type error: cannot declare already declared element "GREEN".
   [1]
   $ aslref --no-exec TypingRule.TEnumDecl.bad2.asl
-  File TypingRule.TEnumDecl.bad2.asl, line 4, characters 0 to 67:
+  File TypingRule.TEnumDecl.bad2.asl, line 4, characters 24 to 47:
   type SubEnumIllegal1 of enumeration {LOW, HIGH} subtypes SuperEnum;
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+                          ^^^^^^^^^^^^^^^^^^^^^^^
   ASL Type error: cannot declare already declared element "LOW".
   [1]
   $ aslref --no-exec TypingRule.TEnumDecl.bad3.asl
@@ -202,18 +202,18 @@ ASL Typing Tests / annotating types:
     provided enumeration {TOP, BOTTOM}.
   [1]
   $ aslref --no-exec TypingRule.TEnumDecl.bad4.asl
-  File TypingRule.TEnumDecl.bad4.asl, line 1, characters 0 to 49:
+  File TypingRule.TEnumDecl.bad4.asl, line 1, characters 14 to 48:
   type Color of enumeration { GREEN, ORANGE, RED };
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   ASL Type error: cannot declare already declared element "RED".
   [1]
   $ aslref --no-exec TypingRule.Subtype.asl
   $ aslref --no-exec TypingRule.GetVariableEnum.asl
   $ aslref TypingRule.TRecordDecl.asl
   $ aslref TypingRule.TRecordDecl.bad.asl
-  File TypingRule.TRecordDecl.bad.asl, line 1, characters 0 to 58:
+  File TypingRule.TRecordDecl.bad.asl, line 1, characters 17 to 57:
   type MyRecord of record {v: integer, b: boolean, v: real};
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   ASL Type error: cannot declare already declared element "v".
   [1]
   $ aslref TypingRule.TExceptionDecl.asl
@@ -716,9 +716,9 @@ ASL Typing Tests / annotating types:
   [1]
   $ aslref --no-exec TypingRule.DeclareType.asl
   $ aslref TypingRule.AnnotateExtraFields.bad.asl
-  File TypingRule.AnnotateExtraFields.bad.asl, line 1, characters 0 to 40:
+  File TypingRule.AnnotateExtraFields.bad.asl, line 1, characters 15 to 39:
   type SubRecord subtypes Record with {-};
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+                 ^^^^^^^^^^^^^^^^^^^^^^^^
   ASL Static error: Undefined identifier: 'Record'
   [1]
   $ aslref --no-exec TypingRule.DeclaredType.asl

asllib/tests/bad-types.t

@@ -22,7 +22,7 @@ Bad fields
   > EOF
 
   $ aslref bad-types2.asl
-  File bad-types2.asl, line 1, character 0 to line 4, character 2:
+  File bad-types2.asl, line 1, character 10 to line 4, character 1:
   type t of bits(12) {
     [10: 3] a,
     [2+:1] a,
@@ -39,7 +39,7 @@ Overlapping slices
   > EOF
 
   $ aslref bad-types3.asl
-  File bad-types3.asl, line 1, character 0 to line 4, character 2:
+  File bad-types3.asl, line 1, character 10 to line 4, character 1:
   type t of bits(64) {
     [23: 0] a,
     [10: 0, 3+: 2] b,
@@ -56,7 +56,7 @@ Bad slices
   > EOF
 
   $ aslref bad-types4.asl
-  File bad-types4.asl, line 1, character 0 to line 4, character 2:
+  File bad-types4.asl, line 1, character 10 to line 4, character 1:
   type t of bits(12) {
     [10: 3] a,
     [14:12] b,
@@ -72,7 +72,7 @@ Bad slices
   > EOF
 
   $ aslref bad-types5.asl
-  File bad-types5.asl, line 1, character 0 to line 4, character 2:
+  File bad-types5.asl, line 1, character 10 to line 4, character 1:
   type t of bits(12) {
     [10: 3] a,
     [-2+:1] b,
@@ -91,7 +91,7 @@ Bad slices
   > EOF
 
   $ aslref bad-types6.asl
-  File bad-types6.asl, line 1, character 0 to line 7, character 2:
+  File bad-types6.asl, line 1, character 10 to line 7, character 1:
   type t of bits(12) {
     [10: 3] a,
     [7+:3] b {

asllib/tests/recursive.t/run.t

@@ -40,9 +40,9 @@
   [1]
 
   $ aslref recursive-type.asl
-  File recursive-type.asl, line 1, characters 0 to 35:
+  File recursive-type.asl, line 1, characters 13 to 34:
   type tree of (tree, integer, tree);
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+               ^^^^^^^^^^^^^^^^^^^^^
   ASL Static error: Undefined identifier: 'tree'
   [1]
 

asllib/tests/regressions.t/run.t

@@ -29,7 +29,7 @@ Type-checking errors:
   [1]
 
   $ aslref duplicate_record_fields.asl
-  File duplicate_record_fields.asl, line 1, character 0 to line 5, character 2:
+  File duplicate_record_fields.asl, line 1, character 17 to line 5, character 1:
   type MyRecord of record {
     i: integer,
     j: boolean,
@@ -39,17 +39,17 @@ Type-checking errors:
   [1]
 
   $ aslref duplicate_enumeration_items.asl
-  File duplicate_enumeration_items.asl, line 1, characters 0 to 34:
+  File duplicate_enumeration_items.asl, line 1, characters 10 to 33:
   type t of enumeration { i, j, i };
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+            ^^^^^^^^^^^^^^^^^^^^^^^
   ASL Type error: cannot declare already declared element "i".
   [1]
 
   $ aslref constant-zeros.asl
 
 Bad types:
   $ aslref overlapping-slices.asl
-  File overlapping-slices.asl, line 1, character 0 to line 4, character 2:
+  File overlapping-slices.asl, line 1, character 10 to line 4, character 1:
   type t of bits(64) {
     [23: 0] a,
     [10: 0, 3+: 2] b,
@@ -622,8 +622,8 @@ Inherit integer constraints on left-hand sides
   [1]
 
   $ aslref inherit-integer-constraints-bad-type.asl
-  File inherit-integer-constraints-bad-type.asl, line 1, character 0 to line 4,
-    character 2:
+  File inherit-integer-constraints-bad-type.asl, line 1, character 16 to
+    line 4, character 1:
   type badtype of record {
       a : integer{},
       c : integer