From: John Snow <jsnow@redhat.com>
Date: Fri, 15 Mar 2024 15:22:44 +0000 (+0100)
Subject: qapi/schema: make c_type() and json_type() abstract methods
X-Git-Tag: v9.1.0-rc0~140^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d150be3d54e4df04948b7205f7ccdde5a84f0684;p=thirdparty%2Fqemu.git

qapi/schema: make c_type() and json_type() abstract methods

These methods should always return a str, it's only the default abstract
implementation that doesn't. They can be marked "abstract", which
requires subclasses to override the method with the proper return type.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240315152301.3621858-9-armbru@redhat.com>
---

diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 48f157fb915..0b01c841ff4 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -16,6 +16,7 @@
 
 # TODO catching name collisions in generated code would be nice
 
+from abc import ABC, abstractmethod
 from collections import OrderedDict
 import os
 import re
@@ -245,9 +246,10 @@ class QAPISchemaInclude(QAPISchemaEntity):
         visitor.visit_include(self._sub_module.name, self.info)
 
 
-class QAPISchemaType(QAPISchemaDefinition):
+class QAPISchemaType(QAPISchemaDefinition, ABC):
     # Return the C type for common use.
     # For the types we commonly box, this is a pointer type.
+    @abstractmethod
     def c_type(self):
         pass
 
@@ -259,6 +261,7 @@ class QAPISchemaType(QAPISchemaDefinition):
     def c_unboxed_type(self):
         return self.c_type()
 
+    @abstractmethod
     def json_type(self):
         pass