Swift: fix potential name conflict on schema class fields

redsun82 · redsun82 · commit f9df8a645fde · 2022-10-20T11:30:05.000+02:00
diff --git a/swift/codegen/lib/schema/defs.py b/swift/codegen/lib/schema/defs.py
@@ -46,19 +46,10 @@ def modify(self, prop: _schema.Property):
 
     def __call__(self, cls: type) -> type:
         """ use this pragma as a decorator on classes """
-        if "pragmas" in cls.__dict__:  # not using hasattr as we don't want to land on inherited pragmas
-            cls.pragmas.append(self.pragma)
+        if "_pragmas" in cls.__dict__:  # not using hasattr as we don't want to land on inherited pragmas
+            cls._pragmas.append(self.pragma)
         else:
-            cls.pragmas = [self.pragma]
-        return cls
-
-
-@_dataclass
-class _DefaultDocNameClassModifier:
-    doc_name: str
-
-    def __call__(self, cls: type) -> type:
-        cls._doc_name = self.doc_name
+            cls._pragmas = [self.pragma]
         return cls
 
 
@@ -106,7 +97,7 @@ def __init__(self, **kwargs):
 def _annotate(**kwargs) -> _ClassDecorator:
     def f(cls: type) -> type:
         for k, v in kwargs.items():
-            setattr(cls, k, v)
+            setattr(cls, f"_{k}", v)
         return cls
 
     return f
@@ -131,7 +122,7 @@ def f(cls: type) -> type:
 )
 
 ql = _Namespace(
-    default_doc_name=_DefaultDocNameClassModifier,
+    default_doc_name=lambda doc: _annotate(doc_name=doc)
 )
 
 cpp = _Namespace(
diff --git a/swift/codegen/lib/schema/schema.py b/swift/codegen/lib/schema/schema.py
@@ -193,16 +193,16 @@ def _get_class(cls: type) -> Class:
         raise Error(f"Only class definitions allowed in schema, found {cls}")
     if cls.__name__[0].islower():
         raise Error(f"Class name must be capitalized, found {cls.__name__}")
-    if len({b.group for b in cls.__bases__ if hasattr(b, "group")}) > 1:
+    if len({b._group for b in cls.__bases__ if hasattr(b, "_group")}) > 1:
         raise Error(f"Bases with mixed groups for {cls.__name__}")
     return Class(name=cls.__name__,
                  bases=[b.__name__ for b in cls.__bases__ if b is not object],
                  derived={d.__name__ for d in cls.__subclasses__()},
                  # getattr to inherit from bases
-                 group=getattr(cls, "group", ""),
+                 group=getattr(cls, "_group", ""),
                  # in the following we don't use `getattr` to avoid inheriting
-                 pragmas=cls.__dict__.get("pragmas", []),
-                 ipa=cls.__dict__.get("ipa", None),
+                 pragmas=cls.__dict__.get("_pragmas", []),
+                 ipa=cls.__dict__.get("_ipa", None),
                  properties=[
                      a | _PropertyNamer(n)
                      for n, a in cls.__dict__.get("__annotations__", {}).items()
