Re: Build issues from git source

[Stephen Leake]

Simon Wright <simon.j.wright@mac.com> writes:

> Reverting to ada-mode 7.2.0, GCC 11.2.0, but emacs 28.1:
>
> Debugger entered--Lisp error: (wrong-type-argument (or eieio-object
> class) #s(xref-item :summary "Command_Line_Configuration"

This is an oref syntax change:

(oref item :summary)

should be

(oref item summary)

It was a bug that :summary was supported; that bug was fixed in Emacs
28.

Patch attached. I'll do a buf fix release.

-- 
-- Stephe

diff --git a/ada-gnat-xref.el b/ada-gnat-xref.el
index a48338f173..6ddb49de95 100644
--- a/ada-gnat-xref.el
+++ b/ada-gnat-xref.el
@@ -5,7 +5,7 @@
 ;;
 ;; GNAT is provided by AdaCore; see http://libre.adacore.com/
 ;;
-;;; Copyright (C) 2012 - 2021  Free Software Foundation, Inc.
+;;; Copyright (C) 2012 - 2022  Free Software Foundation, Inc.
 ;;
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
 ;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
@@ -142,17 +142,17 @@ elements of the result may be nil."
 (defun ada-gnat-xref-refs (project item all)
   ;; WORKAROUND: xref 1.3.2 xref-location changed from defclass to cl-defstruct
   (with-no-warnings ;; "unknown slot"
-    (let ((summary (if (functionp 'xref-item-summary) (xref-item-summary item) 
(oref item :summary)))
-         (location (if (functionp 'xref-item-location) (xref-item-location 
item) (oref item :location))))
+    (let ((summary (if (functionp 'xref-item-summary) (xref-item-summary item) 
(oref item summary)))
+         (location (if (functionp 'xref-item-location) (xref-item-location 
item) (oref item location))))
       (let ((file (if (functionp 'xref-file-location-file)
                      (xref-file-location-file location)
-                   (oref location :file)))
+                   (oref location file)))
            (line (if (functionp 'xref-file-location-line)
                      (xref-file-location-line location)
-                   (oref location :line)))
+                   (oref location line)))
            (column (if (functionp 'xref-file-location-column)
                        (xref-file-location-column location)
-                     (oref location :column))))
+                     (oref location column))))
        (let* ((wisi-xref-full-path t)
               (args (cons "-r" (ada-gnat-xref-common-args project summary file 
line column)))
               (result nil))
diff --git a/gpr-query.el b/gpr-query.el
index da3a8e4932..c6dbad49fa 100644
--- a/gpr-query.el
+++ b/gpr-query.el
@@ -3,7 +3,7 @@
 ;; gpr-query supports Ada and any gcc language that supports the
 ;; AdaCore -fdump-xref switch (which includes C, C++).
 ;;
-;; Copyright (C) 2013 - 2021  Free Software Foundation, Inc.
+;; Copyright (C) 2013 - 2022  Free Software Foundation, Inc.
 
 ;; Author: Stephen Leake <stephen_leake@member.fsf.org>
 ;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
@@ -722,18 +722,18 @@ FILE is from gpr-query."
   "Run gpr_query tree command OP on ITEM (an xref-item), return list of 
xref-items."
   ;; WORKAROUND: xref 1.3.2 xref-location changed from defclass to cl-defstruct
   (with-no-warnings ;; "unknown slot"
-    (let ((summary (if (functionp 'xref-item-summary) (xref-item-summary item) 
(oref item :summary)))
-         (location (if (functionp 'xref-item-location) (xref-item-location 
item) (oref item :location)))
+    (let ((summary (if (functionp 'xref-item-summary) (xref-item-summary item) 
(oref item summary)))
+         (location (if (functionp 'xref-item-location) (xref-item-location 
item) (oref item location)))
          (eieio-skip-typecheck t)) ;; 'location' may have line, column nil
       (let ((file (if (functionp 'xref-file-location-file)
                      (xref-file-location-file location)
-                   (oref location :file)))
+                   (oref location file)))
            (line (if (functionp 'xref-file-location-line)
                      (xref-file-location-line location)
-                   (oref location :line)))
+                   (oref location line)))
            (column (if (functionp 'xref-file-location-column)
                        (xref-file-location-column location)
-                     (oref location :column))))
+                     (oref location column))))
 
        (when (eq ?\" (aref summary 0))
          ;; gpr_query wants the quotes stripped