Fix merge issues

src/ast.rs

@@ -239,7 +239,7 @@ impl Debug for DataTypeDeclaration {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         match self {
             DataTypeDeclaration::DataTypeReference {
-                referenced_type, ..
+                referenced_type, ..  
             } => f
                 .debug_struct("DataTypeReference")
                 .field("referenced_type", referenced_type)

src/index/tests/index_tests.rs

@@ -837,8 +837,10 @@ fn pre_processing_generates_inline_pointers() {
             name: Some("__foo_inline_pointer".to_string()),
             referenced_type: Box::new(DataTypeDeclaration::DataTypeReference {
                 referenced_type: "INT".to_string(),
+                location: (68..71).into(),
             }),
         },
+        location: SourceRange::undefined(),
         initializer: None,
     };
     assert_eq!(format!("{:?}", expected), format!("{:?}", new_pointer_type));
@@ -848,6 +850,7 @@ fn pre_processing_generates_inline_pointers() {
     assert_eq!(
         &DataTypeDeclaration::DataTypeReference {
             referenced_type: "__foo_inline_pointer".to_string(),
+            location: (71..72).into(),
         },
         var_data_type
     );
@@ -878,8 +881,10 @@ fn pre_processing_generates_inline_pointer_to_pointer() {
             name: Some("__foo_inline_pointer_".to_string()),
             referenced_type: Box::new(DataTypeDeclaration::DataTypeReference {
                 referenced_type: "INT".to_string(),
+                location: (75..78).into(),
             }),
         },
+        location: (75..78).into(),
         initializer: None,
     };
     assert_eq!(format!("{:?}", expected), format!("{:?}", new_pointer_type));
@@ -891,8 +896,10 @@ fn pre_processing_generates_inline_pointer_to_pointer() {
             name: Some("__foo_inline_pointer".to_string()),
             referenced_type: Box::new(DataTypeDeclaration::DataTypeReference {
                 referenced_type: "__foo_inline_pointer_".to_string(),
+                location: (78..79).into(),
             }),
         },
+        location: (78..79).into(),
         initializer: None,
     };
     assert_eq!(format!("{:?}", expected), format!("{:?}", new_pointer_type));
@@ -902,6 +909,7 @@ fn pre_processing_generates_inline_pointer_to_pointer() {
     assert_eq!(
         &DataTypeDeclaration::DataTypeReference {
             referenced_type: "__foo_inline_pointer".to_string(),
+            location: (78..79).into(),
         },
         var_data_type
     );

src/parser/tests/type_parser_tests.rs

@@ -318,8 +318,10 @@ fn pointer_type_test() {
             name: Some("SamplePointer".into()),
             referenced_type: Box::new(DataTypeDeclaration::DataTypeReference {
                 referenced_type: "INT".to_string(),
+                location: SourceRange::undefined(),
             }),
         },
+        location: SourceRange::undefined(),
         initializer: None,
     };
     assert_eq!(
@@ -347,8 +349,10 @@ fn ref_type_test() {
             name: Some("SampleReference".into()),
             referenced_type: Box::new(DataTypeDeclaration::DataTypeReference {
                 referenced_type: "INT".to_string(),
+                location: SourceRange::undefined(),
             }),
         },
+        location: SourceRange::undefined(),
         initializer: None,
     };
     assert_eq!(
@@ -374,8 +378,10 @@ fn global_pointer_declaration() {
                 name: None,
                 referenced_type: Box::new(DataTypeDeclaration::DataTypeReference {
                     referenced_type: "INT".to_string(),
+                    location: SourceRange::undefined(),
                 }),
             },
+            location: SourceRange::undefined(),
         },
         initializer: None,
         location: (0..0).into(),
@@ -392,8 +398,10 @@ fn global_pointer_declaration() {
                 name: None,
                 referenced_type: Box::new(DataTypeDeclaration::DataTypeReference {
                     referenced_type: "INT".to_string(),
+                    location: SourceRange::undefined(),
                 }),
             },
+            location: SourceRange::undefined(),
         },
         initializer: None,
         location: (0..0).into(),