From e7c543790d49cada14536af8b4b23eb22d796278 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Thu, 2 Sep 2021 07:23:00 +0200
Subject: vhdl,psl: abort is now identical to async_abort. For #1654
---
src/psl/psl-subsets.adb | 5 ++---
src/vhdl/vhdl-canon.adb | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/psl/psl-subsets.adb b/src/psl/psl-subsets.adb
index 44d74499b..c077c033f 100644
--- a/src/psl/psl-subsets.adb
+++ b/src/psl/psl-subsets.adb
@@ -203,12 +203,11 @@ package body PSL.Subsets is
function Is_Async_Abort (N : Node) return Boolean is
begin
case Get_Kind (N) is
- when N_Async_Abort =>
+ when N_Async_Abort
+ | N_Abort =>
return True;
when N_Sync_Abort =>
return False;
- when N_Abort =>
- return False;
when others =>
raise Internal_Error;
end case;
diff --git a/src/vhdl/vhdl-canon.adb b/src/vhdl/vhdl-canon.adb
index a9efeb457..9e3dea60e 100644
--- a/src/vhdl/vhdl-canon.adb
+++ b/src/vhdl/vhdl-canon.adb
@@ -1744,11 +1744,10 @@ package body Vhdl.Canon is
-- Generate the NFA.
case Get_Kind (Prop) is
when N_Async_Abort
- | N_Sync_Abort =>
+ | N_Sync_Abort
+ | N_Abort =>
Prop := Get_Property (Prop);
Set_PSL_Abort_Flag (Stmt, True);
- when N_Abort =>
- null;
when others =>
null;
end case;
--
cgit v1.2.3