From 1dd52433d2d1c122c7338ddb350f8691f084e0cf Mon Sep 17 00:00:00 2001 From: Raphael Amiard Date: Wed, 15 Feb 2023 12:06:30 +0100 Subject: [PATCH] ada: Make string interpolation part of the core extensions gcc/ada/ * scng.adb (Scan): Replace occurrences of All_Extensions_Allowed by Core_Extensions_Allowed. --- gcc/ada/scng.adb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/ada/scng.adb b/gcc/ada/scng.adb index d1230e2efe1c..abf9c68cd3d2 100644 --- a/gcc/ada/scng.adb +++ b/gcc/ada/scng.adb @@ -1527,10 +1527,10 @@ package body Scng is end if; -- Left curly bracket, treated as right paren but proper delimiter - -- of interpolated string literals when all extensions are allowed. + -- of interpolated string literals when core extensions are allowed. when '{' => - if All_Extensions_Allowed then + if Core_Extensions_Allowed then Scan_Ptr := Scan_Ptr + 1; Token := Tok_Left_Curly_Bracket; @@ -1962,10 +1962,10 @@ package body Scng is return; -- Right curly bracket, treated as right paren but proper delimiter - -- of interpolated string literals when all extensions are allowed. + -- of interpolated string literals when core extensions are allowed. when '}' => - if All_Extensions_Allowed then + if Core_Extensions_Allowed then Token := Tok_Right_Curly_Bracket; else @@ -2125,7 +2125,7 @@ package body Scng is -- Lower case letters when 'a' .. 'z' => - if All_Extensions_Allowed + if Core_Extensions_Allowed and then Source (Scan_Ptr) = 'f' and then Source (Scan_Ptr + 1) = '"' then @@ -2145,7 +2145,7 @@ package body Scng is -- Upper case letters when 'A' .. 'Z' => - if All_Extensions_Allowed + if Core_Extensions_Allowed and then Source (Scan_Ptr) = 'F' and then Source (Scan_Ptr + 1) = '"' then -- 2.47.2