summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO66
-rw-r--r--Makefile-patch23
-rw-r--r--Makefile.stub-patch15
-rw-r--r--PKGBUILD114
-rw-r--r--a4g-a_elists.ads-patch34
-rw-r--r--a4g-asis_tables.ads-patch36
-rw-r--r--a4g-contt-ut.adb-patch14
-rw-r--r--a4g-contt.adb-patch54
-rw-r--r--a4g-contt.ads-patch70
-rw-r--r--a4g-defaults.ads-patch36
-rw-r--r--asis-data_decomposition-set_get.ads-patch14
-rw-r--r--asis-extensions-strings.adb-patch14
-rw-r--r--asis.gpr-patch11
-rw-r--r--asis_ui-compiler_options.adb-patch24
-rw-r--r--asis_ui-global_state.adb-patch14
-rw-r--r--asis_ui-source_table.adb-patch14
-rw-r--r--gnatcheck-asis_utilities.adb-patch14
-rw-r--r--gnatcheck-categories.adb-patch14
-rw-r--r--gnatcheck-diagnoses_old.adb-patch25
-rw-r--r--gnatcheck-name_dictionary.adb-patch14
-rw-r--r--gnatcheck-rules-custom_1.adb-patch14
-rw-r--r--gnatcheck-rules-rule_table.adb-patch14
-rw-r--r--gnatcheck-rules-rule_table.ads-patch14
-rw-r--r--gnatcheck-traversal_stack.adb-patch14
-rw-r--r--gnatelim-closure.adb-patch14
-rw-r--r--metrics-source_table.adb-patch14
26 files changed, 20 insertions, 684 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 67e1cb123a0..045d1262732 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,69 +1,19 @@
-# Generated by mksrcinfo v8
-# Thu Jul 6 12:11:44 UTC 2017
pkgbase = asis
pkgdesc = Allows Ada programs access to the syntactic and semantic structure of source code. Also provides extra tools such as gnatpp.
- pkgver = 2017
- pkgrel = 2
+ pkgver = 2018
+ pkgrel = 1
url = http://libre.adacore.com/tools
arch = i686
arch = x86_64
groups = gcc-ada
license = GPL
- depends = gcc-ada
+ makedepends = gprbuild
+ depends = gcc-ada>=8.2.1
+ depends = gcc-ada<9.0.0
depends = gnat_util
- depends = gnatcoll
- provides = asis
- conflicts = asis
- source = http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
- source = Makefile-patch
- source = Makefile.stub-patch
- source = a4g-a_elists.ads-patch
- source = a4g-asis_tables.ads-patch
- source = a4g-contt-ut.adb-patch
- source = a4g-contt.adb-patch
- source = a4g-contt.ads-patch
- source = a4g-defaults.ads-patch
- source = asis-data_decomposition-set_get.ads-patch
- source = asis-extensions-strings.adb-patch
- source = asis.gpr-patch
- source = asis_ui-compiler_options.adb-patch
- source = asis_ui-global_state.adb-patch
- source = asis_ui-source_table.adb-patch
- source = gnatcheck-asis_utilities.adb-patch
- source = gnatcheck-categories.adb-patch
- source = gnatcheck-diagnoses_old.adb-patch
- source = gnatcheck-name_dictionary.adb-patch
- source = gnatcheck-rules-custom_1.adb-patch
- source = gnatcheck-rules-rule_table.adb-patch
- source = gnatcheck-rules-rule_table.ads-patch
- source = gnatcheck-traversal_stack.adb-patch
- source = gnatelim-closure.adb-patch
- source = metrics-source_table.adb-patch
- sha1sums = 369101e6b0d9e777b9bcae821ddb68567138a95f
- sha1sums = 20452ee87ed5b7a1c10f207e098f29f68f2d18b8
- sha1sums = 60137197ec26eee43fea570a6fc97563437c1c84
- sha1sums = c30f18654d474029119a81bc30d48b8b78c7454f
- sha1sums = cab68c6c9890242f6f547d1a7a6b28909724f494
- sha1sums = 17e195a0f3283e7cb2e314a2a7fbee3d3e16bf4f
- sha1sums = ca5270f9426f96aef4d39017e116bf07c87d18eb
- sha1sums = 900aab3b77f0cb6ab52b1430c4cdb7dc0884adc2
- sha1sums = e4fa897994072830844b1001f4cf018c4b7ef045
- sha1sums = a4c96d9f7eba3bda7011f1b8f6fcc5560b5a7305
- sha1sums = 444099ac59d93e0ac380edc88f581add6fa37e0d
- sha1sums = f47413c62cb45a6cb608d3ce0e09eb4430a8294b
- sha1sums = 6a90ea0eb4c3531b8e93b3026a4d882cd780ba1c
- sha1sums = 138594104b6ccf92449d5d673924b0ae35e64942
- sha1sums = 914921f22db384439d0ba0eb5022670fd4299cb6
- sha1sums = 22c177723b7e31de47c043d7519c7f82153b41df
- sha1sums = d5bc78cf44e743be262218c8eac7d84d76ad6633
- sha1sums = 0cd3ed84e7ddcb739305927b6a8306a2ca1e2d78
- sha1sums = e0efa9a3aa89a65717cbfec6b1efd41bd574b3ba
- sha1sums = a73d7389e09fdb80d17560f29d2e34e3ca01c0b5
- sha1sums = 0aabd9e44ded38630771539ae883dbb1a4b020a4
- sha1sums = 5eefb9a65af42809c9d02c872a8bd75745ce6c88
- sha1sums = 6173adc9dbb5095f58e49eda81beaf63f5fa452e
- sha1sums = 841d3de56687297d4c561b9c882460a3624b0d82
- sha1sums = 0f0c91d8fcd0333eb6ddd9b704bf656bf59cb444
+ depends = gnatcoll-core
+ source = http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8
+ sha1sums = c338044768412af787c8cff13c0d952ed688df11
pkgname = asis
diff --git a/Makefile-patch b/Makefile-patch
deleted file mode 100644
index 143b3b825ad..00000000000
--- a/Makefile-patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- asis-gpl-2017-src/Makefile
-+++ asis-gpl-2017-src-new/Makefile
-@@ -9,7 +9,8 @@
- # ==================================================== build
-
- .PHONY: all
--all: setup-snames
-+#all: setup-snames
-+all:
- $(GPRBUILD) -p -j0 -XBLD=$(BLD) -XASISOPSYS=$(ASISOPSYS) -XGNSA=$(GNSA) \
- $(GPRBUILD_FLAGS) -XASIS_COMPONENTS=$(COMPS) build_asis.gpr
-
-@@ -30,7 +31,8 @@
- # snames.ads". 'cmp' returns true (i.e. 0) if the files are identical.
-
- .PHONY: setup
--setup: setup-snames setup-factory
-+setup: setup-factory
-+#setup: setup-snames setup-factory
-
- .PHONY: setup-snames
- setup-snames: gnat/snames.ads-tmpl gnat/snames.adb-tmpl gnat/xutil.ads gnat/xutil.adb
-
diff --git a/Makefile.stub-patch b/Makefile.stub-patch
deleted file mode 100644
index 469ef3d17fb..00000000000
--- a/Makefile.stub-patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- asis-gpl-2017-src/Makefile.stub
-+++ asis-gpl-2017-src-new/Makefile.stub
-@@ -3,8 +3,9 @@
-
- # Where Asis library should be installed
- # Default is into current GNAT directory
--INSTALL_DIR = $(dir $(shell which gnatls))..
--prefix=$(INSTALL_DIR)
-+#INSTALL_DIR = $(dir $(shell which gnatls))..
-+#prefix=$(INSTALL_DIR)
-+prefix=$(PREFIX)
-
- # System commands
- LN = ln -s
-
diff --git a/PKGBUILD b/PKGBUILD
index 2087f21d9d7..900b59a77c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Contributor: Rod Kay <charlie5 on #ada at freenode.net>
+# Maintainer: Rod Kay <charlie5 on #ada at freenode.net>
pkgname=asis
-pkgver=2017
-pkgrel=2
+pkgver=2018
+pkgrel=1
pkgdesc="Allows Ada programs access to the syntactic and semantic structure of source code. Also provides extra tools such as gnatpp."
arch=(i686 x86_64)
@@ -10,105 +10,11 @@ url=http://libre.adacore.com/tools
license=(GPL)
groups=(gcc-ada)
-depends=(gcc-ada gnat_util gnatcoll)
-
-provides=($pkgname)
-conflicts=($pkgname)
-
-source=(http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
- Makefile-patch
- Makefile.stub-patch
- a4g-a_elists.ads-patch
- a4g-asis_tables.ads-patch
- a4g-contt-ut.adb-patch
- a4g-contt.adb-patch
- a4g-contt.ads-patch
- a4g-defaults.ads-patch
- asis-data_decomposition-set_get.ads-patch
- asis-extensions-strings.adb-patch
- asis.gpr-patch
- asis_ui-compiler_options.adb-patch
- asis_ui-global_state.adb-patch
- asis_ui-source_table.adb-patch
- gnatcheck-asis_utilities.adb-patch
- gnatcheck-categories.adb-patch
- gnatcheck-diagnoses_old.adb-patch
- gnatcheck-name_dictionary.adb-patch
- gnatcheck-rules-custom_1.adb-patch
- gnatcheck-rules-rule_table.adb-patch
- gnatcheck-rules-rule_table.ads-patch
- gnatcheck-traversal_stack.adb-patch
- gnatelim-closure.adb-patch
- metrics-source_table.adb-patch)
-
-
-
-sha1sums=('369101e6b0d9e777b9bcae821ddb68567138a95f'
- '20452ee87ed5b7a1c10f207e098f29f68f2d18b8'
- '60137197ec26eee43fea570a6fc97563437c1c84'
- 'c30f18654d474029119a81bc30d48b8b78c7454f'
- 'cab68c6c9890242f6f547d1a7a6b28909724f494'
- '17e195a0f3283e7cb2e314a2a7fbee3d3e16bf4f'
- 'ca5270f9426f96aef4d39017e116bf07c87d18eb'
- '900aab3b77f0cb6ab52b1430c4cdb7dc0884adc2'
- 'e4fa897994072830844b1001f4cf018c4b7ef045'
- 'a4c96d9f7eba3bda7011f1b8f6fcc5560b5a7305'
- '444099ac59d93e0ac380edc88f581add6fa37e0d'
- 'f47413c62cb45a6cb608d3ce0e09eb4430a8294b'
- '6a90ea0eb4c3531b8e93b3026a4d882cd780ba1c'
- '138594104b6ccf92449d5d673924b0ae35e64942'
- '914921f22db384439d0ba0eb5022670fd4299cb6'
- '22c177723b7e31de47c043d7519c7f82153b41df'
- 'd5bc78cf44e743be262218c8eac7d84d76ad6633'
- '0cd3ed84e7ddcb739305927b6a8306a2ca1e2d78'
- 'e0efa9a3aa89a65717cbfec6b1efd41bd574b3ba'
- 'a73d7389e09fdb80d17560f29d2e34e3ca01c0b5'
- '0aabd9e44ded38630771539ae883dbb1a4b020a4'
- '5eefb9a65af42809c9d02c872a8bd75745ce6c88'
- '6173adc9dbb5095f58e49eda81beaf63f5fa452e'
- '841d3de56687297d4c561b9c882460a3624b0d82'
- '0f0c91d8fcd0333eb6ddd9b704bf656bf59cb444')
-
-
-prepare()
-{
- WRKSRC=$srcdir/$pkgname-gpl-$pkgver-src
-
- sed -i -e 's|OPSYS|ASISOPSYS|g' \
- -e 's|(prefix)|(DESTDIR)$(prefix)|g' \
- ${WRKSRC}/Makefile \
- ${WRKSRC}/Makefile.stub \
- ${WRKSRC}/common.gpr
-
- rm -rf ${WRKSRC}/gnat/*
-
- cd $WRKSRC
- patch -p1 -i ../Makefile-patch
- patch -p1 -i ../Makefile.stub-patch
- patch -p1 -i ../a4g-a_elists.ads-patch
- patch -p1 -i ../a4g-asis_tables.ads-patch
- patch -p1 -i ../a4g-contt-ut.adb-patch
- patch -p1 -i ../a4g-contt.adb-patch
- patch -p1 -i ../a4g-contt.ads-patch
- patch -p1 -i ../a4g-defaults.ads-patch
- patch -p1 -i ../asis-data_decomposition-set_get.ads-patch
- patch -p1 -i ../asis-extensions-strings.adb-patch
- patch -p1 -i ../asis.gpr-patch
- patch -p1 -i ../asis_ui-compiler_options.adb-patch
- patch -p1 -i ../asis_ui-global_state.adb-patch
- patch -p1 -i ../asis_ui-source_table.adb-patch
- patch -p1 -i ../gnatcheck-asis_utilities.adb-patch
- patch -p1 -i ../gnatcheck-categories.adb-patch
- patch -p1 -i ../gnatcheck-diagnoses_old.adb-patch
- patch -p1 -i ../gnatcheck-name_dictionary.adb-patch
- patch -p1 -i ../gnatcheck-rules-custom_1.adb-patch
- patch -p1 -i ../gnatcheck-rules-rule_table.adb-patch
- patch -p1 -i ../gnatcheck-rules-rule_table.ads-patch
- patch -p1 -i ../gnatcheck-traversal_stack.adb-patch
- patch -p1 -i ../gnatelim-closure.adb-patch
- patch -p1 -i ../metrics-source_table.adb-patch
-}
+depends=('gcc-ada>=8.2.1' 'gcc-ada<9.0.0' 'gnat_util' 'gnatcoll-core')
+makedepends=('gprbuild')
+source=(http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8)
+sha1sums=('c338044768412af787c8cff13c0d952ed688df11')
build()
@@ -119,7 +25,6 @@ build()
make tools
}
-
package()
{
@@ -127,4 +32,9 @@ package()
PREFIX=/usr make install prefix=${pkgdir}/usr
PREFIX=/usr make install-tools prefix=${pkgdir}/usr
+
+ # Rid tools superseded by libadalang-tools.
+ rm ${pkgdir}/usr/bin/gnatmetric
+ rm ${pkgdir}/usr/bin/gnatpp
+ rm ${pkgdir}/usr/bin/gnatstub
}
diff --git a/a4g-a_elists.ads-patch b/a4g-a_elists.ads-patch
deleted file mode 100644
index b772d4f4af8..00000000000
--- a/a4g-a_elists.ads-patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- asis-gpl-2017-src/asis/a4g-a_elists.ads
-+++ asis-gpl-2017-src-new/asis/a4g-a_elists.ads
-@@ -268,8 +268,8 @@
- Table_Index_Type => Elist_Id,
- Table_Low_Bound => First_Elist_Id,
- Table_Initial => Alloc.Elists_Initial,
-- Table_Increment => Alloc.Elists_Increment,
-- Table_Name => "Elists");
-+ Table_Increment => Alloc.Elists_Increment);
-+-- Table_Name => "Elists");
-
- type Elmt_Item is record
- Unit : Unit_Id;
-@@ -281,12 +281,12 @@
- Table_Index_Type => Elmt_Id,
- Table_Low_Bound => First_Elmt_Id,
- Table_Initial => Alloc.Elmts_Initial,
-- Table_Increment => Alloc.Elmts_Increment,
-- Table_Name => "Elmts");
--
-- type Saved_Lists is record
-- Saved_Elmts : Elmts.Saved_Table;
-- Saved_Elists : Elists.Saved_Table;
-- end record;
-+ Table_Increment => Alloc.Elmts_Increment);
-+-- Table_Name => "Elmts");
-+
-+-- type Saved_Lists is record
-+-- Saved_Elmts : Elmts.Saved_Table;
-+-- Saved_Elists : Elists.Saved_Table;
-+-- end record;
-
- end A4G.A_Elists;
-
diff --git a/a4g-asis_tables.ads-patch b/a4g-asis_tables.ads-patch
deleted file mode 100644
index 05b5a85775d..00000000000
--- a/a4g-asis_tables.ads-patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- asis-gpl-2017-src/asis/a4g-asis_tables.ads
-+++ asis-gpl-2017-src-new/asis/a4g-asis_tables.ads
-@@ -54,8 +54,8 @@
- Table_Index_Type => Asis.ASIS_Natural,
- Table_Low_Bound => 1,
- Table_Initial => 10,
-- Table_Increment => 100,
-- Table_Name => "Internal Element_List");
-+ Table_Increment => 100);
-+-- Table_Name => "Internal Element_List");
-
- -- This table contains ASIS Elements. It is supposed to be used only for
- -- creating the result Element lists in ASIS structural queries. Note that
-@@ -69,8 +69,8 @@
- Table_Index_Type => Asis.ASIS_Natural,
- Table_Low_Bound => 1,
- Table_Initial => 10,
-- Table_Increment => 100,
-- Table_Name => "Element_List");
-+ Table_Increment => 100);
-+-- Table_Name => "Element_List");
- -- This table contains ASIS Elements. It is supposed to be used for any
- -- purpose except creating the result Element lists in ASIS structural
- -- queries.
-@@ -95,8 +95,8 @@
- Table_Index_Type => Int,
- Table_Low_Bound => 0,
- Table_Initial => 10,
-- Table_Increment => 100,
-- Table_Name => "Node_Trace");
-+ Table_Increment => 100);
-+-- Table_Name => "Node_Trace");
- -- This table is used to create the node trace needed to compare elements
- -- from nested instances
-
-
diff --git a/a4g-contt-ut.adb-patch b/a4g-contt-ut.adb-patch
deleted file mode 100644
index f5569a8c955..00000000000
--- a/a4g-contt-ut.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/asis/a4g-contt-ut.adb
-+++ asis-gpl-2017-src-new/asis/a4g-contt-ut.adb
-@@ -132,8 +132,8 @@
- Table_Index_Type => Unit_Id,
- Table_Low_Bound => First_Unit_Id,
- Table_Initial => 1000,
-- Table_Increment => 100,
-- Table_Name => "Top Node Cache");
-+ Table_Increment => 100);
-+-- Table_Name => "Top Node Cache");
- -- Used to cache the already computed results of the Top function
-
- package Config_files_Sets is new
-
diff --git a/a4g-contt.adb-patch b/a4g-contt.adb-patch
deleted file mode 100644
index db9ebb8f496..00000000000
--- a/a4g-contt.adb-patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- asis-gpl-2017-src/asis/a4g-contt.adb
-+++ asis-gpl-2017-src-new/asis/a4g-contt.adb
-@@ -1938,16 +1938,18 @@
- procedure Restore_Context (C : Context_Id) is
- begin
- pragma Assert (C in Contexts.First .. Contexts.Last);
-- A_Name_Chars.Restore
-- (Contexts.Table (C).Back_Up.Context_Name_Chars);
-- Unit_Table.Restore (Contexts.Table (C).Back_Up.Units);
-- Tree_Table.Restore (Contexts.Table (C).Back_Up.Trees);
-+
-+ raise Program_Error with "Restore_Context is not implemented";
-+-- A_Name_Chars.Restore
-+-- (Contexts.Table (C).Back_Up.Context_Name_Chars);
-+-- Unit_Table.Restore (Contexts.Table (C).Back_Up.Units);
-+-- Tree_Table.Restore (Contexts.Table (C).Back_Up.Trees);
-
- -- restoring lists tables:
-- A4G.A_Elists.Elmts.Restore
-- (Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elmts);
-- A4G.A_Elists.Elists.Restore
-- (Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elists);
-+-- A4G.A_Elists.Elmts.Restore
-+-- (Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elmts);
-+-- A4G.A_Elists.Elists.Restore
-+-- (Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elists);
- end Restore_Context;
-
- ------------------
-@@ -1958,15 +1960,16 @@
- begin
- if Is_Opened (C) then
- pragma Assert (C in Contexts.First .. Contexts.Last);
-- Contexts.Table (C).Back_Up.Context_Name_Chars := A_Name_Chars.Save;
-- Contexts.Table (C).Back_Up.Units := Unit_Table.Save;
-- Contexts.Table (C).Back_Up.Trees := Tree_Table.Save;
-+ raise Program_Error with "Save_Context is not implemented";
-+-- Contexts.Table (C).Back_Up.Context_Name_Chars := A_Name_Chars.Save;
-+-- Contexts.Table (C).Back_Up.Units := Unit_Table.Save;
-+-- Contexts.Table (C).Back_Up.Trees := Tree_Table.Save;
-
- -- saving lists tables:
-- Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elmts :=
-- A4G.A_Elists.Elmts.Save;
-- Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elists :=
-- A4G.A_Elists.Elists.Save;
-+-- Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elmts :=
-+-- A4G.A_Elists.Elmts.Save;
-+-- Contexts.Table (C).Back_Up.Context_Unit_Lists.Saved_Elists :=
-+-- A4G.A_Elists.Elists.Save;
- end if;
- end Save_Context;
-
-
diff --git a/a4g-contt.ads-patch b/a4g-contt.ads-patch
deleted file mode 100644
index 0b582a189ef..00000000000
--- a/a4g-contt.ads-patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- asis-gpl-2017-src/asis/a4g-contt.ads
-+++ asis-gpl-2017-src-new/asis/a4g-contt.ads
-@@ -387,34 +387,34 @@
- Table_Index_Type => Int,
- Table_Low_Bound => 0,
- Table_Initial => Alloc.Name_Chars_Initial,
-- Table_Increment => Alloc.Name_Chars_Increment,
-- Table_Name => "A_Name_Chars");
-+ Table_Increment => Alloc.Name_Chars_Increment);
-+-- Table_Name => "A_Name_Chars");
-
- package Unit_Table is new GNAT.Table (
- Table_Component_Type => A4G.Unit_Rec.Unit_Record,
- Table_Index_Type => A4G.A_Types.Unit_Id,
- Table_Low_Bound => A4G.A_Types.First_Unit_Id,
- Table_Initial => A4G.A_Alloc.Alloc_ASIS_Units_Initial,
-- Table_Increment => A4G.A_Alloc.Alloc_ASIS_Units_Increment,
-- Table_Name => "ASIS_Compilation_Units");
-+ Table_Increment => A4G.A_Alloc.Alloc_ASIS_Units_Increment);
-+-- Table_Name => "ASIS_Compilation_Units");
-
- package Tree_Table is new GNAT.Table (
- Table_Component_Type => A4G.Tree_Rec.Tree_Record,
- Table_Index_Type => A4G.A_Types.Tree_Id,
- Table_Low_Bound => A4G.A_Types.First_Tree_Id,
- Table_Initial => A4G.A_Alloc.Alloc_ASIS_Trees_Initial,
-- Table_Increment => A4G.A_Alloc.Alloc_ASIS_Trees_Increment,
-- Table_Name => "ASIS_Trees");
-+ Table_Increment => A4G.A_Alloc.Alloc_ASIS_Trees_Increment);
-+-- Table_Name => "ASIS_Trees");
-
- subtype Directory_List_Ptr is Argument_List_Access;
- subtype Tree_File_List_Ptr is Argument_List_Access;
-
-- type Saved_Context is record
-- Context_Name_Chars : A_Name_Chars.Saved_Table;
-- Context_Unit_Lists : A4G.A_Elists.Saved_Lists;
-- Units : Unit_Table.Saved_Table;
-- Trees : Tree_Table.Saved_Table;
-- end record;
-+-- type Saved_Context is record
-+-- Context_Name_Chars : A_Name_Chars.Saved_Table;
-+-- Context_Unit_Lists : A4G.A_Elists.Saved_Lists;
-+-- Units : Unit_Table.Saved_Table;
-+-- Trees : Tree_Table.Saved_Table;
-+-- end record;
-
- --------------------
- -- Context Record --
-@@ -502,7 +502,7 @@
-
- Context_Tree_Files : Tree_File_List_Ptr;
-
-- Back_Up : Saved_Context;
-+-- Back_Up : Saved_Context;
-
- Mode : Context_Mode := All_Trees;
- Tree_Processing : Tree_Mode := Pre_Created;
-@@ -523,8 +523,8 @@
- Table_Index_Type => Context_Id,
- Table_Low_Bound => First_Context_Id,
- Table_Initial => Alloc_Contexts_Initial,
-- Table_Increment => Alloc_Contexts_Increment,
-- Table_Name => "ASIS_Contexts");
-+ Table_Increment => Alloc_Contexts_Increment);
-+-- Table_Name => "ASIS_Contexts");
-
- ------------------------------------------------------
- -- "Back-Up" Name Buffer for NB_Save and NB_Restore --
-
diff --git a/a4g-defaults.ads-patch b/a4g-defaults.ads-patch
deleted file mode 100644
index 9f0c19ca2bb..00000000000
--- a/a4g-defaults.ads-patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- asis-gpl-2017-src/asis/a4g-defaults.ads
-+++ asis-gpl-2017-src-new/asis/a4g-defaults.ads
-@@ -60,8 +60,8 @@
- Table_Index_Type => Dir_Id,
- Table_Low_Bound => First_Dir_Id,
- Table_Initial => 12,
-- Table_Increment => 100,
-- Table_Name => "A4G.Defaults.Src_Search_Directories");
-+ Table_Increment => 100);
-+-- Table_Name => "A4G.Defaults.Src_Search_Directories");
- -- Table of the names of the directories listed as the value of the
- -- ADA_INCLUDE_PATH environment variable
-
-@@ -70,8 +70,8 @@
- Table_Index_Type => Dir_Id,
- Table_Low_Bound => First_Dir_Id,
- Table_Initial => 12,
-- Table_Increment => 100,
-- Table_Name => "A4G.Defaults.Lib_Search_Directories");
-+ Table_Increment => 100);
-+-- Table_Name => "A4G.Defaults.Lib_Search_Directories");
- -- Table of the names of the directories listed as the value of the
- -- ADA_OBJECT_PATH environment variable. We are considering object
- -- and ALI files coming together, so we call them both as library
-@@ -82,8 +82,8 @@
- Table_Index_Type => Dir_Id,
- Table_Low_Bound => First_Dir_Id,
- Table_Initial => 12,
-- Table_Increment => 100,
-- Table_Name => "A4G.Defaults.Lib_Search_Directories");
-+ Table_Increment => 100);
-+-- Table_Name => "A4G.Defaults.Lib_Search_Directories");
- -- Table of the names of the directories for dfault trees. Currently
- -- contains exactly the same information as the table defined by
- -- ASIS_Lib_Search_Directories, because we consider, that
-
diff --git a/asis-data_decomposition-set_get.ads-patch b/asis-data_decomposition-set_get.ads-patch
deleted file mode 100644
index 1dda2081d14..00000000000
--- a/asis-data_decomposition-set_get.ads-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/asis/asis-data_decomposition-set_get.ads
-+++ asis-gpl-2017-src-new/asis/asis-data_decomposition-set_get.ads
-@@ -57,8 +57,8 @@
- Table_Index_Type => Asis.ASIS_Natural,
- Table_Low_Bound => 1,
- Table_Initial => 10,
-- Table_Increment => 100,
-- Table_Name => "Record_Componnet_List");
-+ Table_Increment => 100);
-+-- Table_Name => "Record_Componnet_List");
-
- RC_Table : Record_Component_Table.Table_Ptr renames
- Record_Component_Table.Table;
-
diff --git a/asis-extensions-strings.adb-patch b/asis-extensions-strings.adb-patch
deleted file mode 100644
index df299915b6e..00000000000
--- a/asis-extensions-strings.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/asis/asis-extensions-strings.adb
-+++ asis-gpl-2017-src-new/asis/asis-extensions-strings.adb
-@@ -62,8 +62,8 @@
- Table_Index_Type => Integer,
- Table_Low_Bound => 1,
- Table_Initial => 10000,
-- Table_Increment => 1000,
-- Table_Name => "character container");
-+ Table_Increment => 1000);
-+-- Table_Name => "character container");
-
- Table : Chars.Table_Ptr renames Chars.Table;
-
-
diff --git a/asis.gpr-patch b/asis.gpr-patch
deleted file mode 100644
index 8535dd0515d..00000000000
--- a/asis.gpr-patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- asis-gpl-2017-src/asis.gpr
-+++ asis-gpl-2017-src-new/asis.gpr
-@@ -22,6 +22,7 @@
- ------------------------------------------------------------------------------
-
- with "common";
-+with "gnat_util";
-
- project Asis is
-
-
diff --git a/asis_ui-compiler_options.adb-patch b/asis_ui-compiler_options.adb-patch
deleted file mode 100644
index 87d29aff06d..00000000000
--- a/asis_ui-compiler_options.adb-patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- asis-gpl-2017-src/tools/tool_utils/asis_ul-compiler_options.adb
-+++ asis-gpl-2017-src-new/tools/tool_utils/asis_ul-compiler_options.adb
-@@ -53,16 +53,16 @@
- Table_Index_Type => Natural,
- Table_Low_Bound => 1,
- Table_Initial => 20,
-- Table_Increment => 100,
-- Table_Name => "Compiler options");
-+ Table_Increment => 100);
-+-- Table_Name => "Compiler options");
-
- package I_Options is new GNAT.Table (
- Table_Component_Type => String_Access,
- Table_Index_Type => Natural,
- Table_Low_Bound => 1,
- Table_Initial => 20,
-- Table_Increment => 100,
-- Table_Name => "Source search path options");
-+ Table_Increment => 100);
-+-- Table_Name => "Source search path options");
-
- function Get_Full_Path_To_RTS (RTS : String) return String;
- -- Assumes that RTS is a short name of run-time (no path information),
-
diff --git a/asis_ui-global_state.adb-patch b/asis_ui-global_state.adb-patch
deleted file mode 100644
index 7adce8ba951..00000000000
--- a/asis_ui-global_state.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/tool_utils/asis_ul-global_state.adb
-+++ asis-gpl-2017-src-new/tools/tool_utils/asis_ul-global_state.adb
-@@ -138,8 +138,8 @@
- Table_Index_Type => Scope_Ind_Type,
- Table_Low_Bound => 1,
- Table_Initial => 50,
-- Table_Increment => 100,
-- Table_Name => "scope stack table");
-+ Table_Increment => 100);
-+-- Table_Name => "scope stack table");
-
- procedure Set_Scope_Level (N : GS_Node_Id; Val : Positive);
- -- Sets Val as a scope level of N
-
diff --git a/asis_ui-source_table.adb-patch b/asis_ui-source_table.adb-patch
deleted file mode 100644
index 5a93a1b2a3a..00000000000
--- a/asis_ui-source_table.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/tool_utils/asis_ul-source_table.adb
-+++ asis-gpl-2017-src-new/tools/tool_utils/asis_ul-source_table.adb
-@@ -135,8 +135,8 @@
- Table_Index_Type => SF_Id,
- Table_Low_Bound => First_SF_Id,
- Table_Initial => 100,
-- Table_Increment => 100,
-- Table_Name => "Source file table");
-+ Table_Increment => 100);
-+-- Table_Name => "Source file table");
-
- Source_Table : Source_File_Table.Table_Ptr renames Source_File_Table.Table;
-
-
diff --git a/gnatcheck-asis_utilities.adb-patch b/gnatcheck-asis_utilities.adb-patch
deleted file mode 100644
index 9581ba4ca2a..00000000000
--- a/gnatcheck-asis_utilities.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-asis_utilities.adb
-+++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-asis_utilities.adb
-@@ -79,8 +79,8 @@
- Table_Index_Type => Natural,
- Table_Low_Bound => 1,
- Table_Initial => 100,
-- Table_Increment => 100,
-- Table_Name => "GNATCHECK Element List");
-+ Table_Increment => 100);
-+-- Table_Name => "GNATCHECK Element List");
-
- -----------------------
- -- Local subprograms --
-
diff --git a/gnatcheck-categories.adb-patch b/gnatcheck-categories.adb-patch
deleted file mode 100644
index 88c053e12ec..00000000000
--- a/gnatcheck-categories.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-categories.adb
-+++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-categories.adb
-@@ -48,8 +48,8 @@
- Table_Index_Type => Category_Id,
- Table_Low_Bound => Root_Category_Id,
- Table_Initial => 100,
-- Table_Increment => 100,
-- Table_Name => "Category table");
-+ Table_Increment => 100);
-+-- Table_Name => "Category table");
- -- ????
-
- Categories : All_Categories .Table_Ptr renames All_Categories.Table;
-
diff --git a/gnatcheck-diagnoses_old.adb-patch b/gnatcheck-diagnoses_old.adb-patch
deleted file mode 100644
index f6e664d0d73..00000000000
--- a/gnatcheck-diagnoses_old.adb-patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-diagnoses_old.adb
-+++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-diagnoses_old.adb
-@@ -124,8 +124,8 @@
- Table_Index_Type => Diag_Id,
- Table_Low_Bound => First_Diag,
- Table_Initial => 10000,
-- Table_Increment => 100,
-- Table_Name => "diagnoses database");
-+ Table_Increment => 100);
-+-- Table_Name => "diagnoses database");
-
- Diag_Table : Rule_Violations.Table_Ptr renames Rule_Violations.Table;
-
-@@ -160,8 +160,8 @@
- Table_Index_Type => SF_Id,
- Table_Low_Bound => First_SF_Id,
- Table_Initial => 10000,
-- Table_Increment => 100,
-- Table_Name => "diagnoses mapping database");
-+ Table_Increment => 100);
-+-- Table_Name => "diagnoses mapping database");
- -- The Mapping Table. We have to use dynamic table here, because we do not
- -- know in advance how many needed sources may be added during the rule
- -- checking
-
diff --git a/gnatcheck-name_dictionary.adb-patch b/gnatcheck-name_dictionary.adb-patch
deleted file mode 100644
index c32d8903f65..00000000000
--- a/gnatcheck-name_dictionary.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-name_dictionary.adb
-+++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-name_dictionary.adb
-@@ -62,8 +62,8 @@
- Table_Index_Type => Dictionary_Id,
- Table_Low_Bound => First_Dictionary_Id,
- Table_Initial => 100,
-- Table_Increment => 100,
-- Table_Name => "GNATCHECK Name Dictionary");
-+ Table_Increment => 100);
-+-- Table_Name => "GNATCHECK Name Dictionary");
-
- package Dictionary_Hash_Table is new
- ASIS_UL.Misc.String_Hash_Table (Entry_Id => Dictionary_Id);
-
diff --git a/gnatcheck-rules-custom_1.adb-patch b/gnatcheck-rules-custom_1.adb-patch
deleted file mode 100644
index eb9caf615e7..00000000000
--- a/gnatcheck-rules-custom_1.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-rules-custom_1.adb
-+++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-rules-custom_1.adb
-@@ -8774,8 +8774,8 @@
- Table_Index_Type => Natural,
- Table_Low_Bound => 1,
- Table_Initial => 20,
-- Table_Increment => 50,
-- Table_Name => "OUT parameters");
-+ Table_Increment => 50);
-+-- Table_Name => "OUT parameters");
-
- procedure Set_OUT_Parameters (El : Asis.Element);
- -- Supposing that El is a procedure body declaration, sets in
-
diff --git a/gnatcheck-rules-rule_table.adb-patch b/gnatcheck-rules-rule_table.adb-patch
deleted file mode 100644
index e04fbcfc3db..00000000000
--- a/gnatcheck-rules-rule_table.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-rules-rule_table.adb
-+++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-rules-rule_table.adb
-@@ -58,8 +58,8 @@
- Table_Index_Type => Natural,
- Table_Low_Bound => 1,
- Table_Initial => 20,
-- Table_Increment => 100,
-- Table_Name => "Rule file stack");
-+ Table_Increment => 100);
-+-- Table_Name => "Rule file stack");
- -- Keeps the names of the "nested" rule files, in the order of the
- -- macro expansion that is currently performed, is used to detect looping
- -- in macro expansions
-
diff --git a/gnatcheck-rules-rule_table.ads-patch b/gnatcheck-rules-rule_table.ads-patch
deleted file mode 100644
index 137482c4954..00000000000
--- a/gnatcheck-rules-rule_table.ads-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-rules-rule_table.ads
-+++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-rules-rule_table.ads
-@@ -107,8 +107,8 @@
- Table_Index_Type => Rule_Id,
- Table_Low_Bound => First_Rule,
- Table_Initial => 100,
-- Table_Increment => 100,
-- Table_Name => "Rule table");
-+ Table_Increment => 100);
-+-- Table_Name => "Rule table");
-
- function Get_Rule (Rule_Name : String) return Rule_Id;
- -- Returns the Id for the rule registered under the name Rule_Name or
-
diff --git a/gnatcheck-traversal_stack.adb-patch b/gnatcheck-traversal_stack.adb-patch
deleted file mode 100644
index a3fdca40228..00000000000
--- a/gnatcheck-traversal_stack.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatcheck/gnatcheck-traversal_stack.adb
-+++ asis-gpl-2017-src-new/tools/gnatcheck/gnatcheck-traversal_stack.adb
-@@ -58,8 +58,8 @@
- Table_Index_Type => Elmt_Idx,
- Table_Low_Bound => 1,
- Table_Initial => 100,
-- Table_Increment => 100,
-- Table_Name => "Traversal Stack");
-+ Table_Increment => 100);
-+-- Table_Name => "Traversal Stack");
-
- Stack : Stack_Table.Table_Ptr renames Stack_Table.Table;
-
-
diff --git a/gnatelim-closure.adb-patch b/gnatelim-closure.adb-patch
deleted file mode 100644
index 756f82cdb1f..00000000000
--- a/gnatelim-closure.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatelim/gnatelim-closure.adb
-+++ asis-gpl-2017-src-new/tools/gnatelim/gnatelim-closure.adb
-@@ -63,8 +63,8 @@
- Table_Index_Type => Natural,
- Table_Low_Bound => 1,
- Table_Initial => 20,
-- Table_Increment => 100,
-- Table_Name => "Tool options");
-+ Table_Increment => 100);
-+-- Table_Name => "Tool options");
- -- Used to compose a list of switches to call a tool
-
- -----------------------
-
diff --git a/metrics-source_table.adb-patch b/metrics-source_table.adb-patch
deleted file mode 100644
index 0aad386135b..00000000000
--- a/metrics-source_table.adb-patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- asis-gpl-2017-src/tools/gnatmetric/metrics-source_table.adb
-+++ asis-gpl-2017-src-new/tools/gnatmetric/metrics-source_table.adb
-@@ -38,8 +38,8 @@
- Table_Index_Type => SF_Id,
- Table_Low_Bound => First_SF_Id,
- Table_Initial => 100,
-- Table_Increment => 100,
-- Table_Name => "Source file metric table");
-+ Table_Increment => 100);
-+-- Table_Name => "Source file metric table");
-
- Source_Metric_Table : Source_File_Metric_Table.Table_Ptr renames
- Source_File_Metric_Table.Table;
-