Printing of expressions is used in GNATprove to display parts of an
assertion which are not proved, Here the printing is improved slightly
for an expression-with-actions, so that the underlying expression is
printed, instead of the corresponding AST form of the expression with
Expr_Name.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* pprint.adb (Expression_Image): Special case for
expression-with-actions.diff --git a/gcc/ada/pprint.adb b/gcc/ada/pprint.adb
--- a/gcc/ada/pprint.adb
+++ b/gcc/ada/pprint.adb
@@ -682,7 +682,7 @@ package body Pprint is
end case;
end Expr_Name;
- -- Start of processing for Expression_Name
+ -- Start of processing for Expression_Image
begin
if not From_Source then
@@ -697,6 +697,12 @@ package body Pprint is
end;
end if;
+ -- Reach to the underlying expression for an expression-with-actions
+
+ if Nkind (Expr) = N_Expression_With_Actions then
+ return Expression_Image (Expression (Expr), Default);
+ end if;
+
-- Compute left (start) and right (end) slocs for the expression
-- Consider using Sinput.Sloc_Range instead, except that it does not
-- work properly currently???
