aboutsummaryrefslogtreecommitdiffstats
path: root/src/psl
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2019-05-25 07:56:54 +0200
committerTristan Gingold <tgingold@free.fr>2019-05-25 07:56:54 +0200
commitfb6994aec01818bd2096fd0bc12382fb6db8c78f (patch)
treebe1a4ff0e512910e3835fb06270bb71450cf0562 /src/psl
parent979b3e3af338294cf19abbe7d690d284fcaf4c89 (diff)
downloadghdl-fb6994aec01818bd2096fd0bc12382fb6db8c78f.tar.gz
ghdl-fb6994aec01818bd2096fd0bc12382fb6db8c78f.tar.bz2
ghdl-fb6994aec01818bd2096fd0bc12382fb6db8c78f.zip
vhdl-disp_vhdl: fixes for psl.
Diffstat (limited to 'src/psl')
-rw-r--r--src/psl/psl-prints.adb18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/psl/psl-prints.adb b/src/psl/psl-prints.adb
index 9bc05d940..cdd99c0c3 100644
--- a/src/psl/psl-prints.adb
+++ b/src/psl/psl-prints.adb
@@ -58,6 +58,8 @@ package body PSL.Prints is
return Prio_Seq_Or;
when N_And_Prop =>
return Prio_Seq_And;
+ when N_Paren_Prop =>
+ return Prio_FL_Paren;
when N_Imp_Seq
| N_Overlap_Imp_Seq
| N_Log_Imp_Prop
@@ -372,9 +374,21 @@ package body PSL.Prints is
when N_Before =>
Print_Binary_Property_SI (" before", Prop, Prio);
when N_Or_Prop =>
- Print_Binary_Property (" || ", Prop, Prio);
+ if True then
+ Print_Binary_Property (" or ", Prop, Prio);
+ else
+ Print_Binary_Property (" || ", Prop, Prio);
+ end if;
when N_And_Prop =>
- Print_Binary_Property (" && ", Prop, Prio);
+ if True then
+ Print_Binary_Property (" and ", Prop, Prio);
+ else
+ Print_Binary_Property (" && ", Prop, Prio);
+ end if;
+ when N_Paren_Prop =>
+ Put ("(");
+ Print_Property (Get_Property (Prop), Prio);
+ Put (")");
when N_Imp_Seq =>
Print_Property (Get_Sequence (Prop), Prio);
Put (" |=> ");