chromium · danakj · Sep 11, 2023 · Sep 9, 2023 · Sep 9, 2023 · Sep 9, 2023
diff --git a/STYLE.md b/STYLE.md
@@ -60,3 +60,9 @@ footguns, crashes, bugs, and UB.
   * But don't follow the IWYU rules _inside_ the library. We include the minimal internal
     headers internally to reduce the amount of textual parsing needed to satisfy
     including one public header.
+1. All types in requires clauses should be references or pointers.
+   * For mutable access always write it as `requires(T& t)` instead of
+     `requires (T t)`, as the latter will not match pure virtual types in
+     clang-16.
+   * Similarly, for const usage, write `requires (const T& t)` instead of
+     `requires (const T t)`.
diff --git a/subdoc/gen_tests/markdown/Syntax.html b/subdoc/gen_tests/markdown/Syntax.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+
+<head>
+  <meta name="generator" content="subdoc"></meta>
+  <meta name="viewport" content="width=device-width, initial-scale=1"></meta>
+  <meta property="og:type" content="website"></meta>
+  <meta property="og:site_name" content="PROJECT NAME"></meta>
+  <title>Syntax - PROJECT NAME</title>
+  <meta property="og:title" content="Syntax - PROJECT NAME"></meta>
+  <meta name="description" content="A code block with syntax highlighting."></meta>
+  <meta property="og:description" content="A code block with syntax highlighting."></meta>
+  <link rel="stylesheet" href="../subdoc-test-style.css">
+  <link rel="icon" type="image/svg+xml" href="../icon.svg">
+  <link rel="alternate icon" type="image/png" href="../icon.png">
+  <meta property="og:image" content="../icon.svg"></meta>
+</head>
+
+<body>
+  <nav class="topbar">
+    <button class="sidebar-menu-button" onclick="let e = document.getElementsByClassName('sidebar')[0];e.classList.toggle('shown');">
+      ☰
+    </button>
+    <a class="topbar-logo-link" href="index.html"><div class="topbar-logo-border">
+        <img class="topbar-logo" src="PROJECT LOGO.png"></img>
+      </div></a>
+    <span class="topbar-text-area">
+      <span class="topbar-title">
+        <a href="#">Syntax</a>
+      </span>
+    </span>
+  </nav>
+  <nav class="sidebar">
+    <a class="sidebar-logo-link" href="index.html"><div class="sidebar-logo-border">
+        <img class="sidebar-logo" src="PROJECT LOGO.png"></img>
+      </div></a>
+    <div class="sidebar-pretitle sidebar-text">
+      struct
+    </div>
+    <div class="sidebar-title sidebar-text">
+      <a href="#">Syntax</a>
+    </div>
+    <div class="sidebar-subtitle sidebar-text">
+    </div>
+    <div class="sidebar-links sidebar-text">
+      <ul>
+      </ul>
+    </div>
+  </nav>
+  <main>
+    <div class="type record struct">
+      <div class="section overview">
+        <div class="section-header">
+          <span>
+            Struct
+          </span>
+          <a class="project-name" href="index.html">PROJECT NAME</a>
+          <span class="namespace-dots">::</span>
+          <a class="type-name" href="#">Syntax</a>
+        </div>
+        <div class="type-signature">
+          <span class="struct">
+            struct
+          </span>
+          <span class="type-name">
+            Syntax
+          </span>
+          <div class="record-body">
+            { ... };
+          </div>
+        </div>
+        <div class="description long">
+          <p>A code block with syntax highlighting.</p>
+<pre><code>A comment;  <span class="comment">// At the end of the line.</span>
+<span class="comment">// At the start of the line.</span>
+  <span class="comment">// And after some whitespace.</span>
+</code></pre>
+
+        </div>
+      </div>
+    </div>
+  </main>
+</body>
diff --git a/subdoc/gen_tests/markdown/index.html b/subdoc/gen_tests/markdown/index.html
@@ -52,6 +52,9 @@
         <li>
           <a class="sidebar-item" href="S.html">S</a>
         </li>
