feat: deducing this

cppalliance · Feb 9, 2024 · 67fa963 · 67fa963
1 parent 91d6742
commit 67fa963
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 3 deletions.
diff --git a/include/mrdocs/Metadata/Function.hpp b/include/mrdocs/Metadata/Function.hpp
@@ -105,6 +105,8 @@ union FnFlags1
     BitFlag<0> isNodiscard;
 
     BitField<1, 3, ExplicitKind> explicitSpec;
+
+    BitFlag<4> isExplicitObjectMemberFunction;
 };
 
 // KRYSTIAN TODO: attributes (nodiscard, deprecated, and carries_dependency)

diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/function.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/function.adoc.hbs
@@ -11,7 +11,7 @@
 {{#if (eq symbol.class "normal")}}{{>declarator-before symbol.return}}
 {{/if~}}
 {{>declarator-id symbol link=symbol.template.primary}}
-({{#each symbol.params}}{{#unless (and @first @last)}}
+({{#if symbol.isExplicitObjectMemberFunction}}this {{/if}}{{#each symbol.params}}{{#unless (and @first @last)}}
     {{/unless}}{{>declarator type decl-name=name~}}
     {{#if default}} = {{default}}{{/if~}}
     {{#unless @last}},{{/unless~}}

diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp
@@ -1785,7 +1785,7 @@ class ASTVisitor
                 D->getStorageClass());
 
         I.specs1.isNodiscard |= D->template hasAttr<WarnUnusedResultAttr>();
-
+        I.specs1.isExplicitObjectMemberFunction |= D->hasCXXExplicitFunctionObjectParameter();
         //
         // CXXMethodDecl
         //

diff --git a/src/lib/Gen/xml/CXXTags.hpp b/src/lib/Gen/xml/CXXTags.hpp
@@ -170,6 +170,7 @@ inline void write(FnFlags1 const& bits, XMLTags& tags)
 
     fw.write(&FnFlags1::explicitSpec,      "explicit-spec");
     fw.write(&FnFlags1::isNodiscard,       "nodiscard");
+    fw.write(&FnFlags1::isExplicitObjectMemberFunction, "is-explicit-object-member-function");
 }
 
 

diff --git a/src/lib/Lib/SingleFileDB.hpp b/src/lib/Lib/SingleFileDB.hpp
@@ -38,7 +38,7 @@ class SingleFileDB
         std::vector<std::string> cmds;
         cmds.emplace_back("clang");
         cmds.emplace_back("-fsyntax-only");
-        cmds.emplace_back("-std=c++20");
+        cmds.emplace_back("-std=c++23");
         cmds.emplace_back("-pedantic-errors");
         cmds.emplace_back("-Werror");
         cmds.emplace_back(fileName);

diff --git a/src/lib/Metadata/DomMetadata.cpp b/src/lib/Metadata/DomMetadata.cpp
@@ -775,6 +775,7 @@ DomInfo<T>::construct() const
         set_flag("isVolatile",         I_.specs0.isVolatile.get());
         set_flag("isFinal",            I_.specs0.isFinal.get());
         set_flag("isNodiscard",        I_.specs1.isNodiscard.get());
+        set_flag("isExplicitObjectMemberFunction", I_.specs1.isExplicitObjectMemberFunction.get());
 
         auto const set_string =
             [&](dom::String key, dom::String value)

diff --git a/test-files/old-tests/explicit-object-parameter.cpp b/test-files/old-tests/explicit-object-parameter.cpp
@@ -0,0 +1,8 @@
+struct Optional
+{
+    template <typename Self>
+    constexpr auto&& value(this Self&& self);
+
+    template <typename Self>
+    constexpr auto&& value(this Self&& self, int x);
+};
diff --git a/test-files/old-tests/explicit-object-parameter.xml b/test-files/old-tests/explicit-object-parameter.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
+<namespace id="//////////////////////////8=">
+  <struct name="Optional" id="/TAtWMuvF+kz/B0ChmDlGQtnkaA=">
+    <file path="explicit-object-parameter.cpp" line="1" class="def"/>
+    <template>
+      <tparam name="Self" class="type"/>
+      <function name="value" id="XLLL4h9bZlRyA4AQMlfVPCuwMoU=">
+        <file path="explicit-object-parameter.cpp" line="4"/>
+        <attr id="constexpr-kind" name="constexpr" value="1"/>
+        <attr id="is-explicit-object-member-function"/>
+        <return>
+          <type class="rvalue-reference">
+            <pointee-type name="auto"/>
+          </type>
+        </return>
+        <param name="self">
+          <type class="rvalue-reference">
+            <pointee-type name="Self"/>
+          </type>
+        </param>
+      </function>
+    </template>
+    <template>
+      <tparam name="Self" class="type"/>
+      <function name="value" id="aOpxAmSvyM7g6X3lLAJG5i3CTZA=">
+        <file path="explicit-object-parameter.cpp" line="7"/>
+        <attr id="constexpr-kind" name="constexpr" value="1"/>
+        <attr id="is-explicit-object-member-function"/>
+        <return>
+          <type class="rvalue-reference">
+            <pointee-type name="auto"/>
+          </type>
+        </return>
+        <param name="self">
+          <type class="rvalue-reference">
+            <pointee-type name="Self"/>
+          </type>
+        </param>
+        <param name="x">
+          <type name="int"/>
+        </param>
+      </function>
+    </template>
+  </struct>
+</namespace>
+</mrdocs>
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,6 +170,7 @@ inline void write(FnFlags1 const& bits, XMLTags& tags) @@
         fw.write(&FnFlags1::explicitSpec,      "explicit-spec");
         fw.write(&FnFlags1::isNodiscard,       "nodiscard");
+        fw.write(&FnFlags1::isExplicitObjectMemberFunction, "is-explicit-object-member-function");
     }
@@ Expand Down @@