From 87ac6d5e218da7a5d45f291484e2486b40c3eb47 Mon Sep 17 00:00:00 2001 From: Jan Moringen Date: Sun, 16 Jun 2024 15:07:49 +0200 Subject: [PATCH] Simplify the wad class hierarchy a bit Since before this change all subclasses of NON-CST-WAD "added back" WAD as a superclass, change the superclass of NON-CST-WAD from BASIC-WAD to WAD. The only "non-proper" wad class (that is, a class which has BASIC-WAD instead of WAD as its direct superclass) is now ERROR-WAD. --- code/wad.lisp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/wad.lisp b/code/wad.lisp index 89e9735..7e63a19 100644 --- a/code/wad.lisp +++ b/code/wad.lisp @@ -452,10 +452,10 @@ ;;; Non-CST wads -(defclass non-cst-wad (basic-wad) +(defclass non-cst-wad (wad) ()) -(defclass skipped-wad (non-cst-wad wad) +(defclass skipped-wad (non-cst-wad) ()) ;;; This class is the base class of all comment wads. @@ -534,8 +534,7 @@ ;;; `text-wad' does not have any children. (defclass text-wad (no-children-mixin - non-cst-wad - wad) ; TODO should not inherit indentation + non-cst-wad) ; TODO should not inherit indentation ()) (defclass punctuation-wad (text-wad)