Re: Compatibility patches for EDE / EIEIO

[Eric Ludlam <ericludlam@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 801 bytes --]

On 1/11/21 4:21 PM, Stefan Monnier wrote:
>> Attached are two proposed patches related to compatibility for EIEIO
>>   and EDE.
> Thanks, pushed both to `master`,
Attached is one more small patch I had missed in my previous set. This 
change is independent of the other two.  This is also needed to load 
Project.ede files that happen to include custom rules, where those rules 
are also objects.  The Project loader's error checking in eieio-base.el 
requires the :type to be precise when the value can be a list of objects.

I used the same basic mechanism used in ede/base.el for ede-project's 
'targets' slot.

If you want to verify the changes, this project uses the feature:

https://sourceforge.net/p/matlab-emacs/src/ci/master/tree/

Use global-ede-mode and visit this project.

Thanks
Eric

[-- Attachment #2: 0003-lisp-cedet-ede-proj.el.patch --]
[-- Type: text/x-patch, Size: 1247 bytes --]

From d07f0c4711fa8f82c4415a2a69d0338006088205 Mon Sep 17 00:00:00 2001
From: Eric Ludlam <zappo@gnu.org>
Date: Sun, 17 Jan 2021 14:41:51 -0500
Subject: [PATCH 3/3] lisp/cedet/ede/proj.el:

(ede-makefile-rule-list): New type.
(ede-proj-target-makefile): Set :type of :rules slot to
ede-makefile-rule-list.  This enables Project files to
load.
Author: Eric Ludlam <zappo@gnu.org>
---
 lisp/cedet/ede/proj.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 59628ebf4c..78b852378c 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -150,6 +150,9 @@ ede-proj-target
    )
   "Abstract class for ede-proj targets.")
 
+(unless (fboundp 'ede-makefile-rule-p)
+  (cl-deftype ede-makefile-rule-list () '(list-of ede-makefile-rule)))
+
 (defclass ede-proj-target-makefile (ede-proj-target)
   ((makefile :initarg :makefile
 	     :initform "Makefile"
@@ -184,7 +187,7 @@ ede-proj-target-makefile
 commands where the variable would usually appear.")
    (rules :initarg :rules
 	  :initform nil
-	  :type list
+	  :type ede-makefile-rule-list
 	  :custom (repeat (object :objecttype ede-makefile-rule))
 	  :label "Additional Rules"
 	  :group (make)
-- 
2.25.1