[elpa] externals/wisi b94b59f 2/4: Fix more byte compile style warnings

[Stephen Leake]

branch: externals/wisi
commit b94b59f18696b81fa2deba6ba95f6602f9faa143
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Fix more byte compile style warnings
    
    * wisi-parse-common.el: Fix more byte compile style warnings.
    * wisi-prj.el:
    * wisi.el:
---
 NEWS                 |  2 +-
 wisi-parse-common.el |  5 +----
 wisi-prj.el          | 28 ++++++++++++++++------------
 wisi.el              |  3 ++-
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/NEWS b/NEWS
index 078a5c4..952e6c7 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ Please send wisi bug reports to bug-gnu-emacs@gnu.org, with
 ** Update several SAL files for compatibility with gnat FSF 11, Pro
    22, Community 2021.
 
-* wisi 3.1.4 packaging error
+* wisi 3.1.3, 3.1.4 packaging error
 
 * wisi 3.1.2
 4 Jun 2020
diff --git a/wisi-parse-common.el b/wisi-parse-common.el
index 01a417b..4e71be9 100644
--- a/wisi-parse-common.el
+++ b/wisi-parse-common.el
@@ -304,9 +304,6 @@ Larger stack size allows more deeply nested constructs.")
 Otherwise, they are indented with previous comments or code.
 Normally set from a language-specific option.")
 
-(defvar-local wisi-end-caches nil
-  "List of buffer positions of caches in current statement that need 
wisi-cache-end set.")
-
 (defconst wisi-eoi-term 'Wisi_EOI
   ;; must match FastToken wisi-output_elisp.adb EOI_Name, which must
   ;; be part of a valid Ada identifer.
@@ -319,7 +316,7 @@ Normally set from a language-specific option.")
    statement-start
    misc ;; other stuff
    ]
-  "array of valid token classes; checked in wisi-statement-action, used in 
wisi-process-parse.")
+  "array of valid token classes.")
 
 (defun wisi-error-msg (message &rest args)
   (let ((line (line-number-at-pos))
diff --git a/wisi-prj.el b/wisi-prj.el
index 8bbb5ca..015fe1e 100644
--- a/wisi-prj.el
+++ b/wisi-prj.el
@@ -197,18 +197,20 @@ and line number.
 COLUMN).")
 
 (cl-defgeneric wisi-xref-completion-delim-regex (xref)
-  "Return the value for `completion-pcm--delim-wild-regex' to be used with 
`wisi-xref-completion-table'.")
+  "Return the value for `completion-pcm--delim-wild-regex'
+to be used with `wisi-xref-completion-table'.")
 
 (cl-defgeneric wisi-xref-completion-regexp (xref)
-  "Return a regular expression matching the result of completing with 
`wisi-xref-completion-table'.
-Group 1 must be the simple symbol; the rest of the item may be annotations.")
+  "Regular expression matching completion with `wisi-xref-completion-table'.
+Group 1 must be the simple symbol; the rest of the item may be
+annotations.")
 
 (cl-defgeneric wisi-xref-completion-at-point-table (xref project)
-  "Return a completion table of names defined in PROJECT, for 
`completion-at-point'.
+  "Return a completion table of names defined in PROJECT.
 The table is a simple list of symbols.")
 
 (cl-defgeneric wisi-xref-definitions (xref project item)
-  "Return all definitions (classwide) of ITEM (an xref-item), as a list of 
xref-items.")
+  "All definitions of ITEM (an xref-item), as a list of xref-items.")
 
 (cl-defgeneric wisi-xref-references (xref project item)
   "Return all references to ITEM (an xref-item), as a list of xref-items.")
@@ -428,7 +430,8 @@ FILENAME - absolute filename containing the identifier
 LINE - line number containing the identifier
 COLUMN - Emacs column of the start of the identifier
 
-Displays a buffer in compilation-mode giving locations of the parent type 
declarations.")
+Displays a buffer in compilation-mode giving locations of the
+parent type declarations.")
 
 (defun wisi-show-declaration-parents ()
   "Display the locations of the parent type declarations of the type 
identifier around point."
@@ -492,7 +495,7 @@ With prefix, keep previous references in output buffer."
     ))
 
 (cl-defgeneric wisi-xref-overriding (xref project &key identifier filename 
line column)
-  "Displays a buffer in compilation-mode giving locations of the overriding 
declarations.
+  "Displays a buffer giving locations of the overriding declarations.
 XREF    - dispatching object.
 PROJECT - a `wisi-prj' object.
 IDENTIFIER - an identifier or operator_symbol
@@ -515,7 +518,7 @@ COLUMN - Emacs column of the start of the identifier ")
     ))
 
 (cl-defgeneric wisi-xref-overridden (xref project &key identifier filename 
line column)
-  "Returns a list (FILE LINE COLUMN) giving the location of the overridden 
declaration.
+  "Returns the location of the overridden declaration as (FILE LINE COLUMN).
 XREF    - dispatching object.
 PROJECT - a `wisi-prj' object.
 IDENTIFIER - an identifier or operator_symbol
@@ -544,9 +547,9 @@ COLUMN - Emacs column of the start of the identifier")
 
 ;;;; wisi-prj specific methods
 
-(cl-defmethod project-roots ((_project wisi-prj))
-  ;; Not meaningful
-  nil)
+(cl-defmethod project-root ((project wisi-prj))
+   ;; Not meaningful, but some project functions insist on a valid directory
+   (car (wisi-prj-source-path project)))
 
 (cl-defmethod project-files ((project wisi-prj) &optional dirs)
   (let (result)
@@ -1241,7 +1244,8 @@ with \\[universal-argument]."
   ;; gds-mil_std_1553-utf.ads:252:25 - when wisi-xref-full-path is nil
   "\\(\\(?:.:\\\\\\|/\\)?[^:]*\\):\\([0-9]+\\):\\([0-9]+\\)"
   ;; 1                              2            3
-  "Regexp matching <file>:<line>:<column> where <file> is an absolute file 
name or basename.")
+  "Regexp matching <file>:<line>:<column>
+where <file> is an absolute file name or basename.")
 
 (defun wisi-xref-item (identifier prj)
   "Given IDENTIFIER, return an xref-item, with line, column nil if unknown.
diff --git a/wisi.el b/wisi.el
index bbeb001..d9150f3 100644
--- a/wisi.el
+++ b/wisi.el
@@ -1201,7 +1201,8 @@ failing; assumes user was editing code that is now 
syntactically
 correct. Must leave point at indentation of current line.")
 
 (defvar-local wisi-indent-failed nil
-  "Non-nil when wisi-indent-region fails due to parse failing; cleared when 
indent succeeds.")
+  "Non-nil when indent fails due to parse fail.
+Cleared when indent succeeds.")
 
 (defvar-local wisi-indent-region-fallback 'wisi-indent-region-fallback-default
   "Function to compute indent for lines in region when wisi parse fails.