diff mbox series

[Ada] More flexibility in preprocessor

Message ID 20210922151601.GA1908070@adacore.com
State Committed
Commit 3d2226f1730e027808b8f9c17d4f6b7ac1eb7c44
Headers
Series [Ada] More flexibility in preprocessor |

Commit Message

Pierre-Marie de Rodat Sept. 22, 2021, 3:16 p.m. UTC 
  When using -gnatd.M (or in codepeer mode), we want to be more flexible
in the preprocessor syntax, to accomodate better legacy toolchains.

Tested on x86_64-pc-linux-gnu, committed on trunk

gcc/ada/

	* prep.adb (Preprocess): Allow for more flexibility when
	Relaxed_RM_Semantics is set.
diff mbox series

Patch

diff --git a/gcc/ada/prep.adb b/gcc/ada/prep.adb
--- a/gcc/ada/prep.adb
+++ b/gcc/ada/prep.adb
@@ -1410,7 +1410,12 @@  package body Prep is
 
                      Scan.all;
 
-                     if Token /= Tok_If then
+                     --  Ignore all recoverable errors if Relaxed_RM_Semantics
+
+                     if Relaxed_RM_Semantics then
+                        null;
+
+                     elsif Token /= Tok_If then
                         Error_Msg -- CODEFIX
                           ("IF expected", Token_Ptr);
                         No_Error_Found := False;
@@ -1453,21 +1458,31 @@  package body Prep is
                   --  Illegal preprocessor line
 
                   when others =>
-                     No_Error_Found := False;
-
                      if Pp_States.Last = 0 then
                         Error_Msg -- CODEFIX
                           ("IF expected", Token_Ptr);
+                        No_Error_Found := False;
 
-                     elsif
-                       Pp_States.Table (Pp_States.Last).Else_Ptr = 0
+                     elsif Relaxed_RM_Semantics
+                       and then Get_Name_String (Token_Name) = "endif"
                      then
+                        --  In relaxed mode, accept "endif" instead of
+                        --  "end if".
+
+                        --  Decrement the depth of the #if stack
+
+                        if Pp_States.Last > 0 then
+                           Pp_States.Decrement_Last;
+                        end if;
+                     elsif Pp_States.Table (Pp_States.Last).Else_Ptr = 0 then
                         Error_Msg
                           ("IF, ELSIF, ELSE, or `END IF` expected",
                            Token_Ptr);
+                        No_Error_Found := False;
 
                      else
                         Error_Msg ("IF or `END IF` expected", Token_Ptr);
+                        No_Error_Found := False;
                      end if;
 
                      --  Skip to the end of this illegal line