[elpa] externals/gpr-mode updated (ed12dc7327 -> 9ca25ec5ca)
stephen_leake pushed a change to branch externals/gpr-mode. from ed12dc7327 Release version 1.0.4 new 9ca25ec5ca Release version 1.0.5; packaging fix Summary of changes: NEWS| 5 + README | 2 +- build.sh| 12 gpr-mode.el | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-)
[elpa] externals-release/gpr-mode 9ca25ec5ca: Release version 1.0.5; packaging fix
branch: externals-release/gpr-mode commit 9ca25ec5ca871f04b4704b39fb3ba129694e02ac Author: Stephen Leake Commit: Stephen Leake Release version 1.0.5; packaging fix * NEWS: Version. * README: * build.sh: * gpr-mode.el: --- NEWS| 5 + README | 2 +- build.sh| 12 gpr-mode.el | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 3d66dd122a..5a83acda4f 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ Please send gpr-mode bug reports to bug-gnu-em...@gnu.org, with 'gpr-mode' in the subject. If possible, use M-x report-emacs-bug. +* gpr mode 1.0.5 +10 Nov 2023 + +** Fix alire.toml wisitoken version. + * gpr mode 1.0.4 20 Sep 2023 diff --git a/README b/README index d7bbfe68eb..33154adba0 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Emacs gpr mode version 1.0.4 +Emacs gpr mode version 1.0.5 gpr mode provides auto-casing, fontification, navigation, and indentation for gpr source code files. diff --git a/build.sh b/build.sh index ef62145bdd..21409016b0 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/sh # Build executables for gpr mode. -#build.sh +#build.sh options when not using Alire; #e.g. 'build.sh -j0' : use all available processors to compile # 'build.sh -wn' : treat warnings as warnings. # 'build.sh -vh' : Verbose output (high verbosity) @@ -8,15 +8,17 @@ # See install.sh for install if type alr; then +# alr can be installed from https://alire.ada.dev/ echo "building gpr-mode executables via Alire" -alr get emacs_gpr_mode~1.0.4 + +alr get emacs_gpr_mode~1.0.5 cd emacs_gpr_mode_*; alr build --release elif type gprbuild; then echo "building gpr-mode executables via gnat compiler" -if [ -d ../wisi-4.3.? ]; then -WISI_DIR=`ls -d ../wisi-4.3.?` +if [ -d ../wisi-4.3.0 ]; then +WISI_DIR=`ls -d ../wisi-4.3.*` fi args=`echo -DELPA="yes" $WISI_DIR/wisi.gpr.gp $WISI_DIR/wisi.gpr` @@ -31,6 +33,8 @@ elif type gprbuild; then gprclean -r -P gpr_mode_wisi_parse.gpr -aP$WISI_DIR +# We don't generate the parser code here (unlike ada-mode), +# because it is small enough to keep in ELPA gprbuild -p -j8 -P gpr_mode_wisi_parse.gpr -aP $WISI_DIR "$@" else diff --git a/gpr-mode.el b/gpr-mode.el index e58ad88bc0..0a33d4320b 100644 --- a/gpr-mode.el +++ b/gpr-mode.el @@ -4,8 +4,8 @@ ;; Author: Stephen Leake ;; Maintainer: Stephen Leake -;; Version: 1.0.4 -;; package-requires: ((emacs "25.3") (wisi "4.3.0") (gnat-compiler "1.0.3")) +;; Version: 1.0.5 +;; package-requires: ((emacs "25.3") (wisi "4.3.2") (gnat-compiler "1.0.3")) ;; URL: https://stephe-leake.org/ada/wisitoken.html ;; This file is part of GNU Emacs.
[elpa] externals-release/gnat-compiler updated (49774d33dc -> 9db5c393ee)
stephen_leake pushed a change to branch externals-release/gnat-compiler. from 49774d33dc * gnat-alire.el (create-alire-prj): Better error message on missing alire.toml adds 9db5c393ee Release version 1.0.3 No new revisions were added by this update. Summary of changes: NEWS | 5 + gnat-compiler.el | 935 +++ gnat-xref.el | 9 +- notes.text | 5 +- 4 files changed, 481 insertions(+), 473 deletions(-)
[elpa] externals/wisi updated (183c4d0be0 -> 1c4b099bf1)
stephen_leake pushed a change to branch externals/wisi. from 183c4d0be0 Release 4.3.0 new 1c4b099bf1 Release 4.3.2 Summary of changes: NEWS| 7 ++- README | 2 +- emacs_wisi_common_parse.adb | 2 +- wisi-parse-common.el| 7 ++- wisi-process-parse.el | 5 - wisi.el | 2 +- wisitoken-bnf-generate.adb | 2 +- wisitoken-syntax_trees.adb | 4 8 files changed, 24 insertions(+), 7 deletions(-)
[elpa] externals-release/wisi 1c4b099bf1 1/2: Release 4.3.2
branch: externals-release/wisi
commit 1c4b099bf1f93cebee523b0ba75ccab6c6c2a2f0
Author: Stephen Leake
Commit: Stephen Leake
Release 4.3.2
* NEWS: Version.
* README:
* wisi.el:
---
NEWS| 7 ++-
README | 2 +-
emacs_wisi_common_parse.adb | 2 +-
wisi-parse-common.el| 7 ++-
wisi-process-parse.el | 5 -
wisi.el | 2 +-
wisitoken-bnf-generate.adb | 2 +-
wisitoken-syntax_trees.adb | 4
8 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/NEWS b/NEWS
index 2413062e57..bbd9f62724 100644
--- a/NEWS
+++ b/NEWS
@@ -6,10 +6,15 @@ Please send wisi bug reports to bug-gnu-em...@gnu.org, with
'wisi' in the subject. If possible, use M-x report-emacs-bug.
+* wisi 4.3.2
+21 Oct 2023
+
+** wisi-incremental-parse-enable is now t by default.
+
* wisi 4.3.0
15 Sep 2023
-* Use WisiToken 4.2.0.
+** Use WisiToken 4.2.0.
* wisi 4.2.3
26 Jan 2023
diff --git a/README b/README
index 7f73c3f30c..08fe5971a7 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs wisi package 4.3.0
+Emacs wisi package 4.3.2
The wisi package provides utilities for using generalized
error-correcting LR parsers (in external processes) to do indentation,
diff --git a/emacs_wisi_common_parse.adb b/emacs_wisi_common_parse.adb
index 5fc3877ee7..4bedff3f55 100644
--- a/emacs_wisi_common_parse.adb
+++ b/emacs_wisi_common_parse.adb
@@ -2,7 +2,7 @@
--
-- See spec.
--
--- Copyright (C) 2018 - 2022 Free Software Foundation, Inc.
+-- Copyright (C) 2018 - 2023 Free Software Foundation, Inc.
--
-- This program is free software; you can redistribute it and/or
-- modify it under terms of the GNU General Public License as
diff --git a/wisi-parse-common.el b/wisi-parse-common.el
index 7d516b6385..d565c712e7 100644
--- a/wisi-parse-common.el
+++ b/wisi-parse-common.el
@@ -22,7 +22,7 @@
;;; Code:
(require 'cl-lib)
-(defcustom wisi-incremental-parse-enable nil
+(defcustom wisi-incremental-parse-enable t
"If non-nil, use incremental parse when possible."
:type 'boolean
:group 'wisi
@@ -240,6 +240,11 @@ The value is a list (source-buffer (font-lock-begin
region font-lock attempted to fontify while the parser was
busy.")
+(defvar wisi-parse-full-read-only nil
+ ;; Only one buffer can be doing a full parse.
+ "Non-nil if `wisi-parse-full-active is t and the buffer was
+originally read-only.")
+
(cl-defgeneric wisi-parse-incremental (parser parser-action full nowait)
"Incrementally parse current buffer.
PARSER-ACTION (one of `wisi-post-parse-actions') is used to
diff --git a/wisi-process-parse.el b/wisi-process-parse.el
index f5efea4974..60bbdaa2bf 100644
--- a/wisi-process-parse.el
+++ b/wisi-process-parse.el
@@ -151,7 +151,9 @@ Otherwise add PARSER to `wisi-process--alist', return it."
(wisi-parse-log-message wisi-parser-shared "parse--filter found
prompt - initial full"))
(if (buffer-live-p (car wisi-parse-full-active))
(with-current-buffer (car wisi-parse-full-active)
- (read-only-mode -1)
+ (if wisi-parse-full-read-only
+ (setq wisi-parse-full-read-only nil)
+ (read-only-mode -1))
(let ((region (cdr wisi-parse-full-active)))
(font-lock-flush (max (point-min) (car region)) (min
(point-max) (cdr region
@@ -1212,6 +1214,7 @@ Source buffer is current."
((and full nowait)
(set-process-filter (wisi-process--parser-process parser)
#'wisi-process-parse--filter)
(setq wisi-parse-full-active (cons (current-buffer) (cons (point-min)
(point-max
+(setq wisi-parse-full-read-only buffer-read-only)
(read-only-mode 1)
(wisi-process-parse--send-incremental-parse parser full))
(t
diff --git a/wisi.el b/wisi.el
index 7ac38a6e9d..ba704d36f9 100644
--- a/wisi.el
+++ b/wisi.el
@@ -7,7 +7,7 @@
;; Keywords: parser
;; indentation
;; navigation
-;; Version: 4.3.0
+;; Version: 4.3.2
;; package-requires: ((emacs "25.3") (seq "2.20"))
;; URL: https://stephe-leake.org/ada/wisitoken.html
;;
diff --git a/wisitoken-bnf-generate.adb b/wisitoken-bnf-generate.adb
index fbc83d0a8e..fa5f128841 100644
--- a/wisitoken-bnf-generate.adb
+++ b/wisitoken-bnf-generate.adb
@@ -54,7 +54,7 @@ is
use Ada.Text_IO;
First : Boolean := True;
begin
- Put_Line (Standard_Error, "version 4.2"); -- matches release version in
Docs/wisitoken.html
+ Put_Line (Standard_Error, "version 4.2.1"); -- matches release version
in Docs/wisitoken.html
Put_Line (Standard_Error, "wisitoken-bnf-generate [options] {wisi
grammar file}");
Put_Line (Standard_Error, "Generate source code implementing a parser
for the grammar.");
New_Line (Standard_Error);
diff --git a/wisitoken-syntax_trees.adb b/w
[elpa] externals-release/wisi updated (db272eca5c -> cf8a92cec4)
stephen_leake pushed a change to branch externals-release/wisi. from db272eca5c merge from externals/wisi to externals-release/wisi adds 183c4d0be0 Release 4.3.0 new 1c4b099bf1 Release 4.3.2 new cf8a92cec4 merge from externals/wisi to externals-release/wisi Summary of changes: .elpaignore |1 + NEWS| 10 + README |2 +- emacs_wisi_common_parse.adb |2 +- emacs_wisi_common_parse.ads | 10 +- run_wisi_common_parse.adb |6 +- standard_common.gpr | 13 +- wisi-parse-common.el| 19 +- wisi-process-parse.el | 89 +- wisi-run-indent-test.el | 22 +- wisi.adb| 21 +- wisi.ads|6 +- wisi.el |4 +- wisi.texi | 10 +- wisitoken-bnf-generate.adb | 538 wisitoken-bnf-generate_packrat.adb |4 +- wisitoken-bnf-generate_utils.adb| 75 +- wisitoken-bnf-generate_utils.ads| 12 +- wisitoken-bnf-output_ada.adb| 110 +- wisitoken-bnf-output_ada_common.adb | 77 +- wisitoken-bnf-output_ada_common.ads | 37 +- wisitoken-bnf-output_ada_emacs.adb | 539 +--- wisitoken-bnf-output_elisp_common.adb |4 +- wisitoken-bnf-utils.adb |6 +- wisitoken-bnf-utils.ads |4 +- wisitoken-bnf.adb | 13 +- wisitoken-bnf.ads | 52 +- wisitoken-generate-lr-lalr_generate.adb | 70 +- wisitoken-generate-lr-lalr_generate.ads |3 +- wisitoken-generate-lr-lr1_generate.adb | 117 +- wisitoken-generate-lr-lr1_generate.ads |3 +- wisitoken-generate-lr.adb | 210 ++- wisitoken-generate-lr.ads |5 +- wisitoken-generate-packrat.ads |3 +- wisitoken-generate-tree_sitter.adb | 1183 ++-- wisitoken-generate-tree_sitter.ads | 17 +- wisitoken-in_parse_actions.adb | 38 +- wisitoken-in_parse_actions.ads | 10 +- wisitoken-lexer.adb |4 +- wisitoken-parse-lr-mckenzie_recover-explore.adb | 36 +- wisitoken-parse-lr-mckenzie_recover-parse.adb |4 +- wisitoken-parse-lr-mckenzie_recover.adb | 21 +- wisitoken-parse-lr-mckenzie_recover.ads | 13 +- wisitoken-parse-lr-parser-parse.adb |6 +- wisitoken-parse-lr-parser.adb | 55 +- wisitoken-parse-lr-parser_no_recover.adb|7 +- wisitoken-parse-lr.ads |7 +- wisitoken-parse-packrat-generated.adb |6 +- wisitoken-parse-packrat-procedural.adb |6 +- wisitoken-parse.adb |4 +- wisitoken-productions.adb | 43 +- wisitoken-productions.ads | 33 +- wisitoken-syntax_trees-lr_utils.adb |7 +- wisitoken-syntax_trees.adb | 86 +- wisitoken-syntax_trees.ads | 144 +- wisitoken-user_guide.texinfo| 120 +- wisitoken-wisi_ada.adb | 13 +- wisitoken.adb | 94 +- wisitoken.ads | 52 +- wisitoken_grammar_actions.adb | 44 +- wisitoken_grammar_actions.ads | 44 +- wisitoken_grammar_editing.adb | 1673 +-- wisitoken_grammar_editing.ads | 51 +- wisitoken_grammar_main.adb | 1523 - wisitoken_grammar_main.ads |4 +- wisitoken_grammar_re2c.c|4 +- wisitoken_grammar_re2c_c.ads|4 +- wisitoken_grammar_runtime.adb | 445 -- wisitoken_grammar_runtime.ads | 92 +- 69 files changed, 5132 insertions(+), 2858 deletions(-) create mode 100644 .elpaignore
[elpa] externals-release/gpr-query updated (ada0d0afce -> 090cbafa5d)
stephen_leake pushed a change to branch externals-release/gpr-query. from ada0d0afce Release 1.0.3 adds d50f92fe46 Release version 1.0.4 adds 258710222a Resolve conflicts, finish merge adds f46f941e96 * ELPA.make (docs): Add html adds bae92cd621 Minor fixes adds 9619300ce2 Resolve conflicts, finish merge adds 090cbafa5d * notes.text: Update release process No new revisions were added by this update. Summary of changes: .elpaignore| 7 +++ .gitignore | 2 ++ ELPA.make | 8 ++-- NEWS | 9 - README | 2 +- gpr-query.el | 6 +++--- gpr-query.texi | 10 +- install.sh | 6 +- notes.text | 55 +-- 9 files changed, 42 insertions(+), 63 deletions(-)
[elpa] externals-release/gpr-mode updated (9676e6361e -> ed12dc7327)
stephen_leake pushed a change to branch externals-release/gpr-mode. from 9676e6361e Version 1.0.3; packaging fixes adds ed12dc7327 Release version 1.0.4 No new revisions were added by this update. Summary of changes: .gitignore | 1 + NEWS| 5 + README | 2 +- build.sh| 6 +- gpr-mode.el | 4 +- gpr-process.el | 2 +- gpr.wy | 6 +- gpr_process_actions.adb | 2 +- gpr_process_actions.ads | 2 +- gpr_process_main.adb| 2 +- gpr_process_main.ads| 2 +- gpr_re2c.c | 12868 +++--- gpr_re2c_c.ads | 2 +- 13 files changed, 6479 insertions(+), 6425 deletions(-) create mode 100644 .gitignore
[elpa] externals-release/ada-mode updated (1bb112b52e -> e2aa2c7cf1)
stephen_leake pushed a change to branch externals-release/ada-mode. from 1bb112b52e merge from externals/ada-mode to externals-release/ada-mode adds 357ac189be Release version 8.1.0 new e2aa2c7cf1 merge from externals/ada-mode to externals-release/ada-mode Summary of changes: NEWS |17 +- README | 2 +- ada-core.el| 2 +- ada-eglot.el | 8 +- ada-mode.el| 106 +- ada-mode.texi | 2 +- ...nex_p-process.el => ada_annex_p-process-lalr.el | 332 +- ...nnex_p-process.el => ada_annex_p-process-lr1.el | 330 +- ...rocess.el => ada_annex_p-process-tree_sitter.el | 344 +- ada_annex_p.wy | 1208 +- ...ons.adb => ada_annex_p_process_lalr_actions.adb | 19462 +++-- ...ons.ads => ada_annex_p_process_lalr_actions.ads | 2316 +- ada_annex_p_process_lalr_main.adb | 72062 +++ ada_annex_p_process_lalr_main.ads | 2 +- ...ions.adb => ada_annex_p_process_lr1_actions.adb | 19460 +++-- ...ions.ads => ada_annex_p_process_lr1_actions.ads | 2312 +- ada_annex_p_process_lr1_main.adb | 2769 +- ada_annex_p_process_lr1_main.ads | 2 +- ... => ada_annex_p_process_tree_sitter_actions.adb | 19396 +++-- ... => ada_annex_p_process_tree_sitter_actions.ads | 2346 +- ada_annex_p_process_tree_sitter_main.adb |23 + ada_annex_p_process_tree_sitter_main.ads |23 + ada_annex_p_re2c.c | 34502 + ada_annex_p_re2c_c.ads | 2 +- ada_mode_wisi_lr1_parse.ads| 4 +- build.sh | 6 +- install.sh | 2 +- run_ada_libadalang_parse.ads |25 - run_ada_lr1_parse.ads | 4 +- wisi-ada-format_parameter_list.adb | 6 +- wisi-ada.adb |32 +- wisi-ada.ads | 6 +- wisitoken-parse-lr-mckenzie_recover-ada.adb| 234 +- 33 files changed, 104234 insertions(+), 73113 deletions(-) copy ada_annex_p-process.el => ada_annex_p-process-lalr.el (90%) copy ada_annex_p-process.el => ada_annex_p-process-lr1.el (90%) rename ada_annex_p-process.el => ada_annex_p-process-tree_sitter.el (89%) copy ada_annex_p_process_actions.adb => ada_annex_p_process_lalr_actions.adb (59%) copy ada_annex_p_process_actions.ads => ada_annex_p_process_lalr_actions.ads (71%) copy ada_annex_p_process_actions.adb => ada_annex_p_process_lr1_actions.adb (59%) copy ada_annex_p_process_actions.ads => ada_annex_p_process_lr1_actions.ads (71%) rename ada_annex_p_process_actions.adb => ada_annex_p_process_tree_sitter_actions.adb (59%) rename ada_annex_p_process_actions.ads => ada_annex_p_process_tree_sitter_actions.ads (71%) create mode 100644 ada_annex_p_process_tree_sitter_main.adb create mode 100644 ada_annex_p_process_tree_sitter_main.ads delete mode 100644 run_ada_libadalang_parse.ads
[elpa] externals/wisitoken-grammar-mode e3ceac0f8c: * .elpaignore: New file
branch: externals/wisitoken-grammar-mode commit e3ceac0f8c8ea4d742497b71141886c810fffef6 Author: Stephen Leake Commit: Stephen Leake * .elpaignore: New file --- .elpaignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.elpaignore b/.elpaignore new file mode 100644 index 00..ce56bc2095 --- /dev/null +++ b/.elpaignore @@ -0,0 +1 @@ +alire.toml
[elpa] externals/gpr-query 090cbafa5d: * notes.text: Update release process
branch: externals/gpr-query commit 090cbafa5d1f79e703a10e9db4cdbc726de92b44 Author: Stephen Leake Commit: Stephen Leake * notes.text: Update release process --- notes.text | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/notes.text b/notes.text index d265c98158..ca82127208 100644 --- a/notes.text +++ b/notes.text @@ -53,14 +53,13 @@ bump version On Debian (alr publish --tar broken on Windows (alr version 1.2.1)) cd /Projects/org.emacs.gpr-query -alr publish --tar -# at "upload and enter url" prompt; in mys2 -cd alire/archives -gpg -b *.tgz -scp *.tgz* stephen_le...@dl.sv.nongnu.org:/releases/ada-mode/ -# wait until http download actually works; took 0.5 days -cd ~/Downloads; wget https://download.savannah.nongnu.org/releases/ada-mode/emacs_gpr_query-1.0.0.tgz -# link is https://download.savannah.nongnu.org/releases/ada-mode/emacs_gpr_query-i.j.k.tgz +# not ~/bin/alire-publish-git.sh; that hard-codes ada-mode.git +git push +# edit ~/.gitconfig to set fsckObjects false +/Projects/alire-main/bin/alr publish --skip-build https://git.savannah.gnu.org/git/emacs/elpa.git `git rev-parse HEAD` + +after alire pull accepted: +git tag gpr-query-alire- test install from GNU ELPA (add-to-list 'package-archives (cons "test" "/Projects/elpa/archive-devel"))
[elpa] externals/gpr-query d50f92fe46 1/2: Release version 1.0.4
branch: externals/gpr-query commit d50f92fe46828b6b675770dba3004c1ea6ab0b50 Author: Stephen Leake Commit: Stephen Leake Release version 1.0.4 * ELPA.make (INSTALL_DIR): Fix computation of --prefix arg. * NEWS: Version 1.0.4. * README: * gpr-query.el: * gpr-query.texi: --- ELPA.make | 3 ++- NEWS | 7 ++- README | 2 +- gpr-query.el | 6 +++--- gpr-query.texi | 4 ++-- notes.text | 6 +- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ELPA.make b/ELPA.make index 1476d451dd..ab49dfabe8 100644 --- a/ELPA.make +++ b/ELPA.make @@ -11,8 +11,9 @@ docs : gpr-query.info build : config/emacs_gpr_query_config.gpr force gprbuild -p -j8 emacs_gpr_query.gpr +INSTALL_DIR := $(wildcard ~/.local) install : bin/gpr_query$(EXE_EXT) - gprinstall -f -p -P emacs_gpr_query.gpr --prefix=~/.local --install-name=gpr_query + gprinstall -v -f -p -P emacs_gpr_query.gpr --prefix=$(INSTALL_DIR) --install-name=gpr_query ifeq ($(shell uname),Linux) EMACS_EXE ?= emacs diff --git a/NEWS b/NEWS index ffbe0eb981..c012ed1d03 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,16 @@ GNU Emacs gpr-query NEWS -- history of user-visible changes. -Copyright (C) 2022 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. Please send gpr-query bug reports to bug-gnu-em...@gnu.org, with 'gpr-query' in the subject. If possible, use M-x report-emacs-bug. +* gpr-query 1.0.4 +15 Sep 2023 + +** Minor fixes, require wisi 4.3.0. + * gpr-query 1.0.3 28 Jan 2023 diff --git a/README b/README index 72eb0d377f..1c28ffe674 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Emacs gpr-query version 1.0.2 +Emacs gpr-query version 1.0.4 gpr-query provides an emacs xref backend using the cross-reference information output by the AdaCore GNAT compiler. diff --git a/gpr-query.el b/gpr-query.el index 3d02a15c5c..b2f6e831d6 100644 --- a/gpr-query.el +++ b/gpr-query.el @@ -7,8 +7,8 @@ ;; Author: Stephen Leake ;; Maintainer: Stephen Leake -;; Version: 1.0.3 -;; package-requires: ((emacs "25.3") (wisi "4.2.2") (gnat-compiler "1.0.2")) +;; Version: 1.0.4 +;; package-requires: ((emacs "25.3") (wisi "4.3.0") (gnat-compiler "1.0.3")) ;; This file is part of GNU Emacs. @@ -754,7 +754,7 @@ FILE is from gpr-query." ;; WORKAROUND: in emacs 28 xref-location changed from defclass to ;; cl-defstruct. (require 'eieio) -(with-suppressed-warnings ;; "unknown slot" in emacs 28 +(with-no-warnings ;; "unknown slot" in emacs 28 (progn (defun xref-item-summary (item) (oref item summary)) (defun xref-item-location (item) (oref item location)) diff --git a/gpr-query.texi b/gpr-query.texi index c5205f69e8..f7e6a68638 100644 --- a/gpr-query.texi +++ b/gpr-query.texi @@ -25,7 +25,7 @@ developing GNU and promoting software freedom.'' @titlepage @sp 10 -@title gpr-query Version 1.0.2 +@title gpr-query Version 1.0.4 @page @vskip 0pt plus 1filll @insertcopying @@ -37,7 +37,7 @@ developing GNU and promoting software freedom.'' @node Top, Overview, (dir), (dir) @top Top -gpr-query Version 1.0.2 +gpr-query Version 1.0.4 @end ifnottex @menu diff --git a/notes.text b/notes.text index da08dd3230..1032e52798 100644 --- a/notes.text +++ b/notes.text @@ -38,7 +38,7 @@ check emacs buglist tested in ada-mode; it uses the same test sources for multiple xref backends. compare: -(ediff-directories "/Projects/elpa_release/gpr-query" "/Projects/elpa/packages/gpr-query" nil) +(ediff-directories "/Projects/elpa_release/packages/gpr-query" "/Projects/elpa/packages/gpr-query" nil) NEWS copyright date add release date @@ -62,6 +62,7 @@ bump version gpr-query.el Version: +package-requires: NEWS if not done above @@ -74,9 +75,12 @@ bump version first line alire.toml +bump only if Ada code changed version depends-on versions +build.sh 'alr get' version ; must match alire.toml. + (dvc-state-one ".") On Debian (alr publish --tar broken on Windows (alr version 1.2.1))
[elpa] externals/gpr-query 9619300ce2 2/2: Resolve conflicts, finish merge
branch: externals/gpr-query commit 9619300ce22062e2677b0536e7b69dca182f316e Merge: d50f92fe46 bae92cd621 Author: Stephen Leake Commit: Stephen Leake Resolve conflicts, finish merge --- .elpaignore| 7 +++ .gitignore | 2 ++ ELPA.make | 5 - NEWS | 2 ++ gpr-query.texi | 8 install.sh | 6 +- notes.text | 34 +- 7 files changed, 17 insertions(+), 47 deletions(-) diff --git a/.elpaignore b/.elpaignore index ce56bc2095..d295b43551 100644 --- a/.elpaignore +++ b/.elpaignore @@ -1 +1,8 @@ alire.toml +Alire.make +ELPA.make +emacs_gpr_query_config_devel.gpr +emacs_gpr_query_config_release.gpr +gpr-query.prj +prj.el +notes.text diff --git a/.gitignore b/.gitignore index 4eac78d3ce..2f96d82e64 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ bin/ config/ *.elc obj/ +gpr-query.html +gpr-query.info diff --git a/ELPA.make b/ELPA.make index ab49dfabe8..fc651b1f8b 100644 --- a/ELPA.make +++ b/ELPA.make @@ -6,7 +6,7 @@ all : build byte-compile autoloads docs -docs : gpr-query.info +docs : gpr-query.info gpr-query.html build : config/emacs_gpr_query_config.gpr force gprbuild -p -j8 emacs_gpr_query.gpr @@ -38,6 +38,9 @@ autoloads : force %.info : %.texi makeinfo $< -o $@ +%.html : %.texi + makeinfo --html --no-split $< -o $@ + clean : force rm -rf gpr-query.info obj gpr_query$(EXE_EXT) diff --git a/NEWS b/NEWS index c012ed1d03..6e7c7fc87e 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,8 @@ Please send gpr-query bug reports to bug-gnu-em...@gnu.org, with ** Fix Alire build +** ELPA packaging fix. + * gpr-query 1.0.2 5 Jan 2023 diff --git a/gpr-query.texi b/gpr-query.texi index f7e6a68638..0f5f23d873 100644 --- a/gpr-query.texi +++ b/gpr-query.texi @@ -23,14 +23,6 @@ developing GNU and promoting software freedom.'' * gpr-query: (gpr-query). Minor mode providing cross-reference information from the GNAT compiler. @end direntry -@titlepage -@sp 10 -@title gpr-query Version 1.0.4 -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - @contents @ifnottex diff --git a/install.sh b/install.sh index b6d6c25113..f12b5a1f0f 100755 --- a/install.sh +++ b/install.sh @@ -4,10 +4,6 @@ # See build.sh for build (must be run before install). # $1 : optional -# -# If you don't have write permission in the GNAT installation -# directory, you need to use --prefix=, or run with root -# privileges. if [ x$1 = x ]; then PREFIX=$HOME/.local @@ -19,7 +15,7 @@ fi echo "installing gpr-query executables to" $PREFIX/bin if type alr; then -cp emacs_gpr_query/bin/* $PREFIX/bin +cp emacs_gpr_query*/bin/* $PREFIX/bin elif type gprbuild; then cp bin/* $PREFIX/bin diff --git a/notes.text b/notes.text index 1032e52798..d265c98158 100644 --- a/notes.text +++ b/notes.text @@ -13,27 +13,7 @@ o.e.gpr-query: release, in use current work release process -keep status in ~/projects.text - -check for ELPA patches by others -(dvc-state-one "/Projects/elpa/packages/gpr-query") -(dvc-pull "/Projects/elpa") -(dvc-sync-review "/Projects/elpa") -update -clean, quit sync -cd c:/Projects/elpa -git log -2 -- packages/gpr-query -if changes: -(dvc-log "/Projects/elpa/packages//") -apply changes to current - -check emacs buglist -https://debbugs.gnu.org/cgi/pkgreport.cgi?package=gpr-query -to update a bug: n...@debbugs.gnu.org -subject: from bug title, for people who rely on that. -if fixed in devel sources, add 'pending' tag: -cont...@debbugs.gnu.org -tags nnn + pending +See ada-mode notes; only gpr-query specific details listed here. tested in ada-mode; it uses the same test sources for multiple xref backends. @@ -51,24 +31,12 @@ Check copyright on files in elpa if any gpr-query files added to output, fix them (add or change to FSF) bump version -Gnu ELPA requires single digits between dots in versions - -bump if _any_ changes other than autoloads, so ELPA package handler knows to update -bump third digit for bug fixes, minor features, no user-incompatible changes -bump second digit for major features, mostly backward-compatible -or if third digit gets to 10 - -bump first digit for really major elisp user-visible changes: - gpr-query.el Version: package-requires: NEWS -if not done above - gpr-query.texi -@title @node top README
[elpa] externals/gpr-query 258710222a 1/3: Resolve conflicts, finish merge
branch: externals/gpr-query commit 258710222a85130a46c4b7ed927c797265ca63f4 Author: Stephen Leake Commit: Stephen Leake Resolve conflicts, finish merge --- .elpaignore| 7 +++ NEWS | 2 ++ README | 2 +- gpr-query.el | 2 +- gpr-query.texi | 10 +- notes.text | 49 + 6 files changed, 13 insertions(+), 59 deletions(-) diff --git a/.elpaignore b/.elpaignore index ce56bc2095..d295b43551 100644 --- a/.elpaignore +++ b/.elpaignore @@ -1 +1,8 @@ alire.toml +Alire.make +ELPA.make +emacs_gpr_query_config_devel.gpr +emacs_gpr_query_config_release.gpr +gpr-query.prj +prj.el +notes.text diff --git a/NEWS b/NEWS index ffbe0eb981..bd06436b64 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ Please send gpr-query bug reports to bug-gnu-em...@gnu.org, with ** Fix Alire build +** ELPA packaging fix. + * gpr-query 1.0.2 5 Jan 2023 diff --git a/README b/README index 72eb0d377f..eec20eae4a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Emacs gpr-query version 1.0.2 +Emacs gpr-query version 1.0.3 gpr-query provides an emacs xref backend using the cross-reference information output by the AdaCore GNAT compiler. diff --git a/gpr-query.el b/gpr-query.el index 3d02a15c5c..89bbe8f3da 100644 --- a/gpr-query.el +++ b/gpr-query.el @@ -8,7 +8,7 @@ ;; Author: Stephen Leake ;; Maintainer: Stephen Leake ;; Version: 1.0.3 -;; package-requires: ((emacs "25.3") (wisi "4.2.2") (gnat-compiler "1.0.2")) +;; package-requires: ((emacs "25.3") (wisi "4.2.0") (gnat-compiler "1.0.1")) ;; This file is part of GNU Emacs. diff --git a/gpr-query.texi b/gpr-query.texi index c5205f69e8..92fcafaca7 100644 --- a/gpr-query.texi +++ b/gpr-query.texi @@ -23,21 +23,13 @@ developing GNU and promoting software freedom.'' * gpr-query: (gpr-query). Minor mode providing cross-reference information from the GNAT compiler. @end direntry -@titlepage -@sp 10 -@title gpr-query Version 1.0.2 -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - @contents @ifnottex @node Top, Overview, (dir), (dir) @top Top -gpr-query Version 1.0.2 +gpr-query Version 1.0.3 @end ifnottex @menu diff --git a/notes.text b/notes.text index da08dd3230..c7c3834743 100644 --- a/notes.text +++ b/notes.text @@ -13,61 +13,14 @@ o.e.gpr-query: release, in use current work release process -keep status in ~/projects.text - -check for ELPA patches by others -(dvc-state-one "/Projects/elpa/packages/gpr-query") -(dvc-pull "/Projects/elpa") -(dvc-sync-review "/Projects/elpa") -update -clean, quit sync -cd c:/Projects/elpa -git log -2 -- packages/gpr-query -if changes: -(dvc-log "/Projects/elpa/packages//") -apply changes to current - -check emacs buglist -https://debbugs.gnu.org/cgi/pkgreport.cgi?package=gpr-query -to update a bug: n...@debbugs.gnu.org -subject: from bug title, for people who rely on that. -if fixed in devel sources, add 'pending' tag: -cont...@debbugs.gnu.org -tags nnn + pending +See ada-mode notes; only gpr-query specific details listed here. tested in ada-mode; it uses the same test sources for multiple xref backends. -compare: -(ediff-directories "/Projects/elpa_release/gpr-query" "/Projects/elpa/packages/gpr-query" nil) -NEWS -copyright date -add release date -add new features - -ELPA.make all - -Check copyright on files in elpa -../../GNUMakefile check/gpr-query -if any gpr-query files added to output, fix them (add or change to FSF) - bump version -Gnu ELPA requires single digits between dots in versions - -bump if _any_ changes other than autoloads, so ELPA package handler knows to update -bump third digit for bug fixes, minor features, no user-incompatible changes -bump second digit for major features, mostly backward-compatible -or if third digit gets to 10 - -bump first digit for really major elisp user-visible changes: - gpr-query.el -Version: - NEWS -if not done above - gpr-query.texi -@title @node top README
[elpa] externals/gpr-query f46f941e96 2/3: * ELPA.make (docs): Add html
branch: externals/gpr-query commit f46f941e96beec785dc14c0c26a24acb5edd1221 Author: Stephen Leake Commit: Stephen Leake * ELPA.make (docs): Add html --- .gitignore | 2 ++ ELPA.make | 7 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4eac78d3ce..2f96d82e64 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ bin/ config/ *.elc obj/ +gpr-query.html +gpr-query.info diff --git a/ELPA.make b/ELPA.make index 1476d451dd..4006863f26 100644 --- a/ELPA.make +++ b/ELPA.make @@ -1,4 +1,4 @@ -# For compiling gpr-query Ada code in elpa or devel worktree +4# For compiling gpr-query Ada code in elpa or devel worktree #export Standard_Common_Build := Debug @@ -6,7 +6,7 @@ all : build byte-compile autoloads docs -docs : gpr-query.info +docs : gpr-query.info gpr-query.html build : config/emacs_gpr_query_config.gpr force gprbuild -p -j8 emacs_gpr_query.gpr @@ -37,6 +37,9 @@ autoloads : force %.info : %.texi makeinfo $< -o $@ +%.html : %.texi + makeinfo --html --no-split $< -o $@ + clean : force rm -rf gpr-query.info obj gpr_query$(EXE_EXT)
[elpa] externals/gpr-query bae92cd621 3/3: Minor fixes
branch: externals/gpr-query commit bae92cd6218601504f2ff1a508ef79d1bf03b29a Author: Stephen Leake Commit: Stephen Leake Minor fixes * ELPA.make: Fix typo. * gpr-query.el: Use with-no-warnings. * install.sh: Delete old comment, fix install command. --- ELPA.make| 2 +- gpr-query.el | 2 +- install.sh | 6 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ELPA.make b/ELPA.make index 4006863f26..37595957e9 100644 --- a/ELPA.make +++ b/ELPA.make @@ -1,4 +1,4 @@ -4# For compiling gpr-query Ada code in elpa or devel worktree +# For compiling gpr-query Ada code in elpa or devel worktree #export Standard_Common_Build := Debug diff --git a/gpr-query.el b/gpr-query.el index 89bbe8f3da..b40222cd3e 100644 --- a/gpr-query.el +++ b/gpr-query.el @@ -754,7 +754,7 @@ FILE is from gpr-query." ;; WORKAROUND: in emacs 28 xref-location changed from defclass to ;; cl-defstruct. (require 'eieio) -(with-suppressed-warnings ;; "unknown slot" in emacs 28 +(with-no-warnings ;; "unknown slot" in emacs 28 (progn (defun xref-item-summary (item) (oref item summary)) (defun xref-item-location (item) (oref item location)) diff --git a/install.sh b/install.sh index b6d6c25113..f12b5a1f0f 100755 --- a/install.sh +++ b/install.sh @@ -4,10 +4,6 @@ # See build.sh for build (must be run before install). # $1 : optional -# -# If you don't have write permission in the GNAT installation -# directory, you need to use --prefix=, or run with root -# privileges. if [ x$1 = x ]; then PREFIX=$HOME/.local @@ -19,7 +15,7 @@ fi echo "installing gpr-query executables to" $PREFIX/bin if type alr; then -cp emacs_gpr_query/bin/* $PREFIX/bin +cp emacs_gpr_query*/bin/* $PREFIX/bin elif type gprbuild; then cp bin/* $PREFIX/bin
[elpa] externals/gpr-query updated (ada0d0afce -> bae92cd621)
stephen_leake pushed a change to branch externals/gpr-query. from ada0d0afce Release 1.0.3 new 258710222a Resolve conflicts, finish merge new f46f941e96 * ELPA.make (docs): Add html new bae92cd621 Minor fixes Summary of changes: .elpaignore| 7 +++ .gitignore | 2 ++ ELPA.make | 5 - NEWS | 2 ++ README | 2 +- gpr-query.el | 4 ++-- gpr-query.texi | 10 +- install.sh | 6 +- notes.text | 49 + 9 files changed, 21 insertions(+), 66 deletions(-)
[elpa] externals/gnat-compiler 9db5c393ee: Release version 1.0.3
branch: externals/gnat-compiler commit 9db5c393ee0f9694e83305ef8b0b1e37f0560111 Author: Stephen Leake Commit: Stephen Leake Release version 1.0.3 * NEWS: Version. * gnat-compiler.el (wisi-compiler-fix-error): Remove unwind-protect; not needed. * gnat-xref.el: Update comments to refer to 'gnat find'. --- NEWS | 5 + gnat-compiler.el | 935 +++ gnat-xref.el | 9 +- notes.text | 5 +- 4 files changed, 481 insertions(+), 473 deletions(-) diff --git a/NEWS b/NEWS index 46d88237f6..3afeb3beed 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ Please send gnat-compiler bug reports to bug-gnu-em...@gnu.org, with 'gnat-compiler' in the subject. If possible, use M-x report-emacs-bug. +* gnat compiler 1.0.3 +15 Sep 2023 + +* Minor improvements, depend on wisi 4.3.0. + * gnat compiler 1.0.2 24 Jan 2023 diff --git a/gnat-compiler.el b/gnat-compiler.el index 2326b68650..f29488634c 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -6,8 +6,8 @@ ;; ;; Author: Stephen Leake ;; Maintainer: Stephen Leake -;; Version: 1.0.2 -;; package-requires: ((emacs "25.3") (wisi "4.2.0")) +;; Version: 1.0.3 +;; package-requires: ((emacs "25.3") (wisi "4.3.0")) ;; ;; This file is part of GNU Emacs. ;; @@ -943,495 +943,494 @@ server executable not found; otherwise signal user-error." ;; recognize it, handle it (setq result - (unwind-protect -(cond - ;; It is tempting to define an alist of (MATCH . ACTION), but - ;; that is too hard to debug - ;; - ;; This list will get long, so let's impose some order. - ;; - ;; First expressions that start with a named regexp, - ;; alphabetical by variable name and following string. - ;; - ;; Then expressions that start with a string, alphabetical by string. - ;; - ;; Then style errors. - - ((looking-at (concat gnat-quoted-name-regexp " is not a component of ")) - (save-excursion -(let ((child-name (match-string 1)) - (correct-spelling (gnat-misspelling))) - (setq correct-spelling (match-string 1)) - (pop-to-buffer source-buffer) - (search-forward child-name) - (replace-match correct-spelling)) -t)) - - ((looking-at (concat gnat-quoted-name-regexp " is not visible")) - (let* ((done nil) - (err-msg (get-text-property (line-beginning-position) 'compilation-message)) - (file-line-struct err-msg) - pos choices unit-name) -;; next line may contain a reference to where ident is -;; defined; if present, it will have been marked by -;; gnat-compilation-filter: -;; -;; gnatquery.adb:255:13: error: "Has_Element" is not visible -;; gnatquery.adb:255:13: error: non-visible declaration at a-convec.ads:68, instance at gnatcoll-arg_lists.ads:157 -;; gnatquery.adb:255:13: error: non-visible declaration at a-coorse.ads:62, instance at gnatcoll-xref.ads:912 -;; gnatquery.adb:255:13: error: non-visible declaration at a-coorse.ads:62, instance at gnatcoll-xref.ads:799 -;; gnatquery.adb:255:13: error: non-visible declaration at gnatcoll-xref.ads:314 -;; -;; or the next line may contain "multiple use clauses cause hiding" -;; -;; the lines after that may contain alternate matches; -;; collect all, let user choose. -;; -;; However, a line that contains 'gnat-secondary-error may be from the next error message: -;; parser_no_recover.adb:297:60: no selector "Tree" for type "Parser_State" defined at lists.ads:96 -(forward-line 1) -(when (looking-at ".* multiple use clauses cause hiding") - (forward-line 1)) -(while (not done) - (let ((limit (1- (line-end-position -;; 1- because next compilation error is at next line beginning -(setq done (not -(and - (equal file-line-struct err-msg) ;; same error message? - (setq pos (next-single-property-change (point) 'gnat-secondary-error nil limit)) - (<= pos limit -(when (not done) - (let* ((item (get-text-property pos 'gnat-secondary-error)) - (unit-file (nth 0 item)) - (choice (gnat-ada-name-from-file-name unit-file))) -(unless (member choice choices) (push choice choices)) -(goto-char (1+ pos)) -(g
[elpa] externals-release/ada-mode 1bb112b52e 2/2: merge from externals/ada-mode to externals-release/ada-mode
branch: externals-release/ada-mode
commit 1bb112b52ebbb0ada88b2bc1d463a480997b1ce6
Merge: 146cb4ecba 8660d5e9b2
Author: Stephen Leake
Commit: Stephen Leake
merge from externals/ada-mode to externals-release/ada-mode
---
.elpaignore | 1 +
.gitignore | 6 ---
Alire.make | 1 -
NEWS| 5 +++
README | 2 +-
ada-mode.el | 6 +--
ada-mode.texi | 18
ada_mode_wisi_parse.gpr | 110
build.sh| 9 ++--
install.sh | 2 +-
10 files changed, 134 insertions(+), 26 deletions(-)
diff --git a/.elpaignore b/.elpaignore
new file mode 100644
index 00..ce56bc2095
--- /dev/null
+++ b/.elpaignore
@@ -0,0 +1 @@
+alire.toml
diff --git a/.gitignore b/.gitignore
index d9f97eb120..f65844eda1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,4 @@
*.elc
-*.exe
-*.parse_table
ada-mode-autoloads.el
ada-mode-pkg.el
-Makefile.conf
ada_annex_p_lr1_parse_table.txt
-ada_mode_wisi_parse.gpr
-check.gpr
-obj/
diff --git a/Alire.make b/Alire.make
index f7e9a89a24..910183349d 100644
--- a/Alire.make
+++ b/Alire.make
@@ -7,5 +7,4 @@ include
$(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make
include $(WISITOKEN_ALIRE_PREFIX)/build/wisitoken_alire_rules.make
# Local Variables:
-# eval: (load-file "prj.el")
# End:
diff --git a/NEWS b/NEWS
index c5830f9018..ad53c680fe 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Please send ada-mode bug reports to bug-gnu-em...@gnu.org, with
'ada-mode' in the subject. If possible, use M-x report-emacs-bug.
+Ada Mode 8.0.5
+3 Feb 2020
+
+** Alire and ELPA packaging fixes.
+
Ada Mode 8.0.4
16 Jan 2023
diff --git a/README b/README
index 7db7121651..92144ab945 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 8.0.4
+Emacs Ada mode version 8.0.5
Ada mode provides auto-casing, fontification, navigation, and
indentation for Ada source code files.
diff --git a/ada-mode.el b/ada-mode.el
index a67b46aa1b..7e1f09c07e 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,8 +6,8 @@
;; Maintainer: Stephen Leake
;; Keywords: languages
;; ada
-;; Version: 8.0.4
-;; package-requires: ((uniquify-files "1.0.4") (wisi "4.2.2") (gnat-compiler
"1.0.1") (emacs "25.3"))
+;; Version: 8.0.5
+;; package-requires: ((uniquify-files "1.0.4") (wisi "4.2.2") (gnat-compiler
"1.0.2") (emacs "25.3"))
;; url: https://www.nongnu.org/ada-mode/
;;
;; This file is part of GNU Emacs.
@@ -117,7 +117,7 @@
(defun ada-mode-version ()
"Return Ada mode version."
(interactive)
- (let ((version-string "8.0.4"))
+ (let ((version-string "8.0.5"))
(if (called-interactively-p 'interactive)
(message version-string)
version-string)))
diff --git a/ada-mode.texi b/ada-mode.texi
index 84335451ed..456e36f657 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -259,14 +259,14 @@ ELPA package ada-ref-man.
@node Ada executables
@section Ada executables
-Ada mode requires either the external parser and gpr-query, or the Ada
+Ada mode requires either the wisi parser and gpr-query, or the Ada
language server @code{ada_language_server}. All of these can be
installed via the Alire Ada package manager
(@url{https://alire.ada.dev/}), or compiled directly.
See the gpr-query package for information on compiling gpr-query.
-To install the external parser,
+To install the wisi parser:
@example
cd ~/.emacs.d/elpa/ada-mode-i.j.xx
@@ -275,19 +275,19 @@ cd ~/.emacs.d/elpa/ada-mode-i.j.xx
@end example
By default, @file{install.sh} installs the parser executable in
-@code{$HOME/.local/bin}. If you want to install somewhere else, use
-@code{install.sh --prefix=}.
+@code{$HOME/.local/bin}, so you must put that in @code{PATH}. If you
+want to install somewhere else, use @code{install.sh --prefix=}.
These scripts default to use Alire (@url{https://alire.ada.dev/}) if
it is found on @code{PATH}; otherwise they use @code{gprbuild}.
One step in build.sh is to run @code{wisitoken-bnf-generate} to
generate the LR1 parse table for the parser. This can take up to 5.4GB
-of memory; if your machine does not have that much, you can download
-the @file{ada_annex_p_lr1_parse_table.txt} from
-@url{https://download.savannah.nongnu.org/releases/ada-mode/} - be
-sure to get the version that matches ada-mode, and put it in the same
-directory as @file{ada_mode_wisi_lr1_parse}.
+of memory during the generate process; if your machine does not have
+that much, you can download the @file{ada_annex_p_lr1_parse_table.txt}
+from @url{https://download.savannah.nongnu.org/releases/ada-mode/} -
+be sure to get the version that matches the current ada-mode, and put
+it in the same directory as @file{ada_mode_wisi_lr1_parse}.
@node Known versions
@section Known versions
diff -
[elpa] externals-release/ada-mode 8660d5e9b2 1/2: Release 8.0.5 packaging fixes
branch: externals-release/ada-mode
commit 8660d5e9b2219208e5d43b979f5fb57fbb518924
Author: Stephen Leake
Commit: Stephen Leake
Release 8.0.5 packaging fixes
---
.elpaignore | 1 +
.gitignore | 6 ---
Alire.make | 1 -
NEWS| 5 +++
README | 2 +-
ada-mode.el | 6 +--
ada-mode.texi | 18
ada_mode_wisi_parse.gpr | 110
build.sh| 9 ++--
install.sh | 2 +-
10 files changed, 134 insertions(+), 26 deletions(-)
diff --git a/.elpaignore b/.elpaignore
new file mode 100644
index 00..ce56bc2095
--- /dev/null
+++ b/.elpaignore
@@ -0,0 +1 @@
+alire.toml
diff --git a/.gitignore b/.gitignore
index d9f97eb120..f65844eda1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,4 @@
*.elc
-*.exe
-*.parse_table
ada-mode-autoloads.el
ada-mode-pkg.el
-Makefile.conf
ada_annex_p_lr1_parse_table.txt
-ada_mode_wisi_parse.gpr
-check.gpr
-obj/
diff --git a/Alire.make b/Alire.make
index f7e9a89a24..910183349d 100644
--- a/Alire.make
+++ b/Alire.make
@@ -7,5 +7,4 @@ include
$(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make
include $(WISITOKEN_ALIRE_PREFIX)/build/wisitoken_alire_rules.make
# Local Variables:
-# eval: (load-file "prj.el")
# End:
diff --git a/NEWS b/NEWS
index c5830f9018..ad53c680fe 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Please send ada-mode bug reports to bug-gnu-em...@gnu.org, with
'ada-mode' in the subject. If possible, use M-x report-emacs-bug.
+Ada Mode 8.0.5
+3 Feb 2020
+
+** Alire and ELPA packaging fixes.
+
Ada Mode 8.0.4
16 Jan 2023
diff --git a/README b/README
index 7db7121651..92144ab945 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 8.0.4
+Emacs Ada mode version 8.0.5
Ada mode provides auto-casing, fontification, navigation, and
indentation for Ada source code files.
diff --git a/ada-mode.el b/ada-mode.el
index a67b46aa1b..7e1f09c07e 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,8 +6,8 @@
;; Maintainer: Stephen Leake
;; Keywords: languages
;; ada
-;; Version: 8.0.4
-;; package-requires: ((uniquify-files "1.0.4") (wisi "4.2.2") (gnat-compiler
"1.0.1") (emacs "25.3"))
+;; Version: 8.0.5
+;; package-requires: ((uniquify-files "1.0.4") (wisi "4.2.2") (gnat-compiler
"1.0.2") (emacs "25.3"))
;; url: https://www.nongnu.org/ada-mode/
;;
;; This file is part of GNU Emacs.
@@ -117,7 +117,7 @@
(defun ada-mode-version ()
"Return Ada mode version."
(interactive)
- (let ((version-string "8.0.4"))
+ (let ((version-string "8.0.5"))
(if (called-interactively-p 'interactive)
(message version-string)
version-string)))
diff --git a/ada-mode.texi b/ada-mode.texi
index 84335451ed..456e36f657 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -259,14 +259,14 @@ ELPA package ada-ref-man.
@node Ada executables
@section Ada executables
-Ada mode requires either the external parser and gpr-query, or the Ada
+Ada mode requires either the wisi parser and gpr-query, or the Ada
language server @code{ada_language_server}. All of these can be
installed via the Alire Ada package manager
(@url{https://alire.ada.dev/}), or compiled directly.
See the gpr-query package for information on compiling gpr-query.
-To install the external parser,
+To install the wisi parser:
@example
cd ~/.emacs.d/elpa/ada-mode-i.j.xx
@@ -275,19 +275,19 @@ cd ~/.emacs.d/elpa/ada-mode-i.j.xx
@end example
By default, @file{install.sh} installs the parser executable in
-@code{$HOME/.local/bin}. If you want to install somewhere else, use
-@code{install.sh --prefix=}.
+@code{$HOME/.local/bin}, so you must put that in @code{PATH}. If you
+want to install somewhere else, use @code{install.sh --prefix=}.
These scripts default to use Alire (@url{https://alire.ada.dev/}) if
it is found on @code{PATH}; otherwise they use @code{gprbuild}.
One step in build.sh is to run @code{wisitoken-bnf-generate} to
generate the LR1 parse table for the parser. This can take up to 5.4GB
-of memory; if your machine does not have that much, you can download
-the @file{ada_annex_p_lr1_parse_table.txt} from
-@url{https://download.savannah.nongnu.org/releases/ada-mode/} - be
-sure to get the version that matches ada-mode, and put it in the same
-directory as @file{ada_mode_wisi_lr1_parse}.
+of memory during the generate process; if your machine does not have
+that much, you can download the @file{ada_annex_p_lr1_parse_table.txt}
+from @url{https://download.savannah.nongnu.org/releases/ada-mode/} -
+be sure to get the version that matches the current ada-mode, and put
+it in the same directory as @file{ada_mode_wisi_lr1_parse}.
@node Known versions
@section Known versions
diff --git a/ada_mode_wisi_parse.gpr b/ada_mode_wis
[elpa] externals/ada-mode updated (fa98735095 -> 8660d5e9b2)
stephen_leake pushed a change to branch externals/ada-mode. from fa98735095 * Alire.make: Fix prj.el new 8660d5e9b2 Release 8.0.5 packaging fixes Summary of changes: .elpaignore | 1 + .gitignore | 6 --- Alire.make | 1 - NEWS| 5 +++ README | 2 +- ada-mode.el | 6 +-- ada-mode.texi | 18 ada_mode_wisi_parse.gpr | 110 build.sh| 9 ++-- install.sh | 2 +- 10 files changed, 134 insertions(+), 26 deletions(-) create mode 100644 .elpaignore create mode 100644 ada_mode_wisi_parse.gpr
[elpa] externals-release/gpr-query updated (da47f81da1 -> ada0d0afce)
stephen_leake pushed a change to branch externals-release/gpr-query. from da47f81da1 * alire.toml: Fix gnat version new 2f02308eda Don't include alire.toml in ELPA package new ada0d0afce Release 1.0.3 Summary of changes: .elpaignore | 1 + NEWS | 5 gpr-query.el | 4 +-- notes.text | 82 +++- 4 files changed, 12 insertions(+), 80 deletions(-) create mode 100644 .elpaignore
[elpa] externals-release/gpr-query ada0d0afce 2/2: Release 1.0.3
branch: externals-release/gpr-query
commit ada0d0afcefe88b66b9cc53de5d76db661bfb2d7
Author: Stephen Leake
Commit: Stephen Leake
Release 1.0.3
* gpr-query.el: Bump version.
---
gpr-query.el | 4 +--
notes.text | 82 +++-
2 files changed, 6 insertions(+), 80 deletions(-)
diff --git a/gpr-query.el b/gpr-query.el
index abb3dc29a2..3d02a15c5c 100644
--- a/gpr-query.el
+++ b/gpr-query.el
@@ -7,8 +7,8 @@
;; Author: Stephen Leake
;; Maintainer: Stephen Leake
-;; Version: 1.0.2
-;; package-requires: ((emacs "25.3") (wisi "4.2.0") (gnat-compiler "1.0.1"))
+;; Version: 1.0.3
+;; package-requires: ((emacs "25.3") (wisi "4.2.2") (gnat-compiler "1.0.2"))
;; This file is part of GNU Emacs.
diff --git a/notes.text b/notes.text
index 5f6cabb8bf..da08dd3230 100644
--- a/notes.text
+++ b/notes.text
@@ -90,83 +90,9 @@ On Debian (alr publish --tar broken on Windows (alr version
1.2.1))
cd ~/Downloads; wget
https://download.savannah.nongnu.org/releases/ada-mode/emacs_gpr_query-1.0.0.tgz
# link is
https://download.savannah.nongnu.org/releases/ada-mode/emacs_gpr_query-i.j.k.tgz
-update elpa:
-(gpr-query-kill-all-sessions)
-ELPA.make pub
-
-# sometimes this is useful
-# (ediff-directories "/Projects/org.emacs.gpr-query"
"/Projects/elpa/packages/gpr-query" nil)
-
-(dvc-state-multiple "/Projects/elpa/packages" t)
-(dvc-push "/Projects/elpa")
-
-ask for beta testers
-edit notice below
-ada-mode mailing list
-comp.lang.ada
-
-# 24 hrs for web repository to update
-
-after Gnu ELPA updated, test install from GNU ELPA
-first install current version, to be sure upgrade requires new versions
-ada-mode 7.1.5 should have required wisi 3.1.5
-
-(list-packages)
-5.1.8 crashed emacs for me
-see 'build.sh; install.sh' above for compiling
-
-also wisitoken-grammar-mode
-
-(dvc-state-one ".")
-ELPA.make tag zip
-
-in cygwin console for gpg prompts:
-cd /Projects/org.emacs.gpr-query/build/
-ls *.tar*
-rm .tar*
-gpg -b *.tar.*
-
-scp *.tar.* stephen_le...@dl.sv.nongnu.org:/releases/gpr-query/
-
-publish on Alire
-https://alire.ada.dev/
-
-create release branch
-
-post on:
-emacs-ada-mode mailing list
-c.l.a newsgroup
-https://savannah.nongnu.org/news/submit.php?group_id=11631:
-
-Gnu Emacs gpr-query 1.0 released.
-
-Gnu Emacs gpr-query 1.0 is now available in GNU ELPA.
-
-See the NEWS files in ~/.emacs.d/elpa/gpr-query-7.1.6 and wisi-3.1.3,
-or at https://www.nongnu.org/gpr-query/, for more details.
-
-The required Ada code requires a manual compile step, after the normal
-list-packages installation ('install.sh' is new in this release):
-
-cd ~/.emacs.d/elpa/gpr-query-7.1.6
-./build.sh
-./install.sh
-
-If you are not using Alire, this requires AdaCore gnatcoll packages
-which you may not have installed; see gpr-query.info Installation for
-help in installing them.
-
-mark fixed bugs
-https://debbugs.gnu.org/cgi/pkgreport.cgi?package=ada-mode
-https://debbugs.gnu.org/cgi/pkgreport.cgi?package=gpr-query
-https://debbugs.gnu.org/Developer.html
-email to nnn-cl...@debbugs.gnu.org
-subject: copy from bug report
-body: closed by ada-mode version 7.2.1
-don't include Version: header; that's an Emacs version
-debbugs updates summary page within half an hour; no emails
+test install from GNU ELPA
+(add-to-list 'package-archives (cons "test"
"/Projects/elpa/archive-devel"))
+(package-refresh-contents)
+(package-install 'gpr-query)
-- end of file
[elpa] externals-release/gpr-query 2f02308eda 1/2: Don't include alire.toml in ELPA package
branch: externals-release/gpr-query commit 2f02308eda53b95886b94734b44725f3b7ccefeb Author: Stephen Leake Commit: Stephen Leake Don't include alire.toml in ELPA package * NEWS: Version 1.0.3. * .elpaignore: New file. --- .elpaignore | 1 + NEWS| 5 + 2 files changed, 6 insertions(+) diff --git a/.elpaignore b/.elpaignore new file mode 100644 index 00..ce56bc2095 --- /dev/null +++ b/.elpaignore @@ -0,0 +1 @@ +alire.toml diff --git a/NEWS b/NEWS index 89682110e7..ffbe0eb981 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ Please send gpr-query bug reports to bug-gnu-em...@gnu.org, with 'gpr-query' in the subject. If possible, use M-x report-emacs-bug. +* gpr-query 1.0.3 +28 Jan 2023 + +** Fix Alire build + * gpr-query 1.0.2 5 Jan 2023
[elpa] externals/gpr-query updated (da47f81da1 -> ada0d0afce)
stephen_leake pushed a change to branch externals/gpr-query. from da47f81da1 * alire.toml: Fix gnat version new 2f02308eda Don't include alire.toml in ELPA package new ada0d0afce Release 1.0.3 Summary of changes: .elpaignore | 1 + NEWS | 5 gpr-query.el | 4 +-- notes.text | 82 +++- 4 files changed, 12 insertions(+), 80 deletions(-) create mode 100644 .elpaignore
[elpa] externals-release/wisi db272eca5c 2/2: merge from externals/wisi to externals-release/wisi
branch: externals-release/wisi
commit db272eca5c7cce620e19c1040cd97f79e0bd30b4
Merge: 52b2507fb3 ebe31c4c1f
Author: Stephen Leake
Commit: Stephen Leake
merge from externals/wisi to externals-release/wisi
---
NEWS | 5 +
wisi-prj.el | 17 -
wisi-process-parse.el | 4 ++--
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/NEWS b/NEWS
index de041e5bf2..e9b4614448 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Please send wisi bug reports to bug-gnu-em...@gnu.org, with
'wisi' in the subject. If possible, use M-x report-emacs-bug.
+* wisi 4.2.3
+26 Jan 2023
+
+** Fix byte-compiler warnings reported by Emacs master.
+
* wisi 4.2.2
16 Jan 2023
diff --git a/wisi-prj.el b/wisi-prj.el
index 69ecc132a2..cb64fa656f 100644
--- a/wisi-prj.el
+++ b/wisi-prj.el
@@ -1,6 +1,6 @@
;;; wisi-prj.el --- project integration -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2019 - 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2019 - 2023 Free Software Foundation, Inc.
;;
;; Author: Stephen Leake
;;
@@ -365,14 +365,13 @@ user arg limits completion to current file."
;; WORKAROUND: in emacs 28 xref-location changed from defclass to
;; cl-defstruct.
(require 'eieio)
-(with-suppressed-warnings ;; "unknown slot" in emacs 28
- (progn
- (defun xref-item-summary (item) (oref item summary))
- (defun xref-item-location (item) (oref item location))
- (defun xref-file-location-file (location) (oref location file))
- (defun xref-file-location-line (location) (oref location line))
- (defun xref-file-location-column (location) (oref location column))
-
+(with-no-warnings ;; "unknown slot"
+ (defun xref-item-summary (item) (oref item summary))
+ (defun xref-item-location (item) (oref item location))
+ (defun xref-file-location-file (location) (oref location file))
+ (defun xref-file-location-line (location) (oref location line))
+ (defun xref-file-location-column (location) (oref location column))
+ )))
(defun wisi-goto-spec/body (identifier)
"Goto declaration or body for IDENTIFIER (default symbol at point).
diff --git a/wisi-process-parse.el b/wisi-process-parse.el
index 94019e01b1..210f19f81c 100644
--- a/wisi-process-parse.el
+++ b/wisi-process-parse.el
@@ -1129,7 +1129,7 @@ Source buffer is current."
(funcall action)
(condition-case _err
(wisi-process-parse--handle-messages parser)
-('wisi-file_not_found
+(wisi-file_not_found
(message "parsing buffer ...")
(wisi-process-parse--send-incremental-parse parser t) ;; creates parse
context
(wisi-process-parse--wait parser)
@@ -1205,7 +1205,7 @@ Source buffer is current."
(wisi-process-parse--send-incremental-parse parser full)
(condition-case _err
(wisi-process-parse--handle-messages parser)
- ('wisi-file_not_found
+ (wisi-file_not_found
(message "parsing buffer ...")
(wisi-process-parse--send-incremental-parse parser t)
(wisi-process-parse--handle-messages parser)
[elpa] externals/wisi updated (a12d524878 -> ebe31c4c1f)
stephen_leake pushed a change to branch externals/wisi. from a12d524878 Release version 4.2.2 new ebe31c4c1f Release version 4.2.3 Summary of changes: NEWS | 5 + wisi-prj.el | 17 - wisi-process-parse.el | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-)
[elpa] externals-release/wisi ebe31c4c1f 1/2: Release version 4.2.3
branch: externals-release/wisi
commit ebe31c4c1f5aabde66b15f6df03c75188337889c
Author: Stephen Leake
Commit: Stephen Leake
Release version 4.2.3
* NEWS: Version.
* wisi-prj.el: Fix warning suppression.
* wisi-process-parse.el
(wisi-process-parse--handle-messages-file-not-found): Conditions do
not need quotes.
---
NEWS | 5 +
wisi-prj.el | 17 -
wisi-process-parse.el | 4 ++--
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/NEWS b/NEWS
index de041e5bf2..e9b4614448 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Please send wisi bug reports to bug-gnu-em...@gnu.org, with
'wisi' in the subject. If possible, use M-x report-emacs-bug.
+* wisi 4.2.3
+26 Jan 2023
+
+** Fix byte-compiler warnings reported by Emacs master.
+
* wisi 4.2.2
16 Jan 2023
diff --git a/wisi-prj.el b/wisi-prj.el
index 69ecc132a2..cb64fa656f 100644
--- a/wisi-prj.el
+++ b/wisi-prj.el
@@ -1,6 +1,6 @@
;;; wisi-prj.el --- project integration -*- lexical-binding:t -*-
;;
-;; Copyright (C) 2019 - 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2019 - 2023 Free Software Foundation, Inc.
;;
;; Author: Stephen Leake
;;
@@ -365,14 +365,13 @@ user arg limits completion to current file."
;; WORKAROUND: in emacs 28 xref-location changed from defclass to
;; cl-defstruct.
(require 'eieio)
-(with-suppressed-warnings ;; "unknown slot" in emacs 28
- (progn
- (defun xref-item-summary (item) (oref item summary))
- (defun xref-item-location (item) (oref item location))
- (defun xref-file-location-file (location) (oref location file))
- (defun xref-file-location-line (location) (oref location line))
- (defun xref-file-location-column (location) (oref location column))
-
+(with-no-warnings ;; "unknown slot"
+ (defun xref-item-summary (item) (oref item summary))
+ (defun xref-item-location (item) (oref item location))
+ (defun xref-file-location-file (location) (oref location file))
+ (defun xref-file-location-line (location) (oref location line))
+ (defun xref-file-location-column (location) (oref location column))
+ )))
(defun wisi-goto-spec/body (identifier)
"Goto declaration or body for IDENTIFIER (default symbol at point).
diff --git a/wisi-process-parse.el b/wisi-process-parse.el
index 94019e01b1..210f19f81c 100644
--- a/wisi-process-parse.el
+++ b/wisi-process-parse.el
@@ -1129,7 +1129,7 @@ Source buffer is current."
(funcall action)
(condition-case _err
(wisi-process-parse--handle-messages parser)
-('wisi-file_not_found
+(wisi-file_not_found
(message "parsing buffer ...")
(wisi-process-parse--send-incremental-parse parser t) ;; creates parse
context
(wisi-process-parse--wait parser)
@@ -1205,7 +1205,7 @@ Source buffer is current."
(wisi-process-parse--send-incremental-parse parser full)
(condition-case _err
(wisi-process-parse--handle-messages parser)
- ('wisi-file_not_found
+ (wisi-file_not_found
(message "parsing buffer ...")
(wisi-process-parse--send-incremental-parse parser t)
(wisi-process-parse--handle-messages parser)
[elpa] externals/wisitoken-grammar-mode updated (541b6fd423 -> 8f1cb9639d)
stephen_leake pushed a change to branch externals/wisitoken-grammar-mode. from 541b6fd423 ; Prefer HTTPS to HTTP in most URLs new 2d58879cea Release 1.3.0 new 8f1cb9639d Release 1.3.0 Summary of changes: Alire.make | 11 + build.sh| 12 +- emacs_wisitoken_grammar_mode.gpr| 35 + install.sh | 20 + run_wisitoken_grammar_parse.ads |4 +- simple-indent-mode.el | 79 + wisi-wisitoken_grammar.adb | 60 +- wisi-wisitoken_grammar.ads | 35 +- wisitoken-grammar-mode.el | 178 +- wisitoken_grammar.gpr.gp|7 +- wisitoken_grammar_1-process.el | 133 - wisitoken_grammar_1.wy | 186 +- wisitoken_grammar_1_process_actions.adb | 418 --- wisitoken_grammar_1_process_actions.ads | 277 -- wisitoken_grammar_1_process_main.adb| 1749 - wisitoken_grammar_1_process_main.ads| 36 - wisitoken_grammar_1_re2c.c | 4303 --- wisitoken_grammar_1_re2c_c.ads | 63 - wisitoken_grammar_mode_parse.ads|5 +- 19 files changed, 459 insertions(+), 7152 deletions(-) create mode 100644 Alire.make create mode 100644 emacs_wisitoken_grammar_mode.gpr create mode 100755 install.sh create mode 100644 simple-indent-mode.el delete mode 100644 wisitoken_grammar_1-process.el delete mode 100644 wisitoken_grammar_1_process_actions.adb delete mode 100644 wisitoken_grammar_1_process_actions.ads delete mode 100644 wisitoken_grammar_1_process_main.adb delete mode 100644 wisitoken_grammar_1_process_main.ads delete mode 100644 wisitoken_grammar_1_re2c.c delete mode 100644 wisitoken_grammar_1_re2c_c.ads
[elpa] externals-release/ada-mode updated (cdf3e4640e -> 146cb4ecba)
stephen_leake pushed a change to branch externals-release/ada-mode. from cdf3e4640e Resolve conflicts, finish merge adds 977b0e0eeb Release bug-fix version 8.0.4 adds c749149421 More stuff for 8.0.4 new fa98735095 * Alire.make: Fix prj.el new 146cb4ecba Resolve conflicts, finish propagate Summary of changes: Alire.make| 2 +- ELPA.make | 2 +- NEWS | 5 + README| 2 +- ada-mode.el | 57 + ada-mode.texi | 10 +- build.sh | 5 + install.sh| 2 ++ 8 files changed, 17 insertions(+), 68 deletions(-)
[elpa] externals-release/wisi 52b2507fb3: Resolve conflict, finish propagate
branch: externals-release/wisi commit 52b2507fb335f3e9e4a0ce2beb853cc0b6800746 Merge: decea1307c a12d524878 Author: Stephen Leake Commit: Stephen Leake Resolve conflict, finish propagate --- NEWS | 5 + README| 2 +- alire_rules.make | 16 wisi-process-parse.el | 3 ++- wisi.el | 4 ++-- wisi.texi | 10 +- 6 files changed, 11 insertions(+), 29 deletions(-) diff --git a/NEWS b/NEWS index f99e3c21c4..de041e5bf2 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ Please send wisi bug reports to bug-gnu-em...@gnu.org, with 'wisi' in the subject. If possible, use M-x report-emacs-bug. +* wisi 4.2.2 +16 Jan 2023 + +** Fix bug in wisi parser startup. + * wisi 4.2.0 3 Jan 2023 diff --git a/README b/README index 715c4da796..3fe3d2b3d8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Emacs wisi package 4.2.0 +Emacs wisi package 4.2.2 The wisi package provides utilities for using generalized error-correcting LR parsers (in external processes) to do indentation, diff --git a/alire_rules.make b/alire_rules.make deleted file mode 100644 index e214496368..00 --- a/alire_rules.make +++ /dev/null @@ -1,16 +0,0 @@ -# gnu make rules for building with Alire. - -# alr must be started in the directory holding alire.toml -alire-build : force - GPR_PROJECT_PATH= ; alr --no-tty --no-color $(ALIRE_ARGS) build $(ALIRE_BUILD_ARGS) - -alire-env : - GPR_PROJECT_PATH= ; alr $(ALIRE_ARGS) printenv - -alire-clean : - alr clean - rm -rf alire build/obj/release build/obj/development - -.PHONY : force - -# end of file diff --git a/wisi-process-parse.el b/wisi-process-parse.el index def4ce9c6e..94019e01b1 100644 --- a/wisi-process-parse.el +++ b/wisi-process-parse.el @@ -842,7 +842,8 @@ Source buffer is current." (cl-defun wisi-process-parse--prepare (parser parse-action nowait) "Check for parser busy and startup, mark parser busy, require parser process." - (unless (process-live-p (wisi-process--parser-process parser)) + (unless (or (not (wisi-process--parser-process parser)) ;; not created yet + (process-live-p (wisi-process--parser-process parser))) (wisi-parse-log-message parser "process died") (error "parser process died")) diff --git a/wisi.el b/wisi.el index 3ac2c90f83..9ba44a3aad 100644 --- a/wisi.el +++ b/wisi.el @@ -7,7 +7,7 @@ ;; Keywords: parser ;; indentation ;; navigation -;; Version: 4.2.1 +;; Version: 4.2.2 ;; package-requires: ((emacs "25.3") (seq "2.20")) ;; URL: https://stephe-leake.org/ada/wisitoken.html ;; @@ -29,7 +29,7 @@ ;;; Commentary: - History: see NEWS-wisi.text + History: see NEWS ;; Design: ;; diff --git a/wisi.texi b/wisi.texi index 9949c5b1e1..684b2db916 100644 --- a/wisi.texi +++ b/wisi.texi @@ -23,21 +23,13 @@ developing GNU and promoting software freedom.'' * Wisi: (wisi). Error-correcting LR parsers and project integration. @end direntry -@titlepage -@sp 10 -@title Wisi Version 4.2.0 -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - @contents @ifnottex @node Top @top Top -Wisi Version 4.2.0 +Wisi Version 4.2 @end ifnottex @menu
[elpa] externals/gnat-compiler updated (959c4d3596 -> 49774d33dc)
stephen_leake pushed a change to branch externals/gnat-compiler. from 959c4d3596 Release version 1.0.1 new 49774d33dc * gnat-alire.el (create-alire-prj): Better error message on missing alire.toml Summary of changes: NEWS | 5 + gnat-alire.el| 53 - gnat-compiler.el | 2 +- 3 files changed, 34 insertions(+), 26 deletions(-)
[elpa] externals-release/gnat-compiler 49774d33dc: * gnat-alire.el (create-alire-prj): Better error message on missing alire.toml
branch: externals-release/gnat-compiler commit 49774d33dc26ee75944a7380180cd748881e3a3f Author: Stephen Leake Commit: Stephen Leake * gnat-alire.el (create-alire-prj): Better error message on missing alire.toml * NEWS: Version 1.0.2. * gnat-compiler.el: --- NEWS | 5 + gnat-alire.el| 53 - gnat-compiler.el | 2 +- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/NEWS b/NEWS index 87fbbcd962..46d88237f6 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ Please send gnat-compiler bug reports to bug-gnu-em...@gnu.org, with 'gnat-compiler' in the subject. If possible, use M-x report-emacs-bug. +* gnat compiler 1.0.2 +24 Jan 2023 + +** Improve error message in create-alire-prj. + * gnat compiler 1.0.1 ** Rename create-alire-project to create-alire-prj. diff --git a/gnat-alire.el b/gnat-alire.el index fac90efe71..6be083e2c5 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -98,31 +98,34 @@ ;; it is only used for casing. We get GPR_PROJECT_PATH from the ;; Alire environment. "Return an initial wisi project for the current Alire workspace." - (let* ((default-directory (locate-dominating-file default-directory "alire.toml")) -(abs-gpr-file (expand-file-name gpr-file)) -(project (make-alire-prj :name name - :compile-env compile-env - :file-env file-env - :xref-label xref-label))) - -(alire-get-env project) - -;; We need a gnat-compiler to set compilation-search-path; this -;; must run after alire-get-env because it uses GPR_PROJECT_PATH. -(setf (wisi-prj-compiler project) - (create-gnat-compiler - :gpr-file abs-gpr-file - :run-buffer-name (gnat-run-buffer-name abs-gpr-file))) - -(when (null xref-label) - (user-error "create-alire-prj: no xref backend specified; add :xref-label")) -(setf (wisi-prj-xref project) - (funcall (intern (format "create-%s-xref" (symbol-name xref-label) - -(wisi-compiler-parse-one (wisi-prj-compiler project) project "gpr_file" abs-gpr-file) -(wisi-xref-parse-one (wisi-prj-xref project) project "gpr_file" abs-gpr-file) - -project)) + (let ((temp (locate-dominating-file default-directory "alire.toml"))) +(when (null temp) + (user-error "no alire.toml found in or above %s" default-directory)) +(let* ((default-directory temp) + (abs-gpr-file (expand-file-name gpr-file)) + (project (make-alire-prj :name name +:compile-env compile-env +:file-env file-env +:xref-label xref-label))) + + (alire-get-env project) + + ;; We need a gnat-compiler to set compilation-search-path; this + ;; must run after alire-get-env because it uses GPR_PROJECT_PATH. + (setf (wisi-prj-compiler project) + (create-gnat-compiler +:gpr-file abs-gpr-file +:run-buffer-name (gnat-run-buffer-name abs-gpr-file))) + + (when (null xref-label) +(user-error "create-alire-prj: no xref backend specified; add :xref-label")) + (setf (wisi-prj-xref project) + (funcall (intern (format "create-%s-xref" (symbol-name xref-label) + + (wisi-compiler-parse-one (wisi-prj-compiler project) project "gpr_file" abs-gpr-file) + (wisi-xref-parse-one (wisi-prj-xref project) project "gpr_file" abs-gpr-file) + + project))) (cl-defmethod wisi-prj-default ((project alire-prj)) (let* ((gpr-file (gnat-compiler-gpr-file (wisi-prj-compiler project))) diff --git a/gnat-compiler.el b/gnat-compiler.el index 9b9f6d1ffe..2326b68650 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -6,7 +6,7 @@ ;; ;; Author: Stephen Leake ;; Maintainer: Stephen Leake -;; Version: 1.0.1 +;; Version: 1.0.2 ;; package-requires: ((emacs "25.3") (wisi "4.2.0")) ;; ;; This file is part of GNU Emacs.
[elpa] externals-release/gpr-mode updated (823df70936 -> 9676e6361e)
stephen_leake pushed a change to branch externals-release/gpr-mode. from 823df70936 ; Prefer HTTPS to HTTP in URLs adds 64f9e89378 Release version 1.0.2 adds 9676e6361e Version 1.0.3; packaging fixes No new revisions were added by this update. Summary of changes: Alire.make | 2 + NEWS| 5 + README | 2 +- build.sh| 4 +- gpr-mode.el | 6 +- gpr-mode.texi |15 +- gpr_mode_wisi_parse.gpr | 2 +- gpr_re2c.c | 12866 +++--- install.sh | 6 +- run_gpr_parse.exe | Bin 11834278 -> 0 bytes 10 files changed, 6432 insertions(+), 6476 deletions(-) delete mode 100644 run_gpr_parse.exe
[elpa] externals-release/ada-mode fa98735095 1/2: * Alire.make: Fix prj.el
branch: externals-release/ada-mode commit fa98735095744145977de9145244b973dcdd6615 Author: Stephen Leake Commit: Stephen Leake * Alire.make: Fix prj.el --- Alire.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Alire.make b/Alire.make index 0e6188580b..f7e9a89a24 100644 --- a/Alire.make +++ b/Alire.make @@ -7,5 +7,5 @@ include $(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make include $(WISITOKEN_ALIRE_PREFIX)/build/wisitoken_alire_rules.make # Local Variables: -# eval: (load-file "prj-eglot.el") +# eval: (load-file "prj.el") # End:
[elpa] externals-release/ada-mode 146cb4ecba 2/2: Resolve conflicts, finish propagate
branch: externals-release/ada-mode
commit 146cb4ecba073a8669bf90cd198f895d56fc60d1
Merge: cdf3e4640e fa98735095
Author: Stephen Leake
Commit: Stephen Leake
Resolve conflicts, finish propagate
---
Alire.make| 2 +-
ELPA.make | 2 +-
NEWS | 5 +
README| 2 +-
ada-mode.el | 57 +
ada-mode.texi | 10 +-
build.sh | 5 +
install.sh| 2 ++
8 files changed, 17 insertions(+), 68 deletions(-)
diff --git a/Alire.make b/Alire.make
index 0e6188580b..f7e9a89a24 100644
--- a/Alire.make
+++ b/Alire.make
@@ -7,5 +7,5 @@ include
$(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make
include $(WISITOKEN_ALIRE_PREFIX)/build/wisitoken_alire_rules.make
# Local Variables:
-# eval: (load-file "prj-eglot.el")
+# eval: (load-file "prj.el")
# End:
diff --git a/ELPA.make b/ELPA.make
index ccf76b7f89..698f751345 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -1,4 +1,4 @@
-# For compiling ada-mode Ada code in elpa worktree
+# For compiling ada-mode in elpa worktree
#export Standard_Common_Build := Debug
diff --git a/NEWS b/NEWS
index c02f897c7f..c5830f9018 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Please send ada-mode bug reports to bug-gnu-em...@gnu.org, with
'ada-mode' in the subject. If possible, use M-x report-emacs-bug.
+Ada Mode 8.0.4
+16 Jan 2023
+
+** Misc bug fixes.
+
Ada Mode 8.0.3
6 Jan 2023
diff --git a/README b/README
index d2334b7c74..7db7121651 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 8.0.3
+Emacs Ada mode version 8.0.4
Ada mode provides auto-casing, fontification, navigation, and
indentation for Ada source code files.
diff --git a/ada-mode.el b/ada-mode.el
index 5317a9e242..a67b46aa1b 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,8 +6,8 @@
;; Maintainer: Stephen Leake
;; Keywords: languages
;; ada
-;; Version: 8.0.3
-;; package-requires: ((uniquify-files "1.0.1") (wisi "4.2.0") (gnat-compiler
"1.0.1") (emacs "25.3"))
+;; Version: 8.0.4
+;; package-requires: ((uniquify-files "1.0.4") (wisi "4.2.2") (gnat-compiler
"1.0.1") (emacs "25.3"))
;; url: https://www.nongnu.org/ada-mode/
;;
;; This file is part of GNU Emacs.
@@ -117,7 +117,7 @@
(defun ada-mode-version ()
"Return Ada mode version."
(interactive)
- (let ((version-string "8.0.3"))
+ (let ((version-string "8.0.4"))
(if (called-interactively-p 'interactive)
(message version-string)
version-string)))
@@ -164,7 +164,7 @@ nil, only the file name."
;; global-map has C-x ` 'next-error
(define-key map [return]'wisi-case-adjust-interactive)
-(define-key map "\C-c`" 'ada-show-secondary-error)
+(define-key map "\C-c`" 'gnat-show-secondary-error)
(define-key map "\C-c;" (lambda () (error "use M-; instead"))) ;
comment-dwim
(define-key map "\C-c\M-`" 'wisi-fix-compiler-error)
(define-key map "\C-c\C-a" 'ada-align)
@@ -215,7 +215,7 @@ nil, only the file name."
)
("Build"
["Next compilation error/xref" next-error t]
- ["Show secondary error" ada-show-secondary-error t]
+ ["Show secondary error" gnat-show-secondary-error t]
["Fix compilation error"wisi-fix-compiler-error t]
["Show last parse error"wisi-show-parse-errort]
["Check syntax" ada-build-check t]
@@ -879,53 +879,6 @@ the file name."
(speedbar-add-supported-extension body))
)
-(defun ada-show-secondary-error ()
- "Show the next secondary file reference in the compilation buffer.
-A secondary file reference is defined by text having text
-property `gnat-secondary-error'. These can be set by
-compiler-specific compilation filters."
- (interactive)
-
- ;; preserving the current window works only if the frame
- ;; doesn't change, at least on Windows.
- (let ((start-buffer (current-buffer))
- pos item file)
-(when (eq major-mode 'compilation-mode)
- (setq next-error-last-buffer (current-buffer)))
-;; We use `pop-to-buffer', not `set-buffer', so point is correct
-;; for the current window showing next-error-last-buffer, and
-;; moving point in that window works. But that might eat an
-;; `other-frame-window-mode' prefix, which the user means to apply
-;; to ’ada-goto-source’ below; disable that temporarily.
-(let ((display-buffer-overriding-action nil))
- (pop-to-buffer next-error-last-buffer nil t)
- (setq pos (next-single-property-change (point) 'gnat-secondary-error))
- (unless pos
- ;; probably at end of compilation-buffer, in new compile
- (goto-char (poi
[elpa] externals-release/wisi updated (decea1307c -> 52b2507fb3)
stephen_leake pushed a change to branch externals-release/wisi. from decea1307c * wisi.el (Version): Bump to include prj-alire.el copyright fix adds a12d524878 Release version 4.2.2 new 52b2507fb3 Resolve conflict, finish propagate Summary of changes: NEWS | 5 + README| 2 +- alire_rules.make | 16 wisi-process-parse.el | 3 ++- wisi.el | 4 ++-- wisi.texi | 10 +- 6 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 alire_rules.make
[elpa] externals/ada-mode updated (c749149421 -> fa98735095)
stephen_leake pushed a change to branch externals/ada-mode. from c749149421 More stuff for 8.0.4 new fa98735095 * Alire.make: Fix prj.el Summary of changes: Alire.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[elpa] externals/ada-mode c749149421: More stuff for 8.0.4
branch: externals/ada-mode commit c74914942100f71dd8e3e76c04c2e4833e614ea9 Author: Stephen Leake Commit: Stephen Leake More stuff for 8.0.4 --- build.sh | 3 --- install.sh | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 2118dc7f22..08b8ce7094 100755 --- a/build.sh +++ b/build.sh @@ -14,9 +14,6 @@ if type alr; then # alr get --build builds dependencies with release, but top with development. alr get emacs_ada_mode~8.0.3 cd emacs_ada_mode_*; alr build --release - -# WORKAROUND: this should be in alire_rules.make -mv ada_annex_p_lr1_parse_table.txt bin elif type gprbuild; then echo "building ada-mode executables via gnat compiler" diff --git a/install.sh b/install.sh index 0ff97429d2..8645b48b4a 100755 --- a/install.sh +++ b/install.sh @@ -16,6 +16,8 @@ echo "installing ada-mode executables to" $PREFIX/bin # No need for gprinstall; we only need the executable +mkdir -p $PREFIX/bin + if type alr; then cp emacs_ada_mode*/bin/* $PREFIX/bin
[elpa] externals/gpr-mode 9676e6361e: Version 1.0.3; packaging fixes
branch: externals/gpr-mode commit 9676e6361ef38fd953835b405df0d0c5517b Author: Stephen Leake Commit: Stephen Leake Version 1.0.3; packaging fixes --- NEWS | 4 ++-- gpr-mode.el | 4 ++-- gpr-mode.texi | 13 ++--- install.sh| 2 ++ 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index c49b37f866..46bace5245 100644 --- a/NEWS +++ b/NEWS @@ -6,8 +6,8 @@ Please send gpr-mode bug reports to bug-gnu-em...@gnu.org, with 'gpr-mode' in the subject. If possible, use M-x report-emacs-bug. -* gpr mode 1.0.2 -9 Jan 2023 +* gpr mode 1.0.3 +18 Jan 2023 ** Improve Alire packaging diff --git a/gpr-mode.el b/gpr-mode.el index b18ba83371..ccbac7bc9f 100644 --- a/gpr-mode.el +++ b/gpr-mode.el @@ -4,8 +4,8 @@ ;; Author: Stephen Leake ;; Maintainer: Stephen Leake -;; Version: 1.0.2 -;; package-requires: ((emacs "25.3") (wisi "4.2.0") (gnat-compiler "1.0.1")) +;; Version: 1.0.3 +;; package-requires: ((emacs "25.3") (wisi "4.2.2") (gnat-compiler "1.0.1")) ;; URL: https://stephe-leake.org/ada/wisitoken.html ;; This file is part of GNU Emacs. diff --git a/gpr-mode.texi b/gpr-mode.texi index 4be22b70f7..e4243099f6 100644 --- a/gpr-mode.texi +++ b/gpr-mode.texi @@ -23,21 +23,12 @@ developing GNU and promoting software freedom.'' * gpr mode: (gpr-mode). Emacs mode for editing and navigating gpr files (gnat project files). @end direntry -@titlepage -@sp 10 -@title gpr Mode 1.0 -@sp 2 -@subtitle An Emacs major mode for editing and navigating gpr files -@sp 2 -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - @contents @ifnottex @node Top, Overview, (dir), (dir) + +gpr-mode Version 1.0 @end ifnottex @menu diff --git a/install.sh b/install.sh index 2cda816129..045e8ef4c8 100755 --- a/install.sh +++ b/install.sh @@ -16,6 +16,8 @@ echo "installing gpr-mode executables to" $PREFIX/bin # No need for gprinstall; we only need the executables +mkdir -p $PREFIX/bin + if type alr; then cp emacs_gpr_mode*/bin/* $PREFIX/bin
[elpa] externals/ada-mode 977b0e0eeb: Release bug-fix version 8.0.4
branch: externals/ada-mode
commit 977b0e0eeb746c7e2f35697d5b925ca97efa4936
Author: Stephen Leake
Commit: Stephen Leake
Release bug-fix version 8.0.4
---
ELPA.make | 2 +-
NEWS | 8
README| 2 +-
ada-mode.el | 57 +
ada-mode.texi | 12 ++--
build.sh | 2 +-
6 files changed, 18 insertions(+), 65 deletions(-)
diff --git a/ELPA.make b/ELPA.make
index ccf76b7f89..698f751345 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -1,4 +1,4 @@
-# For compiling ada-mode Ada code in elpa worktree
+# For compiling ada-mode in elpa worktree
#export Standard_Common_Build := Debug
diff --git a/NEWS b/NEWS
index 4bd6076c99..c5830f9018 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Please send ada-mode bug reports to bug-gnu-em...@gnu.org, with
'ada-mode' in the subject. If possible, use M-x report-emacs-bug.
+Ada Mode 8.0.4
+16 Jan 2023
+
+** Misc bug fixes.
+
Ada Mode 8.0.3
6 Jan 2023
@@ -47,6 +52,9 @@ Ada Mode 8.0.3
** Minor bug fixes.
+* Ada Mode 7.3.0
+22 Oct 2022 beta promoted to release
+
* Ada Mode 7.3.beta
9 Jul 2022 beta testing
diff --git a/README b/README
index d2334b7c74..7db7121651 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 8.0.3
+Emacs Ada mode version 8.0.4
Ada mode provides auto-casing, fontification, navigation, and
indentation for Ada source code files.
diff --git a/ada-mode.el b/ada-mode.el
index 0f63b9e1f0..a67b46aa1b 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,8 +6,8 @@
;; Maintainer: Stephen Leake
;; Keywords: languages
;; ada
-;; Version: 8.0.3
-;; package-requires: ((uniquify-files "1.0.1") (wisi "4.2.0") (gnat-compiler
"1.0.1") (emacs "25.3"))
+;; Version: 8.0.4
+;; package-requires: ((uniquify-files "1.0.4") (wisi "4.2.2") (gnat-compiler
"1.0.1") (emacs "25.3"))
;; url: https://www.nongnu.org/ada-mode/
;;
;; This file is part of GNU Emacs.
@@ -117,7 +117,7 @@
(defun ada-mode-version ()
"Return Ada mode version."
(interactive)
- (let ((version-string "8.0.2"))
+ (let ((version-string "8.0.4"))
(if (called-interactively-p 'interactive)
(message version-string)
version-string)))
@@ -164,7 +164,7 @@ nil, only the file name."
;; global-map has C-x ` 'next-error
(define-key map [return]'wisi-case-adjust-interactive)
-(define-key map "\C-c`" 'ada-show-secondary-error)
+(define-key map "\C-c`" 'gnat-show-secondary-error)
(define-key map "\C-c;" (lambda () (error "use M-; instead"))) ;
comment-dwim
(define-key map "\C-c\M-`" 'wisi-fix-compiler-error)
(define-key map "\C-c\C-a" 'ada-align)
@@ -215,7 +215,7 @@ nil, only the file name."
)
("Build"
["Next compilation error/xref" next-error t]
- ["Show secondary error" ada-show-secondary-error t]
+ ["Show secondary error" gnat-show-secondary-error t]
["Fix compilation error"wisi-fix-compiler-error t]
["Show last parse error"wisi-show-parse-errort]
["Check syntax" ada-build-check t]
@@ -879,53 +879,6 @@ the file name."
(speedbar-add-supported-extension body))
)
-(defun ada-show-secondary-error ()
- "Show the next secondary file reference in the compilation buffer.
-A secondary file reference is defined by text having text
-property `gnat-secondary-error'. These can be set by
-compiler-specific compilation filters."
- (interactive)
-
- ;; preserving the current window works only if the frame
- ;; doesn't change, at least on Windows.
- (let ((start-buffer (current-buffer))
- pos item file)
-(when (eq major-mode 'compilation-mode)
- (setq next-error-last-buffer (current-buffer)))
-;; We use `pop-to-buffer', not `set-buffer', so point is correct
-;; for the current window showing next-error-last-buffer, and
-;; moving point in that window works. But that might eat an
-;; `other-frame-window-mode' prefix, which the user means to apply
-;; to ’ada-goto-source’ below; disable that temporarily.
-(let ((display-buffer-overriding-action nil))
- (pop-to-buffer next-error-last-buffer nil t)
- (setq pos (next-single-property-change (point) 'gnat-secondary-error))
- (unless pos
- ;; probably at end of compilation-buffer, in new compile
- (goto-char (point-min))
- (setq pos (next-single-property-change (point) 'gnat-secondary-error)))
-
- (when pos
- (setq item (get-text-property pos 'gnat-secondary-error))
- ;; file-relative-name handles absolute Windows paths from
- ;; g++. Do this in compilation buffer to get corr
[elpa] externals/wisi a12d524878: Release version 4.2.2
branch: externals/wisi commit a12d5248783d9c98d46c66c8fd3607fceb47b36d Author: Stephen Leake Commit: Stephen Leake Release version 4.2.2 --- NEWS | 8 README| 2 +- alire_rules.make | 16 wisi-process-parse.el | 3 ++- wisi.el | 4 ++-- wisi.texi | 10 +- 6 files changed, 14 insertions(+), 29 deletions(-) diff --git a/NEWS b/NEWS index 058168d67c..de041e5bf2 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ Please send wisi bug reports to bug-gnu-em...@gnu.org, with 'wisi' in the subject. If possible, use M-x report-emacs-bug. +* wisi 4.2.2 +16 Jan 2023 + +** Fix bug in wisi parser startup. + * wisi 4.2.0 3 Jan 2023 @@ -51,6 +56,9 @@ Please send wisi bug reports to bug-gnu-em...@gnu.org, with ** In wisi project files, import_env_var= can be used to inherit an environment variable from the Emacs process. +* wisi 4.0.0 +22 Oct 2022 beta prompted to release + * wisi 4.0.beta 9 Jul 2022 beta testing diff --git a/README b/README index 715c4da796..3fe3d2b3d8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Emacs wisi package 4.2.0 +Emacs wisi package 4.2.2 The wisi package provides utilities for using generalized error-correcting LR parsers (in external processes) to do indentation, diff --git a/alire_rules.make b/alire_rules.make deleted file mode 100644 index e214496368..00 --- a/alire_rules.make +++ /dev/null @@ -1,16 +0,0 @@ -# gnu make rules for building with Alire. - -# alr must be started in the directory holding alire.toml -alire-build : force - GPR_PROJECT_PATH= ; alr --no-tty --no-color $(ALIRE_ARGS) build $(ALIRE_BUILD_ARGS) - -alire-env : - GPR_PROJECT_PATH= ; alr $(ALIRE_ARGS) printenv - -alire-clean : - alr clean - rm -rf alire build/obj/release build/obj/development - -.PHONY : force - -# end of file diff --git a/wisi-process-parse.el b/wisi-process-parse.el index def4ce9c6e..94019e01b1 100644 --- a/wisi-process-parse.el +++ b/wisi-process-parse.el @@ -842,7 +842,8 @@ Source buffer is current." (cl-defun wisi-process-parse--prepare (parser parse-action nowait) "Check for parser busy and startup, mark parser busy, require parser process." - (unless (process-live-p (wisi-process--parser-process parser)) + (unless (or (not (wisi-process--parser-process parser)) ;; not created yet + (process-live-p (wisi-process--parser-process parser))) (wisi-parse-log-message parser "process died") (error "parser process died")) diff --git a/wisi.el b/wisi.el index ff517456a6..9ba44a3aad 100644 --- a/wisi.el +++ b/wisi.el @@ -7,7 +7,7 @@ ;; Keywords: parser ;; indentation ;; navigation -;; Version: 4.2.0 +;; Version: 4.2.2 ;; package-requires: ((emacs "25.3") (seq "2.20")) ;; URL: https://stephe-leake.org/ada/wisitoken.html ;; @@ -29,7 +29,7 @@ ;;; Commentary: - History: see NEWS-wisi.text + History: see NEWS ;; Design: ;; diff --git a/wisi.texi b/wisi.texi index 9949c5b1e1..684b2db916 100644 --- a/wisi.texi +++ b/wisi.texi @@ -23,21 +23,13 @@ developing GNU and promoting software freedom.'' * Wisi: (wisi). Error-correcting LR parsers and project integration. @end direntry -@titlepage -@sp 10 -@title Wisi Version 4.2.0 -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - @contents @ifnottex @node Top @top Top -Wisi Version 4.2.0 +Wisi Version 4.2 @end ifnottex @menu
[elpa] externals-release/wisi decea1307c: * wisi.el (Version): Bump to include prj-alire.el copyright fix
branch: externals-release/wisi commit decea1307cc18e7596468cca20c626b4c67d1f31 Author: Stephen Leake Commit: Stephen Leake * wisi.el (Version): Bump to include prj-alire.el copyright fix --- wisi.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wisi.el b/wisi.el index ff517456a6..3ac2c90f83 100644 --- a/wisi.el +++ b/wisi.el @@ -7,7 +7,7 @@ ;; Keywords: parser ;; indentation ;; navigation -;; Version: 4.2.0 +;; Version: 4.2.1 ;; package-requires: ((emacs "25.3") (seq "2.20")) ;; URL: https://stephe-leake.org/ada/wisitoken.html ;;
[elpa] externals/wisi updated (4fee1845ac -> 9ddff6cdf1)
stephen_leake pushed a change to branch externals/wisi. from 4fee1845ac * prj-alire.el: Add copyright notice new 9ddff6cdf1 * install.sh: Delete; copied from ada-mode but not edited Summary of changes: install.sh | 15 --- 1 file changed, 15 deletions(-) delete mode 100755 install.sh
[elpa] externals-release/gnat-compiler updated (abad4b333c -> 959c4d3596)
stephen_leake pushed a change to branch externals-release/gnat-compiler. from abad4b333c Add files to gnat-compiler adds a60dfd29b2 File header fixes adds 178098364e * ELPA.make: New file adds 97d26c0f18 Fix bug in alire-get-env; create-alire-project now works for als adds f1493ed944 Fix byte-compile adds 98a036fd6b * gnat-alire.el (alire-get-env): Handle comments in alr printenv output adds e69c29af4d Misc cleanups, fix bug in gnat-find-als adds c13ca26054 Add wisi-prj-default adds 0a14c9a2ca * gnat-alire.el (create-alire-project): Respect convention for create-%s-xref adds 2273ebad7f Misc fixes adds b9a35edb56 ; Fix typos adds 319951218d * ELPA.make: Delete WISI; not useful adds 5b0d334fd9 * ELPA.make (EMACS_EXE): Delete harfbuzz workaround adds ec01992149 ; Prefer HTTPS to HTTP in URLs adds 7496273a2e Match ada-mode function rename adds 8ca2e5bcd2 Finish merge adds d330e13e65 Rename create-alire-project to create-alire-prj adds 959c4d3596 Release version 1.0.1 No new revisions were added by this update. Summary of changes: .gitignore | 3 +++ ELPA.make| 37 ++ NEWS | 17 gnat-alire.el| 81 gnat-compiler.el | 75 ++- gnat-xref.el | 4 +-- notes.text | 19 + 7 files changed, 181 insertions(+), 55 deletions(-) create mode 100644 .gitignore create mode 100644 ELPA.make create mode 100644 NEWS create mode 100644 notes.text
[elpa] externals-release/ada-mode updated (64acce8bda -> cdf3e4640e)
stephen_leake pushed a change to branch externals-release/ada-mode. from 64acce8bda Release 7.3.1; fix install.sh bug adds 0215ceee18 Update to 8.0.2 devel release; split out gnat-compiler, gpr-mode, gpr-query adds 6daaf0ccbe Fix ada-mode.texi bug adds b16f2ce40b * install.sh: Fix comment on argument adds e72d65d459 * build.sh: Move *_parse_table.txt to bin, so install.sh copies it adds 27395c6f1e Finish merge adds 4ae81da579 Fix typos adds e419adcb8f ; Prefer HTTPS to HTTP in URLs adds c3d62e181d Release version 8.0.3 new cdf3e4640e Resolve conflicts, finish merge Summary of changes: Alire.make |11 + Makefile => ELPA.make |15 +- NEWS|47 +- README |30 +- ada-build.el|65 +- ada-compiler-gnat.el| 837 - ada-core.el | 427 +- ada-eglot.el| 422 + ada-gnat-xref.el| 332 - ada-imenu.el| 2 +- ada-indent-user-options.el | 4 +- ada-mode.casing | 7 + ada-mode.el | 648 +- ada-mode.texi | 452 +- ada-skel.el | 8 +- ada_annex_p-process.el |10 +- ada_annex_p.wy |67 +- ada_annex_p_process_actions.adb |20 +- ada_annex_p_process_actions.ads |11 +- ada_annex_p_process_lalr_main.adb | 2503 +- ada_annex_p_process_lalr_main.ads |17 +- ada_annex_p_process_lr1_main.adb|32 +- ada_annex_p_process_lr1_main.ads|19 +- ada_annex_p_re2c.c | 36588 +- ada_annex_p_re2c_c.ads | 2 +- ada_mode.prj| 1 + ada_mode_wisi_lalr_parse.ads| 8 +- ada_mode_wisi_lr1_parse.ads | 8 +- ada_mode_wisi_parse.gpr.gp | 150 - benchmark-xref.el | 2 +- build.sh|70 +- create_makefile_conf.sh |19 - doclicense.texi | 4 +- gpr-indent-user-options.el |48 - gpr-mode.el | 429 - gpr-mode.texi | 256 - gpr-process.el | 148 - gpr-query.el| 1090 - gpr-skel.el | 137 - gpr.wy | 384 - gpr_mode_wisi_parse.ads |37 - gpr_process_actions.adb | 418 - gpr_process_actions.ads | 305 - gpr_process_main.adb| 2625 -- gpr_process_main.ads|31 - gpr_query.adb | 1379 - gpr_re2c.c | 7693 -- gpr_re2c_c.ads |74 - install.sh |31 +- prj.el |37 +- run_ada_lalr_parse.ads | 8 +- run_ada_lr1_parse.ads | 8 +- run_gpr_parse.ads |35 - wisi-ada.adb|54 +- wisi-ada.ads| 4 - wisi-gpr.adb|79 - wisi-gpr.ads|60 - wisitoken-parse-lr-mckenzie_recover-ada.adb |17 +- 58 files changed, 21035 insertions(+), 37190 deletions(-) create mode 100644 Alire.make rename Makefile => ELPA.make (68%) delete mode 100644 ada-compiler-gnat.el create mode 100644 ada-eglot.el delete mode 100644 ada-gnat-xref.el create mode 100644 ada-mode.casing delete mode 100644 ada_mode_wisi_parse.gpr.gp delete mode 100755 create_makefile_conf.sh delete mode 100644 gpr-indent-user-options.el delete mode 100644 gpr-mode.el delete mode 100644 gpr-mode.texi delete mode 100644 gpr-process.el delete mode 100644 gpr-query.el delete mode 100644 gpr-skel.el delete mode 100644 gpr.wy delete mode 100644 gpr_mode_wisi_parse.ads delete mode 100644 gpr_process_actions.adb delete mode 100644 gpr_process_actions.ads delete mode 100644 gpr_process_main.adb delete mode 100644 gpr_process_main.ads delete mode 100644 gpr_query.adb delete mode 100644 gpr_re2c.c delete mode 100644 gpr_re2c_c.ads delete mode 100644 run_gpr_parse.ads delete mode 100644 wisi-gpr.adb delete mode 100644 wisi-gpr.ads
[elpa] externals-release/wisi 9ddff6cdf1 1/2: * install.sh: Delete; copied from ada-mode but not edited
branch: externals-release/wisi commit 9ddff6cdf1dca93b7a661b2874a15a43c180f61b Author: Stephen Leake Commit: Stephen Leake * install.sh: Delete; copied from ada-mode but not edited --- install.sh | 15 --- 1 file changed, 15 deletions(-) diff --git a/install.sh b/install.sh deleted file mode 100755 index 886fc94eed..00 --- a/install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Install executables for Ada mode. -# -# See build.sh for build (must be run before install). - -# $1 : optional --prefix= -# -# If you don't have write permission in the GNAT installation -# directory, you need to use --prefix=, or run with root priviledges. - -WISI_DIR=`ls -d ../wisi-3.1.?` - -gprinstall -f -p -P ada_mode_wisi_parse.gpr -aP $WISI_DIR --install-name=ada_mode_wisi_parse $1 - -# end of file.
[elpa] externals-release/gpr-query updated (57365547c8 -> da47f81da1)
stephen_leake pushed a change to branch externals-release/gpr-query.
from 57365547c8 Add files to gpr-query
adds a9cb407ef8 Misc improve
adds 32c123e157 Misc fixes
adds 5a62db91fc * prj-eglot.el: Delete
adds 542cbf35d6 * ELPA.make (all): Add docs
adds 5104f6f836 * prj.el ("gpr-query.prj"): Use elpa package dirs
adds 99f50385ee * gpr-query.el (gpr-query-session-wait): Restore busy
message
adds 3a8e67a795 Delete gpr-query minor mode; fix executable bit
adds fd1670eded * install.sh: Just copy alr build binary, clean up
adds 6356b18639 * build.sh: Show compiler
adds ca70129df3 Finish merge
adds 41b736e746 ; Fix typos
adds dbbf1ab955 * Alire.make: Match prj.el rename.
adds 89e32005c0 ; Prefer HTTPS to HTTP in URLs
adds 92ac06f23d Release version 1.0.2
adds da47f81da1 * alire.toml: Fix gnat version
No new revisions were added by this update.
Summary of changes:
.gitignore | 7 +++
Alire.make | 7 ---
ELPA.make | 44 ++--
NEWS| 6 ++
README | 5 +
alire.toml | 4 ++--
build.sh| 3 ++-
doclicense.texi | 4 ++--
gpr-query.el| 56
gpr-query.prj | 1 -
gpr-query.texi | 32 ++--
install.sh | 17 +++--
notes.text | 24 +---
prj-eglot.el| 41 -
prj.el | 4 ++--
15 files changed, 82 insertions(+), 173 deletions(-)
create mode 100644 .gitignore
mode change 100644 => 100755 build.sh
mode change 100644 => 100755 install.sh
delete mode 100644 prj-eglot.el
[elpa] externals-release/gpr-mode updated (1932e3a42c -> 823df70936)
stephen_leake pushed a change to branch externals-release/gpr-mode. from 1932e3a42c Add files to gpr-mode adds 1030be428b * build.sh, install.sh: Set executable bit adds 781e7993cc * install.sh: Just copy executable; clean up adds 24e67684df Fix header comment style adds 924bad9645 Fix header comment style again, improve install.sh adds 69de22ba68 Resolve conflicts, finish merge adds eb53a24c6d ; Fix typo adds 823df70936 ; Prefer HTTPS to HTTP in URLs No new revisions were added by this update. Summary of changes: build.sh | 0 doclicense.texi| 4 ++-- gpr-indent-user-options.el | 6 +++--- gpr-mode.el| 4 ++-- gpr-mode.texi | 2 +- gpr-process.el | 2 +- gpr-skel.el| 6 +++--- gpr.wy | 2 +- gpr_process_actions.adb| 2 +- gpr_process_actions.ads| 2 +- gpr_process_main.adb | 2 +- gpr_process_main.ads | 2 +- gpr_re2c.c | 2 +- gpr_re2c_c.ads | 2 +- install.sh | 35 +++ prj-eglot.el | 40 16 files changed, 34 insertions(+), 79 deletions(-) mode change 100644 => 100755 build.sh mode change 100644 => 100755 install.sh delete mode 100644 prj-eglot.el
[elpa] externals-release/wisi updated (dd717efa4b -> 6b011cf077)
stephen_leake pushed a change to branch externals-release/wisi. from dd717efa4b Delete "beta" from version adds 8ee3847f8c Update to wisi 4.1.1 adds 42884728cd Finish commit for upgrade to 4.1.1 adds c101d1009a ; Fix typos adds 6eb5e05ae6 * .gitignore: Ignore autoloads.el adds e7d848deff ; Prefer HTTPS to HTTP in most URLs adds 511d382b2b Release version 4.2.0 adds 4fee1845ac * prj-alire.el: Add copyright notice new 9ddff6cdf1 * install.sh: Delete; copied from ada-mode but not edited new 6b011cf077 Resolve conflicts, finish merge Summary of changes: .gitignore |1 + Alire.make | 10 + ELPA.make | 31 + NEWS| 47 +- README |9 +- alire_rules.make| 16 + doclicense.texi |4 +- emacs_wisi_common_parse.adb | 110 +- emacs_wisi_common_parse.ads |6 +- gen_emacs_wisi_lr_parse.adb | 29 +- gen_emacs_wisi_lr_parse.ads | 14 +- gen_emacs_wisi_lr_text_rep_parse.adb| 96 +- gen_emacs_wisi_lr_text_rep_parse.ads| 15 +- gen_emacs_wisi_packrat_parse.adb| 180 - gen_emacs_wisi_packrat_parse.ads| 42 - gen_run_wisi_lr_parse.adb | 44 +- gen_run_wisi_lr_parse.ads | 14 +- gen_run_wisi_lr_text_rep_parse.adb | 49 +- gen_run_wisi_lr_text_rep_parse.ads | 15 +- gen_run_wisi_packrat_parse.adb | 241 - gen_run_wisi_packrat_parse.ads | 36 - gnat-core.el| 487 -- install.sh | 15 - prj-alire.el| 29 + prj-wisi.el | 30 + run_wisi_common_parse.adb | 183 +- run_wisi_common_parse.ads |8 +- sal-gen_definite_doubly_linked_lists.adb|4 +- sal-gen_definite_doubly_linked_lists.ads|3 +- sal-gen_indefinite_doubly_linked_lists.adb | 41 +- sal-gen_indefinite_doubly_linked_lists.ads |5 +- sal.adb |2 +- standard_common.gpr | 10 +- wisi-fringe.el | 113 +- wisi-parse-common.el| 61 +- wisi-parse_context.adb | 87 +- wisi-parse_context.ads | 53 +- wisi-prj.el | 315 +- wisi-process-parse.el | 299 +- wisi-run-indent-test.el | 220 +- wisi-skel.el| 18 +- wisi.adb| 73 +- wisi.ads| 13 +- wisi.el | 410 +- wisi.texi | 28 +- wisitoken-bnf-generate.adb | 77 +- wisitoken-bnf-generate_packrat.adb | 75 +- wisitoken-bnf-generate_utils.adb| 18 +- wisitoken-bnf-output_ada.adb| 53 +- wisitoken-bnf-output_ada_common.adb | 232 +- wisitoken-bnf-output_ada_common.ads | 12 +- wisitoken-bnf-output_ada_emacs.adb | 23 +- wisitoken-bnf.adb |1 + wisitoken-bnf.ads | 16 +- wisitoken-generate-lr-lalr_generate.adb | 25 +- wisitoken-generate-lr-lalr_generate.ads | 19 +- wisitoken-generate-lr-lr1_generate.adb | 652 +- wisitoken-generate-lr-lr1_generate.ads | 24 +- wisitoken-lexer-re2c.adb|6 +- wisitoken-lexer.adb |4 +- wisitoken-parse-lr-mckenzie_recover-explore.adb |7 +- wisitoken-parse-lr-mckenzie_recover.adb | 10 +- wisitoken-parse-lr-parser-parse.adb |9 +- wisitoken-parse-lr-parser.adb | 194 +- wisitoken-parse-lr-parser.ads | 24 +- wisitoken-parse-lr-parser_no_recover.adb| 72 +- wisitoken-parse-lr-parser_no_recover.ads| 12 - wisitoken-parse-lr.adb | 13 + wisitoken-parse-lr.ads |6 +- wisitoken-parse-packrat-generated.adb | 43 +- wisitoken-parse-packrat-generated.ads | 41 +- wisitoken-parse-packrat-procedural.adb | 258 +- wisitoken-parse-packrat-procedural.ads | 40 +- wisitoken-parse-packrat.adb | 212 +-
[elpa] externals/wisi updated (e7d848deff -> 4fee1845ac)
stephen_leake pushed a change to branch externals/wisi. from e7d848deff ; Prefer HTTPS to HTTP in most URLs new 511d382b2b Release version 4.2.0 new 4fee1845ac * prj-alire.el: Add copyright notice Summary of changes: Alire.make | 10 + ELPA.make | 34 +- NEWS | 31 +- README | 2 +- alire_rules.make | 16 + emacs_wisi_common_parse.adb| 3 +- emacs_wisi_common_parse.ads| 3 +- gen_emacs_wisi_lr_parse.adb| 12 +- gen_emacs_wisi_lr_text_rep_parse.adb | 12 +- gen_run_wisi_lr_parse.adb | 12 +- gen_run_wisi_lr_text_rep_parse.adb | 12 +- install.sh | 2 +- prj-alire.el | 29 ++ prj-wisi.el| 30 ++ run_wisi_common_parse.adb | 10 +- run_wisi_common_parse.ads | 5 +- standard_common.gpr| 7 + wisi-fringe.el | 107 +- wisi-parse_context.adb | 3 +- wisi-parse_context.ads | 2 +- wisi-prj.el| 24 +- wisi-process-parse.el | 40 ++- wisi-run-indent-test.el| 57 ++- wisi-skel.el | 8 +- wisi.el| 101 -- wisi.texi | 12 +- wisitoken-bnf-generate.adb | 36 +- wisitoken-bnf-output_ada.adb | 12 +- wisitoken-bnf.adb | 1 + wisitoken-bnf.ads | 13 +- wisitoken-generate-lr-lr1_generate.adb | 629 + wisitoken-generate-lr-lr1_generate.ads | 18 +- wisitoken-lexer-re2c.ads | 2 +- wisitoken-parse-lr-parser-parse.adb| 3 +- wisitoken-parse-lr-parser.adb | 6 + wisitoken-parse-lr-parser.ads | 12 +- wisitoken-parse.ads| 1 + wisitoken-parse_table-mode.el | 10 +- wisitoken-user_guide.texinfo | 6 +- wisitoken_grammar_actions.adb | 2 +- wisitoken_grammar_actions.ads | 2 +- wisitoken_grammar_main.adb | 2 +- wisitoken_grammar_main.ads | 2 +- wisitoken_grammar_re2c.c | 2 +- wisitoken_grammar_re2c_c.ads | 2 +- 45 files changed, 429 insertions(+), 916 deletions(-) create mode 100644 Alire.make create mode 100644 alire_rules.make mode change 100644 => 100755 install.sh create mode 100644 prj-alire.el create mode 100644 prj-wisi.el
[elpa] externals/wisi 4fee1845ac 2/2: * prj-alire.el: Add copyright notice
branch: externals/wisi commit 4fee1845acd1df2bef926046464615a67767abc3 Author: Stephen Leake Commit: Stephen Leake * prj-alire.el: Add copyright notice --- prj-alire.el | 20 +++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/prj-alire.el b/prj-alire.el index 773c435d3f..269b4d8f25 100644 --- a/prj-alire.el +++ b/prj-alire.el @@ -1,9 +1,27 @@ ;; Set up building with Alire -*- no-byte-compile : t -*- +;; +;; Copyright (C) 2021, 2022 Free Software Foundation, Inc. +;; +;; This file is part of GNU Emacs. +;; +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. + (wisi-prj-select-cache "prj-alire.el" (create-alire-prj - :name "wisi stephe-3 Alire eglot" + :name "wisi main Alire" :gpr-file gpr-file :xref-label 'gpr_query) "Makefile")
[elpa] externals/wisi 511d382b2b 1/2: Release version 4.2.0
branch: externals/wisi commit 511d382b2be240a601c7e5807532d8b09e37785c Author: Stephen Leake Commit: Stephen Leake Release version 4.2.0 --- Alire.make | 10 + ELPA.make | 34 +- NEWS | 31 +- README | 2 +- alire_rules.make | 16 + emacs_wisi_common_parse.adb| 3 +- emacs_wisi_common_parse.ads| 3 +- gen_emacs_wisi_lr_parse.adb| 12 +- gen_emacs_wisi_lr_text_rep_parse.adb | 12 +- gen_run_wisi_lr_parse.adb | 12 +- gen_run_wisi_lr_text_rep_parse.adb | 12 +- install.sh | 2 +- prj-alire.el | 11 + prj-wisi.el| 30 ++ run_wisi_common_parse.adb | 10 +- run_wisi_common_parse.ads | 5 +- standard_common.gpr| 7 + wisi-fringe.el | 107 +- wisi-parse_context.adb | 3 +- wisi-parse_context.ads | 2 +- wisi-prj.el| 24 +- wisi-process-parse.el | 40 ++- wisi-run-indent-test.el| 57 ++- wisi-skel.el | 8 +- wisi.el| 101 -- wisi.texi | 12 +- wisitoken-bnf-generate.adb | 36 +- wisitoken-bnf-output_ada.adb | 12 +- wisitoken-bnf.adb | 1 + wisitoken-bnf.ads | 13 +- wisitoken-generate-lr-lr1_generate.adb | 629 + wisitoken-generate-lr-lr1_generate.ads | 18 +- wisitoken-lexer-re2c.ads | 2 +- wisitoken-parse-lr-parser-parse.adb| 3 +- wisitoken-parse-lr-parser.adb | 6 + wisitoken-parse-lr-parser.ads | 12 +- wisitoken-parse.ads| 1 + wisitoken-parse_table-mode.el | 10 +- wisitoken-user_guide.texinfo | 6 +- wisitoken_grammar_actions.adb | 2 +- wisitoken_grammar_actions.ads | 2 +- wisitoken_grammar_main.adb | 2 +- wisitoken_grammar_main.ads | 2 +- wisitoken_grammar_re2c.c | 2 +- wisitoken_grammar_re2c_c.ads | 2 +- 45 files changed, 411 insertions(+), 916 deletions(-) diff --git a/Alire.make b/Alire.make new file mode 100644 index 00..74f5027966 --- /dev/null +++ b/Alire.make @@ -0,0 +1,10 @@ +# Build Ada parts of Emacs wisi with Alire; see build/Makefile for non-Alire build + +STEPHES_ADA_LIBRARY_ALIRE_PREFIX ?= $(CURDIR)/../org.stephe_leake.sal + +include $(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make + +# Local Variables: +# eval: (unless dvc-doing-ediff-p (load-file "prj-wisi.el")) +# End: +# end of file diff --git a/ELPA.make b/ELPA.make index 27829eef96..566092f31a 100644 --- a/ELPA.make +++ b/ELPA.make @@ -1,31 +1,31 @@ -# For compiling in elpa +# For compiling wisi code in elpa worktree -.PHONY : all force - -all : byte-compile autoloads +#export Standard_Common_Build := Debug -ifeq ($(shell uname),Linux) -EMACS_EXE ?= emacs +.PHONY : all force -else ifeq ($(shell uname),Darwin) -EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs" +all : build_ada byte-compile -else -# windows -# specify uniscribe to workaround weird Windows harfbuzz bug -EMACS_EXE ?= emacs -xrm Emacs.fontBackend:uniscribe +build_ada : wisi.gpr force + gprbuild -p -j8 wisi.gpr -endif +wisi.gpr : wisi.gpr.gp + gnatprep -DELPA="yes" wisi.gpr.gp wisi.gpr -BYTE_COMPILE := "(progn (setq byte-compile-error-on-warn t)(batch-byte-compile))" +BYTE_COMPILE := "(progn (setq package-load-list '((wisi) (ada-mode) (gnat-compiler) all)) (package-initialize)(setq byte-compile-error-on-warn t)(batch-byte-compile))" byte-compile : byte-compile-clean - $(EMACS_EXE) -Q -batch -L . --eval $(BYTE_COMPILE) *.el + emacs -Q -batch -L . --eval $(BYTE_COMPILE) *.el byte-compile-clean : rm -f *.elc -autoloads : force - $(EMACS_EXE) -Q -batch --eval "(progn (setq generated-autoload-file (expand-file-name \"autoloads.el\"))(update-directory-autoloads \".\"))" +clean : force + rm -rf wisi.gpr obj *parse_table* +recursive-clean : force + gprclean -r -P wisi.gpr +# Local Variables: +# eval: (unless dvc-doing-ediff-p (load-file "prj-wisi.el")) +# End: # end of file diff --git a/NEWS b/NEWS index 478b6f91ef..058168d67c 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,40 @@ GNU Emacs wisi NEWS -- history of user-visible changes. -Copyright (C) 2014 - 2022 Free Software Foundation, Inc. +Copyright (C) 2014 - 2023 Free Software Foundation, Inc. Please send wisi bug reports to bug-gnu-em...@gnu.org, with 'wisi' in the subject. If possible, use
[elpa] externals/gpr-query 92ac06f23d 1/2: Release version 1.0.2
branch: externals/gpr-query
commit 92ac06f23d02c94aa89a1a5364776ea7df15d581
Author: Stephen Leake
Commit: Stephen Leake
Release version 1.0.2
* ELPA.make (%.info): Fix output dir.
* NEWS: Version.
* README:
* alire.toml:
* gpr-query.el:
* gpr-query.texi:
---
ELPA.make | 2 +-
NEWS | 6 ++
README | 5 +
alire.toml | 2 +-
gpr-query.el | 6 +++---
gpr-query.texi | 9 +
notes.text | 14 --
7 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/ELPA.make b/ELPA.make
index 0917b2d956..1476d451dd 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -35,7 +35,7 @@ autoloads : force
$(EMACS_EXE) -Q -batch --eval "(progn (setq generated-autoload-file
(expand-file-name \"autoloads.el\"))(update-directory-autoloads \".\"))"
%.info : %.texi
- makeinfo $< -o ../$@
+ makeinfo $< -o $@
clean : force
rm -rf gpr-query.info obj gpr_query$(EXE_EXT)
diff --git a/NEWS b/NEWS
index 35bf501f41..89682110e7 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,12 @@ Please send gpr-query bug reports to bug-gnu-em...@gnu.org,
with
'gpr-query' in the subject. If possible, use M-x report-emacs-bug.
+* gpr-query 1.0.2
+5 Jan 2023
+
+** Minor fixes.
+
* gpr-query 1.0.1
+1 Nov 2022
** Split out from ada-mode
diff --git a/README b/README
index 8687544f76..72eb0d377f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs gpr-query version 1.0.1
+Emacs gpr-query version 1.0.2
gpr-query provides an emacs xref backend using the cross-reference
information output by the AdaCore GNAT compiler.
@@ -18,6 +18,3 @@ Both shell scripts use Alire if the 'alr' executable is found
in PATH.
See gpr-query.info section Installation for more information on
installing; if not using Alire, you may need additional packages.
-
-Ada mode will automatically load gpr-query if the gpr_query executable
-is found in PATH; this may be overridden by setting ada-xref-tool.
diff --git a/alire.toml b/alire.toml
index f9e1a75412..af6944b7f9 100644
--- a/alire.toml
+++ b/alire.toml
@@ -1,7 +1,7 @@
name = "emacs_gpr_query"
description = "Emacs xref backend using information output by GNAT compiler."
tags = ["emacs", "xref"]
-version = "1.0.1"
+version = "1.0.2"
licenses = "GPL-3.0-or-later"
authors = ["Stephen Leake"]
diff --git a/gpr-query.el b/gpr-query.el
index e31b3b058e..abb3dc29a2 100644
--- a/gpr-query.el
+++ b/gpr-query.el
@@ -3,12 +3,12 @@
;; gpr-query supports Ada and any gcc language that supports the
;; AdaCore -fdump-xref switch (which includes C, C++).
;;
-;; Copyright (C) 2013 - 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2013 - 2023 Free Software Foundation, Inc.
;; Author: Stephen Leake
;; Maintainer: Stephen Leake
-;; Version: 1.0.1
-;; package-requires: ((emacs "25.3") (wisi "4.1") (gnat-compiler "1.0"))
+;; Version: 1.0.2
+;; package-requires: ((emacs "25.3") (wisi "4.2.0") (gnat-compiler "1.0.1"))
;; This file is part of GNU Emacs.
diff --git a/gpr-query.texi b/gpr-query.texi
index e14adb0709..c5205f69e8 100644
--- a/gpr-query.texi
+++ b/gpr-query.texi
@@ -2,7 +2,7 @@
@settitle gpr-query
@copying
-Copyright @copyright{} 2022 Free Software Foundation, Inc.
+Copyright @copyright{} 2022 - 2023 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
@titlepage
@sp 10
-@title gpr-query Version 1.0.1
+@title gpr-query Version 1.0.2
@page
@vskip 0pt plus 1filll
@insertcopying
@@ -37,7 +37,8 @@ developing GNU and promoting software freedom.''
@node Top, Overview, (dir), (dir)
@top Top
-gpr-query Version 1.0.1
+gpr-query Version 1.0.2
+@end ifnottex
@menu
* Overview::
@@ -204,4 +205,4 @@ make -C xref install
@appendix GNU Free Documentation License
@include doclicense.texi
-@end ifnottex
+@bye
diff --git a/notes.text b/notes.text
index ae90426295..5f6cabb8bf 100644
--- a/notes.text
+++ b/notes.text
@@ -38,22 +38,16 @@ check emacs buglist
tested in ada-mode; it uses the same test sources for multiple xref backends.
compare:
-ELPA.make pub
-
-(setq package-load-list '(all))
-(list-packages)
-install previous gpr-query from public ELPA for diffs
-
-(ediff-directories "~/.emacs.d/elpa/gpr-query-3.1.7"
"/Projects/elpa/packages/gpr-query" nil)
-../org.emacs.gpr-query/NEWS
+(ediff-directories "/Projects/elpa_release/gpr-query"
"/Projects/elpa/packages/gpr-query" nil)
+NEWS
copyright date
add release date
add new features
-build in elpa; /Projects/elpa/packages/gpr-query/ELPA.make
+ELPA.make all
Check copyright on files in elpa
-c:/Projects/elpa/GNUMakefile check-all
+../../GNUMakefile check/gpr-query
if any gpr-query files added to output, fix them (add or change to FSF)
bump version
[elpa] externals/gpr-query updated (89e32005c0 -> da47f81da1)
stephen_leake pushed a change to branch externals/gpr-query. from 89e32005c0 ; Prefer HTTPS to HTTP in URLs new 92ac06f23d Release version 1.0.2 new da47f81da1 * alire.toml: Fix gnat version Summary of changes: ELPA.make | 2 +- NEWS | 6 ++ README | 5 + alire.toml | 4 ++-- gpr-query.el | 6 +++--- gpr-query.texi | 9 + notes.text | 14 -- 7 files changed, 22 insertions(+), 24 deletions(-)
[elpa] externals/gnat-compiler 959c4d3596: Release version 1.0.1
branch: externals/gnat-compiler commit 959c4d359637d6ddabba5a531266c3bc95df5745 Author: Stephen Leake Commit: Stephen Leake Release version 1.0.1 * gnat-alire.el (wisi-prj-default): Match create-alire-prj rename. * gnat-compiler.el: Version. * notes.text: New file. * NEWS: New file. --- NEWS | 17 + gnat-alire.el| 2 +- gnat-compiler.el | 6 +++--- notes.text | 19 +++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS new file mode 100644 index 00..87fbbcd962 --- /dev/null +++ b/NEWS @@ -0,0 +1,17 @@ +GNU Emacs gnat compiler NEWS -- history of user-visible changes. + +Copyright (C) 2022 Free Software Foundation, Inc. + +Please send gnat-compiler bug reports to bug-gnu-em...@gnu.org, with +'gnat-compiler' in the subject. If possible, use M-x report-emacs-bug. + + +* gnat compiler 1.0.1 + +** Rename create-alire-project to create-alire-prj. + +** Fix bugs. + +* gnat compiler 1.0.0 + +** Split out from ada-mode. diff --git a/gnat-alire.el b/gnat-alire.el index b9b81856b1..fac90efe71 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -127,7 +127,7 @@ (cl-defmethod wisi-prj-default ((project alire-prj)) (let* ((gpr-file (gnat-compiler-gpr-file (wisi-prj-compiler project))) (default-directory (file-name-directory gpr-file))) -(create-alire-project +(create-alire-prj :name(wisi-prj-name project) :gpr-filegpr-file :compile-env (wisi-prj-compile-env project) diff --git a/gnat-compiler.el b/gnat-compiler.el index 3aa0d3fb06..9b9f6d1ffe 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -2,12 +2,12 @@ ;; ;; GNAT is provided by AdaCore; see https://www.adacore.com/community ;; -;;; Copyright (C) 2012 - 2022 Free Software Foundation, Inc. +;;; Copyright (C) 2012 - 2023 Free Software Foundation, Inc. ;; ;; Author: Stephen Leake ;; Maintainer: Stephen Leake -;; Version: 1.0.0 -;; package-requires: ((emacs "25.3") (wisi "4.1")) +;; Version: 1.0.1 +;; package-requires: ((emacs "25.3") (wisi "4.2.0")) ;; ;; This file is part of GNU Emacs. ;; diff --git a/notes.text b/notes.text new file mode 100644 index 00..107490f676 --- /dev/null +++ b/notes.text @@ -0,0 +1,19 @@ + release process +tested by ada-mode + +(ediff-directories "/Projects/elpa_release/gnat-compiler" "/Projects/elpa/packages/gnat-compiler" nil) +NEWS +copyright date +add release date +add new features +list fixed bugs + +bump versions +gnat-compiler.el +Version: +package-requires + +NEWS +if not done above + +# end of file
[elpa] externals/gpr-query da47f81da1 2/2: * alire.toml: Fix gnat version
branch: externals/gpr-query commit da47f81da18a021b8e76aba30574c0d76b801482 Author: Stephen Leake Commit: Stephen Leake * alire.toml: Fix gnat version --- alire.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alire.toml b/alire.toml index af6944b7f9..2de66f02f7 100644 --- a/alire.toml +++ b/alire.toml @@ -20,4 +20,4 @@ gnatcoll_sqlite = "^22.0.0" gnatcoll_xref = "^22.0.0" # We use Ada 2022 syntax, so need the -gnat2022 switch; introduced in gnat FSF 11, Community 2021. -gnat = ">=11 & <2000" +gnat = "(>=11 & <2000) | >=2021"
[elpa] externals/gnat-compiler d330e13e65: Rename create-alire-project to create-alire-prj
branch: externals/gnat-compiler commit d330e13e650a153fd1481ab68664039c3155234a Author: Stephen Leake Commit: Stephen Leake Rename create-alire-project to create-alire-prj * gnat-alire.el (create-alire-prj): Rename from create-alire-project, to be consistent with ada-mode create-ada-prj. Improve error message. --- gnat-alire.el | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnat-alire.el b/gnat-alire.el index b946cce19e..b9b81856b1 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -1,6 +1,6 @@ ;;; gnat-alire.el --- Support for building with Alire -*- lexical-binding:t -*- ;; -;;; Copyright (C) 2012 - 2022 Free Software Foundation, Inc. +;;; Copyright (C) 2012 - 2023 Free Software Foundation, Inc. ;; ;; Author: Stephen Leake ;; Maintainer: Stephen Leake @@ -86,7 +86,7 @@ )) ;;;###autoload -(cl-defun create-alire-project ( name gpr-file compile-env file-env xref-label) +(cl-defun create-alire-prj ( name gpr-file compile-env file-env xref-label) ;; We could use "alr exec -P -- echo" to get the project file (also ;; see https://github.com/alire-project/alire/issues/1151), but that ;; doesn't work when there are multiple project files listed in @@ -114,6 +114,8 @@ :gpr-file abs-gpr-file :run-buffer-name (gnat-run-buffer-name abs-gpr-file))) +(when (null xref-label) + (user-error "create-alire-prj: no xref backend specified; add :xref-label")) (setf (wisi-prj-xref project) (funcall (intern (format "create-%s-xref" (symbol-name xref-label)
[elpa] externals/gnat-compiler 2273ebad7f 1/2: Misc fixes
branch: externals/gnat-compiler commit 2273ebad7f31e149c3fa0b9a2c82707f398dad0c Author: Stephen Leake Commit: Stephen Leake Misc fixes * gnat-alire.el (create-alire-project): Call wisi-compiler-parse-one as well. * gnat-compiler.el (gnat-find-als): Handle locate-file return nil. --- gnat-alire.el| 3 ++- gnat-compiler.el | 9 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnat-alire.el b/gnat-alire.el index 489df1d450..7dc8090c54 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -117,7 +117,8 @@ (setf (wisi-prj-xref project) (funcall (intern (format "create-%s-xref" (symbol-name xref-label) -(wisi-xref-parse-one (wisi-prj-xref project) project "gpr_file" abs-gpr-file) +(wisi-compiler-parse-one (wisi-prj-compiler project) project "gpr_file" abs-gpr-file) +(wisi-xref-parse-one (wisi-prj-xref project) project "gpr_file" abs-gpr-file) project)) diff --git a/gnat-compiler.el b/gnat-compiler.el index cc0a004ce9..c46ce65e15 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -782,11 +782,10 @@ to AdaCore ada_language_server in `exec-path', then in a gnat installation found in `exec-path'. If NO-ERROR, return nil if server executable not found; otherwise signal user-error." (if gnat-lsp-server-exec - (progn -(setq gnat-lsp-server-exec (locate-file gnat-lsp-server-exec exec-path exec-suffixes)) -(if (and gnat-lsp-server-exec -(file-readable-p gnat-lsp-server-exec)) - gnat-lsp-server-exec + (let ((tmp (locate-file gnat-lsp-server-exec exec-path exec-suffixes))) +(if (and tmp +(file-readable-p tmp)) +(setq gnat-lsp-server-exec tmp) (user-error "gnat-lsp-server-exec '%s' not a readable file" gnat-lsp-server-exec)))
[elpa] externals/gnat-compiler 8ca2e5bcd2 2/2: Finish merge
branch: externals/gnat-compiler commit 8ca2e5bcd244c8d191035c3c4e011e31e534738e Merge: 2273ebad7f 7496273a2e Author: Stephen Leake Commit: Stephen Leake Finish merge --- ELPA.make| 6 +- gnat-alire.el| 2 +- gnat-compiler.el | 16 gnat-xref.el | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/ELPA.make b/ELPA.make index b0953e309f..157c9a0371 100644 --- a/ELPA.make +++ b/ELPA.make @@ -6,23 +6,19 @@ all : byte-compile autoloads ifeq ($(shell uname),Linux) EMACS_EXE ?= emacs -WISI ?= /Projects/org.emacs.wisi else ifeq ($(shell uname),Darwin) EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs" -WISI ?= /Projects/org.emacs.wisi else # windows -# specify uniscribe to workaround weird Windows harfbuzz bug -EMACS_EXE ?= emacs -xrm Emacs.fontBackend:uniscribe +EMACS_EXE ?= emacs WISI ?= c:/Projects/elpa/packages/wisi endif BYTE_COMPILE := "(progn (setq byte-compile-error-on-warn t)(batch-byte-compile))" byte-compile : byte-compile-clean - $(MAKE) -C $(WISI)/build byte-compile autoloads $(EMACS_EXE) -Q -batch -L . -L $(WISI) --eval $(BYTE_COMPILE) *.el byte-compile-clean : diff --git a/gnat-alire.el b/gnat-alire.el index 7dc8090c54..b946cce19e 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -18,7 +18,7 @@ ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;; See https://alire.ada.dev/ diff --git a/gnat-compiler.el b/gnat-compiler.el index c46ce65e15..3aa0d3fb06 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -22,7 +22,7 @@ ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. (require 'cl-lib) (require 'wisi-prj) @@ -715,10 +715,10 @@ Prompt user if more than one." (wisi-case-adjust-identifier) (delete-char 1))) -(defun gnat-context-clause () - (if (fboundp 'ada-fix-context-clause);; in ada-mode - (ada-fix-context-clause) -(user-error "ada-fix-context-clause not defined; can't find context clause"))) +(defun gnat-context-clause-region () + (if (fboundp 'ada-context-clause-region);; in ada-mode + (ada-context-clause-region) +(user-error "ada-context-clause-region not defined; can't find context clause"))) (defun gnat-extend-with-clause (partial-parent-name child-name) "Assuming point is in a selected name, just before CHILD-NAME, add or @@ -732,10 +732,10 @@ extend a with_clause to include CHILD-NAME." (skip-syntax-backward "w_.") (search-forward-regexp gnat-name-regexp parent-name-end t) (let ((parent-name (match-string 0)) - (context-clause (gnat-context-clause))) + (context-clause (gnat-context-clause-region))) (goto-char (car context-clause)) (if (search-forward-regexp (concat "^with " parent-name ";") (cdr context-clause) t) - ;; found exisiting 'with' for parent; extend it + ;; found existing 'with' for parent; extend it (progn (forward-char -1) ; skip back over semicolon (insert "." child-name)) @@ -1456,7 +1456,7 @@ server executable not found; otherwise signal user-error." ;; foo.c:2: `TRUE' undeclared here (not in a function) ;; foo.c:2 : `TRUE' undeclared here (not in a function) ;; - ;; we can't handle secondary errors here, because a regexp can't distinquish "message" from "filename" + ;; we can't handle secondary errors here, because a regexp can't distinguish "message" from "filename" "^\\(\\(.:\\)?[^ :\n]+\\):\\([0-9]+\\)\\s-?:?\\([0-9]+\\)?" 1 3 4)) (eval-after-load 'ada-mode '(add-hook 'ada-mode-hook #'gnatprep-setup)) diff --git a/gnat-xref.el b/gnat-xref.el index bba675caac..2a9e9a33f8 100644 --- a/gnat-xref.el +++ b/gnat-xref.el @@ -3,7 +3,7 @@ ;; These tools are all Ada-specific; see gpr-query for multi-language ;; GNAT cross-reference tools. ;; -;; GNAT is provided by AdaCore; see http://libre.adacore.com/ +;; GNAT is provided by AdaCore; see https://libre.adacore.com/ ;; ;;; Copyright (C) 2012 - 2022 Free Software Foundation, Inc. ;; @@ -23,7 +23,7 @@ ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. (require 'compile) (require 'gnat-compiler)
[elpa] externals/gnat-compiler 7496273a2e: Match ada-mode function rename
branch: externals/gnat-compiler commit 7496273a2e9cf971aeef232b252b2eea93c93a74 Author: Stephen Leake Commit: Stephen Leake Match ada-mode function rename * gnat-compiler.el (gnat-context-clause-region): Rename from gnat-context-clause, match ada-mode rename. --- gnat-compiler.el | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnat-compiler.el b/gnat-compiler.el index f297c1cfa5..74e7fd450e 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -715,10 +715,10 @@ Prompt user if more than one." (wisi-case-adjust-identifier) (delete-char 1))) -(defun gnat-context-clause () - (if (fboundp 'ada-fix-context-clause);; in ada-mode - (ada-fix-context-clause) -(user-error "ada-fix-context-clause not defined; can't find context clause"))) +(defun gnat-context-clause-region () + (if (fboundp 'ada-context-clause-region);; in ada-mode + (ada-context-clause-region) +(user-error "ada-context-clause-region not defined; can't find context clause"))) (defun gnat-extend-with-clause (partial-parent-name child-name) "Assuming point is in a selected name, just before CHILD-NAME, add or @@ -732,7 +732,7 @@ extend a with_clause to include CHILD-NAME." (skip-syntax-backward "w_.") (search-forward-regexp gnat-name-regexp parent-name-end t) (let ((parent-name (match-string 0)) - (context-clause (gnat-context-clause))) + (context-clause (gnat-context-clause-region))) (goto-char (car context-clause)) (if (search-forward-regexp (concat "^with " parent-name ";") (cdr context-clause) t) ;; found existing 'with' for parent; extend it
[elpa] externals/gnat-compiler 5b0d334fd9 2/2: * ELPA.make (EMACS_EXE): Delete harfbuzz workaround
branch: externals/gnat-compiler commit 5b0d334fd9c4d30b2e5ab478610facf7efc807e4 Author: Stephen Leake Commit: Stephen Leake * ELPA.make (EMACS_EXE): Delete harfbuzz workaround --- ELPA.make | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ELPA.make b/ELPA.make index a9377cdb18..157c9a0371 100644 --- a/ELPA.make +++ b/ELPA.make @@ -12,8 +12,7 @@ EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs" else # windows -# specify uniscribe to workaround weird Windows harfbuzz bug -EMACS_EXE ?= emacs -xrm Emacs.fontBackend:uniscribe +EMACS_EXE ?= emacs WISI ?= c:/Projects/elpa/packages/wisi endif
[elpa] externals/gnat-compiler 319951218d 1/2: * ELPA.make: Delete WISI; not useful
branch: externals/gnat-compiler commit 319951218de9d4a9611ef96319f0c9446c2828b6 Author: Stephen Leake Commit: Stephen Leake * ELPA.make: Delete WISI; not useful --- ELPA.make | 3 --- 1 file changed, 3 deletions(-) diff --git a/ELPA.make b/ELPA.make index b0953e309f..a9377cdb18 100644 --- a/ELPA.make +++ b/ELPA.make @@ -6,11 +6,9 @@ all : byte-compile autoloads ifeq ($(shell uname),Linux) EMACS_EXE ?= emacs -WISI ?= /Projects/org.emacs.wisi else ifeq ($(shell uname),Darwin) EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs" -WISI ?= /Projects/org.emacs.wisi else # windows @@ -22,7 +20,6 @@ endif BYTE_COMPILE := "(progn (setq byte-compile-error-on-warn t)(batch-byte-compile))" byte-compile : byte-compile-clean - $(MAKE) -C $(WISI)/build byte-compile autoloads $(EMACS_EXE) -Q -batch -L . -L $(WISI) --eval $(BYTE_COMPILE) *.el byte-compile-clean :
[elpa] externals/wisi 6eb5e05ae6: * .gitignore: Ignore autoloads.el
branch: externals/wisi commit 6eb5e05ae66cbb0e9b0ab484938d0a23a0be4f6b Author: Stephen Leake Commit: Stephen Leake * .gitignore: Ignore autoloads.el * ELPA.make: New file. --- .gitignore | 1 + ELPA.make | 31 +++ 2 files changed, 32 insertions(+) diff --git a/.gitignore b/.gitignore index 12798c6e35..cd54022dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ obj/ wisi.gpr wisitoken-user_guide.info wisitoken-bnf-generate.exe +autoloads.el diff --git a/ELPA.make b/ELPA.make new file mode 100644 index 00..27829eef96 --- /dev/null +++ b/ELPA.make @@ -0,0 +1,31 @@ +# For compiling in elpa + +.PHONY : all force + +all : byte-compile autoloads + +ifeq ($(shell uname),Linux) +EMACS_EXE ?= emacs + +else ifeq ($(shell uname),Darwin) +EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs" + +else +# windows +# specify uniscribe to workaround weird Windows harfbuzz bug +EMACS_EXE ?= emacs -xrm Emacs.fontBackend:uniscribe + +endif + +BYTE_COMPILE := "(progn (setq byte-compile-error-on-warn t)(batch-byte-compile))" +byte-compile : byte-compile-clean + $(EMACS_EXE) -Q -batch -L . --eval $(BYTE_COMPILE) *.el + +byte-compile-clean : + rm -f *.elc + +autoloads : force + $(EMACS_EXE) -Q -batch --eval "(progn (setq generated-autoload-file (expand-file-name \"autoloads.el\"))(update-directory-autoloads \".\"))" + + +# end of file
[elpa] externals/gpr-query dbbf1ab955: * Alire.make: Match prj.el rename.
branch: externals/gpr-query commit dbbf1ab95560344d5a1a0bd881f4f84c2bcdcd61 Author: Stephen Leake Commit: Stephen Leake * Alire.make: Match prj.el rename. * gpr-query.prj (casing): Delete; file not present. --- Alire.make| 2 +- gpr-query.prj | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Alire.make b/Alire.make index a52a8e8602..dfe494e602 100644 --- a/Alire.make +++ b/Alire.make @@ -6,5 +6,5 @@ install : bin/gpr_query$(EXE_EXT) gprinstall -f -p -P emacs_gpr_query.gpr --prefix=~/.local --install-name=gpr_query # Local Variables: -# eval: (load-file "prj-eglot.el") +# eval: (load-file "prj.el") # End: diff --git a/gpr-query.prj b/gpr-query.prj index d651ebeb6c..14d094a99a 100644 --- a/gpr-query.prj +++ b/gpr-query.prj @@ -1,2 +1 @@ gpr_file=emacs_gpr_query.gpr -casing=gpr-query.casing
[elpa] externals/gnat-compiler updated (b9a35edb56 -> 5b0d334fd9)
stephen_leake pushed a change to branch externals/gnat-compiler. from b9a35edb56 ; Fix typos new 319951218d * ELPA.make: Delete WISI; not useful new 5b0d334fd9 * ELPA.make (EMACS_EXE): Delete harfbuzz workaround Summary of changes: ELPA.make | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-)
[elpa] externals/gpr-mode 781e7993cc 2/3: * install.sh: Just copy executable; clean up
branch: externals/gpr-mode commit 781e7993cc4ffdd48fe966d397b7755e95c439fb Author: Stephen Leake Commit: Stephen Leake * install.sh: Just copy executable; clean up --- install.sh | 35 +++ 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/install.sh b/install.sh index 0f279215ac..2d37134cb6 100755 --- a/install.sh +++ b/install.sh @@ -1,31 +1,26 @@ #!/bin/sh # Install executables for Gpr mode. # +# $1 : optional +# # See build.sh for build (must be run before install). -if type alr; then -echo "installing gpr-mode executables via Alire" +if [ x$1 = x ]; then +PREFIX=$HOME/.local +# as recommended by https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html +else +PREFIX=$1 +fi + +echo "installing gpr-mode executables to" $PREFIX/bin -if [ x$1 == x ]; then -echo "you must specify the install directory with 'install.sh '" -return 1 -fi -# IMPROVEME: when alr supports install, use that -cp emacs_gpr_mode*/bin/* $1 +# No need for gprinstall; we only need the executable -elif type gprbuild; then -echo "installing gpr-mode executables via gnat compiler" - -# $1 : optional --prefix= -# -# If you don't have write permission in the GNAT installation -# directory, you need to use --prefix=, or run with root priviledges. +if type alr; then +cp emacs_gpr_mode*/bin/* $PREFIX/bin -if [ -d ../wisi-4.1.? ]; then -WISI_DIR=`ls -d ../wisi-4.1.?` -fi - -gprinstall -f -p -P gpr_mode_wisi_parse.gpr -aP $WISI_DIR --install-name=gpr_mode_wisi_parse $1 +elif type gprbuild; then +cp bin/* $PREFIX/bin else echo "neither Alire nor gnat compiler found"
[elpa] externals/gpr-mode updated (924bad9645 -> 69de22ba68)
stephen_leake pushed a change to branch externals/gpr-mode. from 924bad9645 Fix header comment style again, improve install.sh new 1030be428b * build.sh, install.sh: Set executable bit new 781e7993cc * install.sh: Just copy executable; clean up new 69de22ba68 Resolve conflicts, finish merge Summary of changes: build.sh | 0 install.sh | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 build.sh mode change 100644 => 100755 install.sh
[elpa] externals/gpr-mode 69de22ba68 3/3: Resolve conflicts, finish merge
branch: externals/gpr-mode commit 69de22ba688fb5df8cd2d4830aa27d8f651e24d6 Merge: 781e7993cc 924bad9645 Author: Stephen Leake Commit: Stephen Leake Resolve conflicts, finish merge --- gpr-indent-user-options.el | 4 ++-- gpr-mode.el| 2 +- gpr-skel.el| 4 ++-- install.sh | 2 +- prj-eglot.el | 40 5 files changed, 6 insertions(+), 46 deletions(-) diff --git a/gpr-indent-user-options.el b/gpr-indent-user-options.el index 174a5ebc0b..b724ad274b 100644 --- a/gpr-indent-user-options.el +++ b/gpr-indent-user-options.el @@ -1,4 +1,4 @@ -;; user options shared by gpr mode indentation engines -*- lexical-binding:t -*- +;;; user options shared by gpr mode indentation engines -*- lexical-binding:t -*- ;; ;; Copyright (C) 2017, 2019 Free Software Foundation, Inc. ;; @@ -45,4 +45,4 @@ (provide 'gpr-indent-user-options) -;; end file +;; gpr-indent-user-options.el ends here diff --git a/gpr-mode.el b/gpr-mode.el index d5b7db2ba7..a8b5d8fe41 100644 --- a/gpr-mode.el +++ b/gpr-mode.el @@ -1,4 +1,4 @@ -;; gpr-mode --- Major mode for editing GNAT project files -*- lexical-binding:t -*- +;;; gpr-mode.el --- Major mode for editing GNAT project files -*- lexical-binding:t -*- ;; Copyright (C) 2004, 2007, 2008, 2012-2015, 2017 - 2020, 2022 Free Software Foundation, Inc. diff --git a/gpr-skel.el b/gpr-skel.el index 9a53364fcf..599fadcb5e 100644 --- a/gpr-skel.el +++ b/gpr-skel.el @@ -1,4 +1,4 @@ -;; gpr-skel.el --- Extension to gpr-mode for inserting statement skeletons -*- lexical-binding:t -*- +;;; gpr-skel.el --- Extension to gpr-mode for inserting statement skeletons -*- lexical-binding:t -*- ;; Copyright (C) 2013-2015, 2018 - 2021 Free Software Foundation, Inc. @@ -134,4 +134,4 @@ Each user will probably want to override this." (add-hook 'gpr-mode-hook #'gpr-skel-setup) (provide 'gpr-skel) -;;; end of file +;;; gpr-skel.el ends here diff --git a/install.sh b/install.sh index 2d37134cb6..5e3456be3d 100755 --- a/install.sh +++ b/install.sh @@ -14,7 +14,7 @@ fi echo "installing gpr-mode executables to" $PREFIX/bin -# No need for gprinstall; we only need the executable +# No need for gprinstall; we only need the executables if type alr; then cp emacs_gpr_mode*/bin/* $PREFIX/bin diff --git a/prj-eglot.el b/prj-eglot.el deleted file mode 100644 index a88589f730..00 --- a/prj-eglot.el +++ /dev/null @@ -1,40 +0,0 @@ -;; project settings for building gpr-mode with Alire/editing with eglot -*- no-byte-compile : t -*- - -(require 'ada-mode) -;; This require is not needed for the following code, but is needed to -;; ensure ada-mode-hook has sal-ada-mode-setup. - -(setq ada-indent-engine 'wisi) ;; ada_language_server 22.0 doesn't support RangeFormatting - -(setq ada-xref-tool 'eglot) - -(add-hook 'ada-mode-hook #'ada-eglot-setup) - -(let* ((gpr-file (expand-file-name "emacs_gpr_mode.gpr" (file-name-directory load-file-name))) - (prj-file (expand-file-name "prj-eglot.prj" (file-name-directory load-file-name))) - (eglot-workspace-configuration (list `(ada (projectFile . ,gpr-file - - (project - (create-alire-project -:prj-name "gpr-mode main Alire eglot" -:prj-file prj-file -:gpr-file gpr-file))) - - (wisi-prj-select-cache prj-file nil "Makefile") - - ;; ada_language_server gets GPR_PROJECT_PATH from its process - ;; environment, and the gpr file from eglot-workspace-configuration. - (let ((process-environment -(append - (copy-sequence process-environment) - (wisi-prj-compile-env project) - (wisi-prj-file-env project - -(eglot 'ada-mode ;; managed-major-mode - project ;; project; project-root is server process directory - 'eglot-lsp-server ;; class - 'gnat-find-als ;; contact - "Ada" ;; language-id - )) - ) -;; end of file
[elpa] externals/ada-mode 27395c6f1e 2/2: Finish merge
branch: externals/ada-mode commit 27395c6f1e5070b074b0e0cc9f7749f6c6780cd7 Merge: b16f2ce40b e72d65d459 Author: Stephen Leake Commit: Stephen Leake Finish merge --- build.sh | 4 1 file changed, 4 insertions(+) diff --git a/build.sh b/build.sh index f88790beba..fa87fda833 100755 --- a/build.sh +++ b/build.sh @@ -15,6 +15,9 @@ if type alr; then alr get emacs_ada_mode~8.0.2 cd emacs_ada_mode_*; alr build --release +# WORKAROUND: this should be in alire_rules.make +mv emacs_ada_mode_*/ada_annex_p_lr1_parse_table.txt emacs_ada_mode_*/bin + elif type gprbuild; then echo "building ada-mode executables via gnat compiler" @@ -45,6 +48,7 @@ elif type gprbuild; then $WISI_DIR/wisitoken-bnf-generate --task_count 1 ada_annex_p.wy gprbuild -p -j8 -P ada_mode_wisi_parse.gpr -aP $WISI_DIR "$@" +mv ada_annex_p_lr1_parse_table.txt bin else echo "neither Alire nor gnat compiler found"
[elpa] externals/gpr-query 5104f6f836 1/5: * prj.el ("gpr-query.prj"): Use elpa package dirs
branch: externals/gpr-query
commit 5104f6f8368a8fbe6162d030c3218ea30b580f55
Author: Stephen Leake
Commit: Stephen Leake
* prj.el ("gpr-query.prj"): Use elpa package dirs
---
prj.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/prj.el b/prj.el
index bc6ad675f1..d16bcb9007 100644
--- a/prj.el
+++ b/prj.el
@@ -8,8 +8,8 @@
:name "gpr-query elpa"
:compile-env
(list
- (concat "GNAT_COMPILER=" (expand-file-name "../org.emacs.gnat-compiler"))
- (concat "WISI=" (expand-file-name "../org.emacs.wisi"))
+ (concat "GNAT_COMPILER=" (expand-file-name "../gnat-compiler"))
+ (concat "WISI=" (expand-file-name "../wisi"))
))
"ELPA.make"
)
[elpa] externals/gpr-query 3a8e67a795 3/5: Delete gpr-query minor mode; fix executable bit
branch: externals/gpr-query
commit 3a8e67a7955ec1e2ec28a34640b4a50ec552b656
Author: Stephen Leake
Commit: Stephen Leake
Delete gpr-query minor mode; fix executable bit
* gpr-query.el (gpr-query-map, gpr-query-menu, gpr-query): Delete;
replaced by minor-mode in ada-mode.
(create-gpr_query-xref): Don't take gpr-file arg.
* build.sh, install.sh: Set executable bit.
---
build.sh | 0
gpr-query.el | 38 +++---
install.sh | 0
3 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
diff --git a/gpr-query.el b/gpr-query.el
index e8303a32d4..ec7b277314 100644
--- a/gpr-query.el
+++ b/gpr-query.el
@@ -653,39 +653,6 @@ with compilation-error-regexp-alist set to COMP-ERR."
(+ (abs (- found-col col))
(* (abs (- found-line line)) 250)))
-(defvar gpr-query-map
- (let ((map (make-sparse-keymap)))
-;; C-c C-i prefix for gpr-query minor mode
-
-(define-key map "\C-c\C-i\C-d" 'gpr-query-goto-declaration)
-(define-key map "\C-c\C-i\C-q" 'gpr-query-refresh)
-(define-key map "\C-c\C-i\C-r" 'gpr-query-show-references)
-;; IMPROVEME: (define-key map "\C-c\M-d" 'gpr-query-parents)
-;; IMPROVEME: overriding
-map
- ) "Local keymap used for gpr query minor mode.")
-
-(defvar gpr-query-menu (make-sparse-keymap "gpr-query"))
-(easy-menu-define gpr-query-menu gpr-query-map "Menu keymap for gpr-query
minor mode"
- '("gpr-query"
-["Next xref" next-error t]
-["Goto declaration/body" xref-find-definitionst]
-["Show parent declarations" wisi-show-declaration-parents t]
-["Show references" wisi-show-references t]
-["Show overriding" wisi-show-overriding t]
-["Show overridden" wisi-show-overridden t]
-["Refresh cross reference cache" wisi-refresh-prj-cache t]
-))
-
-(define-minor-mode gpr-query
- "Minor mode for navigating sources using GNAT cross reference tool.
-Enable mode if ARG is positive."
- :initial-value t
- :lighter " gpr-query" ;; mode line
-
- ;; just enable the menu and keymap
- )
-
(defun gpr-query--normalize-filename (file)
"Convert FILE from native format to Emacs standard.
FILE is from gpr-query."
@@ -712,9 +679,10 @@ FILE is from gpr-query."
)
;;;###autoload
-(cl-defun create-gpr_query-xref ( gpr-file)
+(cl-defun create-gpr_query-xref ()
;; See note on `create-ada-prj' for why this is not a defalias.
- (make-gpr-query-xref :gpr-file gpr-file))
+ ;; The gpr file is set later by parsing the project file.
+ (make-gpr-query-xref))
(cl-defmethod wisi-xref-parse-one ((xref gpr-query-xref) project name value)
(wisi-compiler-parse-one xref project name value))
diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
[elpa] externals/gpr-query ca70129df3 5/5: Finish merge
branch: externals/gpr-query commit ca70129df33adc80340b40edb860c3bfe0d5d718 Merge: fd1670eded 6356b18639 Author: Stephen Leake Commit: Stephen Leake Finish merge --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2c70e6607a..4f6d3f1ad0 100755 --- a/build.sh +++ b/build.sh @@ -9,7 +9,8 @@ if type alr; then # alr can be installed from https://alire.ada.dev/ -echo "building gpr_query via Alire" +echo "building gpr_query via Alire; compiler:" +alr toolchain alr get emacs_gpr_query~1.0.1 cd emacs_gpr_query_*; alr build --release
[elpa] externals/gpr-mode 1030be428b 1/3: * build.sh, install.sh: Set executable bit
branch: externals/gpr-mode commit 1030be428b0ceab93e5fec785728dca76da8f7de Author: Stephen Leake Commit: Stephen Leake * build.sh, install.sh: Set executable bit --- build.sh | 0 install.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/install.sh b/install.sh old mode 100644 new mode 100755
[elpa] externals/gpr-query updated (6356b18639 -> ca70129df3)
stephen_leake pushed a change to branch externals/gpr-query.
from 6356b18639 * build.sh: Show compiler
new 5104f6f836 * prj.el ("gpr-query.prj"): Use elpa package dirs
new 99f50385ee * gpr-query.el (gpr-query-session-wait): Restore busy
message
new 3a8e67a795 Delete gpr-query minor mode; fix executable bit
new fd1670eded * install.sh: Just copy alr build binary, clean up
new ca70129df3 Finish merge
Summary of changes:
build.sh | 0
gpr-query.el | 40
install.sh | 17 +++--
prj.el | 4 ++--
4 files changed, 17 insertions(+), 44 deletions(-)
mode change 100644 => 100755 build.sh
mode change 100644 => 100755 install.sh
[elpa] externals/gpr-query fd1670eded 4/5: * install.sh: Just copy alr build binary, clean up
branch: externals/gpr-query commit fd1670eded985f20ca0fd1f9254f7d8f05452e12 Author: Stephen Leake Commit: Stephen Leake * install.sh: Just copy alr build binary, clean up --- install.sh | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 961272cba8..b6d6c25113 100755 --- a/install.sh +++ b/install.sh @@ -3,21 +3,26 @@ # # See build.sh for build (must be run before install). -# $1 : optional --prefix= +# $1 : optional # # If you don't have write permission in the GNAT installation # directory, you need to use --prefix=, or run with root # privileges. -# We use 'gprinstall', because it defaults to the gnat compiler -# install directory; gpr_query relies on the format of the *.ali -# files, so it is tightly tied to the compiler version. +if [ x$1 = x ]; then +PREFIX=$HOME/.local +# as recommended by https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html +else +PREFIX=$1 +fi + +echo "installing gpr-query executables to" $PREFIX/bin if type alr; then -alr exec -- gprinstall -f -p -P emacs_gpr_query.gpr --install-name=emacs_gpr_query $1 +cp emacs_gpr_query/bin/* $PREFIX/bin elif type gprbuild; then -gprinstall -f -p -P emacs_gpr_query.gpr --install-name=emacs_gpr_query $1 +cp bin/* $PREFIX/bin else echo "neither Alire nor gnat compiler found"
[elpa] externals/gpr-query 99f50385ee 2/5: * gpr-query.el (gpr-query-session-wait): Restore busy message
branch: externals/gpr-query commit 99f50385eee43429ce0ad34d4a86b32b8bdb07e3 Author: Stephen Leake Commit: Stephen Leake * gpr-query.el (gpr-query-session-wait): Restore busy message --- gpr-query.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpr-query.el b/gpr-query.el index 97046cc427..e8303a32d4 100644 --- a/gpr-query.el +++ b/gpr-query.el @@ -419,7 +419,7 @@ COMMAND-TYPE is one of xref or symbols." (message "gpr-query receiving symbols %s" gpr-query--symbols-progress (xref -(message "running gpr_query xref ... %d" wait-count) +(message "running gpr_query xref ... %s" (make-string wait-count ?.)) ;; process output is inserted before point, so move back over it to search it (with-current-buffer (process-buffer process)
[elpa] externals/ada-mode b16f2ce40b 1/2: * install.sh: Fix comment on argument
branch: externals/ada-mode commit b16f2ce40bac8f23e04e6f7891bc05dc9661b2f3 Author: Stephen Leake Commit: Stephen Leake * install.sh: Fix comment on argument --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 0ff97429d2..420a7f37e4 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/sh # Install executables for Ada mode. # -# $1 : optional --prefix= +# $1 : optional # # See build.sh for build (must be run before install).
[elpa] externals/gnat-compiler updated (e69c29af4d -> 0a14c9a2ca)
stephen_leake pushed a change to branch externals/gnat-compiler. from e69c29af4d Misc cleanups, fix bug in gnat-find-als new c13ca26054 Add wisi-prj-default new 0a14c9a2ca * gnat-alire.el (create-alire-project): Respect convention for create-%s-xref Summary of changes: gnat-alire.el | 31 ++- 1 file changed, 26 insertions(+), 5 deletions(-)
[elpa] externals/gnat-compiler 0a14c9a2ca 2/2: * gnat-alire.el (create-alire-project): Respect convention for create-%s-xref
branch: externals/gnat-compiler commit 0a14c9a2ca2df43714136ad9dfa6089bb0fc4288 Author: Stephen Leake Commit: Stephen Leake * gnat-alire.el (create-alire-project): Respect convention for create-%s-xref --- gnat-alire.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnat-alire.el b/gnat-alire.el index 64f579aa1a..489df1d450 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -115,8 +115,9 @@ :run-buffer-name (gnat-run-buffer-name abs-gpr-file))) (setf (wisi-prj-xref project) - (funcall (intern (format "create-%s-xref" (symbol-name xref-label))) - :gpr-file abs-gpr-file)) + (funcall (intern (format "create-%s-xref" (symbol-name xref-label) + +(wisi-xref-parse-one (wisi-prj-xref project) project "gpr_file" abs-gpr-file) project))
[elpa] externals/gnat-compiler c13ca26054 1/2: Add wisi-prj-default
branch: externals/gnat-compiler commit c13ca260542997b4277404346287e3f0828370b2 Author: Stephen Leake Commit: Stephen Leake Add wisi-prj-default * gnat-alire.el (alire-prj): New, for wisi-prj-default. (create-alire-project): Use it. (wisi-prj-default): New. --- gnat-alire.el | 26 +++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/gnat-alire.el b/gnat-alire.el index b9b9dadcce..64f579aa1a 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -24,6 +24,13 @@ (require 'gnat-compiler) +(cl-defstruct +(alire-prj + (:include wisi-prj) + (:copier nil)) + xref-label + ) + (defun alire-get-env (project) "Set PROJECT slots from Alire as needed." @@ -93,12 +100,15 @@ "Return an initial wisi project for the current Alire workspace." (let* ((default-directory (locate-dominating-file default-directory "alire.toml")) (abs-gpr-file (expand-file-name gpr-file)) -(project (make-wisi-prj :name name :compile-env compile-env :file-env file-env)) -) +(project (make-alire-prj :name name + :compile-env compile-env + :file-env file-env + :xref-label xref-label))) (alire-get-env project) -;; We need a gnat-compiler to set compilation-search-path. +;; We need a gnat-compiler to set compilation-search-path; this +;; must run after alire-get-env because it uses GPR_PROJECT_PATH. (setf (wisi-prj-compiler project) (create-gnat-compiler :gpr-file abs-gpr-file @@ -110,5 +120,15 @@ project)) +(cl-defmethod wisi-prj-default ((project alire-prj)) + (let* ((gpr-file (gnat-compiler-gpr-file (wisi-prj-compiler project))) + (default-directory (file-name-directory gpr-file))) +(create-alire-project + :name(wisi-prj-name project) + :gpr-filegpr-file + :compile-env (wisi-prj-compile-env project) + :file-env(wisi-prj-file-env project) + :xref-label (alire-prj-xref-label project + (provide 'gnat-alire) ;;; gnat-alire.el ends here
[elpa] externals/gnat-compiler e69c29af4d: Misc cleanups, fix bug in gnat-find-als
branch: externals/gnat-compiler commit e69c29af4d3db76276d71abee8754db291987ffd Author: Stephen Leake Commit: Stephen Leake Misc cleanups, fix bug in gnat-find-als * gnat-compiler.el: Use #' where appropriate. (gnat-debug-run): Delete redundant :group. (gnat-find-als): Fix bug; locate-file can return nil. --- gnat-compiler.el | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnat-compiler.el b/gnat-compiler.el index 9496393a4c..cc0a004ce9 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -38,8 +38,7 @@ the command. Otherwise, they will show only the output of the command. Higher integers show more information (environment vars etc)." :type 'integer - :safe #'integerp - :group 'gnat-compiler) + :safe #'integerp) (defun gnat-debug-enabled (level) "Return t if gnat-debug-run is t or > LEVEL." @@ -74,7 +73,7 @@ command. Higher integers show more information (environment vars etc)." gnat-stub-opts gnat-stub-cargs) ;; We declare and autoload this because we can't autoload - ;; make-gnat-compiler in emacs < 27. We also can't use '(defalias + ;; make-gnat-compiler in emacs < 27. We also can't use (defalias ;; 'create-gnat-compiler 'make-gnat-compiler); then ;; make-gnat-compiler is not defined by autoload. (make-gnat-compiler @@ -113,7 +112,7 @@ Throw an error if current project does not have a gnat-compiler." (cl-pushnew dir (gnat-compiler-project-path compiler) :test #'string-equal) (setenv "GPR_PROJECT_PATH" - (mapconcat 'identity + (mapconcat #'identity (gnat-compiler-project-path compiler) path-separator)) (setf (wisi-prj-file-env project) (copy-sequence process-environment)) ))) @@ -170,8 +169,8 @@ Throw an error if current project does not have a gnat-compiler." (directory-file-name default-directory) (expand-file-name (buffer-substring-no-properties (point) (line-end-position)) - (cl-pushnew f src-dirs :test 'string-equal) - (cl-pushnew f prj-dirs :test 'string-equal)) + (cl-pushnew f src-dirs :test #'string-equal) + (cl-pushnew f prj-dirs :test #'string-equal)) (forward-line 1)) ) @@ -279,7 +278,7 @@ Assumes current buffer is (gnat-run-buffer)" (dolist (item process-environment) (insert item)(insert "\n"))) - (setq status (apply 'call-process exec nil t nil command))) + (setq status (apply #'call-process exec nil t nil command))) (cond ((memq status (or expected-status '(0))); success @@ -331,7 +330,7 @@ which is displayed on error." (let ((default-directory (or dir default-directory)) status) -(setq status (apply 'call-process "gnat" nil t nil command)) +(setq status (apply #'call-process "gnat" nil t nil command)) (cond ((= status 0); success nil) @@ -785,7 +784,8 @@ server executable not found; otherwise signal user-error." (if gnat-lsp-server-exec (progn (setq gnat-lsp-server-exec (locate-file gnat-lsp-server-exec exec-path exec-suffixes)) -(if (file-readable-p gnat-lsp-server-exec) +(if (and gnat-lsp-server-exec +(file-readable-p gnat-lsp-server-exec)) gnat-lsp-server-exec (user-error "gnat-lsp-server-exec '%s' not a readable file" gnat-lsp-server-exec))) @@ -906,7 +906,7 @@ server executable not found; otherwise signal user-error." ;; which is just annoying, but should be up to the user. '(gnu) ) - (add-hook 'compilation-filter-hook 'gnat-compilation-filter) + (add-hook 'compilation-filter-hook #'gnat-compilation-filter) (add-hook 'ada-syntax-propertize-hook #'gnat-syntax-propertize) ;; We should call `syntax-ppss-flush-cache' here, to force ppss with
[elpa] externals/gnat-compiler 98a036fd6b 3/3: * gnat-alire.el (alire-get-env): Handle comments in alr printenv output
branch: externals/gnat-compiler commit 98a036fd6b7ee0814dc69b15afc3a706103b6b8f Author: Stephen Leake Commit: Stephen Leake * gnat-alire.el (alire-get-env): Handle comments in alr printenv output * gnat-compiler.el (gnat-find-als): Fix bug, improve error message. --- gnat-alire.el| 26 +++--- gnat-compiler.el | 13 +++-- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/gnat-alire.el b/gnat-alire.el index 9ca951f041..b9b9dadcce 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -48,18 +48,22 @@ ((= 0 status) (goto-char (point-min)) (while (not (eobp)) - (looking-at "export \\(.*\\)=\"\\(.*\\)\"$") - (setf (wisi-prj-file-env project) - (append (wisi-prj-file-env project) - (list (concat (match-string-no-properties 1) "=" (match-string-no-properties 2) +;; Sometimes alr puts comments in this output: +;; Note: Running post_fetch actions for xmlada=23.0.0... +;; checking build system type... x86_64-pc-linux-gnu + (when (looking-at "export \\(.*\\)=\"\\(.*\\)\"$") + (setf (wisi-prj-file-env project) + (append (wisi-prj-file-env project) + (list (concat (match-string-no-properties 1) "=" (match-string-no-properties 2) - (let ((name (match-string-no-properties 1)) - (value (match-string-no-properties 2))) - (when (string= name "ADA_PROJECT_PATH") - (setq ada-project-path value)) - (when (string= name "GPR_PROJECT_PATH") - (setq gpr-project-path value))) - (forward-line 1) + (let ((name (match-string-no-properties 1)) + (value (match-string-no-properties 2))) + (when (string= name "ADA_PROJECT_PATH") + (setq ada-project-path value)) + (when (string= name "GPR_PROJECT_PATH") + (setq gpr-project-path value))) + ) +(forward-line 1) )) (t diff --git a/gnat-compiler.el b/gnat-compiler.el index 81c00611b8..9496393a4c 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -783,11 +783,12 @@ to AdaCore ada_language_server in `exec-path', then in a gnat installation found in `exec-path'. If NO-ERROR, return nil if server executable not found; otherwise signal user-error." (if gnat-lsp-server-exec - (setq gnat-lsp-server-exec (locate-file gnat-lsp-server-exec exec-path exec-suffixes)) - (if (file-readable-p gnat-lsp-server-exec) - gnat-lsp-server-exec - (user-error "gnat-lsp-server-exec '%s' not a readable file" - gnat-lsp-server-exec)) + (progn +(setq gnat-lsp-server-exec (locate-file gnat-lsp-server-exec exec-path exec-suffixes)) +(if (file-readable-p gnat-lsp-server-exec) + gnat-lsp-server-exec + (user-error "gnat-lsp-server-exec '%s' not a readable file" + gnat-lsp-server-exec))) ;; else look for AdaCore ada_language_server ;; @@ -806,7 +807,7 @@ server executable not found; otherwise signal user-error." (if guess guess (unless no-error - (user-error "ada_language_server not found"))) + (user-error "ada_language_server not found; set gnat-lsp-server-exec?"))) ; wisi compiler generic methods
[elpa] externals/gnat-compiler f1493ed944 2/3: Fix byte-compile
branch: externals/gnat-compiler commit f1493ed944e4ef89b3f1f6455bb61d036710b2e7 Author: Stephen Leake Commit: Stephen Leake Fix byte-compile * ELPA.make (WISI): New. (byte-compile): Do WISI as well. --- .gitignore | 1 + ELPA.make | 7 +++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 9850d0ff11..8420881ab3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ autoloads.el autoloads.el~ +*.elc diff --git a/ELPA.make b/ELPA.make index fe7fa41572..b0953e309f 100644 --- a/ELPA.make +++ b/ELPA.make @@ -6,16 +6,23 @@ all : byte-compile autoloads ifeq ($(shell uname),Linux) EMACS_EXE ?= emacs +WISI ?= /Projects/org.emacs.wisi + else ifeq ($(shell uname),Darwin) EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs" +WISI ?= /Projects/org.emacs.wisi + else # windows # specify uniscribe to workaround weird Windows harfbuzz bug EMACS_EXE ?= emacs -xrm Emacs.fontBackend:uniscribe +WISI ?= c:/Projects/elpa/packages/wisi + endif BYTE_COMPILE := "(progn (setq byte-compile-error-on-warn t)(batch-byte-compile))" byte-compile : byte-compile-clean + $(MAKE) -C $(WISI)/build byte-compile autoloads $(EMACS_EXE) -Q -batch -L . -L $(WISI) --eval $(BYTE_COMPILE) *.el byte-compile-clean :
[elpa] work/gnat-compiler updated (178098364e -> f1493ed944)
stephen_leake pushed a change to branch work/gnat-compiler. from 178098364e * ELPA.make: New file new 97d26c0f18 Fix bug in alire-get-env; create-alire-project now works for als new f1493ed944 Fix byte-compile Summary of changes: .gitignore | 1 + ELPA.make| 7 +++ gnat-alire.el| 35 --- gnat-compiler.el | 18 ++ 4 files changed, 46 insertions(+), 15 deletions(-)
[elpa] externals/gnat-compiler 97d26c0f18 1/3: Fix bug in alire-get-env; create-alire-project now works for als
branch: externals/gnat-compiler commit 97d26c0f18b0c8633e5f28badfc84bb6858c0f8e Author: Stephen Leake Commit: Stephen Leake Fix bug in alire-get-env; create-alire-project now works for als * gnat-alire.el (alire-get-env): Handle alire.toml setting ADA_PROJECT_PATH. Fix bugs with quotes. (create-alire-project): Add file-env arg, for completeness. * gnat-compiler.el (gnat-run): Improve verbosity. --- gnat-alire.el| 35 --- gnat-compiler.el | 18 ++ 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/gnat-alire.el b/gnat-alire.el index 5768d97615..9ca951f041 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -31,9 +31,15 @@ ;; https://github.com/alire-project/alire/issues/1147). So empty it ;; here. ;; + ;; gnat list does not respect ADA_PROJECT_PATH, so if the + ;; alire.toml specifies ADA_PROJECT_PATH (ada_language_server does + ;; this), append that to GPR_PROJECT_PATH here. + ;; ;; We need all of the alire settings for "gnat list" and "gpr_query" ;; to properly process complex projects (like Alire). - (let ((process-environment (copy-sequence process-environment))) + (let ((process-environment (copy-sequence process-environment)) + ada-project-path + gpr-project-path) (setenv "GPR_PROJECT_PATH" "") (with-temp-buffer @@ -42,19 +48,34 @@ ((= 0 status) (goto-char (point-min)) (while (not (eobp)) - (looking-at "export \\(.*\\)$") + (looking-at "export \\(.*\\)=\"\\(.*\\)\"$") (setf (wisi-prj-file-env project) - (append (wisi-prj-file-env project) (list (match-string-no-properties 1 + (append (wisi-prj-file-env project) + (list (concat (match-string-no-properties 1) "=" (match-string-no-properties 2) + + (let ((name (match-string-no-properties 1)) + (value (match-string-no-properties 2))) + (when (string= name "ADA_PROJECT_PATH") + (setq ada-project-path value)) + (when (string= name "GPR_PROJECT_PATH") + (setq gpr-project-path value))) (forward-line 1) )) (t (user-error "alr printenv failed; bad or missing alire.toml?")) -)) - ))) +))) +(when ada-project-path + (setf (wisi-prj-file-env project) + (delete (concat "GPR_PROJECT_PATH=" gpr-project-path) (wisi-prj-file-env project))) + (setf (wisi-prj-file-env project) + (append (wisi-prj-file-env project) + (list (concat "GPR_PROJECT_PATH=" + (concat gpr-project-path ":" ada-project-path)) +)) ;;;###autoload -(cl-defun create-alire-project ( name gpr-file compile-env xref-label) +(cl-defun create-alire-project ( name gpr-file compile-env file-env xref-label) ;; We could use "alr exec -P -- echo" to get the project file (also ;; see https://github.com/alire-project/alire/issues/1151), but that ;; doesn't work when there are multiple project files listed in @@ -68,7 +89,7 @@ "Return an initial wisi project for the current Alire workspace." (let* ((default-directory (locate-dominating-file default-directory "alire.toml")) (abs-gpr-file (expand-file-name gpr-file)) -(project (make-wisi-prj :name name :compile-env compile-env)) +(project (make-wisi-prj :name name :compile-env compile-env :file-env file-env)) ) (alire-get-env project) diff --git a/gnat-compiler.el b/gnat-compiler.el index 266b8475f1..81c00611b8 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -268,17 +268,19 @@ Assumes current buffer is (gnat-run-buffer)" (funcall process-list (wisi-prj-compile-env project)) (funcall process-list (wisi-prj-file-env project)) -(when (gnat-debug-enabled 0) - (insert (format "GPR_PROJECT_PATH=%s\n%s " (getenv "GPR_PROJECT_PATH") exec)) - (mapc (lambda (str) (insert (concat str " "))) command) - (newline)) +(let ((exec-path (split-string (getenv "PATH") path-separator))) + (when (gnat-debug-enabled 0) + (insert (format "GPR_PROJECT_PATH=%s\n%s " (getenv "GPR_PROJECT_PATH") + (executable-find exec))) + (mapc (lambda (str) (insert (concat str " "))) command) + (newline)) -(when (gnat-debug-enabled 1) - (dolist (item process-environment) - (insert item)(insert "\n"))) + (when (gnat-debug-enabled 1) + (dolist (item process-environment) + (insert item)(insert "\n"))) -(let ((exec-path (split-string (getenv "PATH") path-separator))) (setq status (apply 'call-process exec nil t nil command))) + (cond ((memq status (or expected-status '(0))); success nil)
[elpa] externals/gnat-compiler updated (178098364e -> 98a036fd6b)
stephen_leake pushed a change to branch externals/gnat-compiler. from 178098364e * ELPA.make: New file new 97d26c0f18 Fix bug in alire-get-env; create-alire-project now works for als new f1493ed944 Fix byte-compile new 98a036fd6b * gnat-alire.el (alire-get-env): Handle comments in alr printenv output Summary of changes: .gitignore | 1 + ELPA.make| 7 +++ gnat-alire.el| 43 ++- gnat-compiler.el | 31 +-- 4 files changed, 59 insertions(+), 23 deletions(-)
[elpa] externals/gpr-query 6356b18639: * build.sh: Show compiler
branch: externals/gpr-query commit 6356b186399180bb67319247cad07965bb6ad6ff Author: Stephen Leake Commit: Stephen Leake * build.sh: Show compiler --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2c70e6607a..4f6d3f1ad0 100644 --- a/build.sh +++ b/build.sh @@ -9,7 +9,8 @@ if type alr; then # alr can be installed from https://alire.ada.dev/ -echo "building gpr_query via Alire" +echo "building gpr_query via Alire; compiler:" +alr toolchain alr get emacs_gpr_query~1.0.1 cd emacs_gpr_query_*; alr build --release
[elpa] externals/gpr-mode 924bad9645: Fix header comment style again, improve install.sh
branch: externals/gpr-mode commit 924bad964550047a4c06405c66a035fa28e1f4d2 Author: Stephen Leake Commit: Stephen Leake Fix header comment style again, improve install.sh * gpr-mode.el: Really fix header comment style. * install.sh: Improve. --- gpr-mode.el | 2 +- install.sh | 37 - 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/gpr-mode.el b/gpr-mode.el index 00094469a6..a8b5d8fe41 100644 --- a/gpr-mode.el +++ b/gpr-mode.el @@ -1,4 +1,4 @@ -;;; gpr-mode --- Major mode for editing GNAT project files -*- lexical-binding:t -*- +;;; gpr-mode.el --- Major mode for editing GNAT project files -*- lexical-binding:t -*- ;; Copyright (C) 2004, 2007, 2008, 2012-2015, 2017 - 2020, 2022 Free Software Foundation, Inc. diff --git a/install.sh b/install.sh index 0f279215ac..2cda816129 100644 --- a/install.sh +++ b/install.sh @@ -1,31 +1,26 @@ #!/bin/sh # Install executables for Gpr mode. -# +# +# $1 : optional --prefix= +# # See build.sh for build (must be run before install). -if type alr; then -echo "installing gpr-mode executables via Alire" +if [ x$1 = x ]; then +PREFIX=$HOME/.local +# as recommended by https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html +else +PREFIX=$1 +fi + +echo "installing gpr-mode executables to" $PREFIX/bin -if [ x$1 == x ]; then -echo "you must specify the install directory with 'install.sh '" -return 1 -fi -# IMPROVEME: when alr supports install, use that -cp emacs_gpr_mode*/bin/* $1 +# No need for gprinstall; we only need the executables -elif type gprbuild; then -echo "installing gpr-mode executables via gnat compiler" - -# $1 : optional --prefix= -# -# If you don't have write permission in the GNAT installation -# directory, you need to use --prefix=, or run with root priviledges. +if type alr; then +cp emacs_gpr_mode*/bin/* $PREFIX/bin -if [ -d ../wisi-4.1.? ]; then -WISI_DIR=`ls -d ../wisi-4.1.?` -fi - -gprinstall -f -p -P gpr_mode_wisi_parse.gpr -aP $WISI_DIR --install-name=gpr_mode_wisi_parse $1 +elif type gprbuild; then +cp bin/* $PREFIX/bin else echo "neither Alire nor gnat compiler found"
[elpa] externals/ada-mode e72d65d459: * build.sh: Move *_parse_table.txt to bin, so install.sh copies it
branch: externals/ada-mode commit e72d65d459949e71d61f816fc5f88a6076207532 Author: Stephen Leake Commit: Stephen Leake * build.sh: Move *_parse_table.txt to bin, so install.sh copies it --- build.sh | 4 1 file changed, 4 insertions(+) diff --git a/build.sh b/build.sh index f88790beba..fa87fda833 100755 --- a/build.sh +++ b/build.sh @@ -15,6 +15,9 @@ if type alr; then alr get emacs_ada_mode~8.0.2 cd emacs_ada_mode_*; alr build --release +# WORKAROUND: this should be in alire_rules.make +mv emacs_ada_mode_*/ada_annex_p_lr1_parse_table.txt emacs_ada_mode_*/bin + elif type gprbuild; then echo "building ada-mode executables via gnat compiler" @@ -45,6 +48,7 @@ elif type gprbuild; then $WISI_DIR/wisitoken-bnf-generate --task_count 1 ada_annex_p.wy gprbuild -p -j8 -P ada_mode_wisi_parse.gpr -aP $WISI_DIR "$@" +mv ada_annex_p_lr1_parse_table.txt bin else echo "neither Alire nor gnat compiler found"
[elpa] externals/gpr-mode 24e67684df: Fix header comment style
branch: externals/gpr-mode commit 24e67684dfacd4b12e4d5792361f5fc8bb2c2f7f Author: Stephen Leake Commit: Stephen Leake Fix header comment style * gpr-indent-user-options.el: Fix header comment style. * gpr-mode.el: * gpr-skel.el: * prj-eglot.el: Delete. --- gpr-indent-user-options.el | 4 ++-- gpr-mode.el| 2 +- gpr-skel.el| 4 ++-- prj-eglot.el | 40 4 files changed, 5 insertions(+), 45 deletions(-) diff --git a/gpr-indent-user-options.el b/gpr-indent-user-options.el index 174a5ebc0b..b724ad274b 100644 --- a/gpr-indent-user-options.el +++ b/gpr-indent-user-options.el @@ -1,4 +1,4 @@ -;; user options shared by gpr mode indentation engines -*- lexical-binding:t -*- +;;; user options shared by gpr mode indentation engines -*- lexical-binding:t -*- ;; ;; Copyright (C) 2017, 2019 Free Software Foundation, Inc. ;; @@ -45,4 +45,4 @@ (provide 'gpr-indent-user-options) -;; end file +;; gpr-indent-user-options.el ends here diff --git a/gpr-mode.el b/gpr-mode.el index d5b7db2ba7..00094469a6 100644 --- a/gpr-mode.el +++ b/gpr-mode.el @@ -1,4 +1,4 @@ -;; gpr-mode --- Major mode for editing GNAT project files -*- lexical-binding:t -*- +;;; gpr-mode --- Major mode for editing GNAT project files -*- lexical-binding:t -*- ;; Copyright (C) 2004, 2007, 2008, 2012-2015, 2017 - 2020, 2022 Free Software Foundation, Inc. diff --git a/gpr-skel.el b/gpr-skel.el index 9a53364fcf..599fadcb5e 100644 --- a/gpr-skel.el +++ b/gpr-skel.el @@ -1,4 +1,4 @@ -;; gpr-skel.el --- Extension to gpr-mode for inserting statement skeletons -*- lexical-binding:t -*- +;;; gpr-skel.el --- Extension to gpr-mode for inserting statement skeletons -*- lexical-binding:t -*- ;; Copyright (C) 2013-2015, 2018 - 2021 Free Software Foundation, Inc. @@ -134,4 +134,4 @@ Each user will probably want to override this." (add-hook 'gpr-mode-hook #'gpr-skel-setup) (provide 'gpr-skel) -;;; end of file +;;; gpr-skel.el ends here diff --git a/prj-eglot.el b/prj-eglot.el deleted file mode 100644 index a88589f730..00 --- a/prj-eglot.el +++ /dev/null @@ -1,40 +0,0 @@ -;; project settings for building gpr-mode with Alire/editing with eglot -*- no-byte-compile : t -*- - -(require 'ada-mode) -;; This require is not needed for the following code, but is needed to -;; ensure ada-mode-hook has sal-ada-mode-setup. - -(setq ada-indent-engine 'wisi) ;; ada_language_server 22.0 doesn't support RangeFormatting - -(setq ada-xref-tool 'eglot) - -(add-hook 'ada-mode-hook #'ada-eglot-setup) - -(let* ((gpr-file (expand-file-name "emacs_gpr_mode.gpr" (file-name-directory load-file-name))) - (prj-file (expand-file-name "prj-eglot.prj" (file-name-directory load-file-name))) - (eglot-workspace-configuration (list `(ada (projectFile . ,gpr-file - - (project - (create-alire-project -:prj-name "gpr-mode main Alire eglot" -:prj-file prj-file -:gpr-file gpr-file))) - - (wisi-prj-select-cache prj-file nil "Makefile") - - ;; ada_language_server gets GPR_PROJECT_PATH from its process - ;; environment, and the gpr file from eglot-workspace-configuration. - (let ((process-environment -(append - (copy-sequence process-environment) - (wisi-prj-compile-env project) - (wisi-prj-file-env project - -(eglot 'ada-mode ;; managed-major-mode - project ;; project; project-root is server process directory - 'eglot-lsp-server ;; class - 'gnat-find-als ;; contact - "Ada" ;; language-id - )) - ) -;; end of file
[elpa] branch work/gnat-compiler created (now 178098364e)
stephen_leake pushed a change to branch work/gnat-compiler. at 178098364e * ELPA.make: New file No new revisions were added by this update.
[elpa] externals/gpr-query updated (a9cb407ef8 -> 542cbf35d6)
stephen_leake pushed a change to branch externals/gpr-query. from a9cb407ef8 Misc improve new 32c123e157 Misc fixes new 5a62db91fc * prj-eglot.el: Delete new 542cbf35d6 * ELPA.make (all): Add docs Summary of changes: ELPA.make | 8 gpr-query.el | 4 ++-- gpr-query.texi | 9 +++-- prj-eglot.el | 41 - 4 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 prj-eglot.el
[elpa] externals/gpr-query 32c123e157 1/3: Misc fixes
branch: externals/gpr-query commit 32c123e157caa4421680c338ada5807c1e4dbef1 Author: Stephen Leake Commit: Stephen Leake Misc fixes * ELPA.make (build-elpa): Fix path to elpa root. * gpr-query.el: Match required header comment style. --- ELPA.make| 6 +++--- gpr-query.el | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ELPA.make b/ELPA.make index e0fa44f647..b80d138872 100644 --- a/ELPA.make +++ b/ELPA.make @@ -46,9 +46,9 @@ recursive-clean : force # builds $(ELPA_ROOT)/archive-devel/*, from the last commit, _not_ the # current workspace Also checks copyright; run elpa/GNUMakefile # check/ first if added files. -build-elpa : force - rm -rf $(ELPA_ROOT)/archive-devel - make -C $(ELPA_ROOT)/ build/gpr-query +build-elpa : ../../GNUmakefile force + rm -rf ../../archive-devel + make -C ../.. build/gpr-query config : mkdir config diff --git a/gpr-query.el b/gpr-query.el index d047c50f79..943efda022 100644 --- a/gpr-query.el +++ b/gpr-query.el @@ -1,4 +1,4 @@ -;; gpr-query.el --- Minor mode for navigating sources using gpr_query -*- lexical-binding:t -*- +;;; gpr-query.el --- Minor mode for navigating sources using gpr_query -*- lexical-binding:t -*- ;; ;; gpr-query supports Ada and any gcc language that supports the ;; AdaCore -fdump-xref switch (which includes C, C++).
[elpa] externals/gpr-query 5a62db91fc 2/3: * prj-eglot.el: Delete
branch: externals/gpr-query commit 5a62db91fc1c39623e609983d3863a9c7c41059d Author: Stephen Leake Commit: Stephen Leake * prj-eglot.el: Delete * gpr-query.el: Match required end comment style. --- gpr-query.el | 2 +- prj-eglot.el | 41 - 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/gpr-query.el b/gpr-query.el index 943efda022..97046cc427 100644 --- a/gpr-query.el +++ b/gpr-query.el @@ -1103,4 +1103,4 @@ FILE is from gpr-query." (cons 'gpr-query-ident-file gpr-query-ident-file-regexp-alist)) (provide 'gpr-query) -;;; end of file +;;; gpr-query.el ends here diff --git a/prj-eglot.el b/prj-eglot.el deleted file mode 100644 index 72788da0d8..00 --- a/prj-eglot.el +++ /dev/null @@ -1,41 +0,0 @@ -;; project settings for building gpr-query with Alire/editing with eglot -*- no-byte-compile : t -*- - -(require 'ada-mode) -;; This require is not needed for the following code, but is needed to -;; ensure ada-mode-hook has sal-ada-mode-setup. - -(setq ada-indent-engine 'wisi) ;; ada_language_server 22.0 doesn't support RangeFormatting - -(setq ada-xref-tool 'eglot) - -(add-hook 'ada-mode-hook #'ada-eglot-setup) - -(let* ((gpr-file (expand-file-name "emacs_gpr_query.gpr" (file-name-directory load-file-name))) - (prj-file (expand-file-name "gpr-query.prj" (file-name-directory load-file-name))) - (eglot-workspace-configuration (list `(ada (projectFile . ,gpr-file - - (project - (create-alire-project -:prj-name "gpr-query main Alire eglot" -:prj-file prj-file -:gpr-file gpr-file))) - - (wisi-prj-select-cache prj-file nil "Alire.make") - - ;; ada_language_server gets GPR_PROJECT_PATH from its process - ;; environment, and the gpr file from eglot-workspace-configuration. - (let ((process-environment -(append - (copy-sequence process-environment) - (wisi-prj-compile-env project) - (wisi-prj-file-env project - -(eglot 'ada-mode ;; managed-major-mode - project ;; project; project-root is server process directory - 'eglot-lsp-server ;; class - 'gnat-find-als ;; contact - "Ada" ;; language-id - )) - ) - -;; end of file
[elpa] externals/gpr-query 542cbf35d6 3/3: * ELPA.make (all): Add docs
branch: externals/gpr-query commit 542cbf35d685b159b56bed12ce97232232d77f57 Author: Stephen Leake Commit: Stephen Leake * ELPA.make (all): Add docs * gpr-query.texi: Update menus, fix sectioning bug. --- ELPA.make | 2 +- gpr-query.texi | 9 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ELPA.make b/ELPA.make index b80d138872..0917b2d956 100644 --- a/ELPA.make +++ b/ELPA.make @@ -4,7 +4,7 @@ .PHONY : all force -all : build byte-compile autoloads +all : build byte-compile autoloads docs docs : gpr-query.info diff --git a/gpr-query.texi b/gpr-query.texi index 3723803b36..e9c5e6e587 100644 --- a/gpr-query.texi +++ b/gpr-query.texi @@ -39,6 +39,12 @@ developing GNU and promoting software freedom.'' gpr-query Version 1.0.1 +@menu +* Overview:: +* Installation:: +* GNU Free Documentation License:: +@end menu + @node Overview @chapter Overview @@ -124,11 +130,10 @@ is available in Mingw64 as package @menu * Building GNATCOLL:: -* Building the executables:: @end menu @node Building GNATCOLL -@subsection Building GNATCOLL +@section Building GNATCOLL The GNAT Community and GNAT pro binary installs have some of the GNATCOLL packages we need, but we need to install others from source.
[elpa] externals/gnat-compiler 178098364e: * ELPA.make: New file
branch: externals/gnat-compiler commit 178098364ea846067c82ef31f6f518e952e5a8bd Author: Stephen Leake Commit: Stephen Leake * ELPA.make: New file --- .gitignore | 2 ++ ELPA.make | 34 ++ 2 files changed, 36 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00..9850d0ff11 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +autoloads.el +autoloads.el~ diff --git a/ELPA.make b/ELPA.make new file mode 100644 index 00..fe7fa41572 --- /dev/null +++ b/ELPA.make @@ -0,0 +1,34 @@ +# For compiling in elpa + +.PHONY : all force + +all : byte-compile autoloads + +ifeq ($(shell uname),Linux) +EMACS_EXE ?= emacs +else ifeq ($(shell uname),Darwin) +EMACS_EXE ?= "/Applications/Emacs.app/Contents/MacOS/Emacs" +else +# windows +# specify uniscribe to workaround weird Windows harfbuzz bug +EMACS_EXE ?= emacs -xrm Emacs.fontBackend:uniscribe +endif + +BYTE_COMPILE := "(progn (setq byte-compile-error-on-warn t)(batch-byte-compile))" +byte-compile : byte-compile-clean + $(EMACS_EXE) -Q -batch -L . -L $(WISI) --eval $(BYTE_COMPILE) *.el + +byte-compile-clean : + rm -f *.elc + +autoloads : force + $(EMACS_EXE) -Q -batch --eval "(progn (setq generated-autoload-file (expand-file-name \"autoloads.el\"))(update-directory-autoloads \".\"))" + +# builds $(ELPA_ROOT)/archive-devel/*, from the last commit, _not_ the +# current workspace Also checks copyright; run elpa/GNUMakefile +# check/ first if added files. +build-elpa : force + rm -rf $(ELPA_ROOT)/archive-devel + make -C $(ELPA_ROOT)/ build/gnat-compiler + +# end of file
[elpa] externals/gpr-query a9cb407ef8: Misc improve
branch: externals/gpr-query
commit a9cb407ef8adca50e0ef5d2dece57529e1d2d380
Author: Stephen Leake
Commit: Stephen Leake
Misc improve
* Alire.make: Simplify path to alire_rules.make.
(install): New.
* ELPA.make: Delete copy to elpa, tar, zip, tag; only developed in elpa git.
(install): Add --prefix=~/.local.
* gpr-query.texi (Installation): Delete install Alire compiler for
external use; would also require gnatcoll.
---
.gitignore | 7 +++
Alire.make | 5 +++--
ELPA.make | 34 +-
gpr-query.texi | 12 +---
4 files changed, 16 insertions(+), 42 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00..4eac78d3ce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+alire/
+autoloads.el
+autoloads.el~
+bin/
+config/
+*.elc
+obj/
diff --git a/Alire.make b/Alire.make
index b002db006e..a52a8e8602 100644
--- a/Alire.make
+++ b/Alire.make
@@ -1,8 +1,9 @@
# For compiling gpr-query Ada code with Alire
-STEPHES_ADA_LIBRARY_ALIRE_PREFIX ?= $(CURDIR)/../org.stephe_leake.sal
+include ../wisi/alire_rules.make
-include $(STEPHES_ADA_LIBRARY_ALIRE_PREFIX)/build/alire_rules.make
+install : bin/gpr_query$(EXE_EXT)
+ gprinstall -f -p -P emacs_gpr_query.gpr --prefix=~/.local
--install-name=gpr_query
# Local Variables:
# eval: (load-file "prj-eglot.el")
diff --git a/ELPA.make b/ELPA.make
index 9128803062..e0fa44f647 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -12,7 +12,7 @@ build : config/emacs_gpr_query_config.gpr force
gprbuild -p -j8 emacs_gpr_query.gpr
install : bin/gpr_query$(EXE_EXT)
- gprinstall -f -p -P emacs_gpr_query.gpr --install-name=gpr_query
+ gprinstall -f -p -P emacs_gpr_query.gpr --prefix=~/.local
--install-name=gpr_query
ifeq ($(shell uname),Linux)
EMACS_EXE ?= emacs
@@ -43,15 +43,6 @@ clean : force
recursive-clean : force
gprclean -r -P emacs_gpr_query.gpr
-### publish to elpa package
-ELPA_ROOT ?= $(shell cd ../elpa; pwd -W)
-
-pub : force | $(ELPA_ROOT)/packages/gpr-query
- rm -rf $(ELPA_ROOT)/packages/gpr-query/*
- cp *.el *.gpr *.make *.prj *.sh *.texi $(ELPA_ROOT)/packages/gpr-query
- cp NEWS README $(ELPA_ROOT)/packages/gpr-query
- cd $(ELPA_ROOT)/packages/gpr-query; rm autoloads.el
-
# builds $(ELPA_ROOT)/archive-devel/*, from the last commit, _not_ the
# current workspace Also checks copyright; run elpa/GNUMakefile
# check/ first if added files.
@@ -59,26 +50,11 @@ build-elpa : force
rm -rf $(ELPA_ROOT)/archive-devel
make -C $(ELPA_ROOT)/ build/gpr-query
-config/emacs_gpr_query_config.gpr :
- cp emacs_gpr_query_config_devel.gpr config/emacs_gpr_query_config.gpr
-
-### misc stuff
-BRANCH := $(notdir $(shell cd ..; pwd))
-
-ifeq ($(BRANCH),org.emacs.gpr-query)
- TAR_FILE := org.emacs.gpr-query-$(GPR_QUERY_VERSION)
-else
- TAR_FILE := $(BRANCH)
-endif
-
-zip :
- rm -rf $(TAR_FILE)
- mtn checkout --branch $(BRANCH) $(TAR_FILE)
- tar jcf $(TAR_FILE).tar.bz2 --exclude _MTN -C .. $(TAR_FILE)
-
-tag :
- mtn tag h:org.emacs.gpr-query org.emacs.gpr-query-$(GPR_QUERY_VERSION)
+config :
+ mkdir config
+config/emacs_gpr_query_config.gpr : config
+ cp emacs_gpr_query_config_devel.gpr config/emacs_gpr_query_config.gpr
# Local Variables:
# eval: (load-file "prj.el")
diff --git a/gpr-query.texi b/gpr-query.texi
index 59a870a023..3723803b36 100644
--- a/gpr-query.texi
+++ b/gpr-query.texi
@@ -77,17 +77,7 @@ gprbuild; then you must use the toolchain assistant:
alr toolchain --select --local
@end example
-You can also install a compiler provided by Alire in an external
-directory, to be used outside Alire:
-@example
-alr toolchain --install --install-dir $HOME/.local gnat_native
-alr toolchain --install --install-dir $HOME/.local gprbuild
-@end example
-
-Then add the installed @code{bin} directories to your @code{PATH}.
-
-
-In any case, after installing the gpr-query ELPA package:
+After installing the gpr-query ELPA package:
@example
cd ~/.emacs.d/elpa/gpr-query-1.0.x
./build.sh
[elpa] elpa-admin 38b62c5795: * elpa-admin.el (elpaa--string-width): Handle ImageMagick >=7.1.0
branch: elpa-admin
commit 38b62c5795cbd807bcad37fd22fb1d1acd79c554
Author: Stephen Leake
Commit: Stephen Leake
* elpa-admin.el (elpaa--string-width): Handle ImageMagick >=7.1.0
---
elpa-admin.el | 35 +++
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/elpa-admin.el b/elpa-admin.el
index 496b6c8ba0..f4f8809b1d 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -884,22 +884,25 @@ SPECS is the list of package specifications."
(defun elpaa--string-width (str)
"Determine string width in pixels of STR."
(with-temp-buffer
-;; Current (2021) ImageMagick recommends using the "magick"
-;; driver, rather than "convert" directly, but Debian doesn't
-;; provide it yet.
-(elpaa--call (current-buffer)
- "convert" "-debug" "annotate" "xc:" "-font" "DejaVu-Sans"
- "-pointsize" "110" "-annotate" "0" str "null:")
-(goto-char (point-min))
-(if (not (re-search-forward "Metrics:.*?width: \\([0-9]+\\)"))
-(error "Could not determine string width")
- (let ((width (string-to-number (match-string 1
-;; This test aims to catch the case where the font is missing,
-;; but it seems it only works in some cases :-(
-(if (and (> (string-width str) 0) (not (> width 0)))
-(progn (message "convert:\n%s" (buffer-string))
- (error "Could not determine string width"))
- width)
+;; ImageMagick 7.1.0 or later requires using the "magick" driver,
+;; rather than "convert" directly, but Debian doesn't provide it
+;; yet (2021).
+(let ((args
+ (append (list (current-buffer))
+ (if (executable-find "magick") '("magick" "convert")
'("convert"))
+ (list "-debug" "annotate" "xc:" "-font" "DejaVu-Sans"
+ "-pointsize" "110" "-annotate" "0" str "null:"
+ (apply #'elpaa--call args)
+ (goto-char (point-min))
+ (if (not (re-search-forward "Metrics:.*?width: \\([0-9]+\\)"))
+ (error "Could not determine string width")
+(let ((width (string-to-number (match-string 1
+ ;; This test aims to catch the case where the font is missing,
+ ;; but it seems it only works in some cases :-(
+ (if (and (> (string-width str) 0) (not (> width 0)))
+ (progn (message "convert:\n%s" (buffer-string))
+ (error "Could not determine string width"))
+width))
(defun elpaa--make-badge (file left right)
"Make badge svg FILE with LEFT and RIGHT string."
[elpa] externals/gnat-compiler a60dfd29b2: File header fixes
branch: externals/gnat-compiler commit a60dfd29b2970282e2b7d2f6dd08520d56d31586 Author: Stephen Leake Commit: Stephen Leake File header fixes * gnat-alire.el: Delete Version, package-requires headers; this is not the main package file. * gnat-compiler.el: Match ELPA style requirements. --- gnat-alire.el| 2 -- gnat-compiler.el | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gnat-alire.el b/gnat-alire.el index af37a5f52a..5768d97615 100644 --- a/gnat-alire.el +++ b/gnat-alire.el @@ -4,8 +4,6 @@ ;; ;; Author: Stephen Leake ;; Maintainer: Stephen Leake -;; Version: 1.0 -;; package-requires: ((emacs "25.3") (wisi "4.0")) ;; ;; This file is part of GNU Emacs. ;; diff --git a/gnat-compiler.el b/gnat-compiler.el index a086a369be..266b8475f1 100644 --- a/gnat-compiler.el +++ b/gnat-compiler.el @@ -1,4 +1,4 @@ -;; gnat-compiler.el --- Support for running GNAT tools -*- lexical-binding:t -*- +;;; gnat-compiler.el --- Support for running GNAT tools -*- lexical-binding:t -*- ;; ;; GNAT is provided by AdaCore; see https://www.adacore.com/community ;; @@ -1460,4 +1460,5 @@ server executable not found; otherwise signal user-error." (eval-after-load 'ada-mode '(add-hook 'ada-mode-hook #'gnatprep-setup)) (provide 'gnat-compiler) -;; end of file + +;;; gnat-compiler.el ends here
