diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-03-20 07:37:03 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-03-20 18:53:04 +0100 |
| commit | 0c79f9cfade3b5a8fc8bb24cad944e70109b86e5 (patch) | |
| tree | 8c0fc1ae4bcb20a2ec2d665b9d6bd4d246419e36 | |
| parent | 0ed24515f1d273ebe494e51dd7fdfb70ca13cc73 (diff) | |
| download | ghdl-0c79f9cfade3b5a8fc8bb24cad944e70109b86e5.tar.gz ghdl-0c79f9cfade3b5a8fc8bb24cad944e70109b86e5.tar.bz2 ghdl-0c79f9cfade3b5a8fc8bb24cad944e70109b86e5.zip | |
move algos to grt.
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | src/grt/grt-algos.adb (renamed from src/algos.adb) | 4 | ||||
| -rw-r--r-- | src/grt/grt-algos.ads (renamed from src/algos.ads) | 4 | ||||
| -rw-r--r-- | src/synth/synth-stmts.adb | 5 | ||||
| -rw-r--r-- | src/vhdl/sem_expr.adb | 7 |
5 files changed, 12 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 9f9f18f02..9c2624f9e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -207,6 +207,7 @@ copy-sources.gcc: version.ads $(CP) -p $(srcdir)/src/psl/*.ad? $(gcc_vhdl_dir) $(CP) -p $(srcdir)/src/grt/grt.ad? $(gcc_vhdl_dir) $(CP) -p $(srcdir)/src/grt/grt-fcvt.ad? $(gcc_vhdl_dir) + $(CP) -p $(srcdir)/src/grt/grt-algos.ad? $(gcc_vhdl_dir) $(CP) -p $(srcdir)/src/ortho/*.ad? $(gcc_vhdl_dir) $(CP) -p $(srcdir)/src/ortho/gcc/*.ad? $(gcc_vhdl_dir) $(CP) -p $(srcdir)/src/ortho/gcc/*.c $(gcc_vhdl_dir) diff --git a/src/algos.adb b/src/grt/grt-algos.adb index e40971495..9482e8208 100644 --- a/src/algos.adb +++ b/src/grt/grt-algos.adb @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. -package body Algos is +package body Grt.Algos is procedure Heap_Sort (N : Natural) is -- An heap is an almost complete binary tree whose each edge is less -- than or equal as its decendent. @@ -52,4 +52,4 @@ package body Algos is Bubble_Down (1, I - 1); end loop; end Heap_Sort; -end Algos; +end Grt.Algos; diff --git a/src/algos.ads b/src/grt/grt-algos.ads index 39004d3ac..85fe93ac3 100644 --- a/src/algos.ads +++ b/src/grt/grt-algos.ads @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. -package Algos is +package Grt.Algos is -- Heap sort the N elements. generic -- Compare two elements, return true iff OP1 < OP2. @@ -25,4 +25,4 @@ package Algos is -- Swap two elements. with procedure Swap (From : Natural; To : Natural); procedure Heap_Sort (N : Natural); -end Algos; +end Grt.Algos; diff --git a/src/synth/synth-stmts.adb b/src/synth/synth-stmts.adb index 3d8ee03f6..df49a624c 100644 --- a/src/synth/synth-stmts.adb +++ b/src/synth/synth-stmts.adb @@ -21,7 +21,7 @@ with Ada.Unchecked_Deallocation; with Types; use Types; -with Algos; +with Grt.Algos; with Areapools; with Errorout; use Errorout; @@ -278,7 +278,8 @@ package body Synth.Stmts is Arr (To) := T; end Swap; - procedure Wid_Heap_Sort is new Algos.Heap_Sort (Lt => Lt, Swap => Swap); + procedure Wid_Heap_Sort is + new Grt.Algos.Heap_Sort (Lt => Lt, Swap => Swap); begin Wid_Heap_Sort (Arr'Length); end Sort_Wire_Id_Array; diff --git a/src/vhdl/sem_expr.adb b/src/vhdl/sem_expr.adb index dabcce490..1aeaf0e2d 100644 --- a/src/vhdl/sem_expr.adb +++ b/src/vhdl/sem_expr.adb @@ -16,7 +16,7 @@ -- Software Foundation, 59 Temple Place - Suite 330, Boston, MA -- 02111-1307, USA. -with Algos; +with Grt.Algos; with Std_Package; use Std_Package; with Errorout; use Errorout; with Flags; use Flags; @@ -2189,7 +2189,7 @@ package body Sem_Expr is end Swap; procedure Str_Heap_Sort is - new Algos.Heap_Sort (Lt => Lt, Swap => Swap); + new Grt.Algos.Heap_Sort (Lt => Lt, Swap => Swap); begin Str_Heap_Sort (Info.Nbr_Choices); end Sort_String_Choices; @@ -2433,7 +2433,8 @@ package body Sem_Expr is Swap_Choice_Info (Info, From, To); end Swap; - procedure Disc_Heap_Sort is new Algos.Heap_Sort (Lt => Lt, Swap => Swap); + procedure Disc_Heap_Sort is + new Grt.Algos.Heap_Sort (Lt => Lt, Swap => Swap); begin Disc_Heap_Sort (Info.Nbr_Choices); end Sort_Discrete_Choices; |