Add exprt::with_source_location with source_locationt parameter

We already supported the fluent-style with_source_location for copying
from another expression (since 917f9a0). Now also support passing a
source location directly.

Author: tautschnig

src/util/expr.h

@@ -97,6 +97,22 @@ class exprt:public irept
   const operandst &operands() const
   { return (const operandst &)get_sub(); }
 
+  /// Add the source location from \p location, if it is non-nil.
+  exprt &with_source_location(source_locationt location) &
+  {
+    if(location.is_not_nil())
+      add_source_location() = std::move(location);
+    return *this;
+  }
+
+  /// Add the source location from \p location, if it is non-nil.
+  exprt &&with_source_location(source_locationt location) &&
+  {
+    if(location.is_not_nil())
+      add_source_location() = std::move(location);
+    return std::move(*this);
+  }
+
   /// Add the source location from \p other, if it has any.
   exprt &with_source_location(const exprt &other) &
   {

src/util/std_expr.h

@@ -161,6 +161,38 @@ class symbol_exprt : public nullary_exprt
   {
     return get(ID_identifier);
   }
+
+  /// Add the source location from \p location, if it is non-nil.
+  symbol_exprt &with_source_location(source_locationt location) &
+  {
+    if(location.is_not_nil())
+      add_source_location() = std::move(location);
+    return *this;
+  }
+
+  /// Add the source location from \p location, if it is non-nil.
+  symbol_exprt &&with_source_location(source_locationt location) &&
+  {
+    if(location.is_not_nil())
+      add_source_location() = std::move(location);
+    return std::move(*this);
+  }
+
+  /// Add the source location from \p other, if it has any.
+  symbol_exprt &with_source_location(const exprt &other) &
+  {
+    if(other.source_location().is_not_nil())
+      add_source_location() = other.source_location();
+    return *this;
+  }
+
+  /// Add the source location from \p other, if it has any.
+  symbol_exprt &&with_source_location(const exprt &other) &&
+  {
+    if(other.source_location().is_not_nil())
+      add_source_location() = other.source_location();
+    return std::move(*this);
+  }
 };
 
 // NOLINTNEXTLINE(readability/namespace)