Handling storage class specifier thread_local

The `thread_local` storage class specifier was handled differently from the other storage class specifiers (like `mutable`) this has been corrected

Author: albert-github

addon/doxmlparser/doxmlparser/compound.py

@@ -3741,7 +3741,7 @@ class memberdefType(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
-    def __init__(self, kind=None, id=None, prot=None, static=None, extern=None, strong=None, const=None, explicit=None, inline=None, refqual=None, virt=None, volatile=None, mutable=None, noexcept=None, noexceptexpression=None, nodiscard=None, constexpr=None, consteval=None, constinit=None, readable=None, writable=None, initonly=None, settable=None, privatesettable=None, protectedsettable=None, gettable=None, privategettable=None, protectedgettable=None, final=None, sealed=None, new=None, add=None, remove=None, raise_=None, optional=None, required=None, accessor=None, attribute=None, property=None, readonly=None, bound=None, removable=None, constrained=None, transient=None, maybevoid=None, maybedefault=None, maybeambiguous=None, templateparamlist=None, type_=None, definition=None, argsstring=None, name=None, qualifiedname=None, read=None, write=None, bitfield=None, reimplements=None, reimplementedby=None, qualifier=None, param=None, enumvalue=None, requiresclause=None, initializer=None, exceptions=None, briefdescription=None, detaileddescription=None, inbodydescription=None, location=None, references=None, referencedby=None, gds_collector_=None, **kwargs_):
+    def __init__(self, kind=None, id=None, prot=None, static=None, extern=None, strong=None, const=None, explicit=None, inline=None, refqual=None, virt=None, volatile=None, mutable=None, thread_local=None, noexcept=None, noexceptexpression=None, nodiscard=None, constexpr=None, consteval=None, constinit=None, readable=None, writable=None, initonly=None, settable=None, privatesettable=None, protectedsettable=None, gettable=None, privategettable=None, protectedgettable=None, final=None, sealed=None, new=None, add=None, remove=None, raise_=None, optional=None, required=None, accessor=None, attribute=None, property=None, readonly=None, bound=None, removable=None, constrained=None, transient=None, maybevoid=None, maybedefault=None, maybeambiguous=None, templateparamlist=None, type_=None, definition=None, argsstring=None, name=None, qualifiedname=None, read=None, write=None, bitfield=None, reimplements=None, reimplementedby=None, qualifier=None, param=None, enumvalue=None, requiresclause=None, initializer=None, exceptions=None, briefdescription=None, detaileddescription=None, inbodydescription=None, location=None, references=None, referencedby=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
         self.original_tagname_ = None
@@ -3773,6 +3773,8 @@ def __init__(self, kind=None, id=None, prot=None, static=None, extern=None, stro
         self.volatile_nsprefix_ = None
         self.mutable = _cast(None, mutable)
         self.mutable_nsprefix_ = None
+        self.thread_local = _cast(None, thread_local)
+        self.thread_local_nsprefix_ = None
         self.noexcept = _cast(None, noexcept)
         self.noexcept_nsprefix_ = None
         self.noexceptexpression = _cast(None, noexceptexpression)
@@ -4109,6 +4111,10 @@ def get_mutable(self):
         return self.mutable
     def set_mutable(self, mutable):
         self.mutable = mutable
+    def get_thread_local(self):
+        return self.thread_local
+    def set_thread_local(self, thread_local):
+        self.thread_local = thread_local
     def get_noexcept(self):
         return self.noexcept
     def set_noexcept(self, noexcept):
@@ -4415,6 +4421,9 @@ def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='
         if self.mutable is not None and 'mutable' not in already_processed:
             already_processed.add('mutable')
             outfile.write(' mutable=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.mutable), input_name='mutable')), ))
+        if self.thread_local is not None and 'thread_local' not in already_processed:
+            already_processed.add('thread_local')
+            outfile.write(' thread_local=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.thread_local), input_name='thread_local')), ))
         if self.noexcept is not None and 'noexcept' not in already_processed:
             already_processed.add('noexcept')
             outfile.write(' noexcept=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.noexcept), input_name='noexcept')), ))
@@ -4675,6 +4684,11 @@ def buildAttributes(self, node, attrs, already_processed):
             already_processed.add('mutable')
             self.mutable = value
             self.validate_DoxBool(self.mutable)    # validate type DoxBool
+        value = find_attr_value_('thread_local', node)
+        if value is not None and 'thread_local' not in already_processed:
+            already_processed.add('thread_local')
+            self.thread_local = value
+            self.validate_DoxBool(self.thread_local)    # validate type DoxBool
         value = find_attr_value_('noexcept', node)
         if value is not None and 'noexcept' not in already_processed:
             already_processed.add('noexcept')

src/classdef.cpp

@@ -3317,7 +3317,7 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
             (prot!=Protection::Public || (virt!=Specifier::Normal && getLanguage()!=SrcLangExt::ObjC) ||
              md->isFriend() || md->isRelated() || md->isExplicit() ||
              md->isMutable() || (md->isInline() && Config_getBool(INLINE_INFO)) ||
-             md->isSignal() || md->isSlot() ||
+             md->isSignal() || md->isSlot() || md->isThreadLocal() ||
              (getLanguage()==SrcLangExt::IDL &&
               (md->isOptional() || md->isAttribute() || md->isUNOProperty())) ||
              md->isStatic() || lang==SrcLangExt::VHDL
@@ -3337,6 +3337,7 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
                                                    sl.emplace_back("inline");
             if (md->isExplicit())                  sl.emplace_back("explicit");
             if (md->isMutable())                   sl.emplace_back("mutable");
+            if (md->isThreadLocal())               sl.emplace_back("thread_local");
             if (prot==Protection::Protected)       sl.emplace_back("protected");
             else if (prot==Protection::Private)    sl.emplace_back("private");
             else if (prot==Protection::Package)    sl.emplace_back("package");

src/doxygen.cpp

@@ -6690,6 +6690,11 @@ static void findMember(const Entry *root,
       spec.setMutable(true);
       done=false;
     }
+    if (funcDecl.stripPrefix("thread_local "))
+    {
+      spec.setThreadLocal(true);
+      done=false;
+    }
     if (funcDecl.stripPrefix("virtual "))
     {
       done=false;

src/memberdef.cpp

@@ -126,6 +126,7 @@ class MemberDefImpl : public DefinitionMixin<MemberDefMutable>
     bool isInline() const override;
     bool isExplicit() const override;
     bool isMutable() const override;
+    bool isThreadLocal() const override;
     bool isGettable() const override;
     bool isPrivateGettable() const override;
     bool isProtectedGettable() const override;
@@ -675,6 +676,8 @@ class MemberDefAliasImpl : public DefinitionAliasMixin<MemberDef>
     { return getMdAlias()->isExplicit(); }
     bool isMutable() const override
     { return getMdAlias()->isMutable(); }
+    bool isThreadLocal() const override
+    { return getMdAlias()->isThreadLocal(); }
     bool isGettable() const override
     { return getMdAlias()->isGettable(); }
     bool isPrivateGettable() const override
@@ -2831,6 +2834,7 @@ StringVector MemberDefImpl::getLabels(const Definition *container) const
         if      (inlineInfo && isInline())              sl.emplace_back("inline");
         if      (isExplicit())                          sl.emplace_back("explicit");
         if      (isMutable())                           sl.emplace_back("mutable");
+        if      (isThreadLocal())                       sl.emplace_back("thread_local");
         if      (isStatic())                            sl.emplace_back("static");
         if      (isGettable())                          sl.emplace_back("get");
         if      (isProtectedGettable())                 sl.emplace_back("protected get");
@@ -5272,6 +5276,11 @@ bool MemberDefImpl::isMutable() const
   return m_memSpec.isMutable();
 }
 
+bool MemberDefImpl::isThreadLocal() const
+{
+  return m_memSpec.isThreadLocal();
+}
+
 bool MemberDefImpl::isGettable() const
 {
   return m_memSpec.isGettable();

src/memberdef.h

@@ -128,6 +128,7 @@ class MemberDef : public Definition
     virtual bool isInline() const = 0;
     virtual bool isExplicit() const = 0;
     virtual bool isMutable() const = 0;
+    virtual bool isThreadLocal() const = 0;
     virtual bool isGettable() const = 0;
     virtual bool isPrivateGettable() const = 0;
     virtual bool isProtectedGettable() const = 0;

src/scanner.l

@@ -1326,6 +1326,10 @@ NONLopt [^\n]*
                                           yyextra->current->spec.setMutable(true);
                                           lineCount(yyscanner);
                                         }
+<FindMembers>{B}*"thread_local"{BN}+    { if (yyextra->insideJava) REJECT;
+                                          yyextra->current->spec.setThreadLocal(true);
+                                          lineCount(yyscanner);
+                                        }
 <FindMembers>{B}*"explicit"{BN}+        { if (yyextra->insideJava) REJECT;
                                           yyextra->current->spec.setExplicit(true);
                                           lineCount(yyscanner);

src/sqlite3gen.cpp

@@ -189,6 +189,7 @@ const char * table_schema[][2] = {
       "\tvolatile             INTEGER DEFAULT 0, -- 0:no 1:yes\n"
       "\tvirt                 INTEGER DEFAULT 0, -- 0:no 1:virtual 2:pure-virtual\n"
       "\tmutable              INTEGER DEFAULT 0, -- 0:no 1:yes\n"
+      "\tthread_local         INTEGER DEFAULT 0, -- 0:no 1:yes\n"
       "\tinitonly             INTEGER DEFAULT 0, -- 0:no 1:yes\n"
       "\tattribute            INTEGER DEFAULT 0, -- 0:no 1:yes\n"
       "\tproperty             INTEGER DEFAULT 0, -- 0:no 1:yes\n"
@@ -623,6 +624,7 @@ SqlStmt memberdef_insert={
     "volatile,"
     "virt,"
     "mutable,"
+    "thread_local,"
     "initonly,"
     "attribute,"
     "property,"
@@ -682,6 +684,7 @@ SqlStmt memberdef_insert={
     ":volatile,"
     ":virt,"
     ":mutable,"
+    ":thread_local,"
     ":initonly,"
     ":attribute,"
     ":property,"
@@ -1693,6 +1696,7 @@ static void generateSqlite3ForMember(const MemberDef *md, struct Refid scope_ref
   if (md->memberType() == MemberType::Variable)
   {
     bindIntParameter(memberdef_insert,":mutable",md->isMutable());
+    bindIntParameter(memberdef_insert,":thread_local",md->isThreadLocal());
     bindIntParameter(memberdef_insert,":initonly",md->isInitonly());
     bindIntParameter(memberdef_insert,":attribute",md->isAttribute());
     bindIntParameter(memberdef_insert,":property",md->isProperty());

src/types.h

@@ -645,7 +645,7 @@ class LocalToc
 /* 50 */ TSPEC(Default)           TSPEC(Delete)          TSPEC(NoExcept)          TSPEC(Attribute)    TSPEC(Property)           \
 /* 55 */ TSPEC(Readonly)          TSPEC(Bound)           TSPEC(Constrained)       TSPEC(Transient)    TSPEC(MaybeVoid)          \
 /* 60 */ TSPEC(MaybeDefault)      TSPEC(MaybeAmbiguous)  TSPEC(Published)         TSPEC(ConstEval)    TSPEC(ConstInit)          \
-/* 65 */ TSPEC(NoDiscard)
+/* 65 */ TSPEC(NoDiscard)         TSPEC(ThreadLocal)
 
 /** Wrapper class for a number of boolean properties.
  *  The properties are packed together, and initialized to false.

src/xmlgen.cpp

@@ -904,6 +904,10 @@ static void generateXMLForMember(const MemberDef *md,TextStream &ti,TextStream &
     if (md->isMutable()) t << "yes"; else t << "no";
     t << "\"";
 
+    t << " thread_local=\"";
+    if (md->isThreadLocal()) t << "yes"; else t << "no";
+    t << "\"";
+
     if (md->isInitonly())
     {
       t << " initonly=\"yes\"";

templates/xml/compound.xsd

@@ -221,6 +221,7 @@
     <xsd:attribute name="virt" type="DoxVirtualKind" use="optional"/>
     <xsd:attribute name="volatile" type="DoxBool" use="optional"/>
     <xsd:attribute name="mutable" type="DoxBool" use="optional"/>
+    <xsd:attribute name="thread_local" type="DoxBool" use="optional"/>
     <xsd:attribute name="noexcept" type="DoxBool" use="optional"/>
     <xsd:attribute name="noexceptexpression" type="xsd:string" use="optional"/>
     <xsd:attribute name="nodiscard" type="DoxBool" use="optional"/>