stephen_leake pushed a change to branch master.
from 5b562e4 Also accept octet parts in debbugs-gnu patches
new 9aad8f1 In uniquify-files, factor out file-complete.el
new b13820c Merge commit '98405112baa5ce2a118d1c65184c005d8ddaa1a9'
new b3034e0 In uniquify-files, rewrite to use an alist, clean up
tests to match
new 280522c Merge commit '5b562e4ddfc449cd61c82ef7646a6c501b913b6c'
new 67dcbc4 In ada-mode, wisi; release ada-mode 6.1.1, wisi 2.1.1
Summary of changes:
packages/ada-mode/NEWS | 26 +-
packages/ada-mode/README | 2 +-
packages/ada-mode/ada-lalr-elisp.el | 1506 ++---
packages/ada-mode/ada-mode.el | 98 +-
packages/ada-mode/ada-mode.info | 241 +-
packages/ada-mode/ada-mode.texi | 154 +-
packages/ada-mode/ada-process.el | 125 +
packages/ada-mode/ada-wisi-elisp-parse.el | 10 +-
packages/ada-mode/ada-wisi.el | 270 +-
packages/ada-mode/ada.wy | 2740 +++++++++
packages/ada-mode/ada_lr1_parse_table.txt.gz | Bin 2831194 -> 2955113
bytes
packages/ada-mode/ada_mode_wisi_lalr_parse.ads | 17 +-
packages/ada-mode/ada_mode_wisi_lr1_parse.ads | 19 +-
packages/ada-mode/ada_process_actions.adb | 1230 ++--
packages/ada-mode/ada_process_actions.ads | 31 +-
packages/ada-mode/ada_process_lalr_main.adb | 5849 ++++++++++----------
packages/ada-mode/ada_process_lalr_main.ads | 9 +-
packages/ada-mode/ada_process_lr1_main.adb | 1268 ++---
packages/ada-mode/ada_process_lr1_main.ads | 9 +-
packages/ada-mode/ada_re2c.c | 3157 +++++------
packages/ada-mode/build.sh | 2 +-
packages/ada-mode/emacs_wisi_common_parse.adb | 29 +-
packages/ada-mode/emacs_wisi_common_parse.ads | 31 +-
packages/ada-mode/gen_emacs_wisi_lr_parse.adb | 4 +-
packages/ada-mode/gen_emacs_wisi_lr_parse.ads | 26 +-
.../ada-mode/gen_emacs_wisi_lr_text_rep_parse.adb | 4 +-
.../ada-mode/gen_emacs_wisi_lr_text_rep_parse.ads | 30 +-
packages/ada-mode/gen_run_wisi_lr_parse.adb | 2 +-
packages/ada-mode/gen_run_wisi_lr_parse.ads | 23 +-
.../ada-mode/gen_run_wisi_lr_text_rep_parse.adb | 2 +-
.../ada-mode/gen_run_wisi_lr_text_rep_parse.ads | 27 +-
packages/ada-mode/gnat-core.el | 1 +
packages/ada-mode/gpr-lalr-elisp.el | 64 +-
packages/ada-mode/gpr-mode.el | 3 +-
packages/ada-mode/gpr-process.el | 54 +
packages/ada-mode/gpr-query.el | 4 +-
packages/ada-mode/gpr-wisi.el | 5 +
packages/ada-mode/gpr.wy | 369 ++
packages/ada-mode/gpr_mode_wisi_parse.ads | 17 +-
packages/ada-mode/gpr_process_actions.adb | 39 +-
packages/ada-mode/gpr_process_actions.ads | 37 +-
packages/ada-mode/gpr_process_lr1_main.adb | 3567 ++++++------
packages/ada-mode/gpr_process_lr1_main.ads | 9 +-
packages/ada-mode/gpr_re2c.c | 1878 ++++---
packages/ada-mode/run_ada_lalr_parse.ads | 4 +-
packages/ada-mode/run_ada_lr1_parse.ads | 4 +-
packages/ada-mode/run_wisi_common_parse.adb | 7 -
packages/ada-mode/wisi-ada.adb | 1017 ++--
packages/ada-mode/wisi-ada.ads | 9 +
packages/ada-mode/wisi-gpr.adb | 7 +
packages/ada-mode/wisi-gpr.ads | 6 +
.../wisitoken-parse-lr-mckenzie_recover-ada.adb | 2276 ++++----
.../wisitoken-parse-lr-mckenzie_recover-ada.ads | 13 +-
packages/ada-mode/xref-ada.el | 120 +-
.../alice-1/bar-file1.text | 0
packages/path-iterator/path-iterator-test.el | 83 +-
packages/path-iterator/path-iterator.el | 30 +-
.../file-complete-root-relative-test.el | 328 --
.../uniquify-files/file-complete-root-relative.el | 415 --
.../wisitoken-generate-packrat-test.text | 1 +
.../wisitoken-syntax_trees-test.text | 1 +
.../wisitoken-text_io_trace.text | 1 +
packages/uniquify-files/uniquify-files-test.el | 787 +--
packages/uniquify-files/uniquify-files.el | 729 +--
packages/wisi/NEWS | 37 +-
packages/wisi/README | 2 +-
...a_containers-gen_doubly_linked_lists_image.adb} | 13 +-
...a_containers-gen_doubly_linked_lists_image.ads} | 10 +-
...entary_functions.ads => sal-ada_containers.ads} | 8 +-
packages/wisi/sal-gen_bounded_definite_queues.adb | 154 +
packages/wisi/sal-gen_bounded_definite_queues.ads | 99 +
...sal-gen_bounded_definite_vectors-gen_sorted.adb | 15 +-
...sal-gen_bounded_definite_vectors-gen_sorted.ads | 10 +-
packages/wisi/sal-gen_graphs.adb | 718 +++
packages/wisi/sal-gen_graphs.ads | 190 +
.../wisi/sal-gen_unbounded_definite_stacks.adb | 34 +-
.../wisi/sal-gen_unbounded_definite_stacks.ads | 37 +-
...en_unbounded_definite_vectors-gen_image_aux.adb | 11 +-
...en_unbounded_definite_vectors-gen_image_aux.ads | 9 +-
.../wisi/sal-gen_unbounded_definite_vectors.adb | 22 +
.../wisi/sal-gen_unbounded_definite_vectors.ads | 3 +
packages/wisi/sal-generic_decimal_image.adb | 48 +
packages/wisi/sal-generic_decimal_image.ads | 37 +
packages/wisi/sal.adb | 2 +-
packages/wisi/wisi-elisp-parse.el | 3407 ++++++------
packages/wisi/wisi-parse-common.el | 53 +-
packages/wisi/wisi-process-parse.el | 107 +-
packages/wisi/wisi-run-indent-test.el | 300 +
packages/wisi/wisi-tests.el | 146 +
packages/wisi/wisi.adb | 383 +-
packages/wisi/wisi.ads | 99 +-
packages/wisi/wisi.el | 3157 ++++++-----
packages/wisi/wisitoken-bnf-generate.adb | 239 +-
packages/wisi/wisitoken-bnf-generate_grammar.adb | 172 +-
packages/wisi/wisitoken-bnf-generate_utils.adb | 105 +-
packages/wisi/wisitoken-bnf-generate_utils.ads | 32 +-
packages/wisi/wisitoken-bnf-output_ada.adb | 117 +-
packages/wisi/wisitoken-bnf-output_ada_common.adb | 187 +-
packages/wisi/wisitoken-bnf-output_ada_emacs.adb | 739 ++-
packages/wisi/wisitoken-bnf-output_elisp.adb | 4 +-
.../wisi/wisitoken-bnf-output_elisp_common.adb | 19 +-
packages/wisi/wisitoken-bnf.adb | 19 +-
packages/wisi/wisitoken-bnf.ads | 112 +-
packages/wisi/wisitoken-gen_token_enum.ads | 64 +-
.../wisi/wisitoken-generate-lr-lalr_generate.adb | 1207 ++--
.../wisi/wisitoken-generate-lr-lalr_generate.ads | 14 +-
.../wisi/wisitoken-generate-lr-lr1_generate.adb | 652 +--
.../wisi/wisitoken-generate-lr-lr1_generate.ads | 14 +-
packages/wisi/wisitoken-generate-lr.adb | 966 +++-
packages/wisi/wisitoken-generate-lr.ads | 59 +-
packages/wisi/wisitoken-generate-lr1_items.adb | 3 +-
packages/wisi/wisitoken-generate-lr1_items.ads | 2 +-
packages/wisi/wisitoken-generate-packrat.adb | 494 +-
packages/wisi/wisitoken-generate-packrat.ads | 150 +-
packages/wisi/wisitoken-generate.adb | 977 ++--
packages/wisi/wisitoken-generate.ads | 310 +-
packages/wisi/wisitoken-lexer-re2c.adb | 2 +-
packages/wisi/wisitoken-lexer-re2c.ads | 2 +-
packages/wisi/wisitoken-lexer-regexp.adb | 6 +-
packages/wisi/wisitoken-lexer-regexp.ads | 2 +-
packages/wisi/wisitoken-lexer.ads | 4 +-
.../wisitoken-parse-lr-mckenzie_recover-base.adb | 875 +--
.../wisitoken-parse-lr-mckenzie_recover-base.ads | 365 +-
...wisitoken-parse-lr-mckenzie_recover-explore.adb | 3074 +++++-----
...wisitoken-parse-lr-mckenzie_recover-explore.ads | 56 +-
.../wisitoken-parse-lr-mckenzie_recover-parse.adb | 629 ++-
.../wisitoken-parse-lr-mckenzie_recover-parse.ads | 157 +-
.../wisi/wisitoken-parse-lr-mckenzie_recover.adb | 2389 ++++----
.../wisi/wisitoken-parse-lr-mckenzie_recover.ads | 500 +-
packages/wisi/wisitoken-parse-lr-parser.adb | 2282 ++++----
packages/wisi/wisitoken-parse-lr-parser.ads | 50 +-
packages/wisi/wisitoken-parse-lr-parser_lists.adb | 18 +-
packages/wisi/wisitoken-parse-lr-parser_lists.ads | 1 +
.../wisi/wisitoken-parse-lr-parser_no_recover.adb | 1060 ++--
packages/wisi/wisitoken-parse-lr.adb | 1764 +++---
packages/wisi/wisitoken-parse-lr.ads | 1310 ++---
.../wisi/wisitoken-parse-packrat-procedural.adb | 512 +-
.../wisi/wisitoken-parse-packrat-procedural.ads | 166 +-
packages/wisi/wisitoken-parse_table-mode.el | 3 +-
packages/wisi/wisitoken-semantic_checks.adb | 304 +-
packages/wisi/wisitoken-semantic_checks.ads | 204 +-
packages/wisi/wisitoken-syntax_trees.adb | 2838 ++++++----
packages/wisi/wisitoken-syntax_trees.ads | 998 ++--
packages/wisi/wisitoken.adb | 30 +
packages/wisi/wisitoken.ads | 922 +--
packages/wisi/wisitoken_grammar_actions.adb | 79 +-
packages/wisi/wisitoken_grammar_actions.ads | 117 +-
packages/wisi/wisitoken_grammar_main.adb | 656 ++-
packages/wisi/wisitoken_grammar_main.ads | 2 +-
packages/wisi/wisitoken_grammar_re2c.c | 2521 ++++++---
packages/wisi/wisitoken_grammar_re2c_c.ads | 2 +-
packages/wisi/wisitoken_grammar_runtime.adb | 2434 +++++++-
packages/wisi/wisitoken_grammar_runtime.ads | 67 +-
153 files changed, 40841 insertions(+), 30154 deletions(-)
create mode 100644 packages/ada-mode/ada.wy
create mode 100644 packages/ada-mode/gpr.wy
copy packages/{uniquify-files/uniquify-files-resources/Alice =>
path-iterator/path-iterator-resources}/alice-1/bar-file1.text (100%)
delete mode 100644 packages/uniquify-files/file-complete-root-relative-test.el
delete mode 100644 packages/uniquify-files/file-complete-root-relative.el
create mode 100644
packages/uniquify-files/uniquify-files-resources/wisitoken-generate-packrat-test.text
create mode 100644
packages/uniquify-files/uniquify-files-resources/wisitoken-syntax_trees-test.text
create mode 100644
packages/uniquify-files/uniquify-files-resources/wisitoken-text_io_trace.text
copy packages/wisi/{sal-gen_definite_doubly_linked_lists_sorted-gen_image.adb
=> sal-ada_containers-gen_doubly_linked_lists_image.adb} (76%)
copy packages/wisi/{sal-gen_array_image.ads =>
sal-ada_containers-gen_doubly_linked_lists_image.ads} (71%)
copy packages/wisi/{long_float_elementary_functions.ads =>
sal-ada_containers.ads} (76%)
create mode 100644 packages/wisi/sal-gen_bounded_definite_queues.adb
create mode 100644 packages/wisi/sal-gen_bounded_definite_queues.ads
create mode 100644 packages/wisi/sal-gen_graphs.adb
create mode 100644 packages/wisi/sal-gen_graphs.ads
create mode 100644 packages/wisi/sal-generic_decimal_image.adb
create mode 100644 packages/wisi/sal-generic_decimal_image.ads
create mode 100644 packages/wisi/wisi-run-indent-test.el
create mode 100644 packages/wisi/wisi-tests.el