+        <li>
+          <a class="sidebar-item" href="Syntax.html">Syntax</a>
+        </li>
       </ul>
     </div>
   </nav>
@@ -91,6 +94,16 @@
               <p>The <code>summary</code> has <b>html tags</b> in it.</p>
             </div>
           </li>
+          <li class="section-item">
+            <div class="item-name">
+              <div class="type-signature">
+                <a class="type-name" href="Syntax.html">Syntax</a>
+              </div>
+            </div>
+            <div class="description short">
+              <p>A code block with syntax highlighting.</p>
+            </div>
+          </li>
         </ul>
       </div>
     </div>

diff --git a/subdoc/gen_tests/markdown/test.cc b/subdoc/gen_tests/markdown/test.cc
@@ -8,3 +8,11 @@ struct S {};
 /// newlines in
 /// it.
 struct N {};
+
+/// A code block with syntax highlighting.
+/// ```
+/// A comment;  // At the end of the line.
+/// // At the start of the line.
+///   // And after some whitespace.
+/// ```
+struct Syntax {};
diff --git a/subdoc/gen_tests/struct-complex/S.html b/subdoc/gen_tests/struct-complex/S.html
@@ -73,6 +73,12 @@
         <li>
           <a class="sidebar-item" href="S.html#method.void_method">void_method</a>
         </li>
+        <li>
+          <a class="sidebar-header" href="#operators">Operators</a>
+        </li>
+        <li>
+          <a class="sidebar-item" href="S.html#method.operator()">operator()</a>
+        </li>
         <li>
           <a class="sidebar-header" href="#data-members">Data Members</a>
         </li>
@@ -190,6 +196,28 @@
           </div>
         </div>
       </div>
+      <div class="section methods nonstatic">
+        <div class="section-header">
+          <a name="operators" href="#operators">Operators</a>
+        </div>
+        <div class="section-items">
+          <div class="overload-set item-name">
+            <div class="overload">
+              <div class="function-signature"><a name="method.operator()"></a><span class="function-auto">auto</span> <a class="function-name" href="S.html#method.operator()">operator()</a>() const& -&gt; int</div>
+            </div>
+            <div class="overload">
+              <div class="function-signature"><a name="method.operator()"></a><span class="function-auto">auto</span> <a class="function-name" href="S.html#method.operator()">operator()</a>() & -&gt; bool</div>
+            </div>
+            <div class="overload">
+              <div class="function-signature"><a name="method.operator()"></a><span class="function-auto">auto</span> <a class="function-name" href="S.html#method.operator()">operator()</a>() && -&gt; float</div>
+            </div>
+          </div>
+          <div class="description long">
+            <p>Call operator with two overloads.</p>
+
+          </div>
+        </div>
+      </div>
       <div class="section fields nonstatic">
         <div class="section-header">
           <a name="data-members" href="#data-members">Data Members</a>

