Merge pull request #8194 from diffblue/fluent-type-with-source-location

add a fluent-style typet::with_source_location

src/ansi-c/c_typecheck_type.cpp

@@ -283,10 +283,8 @@ void c_typecheck_baset::typecheck_type(typet &type)
       else // give up, just use subtype
         result = to_type_with_subtype(type).subtype();
 
-      // save the location
-      result.add_source_location()=type.source_location();
-
-      type=result;
+      // preserve the location
+      type = result.with_source_location(type);
     }
     else if(underlying_type.id()==ID_complex)
     {
@@ -303,9 +301,7 @@ void c_typecheck_baset::typecheck_type(typet &type)
         result = to_type_with_subtype(type).subtype();
 
       // save the location
-      result.add_source_location()=type.source_location();
-
-      type=complex_typet(result);
+      type = complex_typet(result).with_source_location(type);
     }
     else
     {
@@ -726,9 +722,8 @@ void c_typecheck_baset::typecheck_vector_type(typet &type)
   // produce the type with ID_vector
   vector_typet new_type(
     c_index_type(), subtype, from_integer(s, signed_size_type()));
-  new_type.add_source_location() = source_location;
   new_type.size().add_source_location() = source_location;
-  type = new_type;
+  type = new_type.with_source_location(source_location);
 }
 
 void c_typecheck_baset::typecheck_compound_type(struct_union_typet &type)

src/util/type.h

@@ -79,6 +79,39 @@ class typet:public irept
     return static_cast<source_locationt &>(add(ID_C_source_location));
   }
 
+  /// This is a 'fluent style' method for creating a new type
+  /// with an added-on source location.
+  typet &&with_source_location(source_locationt location) &&
+  {
+    if(location.is_not_nil())
+      add_source_location() = std::move(location);
+    return std::move(*this);
+  }
+
+  /// This is a 'fluent style' method for adding a source location.
+  typet &with_source_location(source_locationt location) &
+  {
+    if(location.is_not_nil())
+      add_source_location() = std::move(location);
+    return *this;
+  }
+
+  /// This is a 'fluent style' method for creating a new type
+  /// with an added-on source location.
+  typet &&with_source_location(const typet &type) &&
+  {
+    return std::move(*this).with_source_location(type.source_location());
+  }
+
+  /// This is a 'fluent style' method for adding a source location.
+  typet &with_source_location(const typet &type) &
+  {
+    auto &location = type.source_location();
+    if(location.is_not_nil())
+      add_source_location() = location;
+    return *this;
+  }
+
   typet &add_type(const irep_idt &name)
   {
     return static_cast<typet &>(add(name));