diff --git a/subdoc/gen_tests/struct-complex/test.cc b/subdoc/gen_tests/struct-complex/test.cc
@@ -6,16 +6,16 @@ struct OtherType {};
 /// Comment headline S
 struct S {
   /// Comment headline void_method
-  void void_method() const& {}
+  void void_method() const&;
   /// Comment headline static_type_method
-  static OtherType static_type_method() {}
+  static OtherType static_type_method();
   /// Comment headline type_method
-  OtherType type_method() {}
+  OtherType type_method();
   /// Comment headline static_bool_method
-  static bool static_bool_method() {}
+  static bool static_bool_method();
 
   // Overload should be grouped with the other int_method().
-  void int_method() volatile {}
+  void int_method() volatile;
 
   /// Comment headline type_field
   const OtherType type_field;
@@ -25,4 +25,9 @@ struct S {
   bool bool_field;
   /// Comment headline static_bool_member
   static bool static_bool_member;
+
+  /// Call operator with two overloads.
+  int operator()() const&;
+  bool operator()() &;
+  float operator()() &&;
 };
diff --git a/subdoc/gen_tests/subdoc-test-style.css b/subdoc/gen_tests/subdoc-test-style.css
@@ -206,6 +206,9 @@ main {
     color:rgb(230, 230, 230);
     overflow-x: auto;
 }
+pre > code span.comment {
+    color: #3ff9bd;
+}
 
 .section-header {
     font-size: 125%;

diff --git a/subdoc/lib/database.h b/subdoc/lib/database.h
@@ -18,13 +18,13 @@
 
 #include "subdoc/lib/doc_attributes.h"
 #include "subdoc/lib/friendly_names.h"
+#include "subdoc/lib/linked_type.h"
 #include "subdoc/lib/method_qualifier.h"
 #include "subdoc/lib/parse_comment.h"
 #include "subdoc/lib/path.h"
 #include "subdoc/lib/record_type.h"
 #include "subdoc/lib/requires.h"
 #include "subdoc/lib/type.h"
-#include "subdoc/lib/linked_type.h"
 #include "subdoc/lib/unique_symbol.h"
 #include "subdoc/llvm.h"
 #include "sus/assertions/check.h"
@@ -226,7 +226,7 @@ struct FunctionElement : public CommentElement {
     return sus::none();
   }
 
-  void for_each_comment(sus::fn::FnMutRef<void(Comment&)> fn) { fn(comment); }
+  void for_each_comment(sus::fn::FnMut<void(Comment&)> auto fn) { fn(comment); }
 };
 
 struct ConceptElement : public CommentElement {
@@ -262,7 +262,7 @@ struct ConceptElement : public CommentElement {
     return sus::none();
   }
 
-  void for_each_comment(sus::fn::FnMutRef<void(Comment&)> fn) { fn(comment); }
+  void for_each_comment(sus::fn::FnMut<void(Comment&)> auto fn) { fn(comment); }
 };
 
 struct FieldElement : public CommentElement {
@@ -310,7 +310,7 @@ struct FieldElement : public CommentElement {
     return sus::none();
   }
 
-  void for_each_comment(sus::fn::FnMutRef<void(Comment&)> fn) { fn(comment); }
+  void for_each_comment(sus::fn::FnMut<void(Comment&)> auto fn) { fn(comment); }
 };
 
 struct ConceptId {
@@ -552,7 +552,7 @@ struct RecordElement : public TypeElement {
     return out;
   }
 
-  void for_each_comment(sus::fn::FnMutRef<void(Comment&)> fn) {
+  void for_each_comment(sus::fn::FnMut<void(Comment&)> auto fn) {
     fn(comment);
     for (auto& [k, e] : records) e.for_each_comment(fn);
     for (auto& [k, e] : fields) e.for_each_comment(fn);
@@ -736,7 +736,7 @@ struct NamespaceElement : public CommentElement {
     return out;
   }
 
-  void for_each_comment(sus::fn::FnMutRef<void(Comment&)> fn) {
+  void for_each_comment(sus::fn::FnMut<void(Comment&)> auto fn) {
     fn(comment);
     for (auto& [k, e] : concepts) e.for_each_comment(fn);
     for (auto& [k, e] : namespaces) e.for_each_comment(fn);
@@ -777,13 +777,11 @@ struct Database {
     sus::Vec<Comment*> to_resolve;
     {
       sus::Vec<Comment*>* to_resolve_ptr = &to_resolve;
-      sus::fn::FnMutBox<void(Comment&)> fn = sus_bind_mut(
-          sus_store(sus_unsafe_pointer(to_resolve_ptr)), [&](Comment& c) {
-            if (c.attrs.inherit.is_some()) {
-              to_resolve_ptr->push(&c);
-            }
-          });
-      global.for_each_comment(fn);
+      global.for_each_comment([&](Comment& c) {
+        if (c.attrs.inherit.is_some()) {
+          to_resolve_ptr->push(&c);
+        }
+      });
     }
 
     while (!to_resolve.is_empty()) {
@@ -931,41 +929,44 @@ struct Database {
   sus::Vec<sus::Option<TypeRef>> collect_type_element_refs(
       const Type& type) const noexcept {
     sus::Vec<sus::Option<TypeRef>> vec;
-    type_walk_types(type, [&](TypeToStringQuery q) {
-      const NamespaceElement* ns_cursor = &global;
-      for (const std::string& name : q.namespace_path) {
-        auto it = ns_cursor->namespaces.find(NamespaceId(name));
-        if (it == ns_cursor->namespaces.end()) {
-          vec.push(sus::none());
-          return;
-        }
-        ns_cursor = &it->second;
-      }
-      if (q.record_path.is_empty()) {
-        vec.push(ns_cursor->get_local_type_element_ref_by_name(q.name));
-        return;
-      }
+    type_walk_types(
+        type,
+        sus::dyn<sus::fn::DynFnMut<void(TypeToStringQuery)>>(
+            [&](TypeToStringQuery q) {
+              const NamespaceElement* ns_cursor = &global;
+              for (const std::string& name : q.namespace_path) {
+                auto it = ns_cursor->namespaces.find(NamespaceId(name));
+                if (it == ns_cursor->namespaces.end()) {
+                  vec.push(sus::none());
+                  return;
+                }
+                ns_cursor = &it->second;
+              }
+              if (q.record_path.is_empty()) {
+                vec.push(ns_cursor->get_local_type_element_ref_by_name(q.name));
+                return;
+              }
 
-      const RecordElement* rec_cursor = nullptr;
-      for (const auto& [i, name] : q.record_path.iter().enumerate()) {
-        if (i == 0u) {
-          auto it = ns_cursor->records.find(RecordId(name));
-          if (it == ns_cursor->records.end()) {
-            vec.push(sus::none());
-            return;
-          }
-          rec_cursor = &it->second;
-        } else {
-          auto it = rec_cursor->records.find(RecordId(name));
-          if (it == rec_cursor->records.end()) {
-            vec.push(sus::none());
-            return;
-          }
-          rec_cursor = &it->second;
-        }
-      }
-      vec.push(rec_cursor->get_local_type_element_ref_by_name(q.name));
-    });
+              const RecordElement* rec_cursor = nullptr;
+              for (const auto& [i, name] : q.record_path.iter().enumerate()) {
+                if (i == 0u) {
+                  auto it = ns_cursor->records.find(RecordId(name));
+                  if (it == ns_cursor->records.end()) {
+                    vec.push(sus::none());
+                    return;
+                  }
+                  rec_cursor = &it->second;
+                } else {
+                  auto it = rec_cursor->records.find(RecordId(name));
+                  if (it == rec_cursor->records.end()) {
+                    vec.push(sus::none());
+                    return;
+                  }
+                  rec_cursor = &it->second;
+                }
+              }
+              vec.push(rec_cursor->get_local_type_element_ref_by_name(q.name));
+            }));
     return vec;
   }
 

diff --git a/subdoc/lib/gen/generate_function.cc b/subdoc/lib/gen/generate_function.cc
@@ -49,9 +49,12 @@ void generate_function_params(HtmlWriter::OpenDiv& div,
       if (p.parameter_name.empty()) {
         generate_type(div, p.type, sus::none());
       } else {
-        generate_type(div, p.type, sus::some([&](HtmlWriter::OpenDiv& div) {
-                        div.write_text(p.parameter_name);
-                      }));
+        generate_type(
+            div, p.type,
+            sus::some(sus::dyn<sus::fn::DynFnMut<void(HtmlWriter::OpenDiv&)>>(
+                [&](HtmlWriter::OpenDiv& div) {
+                  div.write_text(p.parameter_name);
+                })));
       }
 
       if (p.default_value.is_some()) {