[clang][extract-api] Fix small issues with SymbolGraphSerializer

[dang]

Summary

This includes:

• replacing "relationhips" with "relationships"
• emitting the "pathComponents" property on symbols
• emitting the "accessLevel" property on symbols

[zixuw]

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

17

Not needed

509

What's the cost/would it worth it to wrap the emplace_backs and pop_backs of PathComponentContext in meaningful APIs like enterPathComponentContext and exitPathComponentContext?
That way the code is more self-explanatory and easier to read. It took me some time and mental resources to figure out why the pop_back is placed here.

519–530

Same comment as above, would be nice to have clear APIs for entering and exiting path component contexts.

655

oops 😬

clang/test/ExtractAPI/macro_undefined.c

53

s/m/,/

[QuietMisdreavus]

After a quick scan comparing the current output of these symbol graphs with the primary library used for reading them, the last thing i can spot that's "off" is that the "function signature" is currently being serialized under a parameters field instead of the required functionSignature.

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

509

What's the use of having the emplace_back call inside serializeAPIRecord but to pop it outside? It seems like it's easier to mess up for new kinds of records.

[zixuw]

In D123045#3427699, @QuietMisdreavus wrote:

After a quick scan comparing the current output of these symbol graphs with the primary library used for reading them, the last thing i can spot that's "off" is that the "function signature" is currently being serialized under a parameters field instead of the required functionSignature.

Hmm, I was looking at the format specification at https://github.com/apple/swift-docc-symbolkit/blob/0a45209833f4a151212c1aa38e13cfc03b9462e4/openapi.yaml#L307, and I searched the term functionSignature in the spec but found no property with that name (except for the FunctionSignature schema that the parameters property is referring to). But anyway this should be a easy fix.

[zixuw]

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

509

The reason to emplace_back the path component inside serializeAPIRecord is that the pathComponent field of the Record is serialized in there so you want to include the name of the symbol itself in the path component list.
The pop_back is delayed til all other additional serialization for a specific kind of record, for example serializeEnumRecord handles all the enum cases after processing the enum record itself using serializeAPIRecord. So in order to correctly include the enum name in the path components of all the enum cases, the enum name has to stay in PathComponentContext until all members are serialized.

This is exactly the reason why I wanted a clearer API to make it easier to see.

[zixuw]

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

509

Hmm now that I thought about this, it seems that it would be easier to understand and avoid bugs if we lift PathComponentContext.emplace_back/enterPathComponentContext out of serializeAPIRecord, because we have access to the record name before that anyway.

So we establish a pre-condition of serializeAPIRecord that the correct path components would be set up in PathComponentContext before the call so we could still serialize the field inside that method. And in specific serialize*Record methods we push the record name, and pop out at the end.

This way the push and pop operations would appear in pairs in a single block, saving the confusion and mental work of jumping across functions to see how PathComponentContext is evolving.

[QuietMisdreavus]

In D123045#3427992, @zixuw wrote:

In D123045#3427699, @QuietMisdreavus wrote:

After a quick scan comparing the current output of these symbol graphs with the primary library used for reading them, the last thing i can spot that's "off" is that the "function signature" is currently being serialized under a parameters field instead of the required functionSignature.

Hmm, I was looking at the format specification at https://github.com/apple/swift-docc-symbolkit/blob/0a45209833f4a151212c1aa38e13cfc03b9462e4/openapi.yaml#L307, and I searched the term functionSignature in the spec but found no property with that name (except for the FunctionSignature schema that the parameters property is referring to). But anyway this should be a easy fix.

It seems like the specification and implementation have diverged. The parser in swift-docc-symbolkit is looking for a functionSignature field by virtue of how it names its "coding key". By comparison, here is the functionSignature emitter in the Swift symbol-graph generator.

[dang]

In D123045#3428030, @QuietMisdreavus wrote:

In D123045#3427992, @zixuw wrote:

In D123045#3427699, @QuietMisdreavus wrote:

After a quick scan comparing the current output of these symbol graphs with the primary library used for reading them, the last thing i can spot that's "off" is that the "function signature" is currently being serialized under a parameters field instead of the required functionSignature.

Hmm, I was looking at the format specification at https://github.com/apple/swift-docc-symbolkit/blob/0a45209833f4a151212c1aa38e13cfc03b9462e4/openapi.yaml#L307, and I searched the term functionSignature in the spec but found no property with that name (except for the FunctionSignature schema that the parameters property is referring to). But anyway this should be a easy fix.

It seems like the specification and implementation have diverged. The parser in swift-docc-symbolkit is looking for a functionSignature field by virtue of how it names its "coding key". By comparison, here is the functionSignature emitter in the Swift symbol-graph generator.

Yeah we should fix that I will do it as part of this patch since it seems like a small change.

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

509

If you think we should have a specialized API I am happy to do this. I figured it was self-explanatory by the name of PathComponentContext but it clearly isn't so needs addressing. I put the emplace_back call in serializeAPIRecord since all the specific serialization methods call it. I thought it would make it impossible to forget to add them. @zixuw is correct in the reason why the pop is outside we don't want to pop before we have serialized the sub records by agree it is ugly and potentially error prone. I can see three ways forward for improving the ergonomics of this since this seems to be problematic:

• Provide serializeAPIRecord a continuation to serialize the sub records or additional fields, that way we can move the pop inside serializeAPIRecord I am not a fan personally because we get into JS style closure hell if we start doing this...
• Use a visitor pattern where the visitor would be responsible for managing PathComponentContext and do the appropriate push/pops in the visit methods. We would need to add a APIRecordVisitor type, and appropriate visit methods for each APIRecord. This would make sense because the records should really know how to visit themselves.
• Just add a specialized API although it seems it would really easy to forget to remove path components.

Let me know what you think is the way forward.

655

Yeah that's on us for not catching this earlier.

[dang]

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

509

Unless we go with the last option, I think this should be a follow up patch since it would a structural change.

[dang]

Address code review feedback:

• Fix the function signature serialization
• Typo fix of "m to ",

[QuietMisdreavus]

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

509

I'm most a fan of the APIRecordVisitor option, but you're right in that that would be a rather involved change. Now that you've said that the arrangement is for encoding sub-records, it makes sense to me. As an alternative, i think moving the emplace_back outside of serializeAPIRecord is actually my other preferred arrangement; without some other way of calculating the path components on-the-fly (e.g. walking up DeclContexts) simply having serializeAPIRecord look at what's there and have the wrapper calls deal with setting up its state sounds the most reasonable to me. That way, as @zixuw said, the emplace_back and pop_back calls are at least lexically close to each other.

[dang]

Add descriptive method names for manipulating the path component stack.

[dang]

Manage PatchComponents stack manipulation using RAII to avoid forgetting to pop
the stack when returning early from serializeAPIRecord.

[dang]

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

509

Let's move to a visitor based implementation later as a follow up patch since it is quite a big structural change. For now, I have implemented managing path components using RAII to avoid issues around forgetting to pop when returning early for skipped records.

[QuietMisdreavus]

I like the idea of using the RAII context/guard to manage the path components stack. I have one non-blocking comment about the rest of the patch now.

clang/include/clang/ExtractAPI/Serialization/SymbolGraphSerializer.h

125

Now that the path components are being manipulated outside of serializeAPIRecord, can this function become const again?

[dang]

Make SymbolGraphSerializer::serializeAPIRecord const again.

[zixuw]

Unused include of declaration fragments in SymbolGraphSerializer. Otherwise LGTM!

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

17

ping.

[dang]

Remove unnecessary include.

clang/include/clang/ExtractAPI/Serialization/SymbolGraphSerializer.h

 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_EXTRACTAPI_SERIALIZATION_SYMBOLGRAPHSERIALIZER_H
 #define LLVM_CLANG_EXTRACTAPI_SERIALIZATION_SYMBOLGRAPHSERIALIZER_H
 
 #include "clang/ExtractAPI/API.h"
 #include "clang/ExtractAPI/Serialization/SerializerBase.h"
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/VersionTuple.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace clang {
 namespace extractapi {
 
 using namespace llvm::json;
class SymbolGraphSerializer : public APISerializer {
   Array Symbols;
 
   /// A JSON array of formatted symbol relationships in \c APISet.
   Array Relationships;
 
   /// The Symbol Graph format version used by this serializer.
   static const VersionTuple FormatVersion;
 
+  using PathComponentStack = llvm::SmallVector<llvm::StringRef, 4>;
+  /// The current path component stack.
+  ///
+  /// Note: this is used to serialize the ``pathComponents`` field of symbols in
+  /// the Symbol Graph.
+  PathComponentStack PathComponents;
+
+  /// A helper type to manage PathComponents correctly using RAII.
+  struct PathComponentGuard {
+    PathComponentGuard(PathComponentStack &PC, StringRef Component) : PC(PC) {
+      PC.emplace_back(Component);
+    }
+
+    ~PathComponentGuard() { PC.pop_back(); }
+
+  private:
+    PathComponentStack &PC;
+  };
+
 public:
   /// Serialize the APIs in \c APISet in the Symbol Graph format.
   ///
   /// \returns a JSON object that contains the root of the formatted
   /// Symbol Graph.
   Object serialize();
 
   /// Implement the APISerializer::serialize interface. Wrap serialize(void) and
private:
   /// This handles the shared information of all kinds of API records,
   /// for example identifier and source location. The resulting object is then
   /// augmented with kind-specific symbol information by the caller.
   /// This method also checks if the given \p Record should be skipped during
   /// serialization.
   ///
   /// \returns \c None if this \p Record should be skipped, or a JSON object
   /// containing common symbol information of \p Record.
   Optional<Object> serializeAPIRecord(const APIRecord &Record) const;
 
   /// Serialize the \p Kind relationship between \p Source and \p Target.
   ///
   /// Record the relationship between the two symbols in
   /// SymbolGraphSerializer::Relationships.
   void serializeRelationship(RelationshipKind Kind, SymbolReference Source,
                              SymbolReference Target);
 
   /// Serialize a global record.
   void serializeGlobalRecord(const GlobalRecord &Record);
 
   /// Serialize an enum record.
   void serializeEnumRecord(const EnumRecord &Record);
 
   /// Serialize a struct record.
   void serializeStructRecord(const StructRecord &Record);
 
   /// Serialize an Objective-C container record.
   void serializeObjCContainerRecord(const ObjCContainerRecord &Record);
 
   /// Serialize a macro defintion record.
   void serializeMacroDefinitionRecord(const MacroDefinitionRecord &Record);
 
+  /// Push a component to the current path components stack.
+  ///
+  /// \param Component The component to push onto the path components stack.
+  /// \return A PathComponentGuard responsible for removing the latest
+  /// component from the stack on scope exit.
+  LLVM_NODISCARD PathComponentGuard makePathComponentGuard(StringRef Component);
+
 public:
   SymbolGraphSerializer(const APISet &API, StringRef ProductName,
                         APISerializerOption Options = {})
       : APISerializer(API, ProductName, Options) {}
 };
 
 } // namespace extractapi
 } // namespace clang
 
 #endif // LLVM_CLANG_EXTRACTAPI_SERIALIZATION_SYMBOLGRAPHSERIALIZER_H

clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

 //===- ExtractAPI/Serialization/SymbolGraphSerializer.cpp -------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// This file implements the SymbolGraphSerializer.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "clang/ExtractAPI/Serialization/SymbolGraphSerializer.h"
 #include "clang/Basic/Version.h"
 #include "clang/ExtractAPI/API.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/VersionTuple.h"
 
 using namespace clang;
 using namespace clang::extractapi;
 using namespace llvm;
 using namespace llvm::json;
 

 Object serializePlatform(const Triple &T) {
   Object Platform;
   Platform["architecture"] = T.getArchName();
   Platform["vendor"] = T.getVendorName();
   Platform["operatingSystem"] = serializeOperatingSystem(T);
   return Platform;
 }
 
+/// Serialize a source position.
+Object serializeSourcePosition(const PresumedLoc &Loc) {
+  assert(Loc.isValid() && "invalid source position");
+
+  Object SourcePosition;
+  SourcePosition["line"] = Loc.getLine();
+  SourcePosition["character"] = Loc.getColumn();
+
+  return SourcePosition;
+}
+
 /// Serialize a source location in file.
 ///
 /// \param Loc The presumed location to serialize.
 /// \param IncludeFileURI If true, include the file path of \p Loc as a URI.
 /// Defaults to false.
-Object serializeSourcePosition(const PresumedLoc &Loc,
+Object serializeSourceLocation(const PresumedLoc &Loc,
                                bool IncludeFileURI = false) {
-  assert(Loc.isValid() && "invalid source position");
-
-  Object SourcePosition;
-  SourcePosition["line"] = Loc.getLine();
-  SourcePosition["character"] = Loc.getColumn();
+  Object SourceLocation;
+  serializeObject(SourceLocation, "position", serializeSourcePosition(Loc));
 
   if (IncludeFileURI) {
     std::string FileURI = "file://";
     // Normalize file path to use forward slashes for the URI.
     FileURI += sys::path::convert_to_slash(Loc.getFilename());
-    SourcePosition["uri"] = FileURI;
+    SourceLocation["uri"] = FileURI;
   }
 
-  return SourcePosition;
+  return SourceLocation;
 }
 
 /// Serialize a source range with begin and end locations.
 Object serializeSourceRange(const PresumedLoc &BeginLoc,
                             const PresumedLoc &EndLoc) {
   Object SourceRange;
   serializeObject(SourceRange, "start", serializeSourcePosition(BeginLoc));
   serializeObject(SourceRange, "end", serializeSourcePosition(EndLoc));
SymbolGraphSerializer::serializeAPIRecord(const APIRecord &Record) const {
 
   Object Obj;
   serializeObject(Obj, "identifier",
                   serializeIdentifier(Record, API.getLanguage()));
   serializeObject(Obj, "kind", serializeSymbolKind(Record, API.getLanguage()));
   serializeObject(Obj, "names", serializeNames(Record));
   serializeObject(
       Obj, "location",
-      serializeSourcePosition(Record.Location, /*IncludeFileURI=*/true));
+      serializeSourceLocation(Record.Location, /*IncludeFileURI=*/true));
   serializeObject(Obj, "availbility",
                   serializeAvailability(Record.Availability));
   serializeObject(Obj, "docComment", serializeDocComment(Record.Comment));
   serializeArray(Obj, "declarationFragments",
                  serializeDeclarationFragments(Record.Declaration));
+  // TODO: Once we keep track of symbol access information serialize it
+  // correctly here.
+  Obj["accessLevel"] = "public";
+  serializeArray(Obj, "pathComponents", Array(PathComponents));
 
   return Obj;
 }
 
 StringRef SymbolGraphSerializer::getRelationshipString(RelationshipKind Kind) {
   switch (Kind) {
   case RelationshipKind::MemberOf:
     return "memberOf";
void SymbolGraphSerializer::serializeRelationship(RelationshipKind Kind,
   Relationship["source"] = Source.USR;
   Relationship["target"] = Target.USR;
   Relationship["kind"] = getRelationshipString(Kind);
 
   Relationships.emplace_back(std::move(Relationship));
 }
 
 void SymbolGraphSerializer::serializeGlobalRecord(const GlobalRecord &Record) {
+  auto GlobalPathComponentGuard = makePathComponentGuard(Record.Name);
+
   auto Obj = serializeAPIRecord(Record);
   if (!Obj)
     return;
 
   if (Record.GlobalKind == GVKind::Function)
-    serializeObject(*Obj, "parameters",
+    serializeObject(*Obj, "functionSignature",
                     serializeFunctionSignature(Record.Signature));
 
   Symbols.emplace_back(std::move(*Obj));
 }
 
 void SymbolGraphSerializer::serializeEnumRecord(const EnumRecord &Record) {
+  auto EnumPathComponentGuard = makePathComponentGuard(Record.Name);
   auto Enum = serializeAPIRecord(Record);
   if (!Enum)
     return;
 
   Symbols.emplace_back(std::move(*Enum));
 
   for (const auto &Constant : Record.Constants) {
+    auto EnumConstantPathComponentGuard =
+        makePathComponentGuard(Constant->Name);
     auto EnumConstant = serializeAPIRecord(*Constant);
+
     if (!EnumConstant)
       continue;
 
     Symbols.emplace_back(std::move(*EnumConstant));
     serializeRelationship(RelationshipKind::MemberOf, *Constant, Record);
   }
 }
 
 void SymbolGraphSerializer::serializeStructRecord(const StructRecord &Record) {
+  auto StructPathComponentGuard = makePathComponentGuard(Record.Name);
   auto Struct = serializeAPIRecord(Record);
   if (!Struct)
     return;
 
   Symbols.emplace_back(std::move(*Struct));
 
   for (const auto &Field : Record.Fields) {
+    auto StructFieldPathComponentGuard = makePathComponentGuard(Field->Name);
     auto StructField = serializeAPIRecord(*Field);
+
     if (!StructField)
       continue;
 
     Symbols.emplace_back(std::move(*StructField));
     serializeRelationship(RelationshipKind::MemberOf, *Field, Record);
   }
 }
 
 void SymbolGraphSerializer::serializeObjCContainerRecord(
     const ObjCContainerRecord &Record) {
+  auto ObjCContainerPathComponentGuard = makePathComponentGuard(Record.Name);
   auto ObjCContainer = serializeAPIRecord(Record);
   if (!ObjCContainer)
     return;
 
   Symbols.emplace_back(std::move(*ObjCContainer));
 
   // Record instance variables and that the instance variables are members of
   // the container.
   for (const auto &Ivar : Record.Ivars) {
+    auto IvarPathComponentGuard = makePathComponentGuard(Ivar->Name);
     auto ObjCIvar = serializeAPIRecord(*Ivar);
+
     if (!ObjCIvar)
       continue;
 
     Symbols.emplace_back(std::move(*ObjCIvar));
     serializeRelationship(RelationshipKind::MemberOf, *Ivar, Record);
   }
 
   // Record methods and that the methods are members of the container.
   for (const auto &Method : Record.Methods) {
+    auto MethodPathComponentGuard = makePathComponentGuard(Method->Name);
     auto ObjCMethod = serializeAPIRecord(*Method);
+
     if (!ObjCMethod)
       continue;
 
     Symbols.emplace_back(std::move(*ObjCMethod));
     serializeRelationship(RelationshipKind::MemberOf, *Method, Record);
   }
 
   // Record properties and that the properties are members of the container.
   for (const auto &Property : Record.Properties) {
+    auto PropertyPathComponentGuard = makePathComponentGuard(Property->Name);
     auto ObjCProperty = serializeAPIRecord(*Property);
+
     if (!ObjCProperty)
       continue;
 
     Symbols.emplace_back(std::move(*ObjCProperty));
     serializeRelationship(RelationshipKind::MemberOf, *Property, Record);
   }
 
   for (const auto &Protocol : Record.Protocols)
     // Record that Record conforms to Protocol.
     serializeRelationship(RelationshipKind::ConformsTo, Record, Protocol);
 
   if (auto *ObjCInterface = dyn_cast<ObjCInterfaceRecord>(&Record))
     if (!ObjCInterface->SuperClass.empty())
       // If Record is an Objective-C interface record and it has a super class,
       // record that Record is inherited from SuperClass.
       serializeRelationship(RelationshipKind::InheritsFrom, Record,
                             ObjCInterface->SuperClass);
 }
 
 void SymbolGraphSerializer::serializeMacroDefinitionRecord(
     const MacroDefinitionRecord &Record) {
+  auto MacroPathComponentGuard = makePathComponentGuard(Record.Name);
   auto Macro = serializeAPIRecord(Record);
+
   if (!Macro)
     return;
 
   Symbols.emplace_back(std::move(*Macro));
 }
 
+SymbolGraphSerializer::PathComponentGuard
+SymbolGraphSerializer::makePathComponentGuard(StringRef Component) {
+  return PathComponentGuard(PathComponents, Component);
+}
+
 Object SymbolGraphSerializer::serialize() {
   Object Root;
   serializeObject(Root, "metadata", serializeMetadata());
   serializeObject(Root, "module", serializeModule());
 
   // Serialize global records in the API set.
   for (const auto &Global : API.getGlobals())
     serializeGlobalRecord(*Global.second);
Object SymbolGraphSerializer::serialize() {
   // Serialize Objective-C protocol records in the API set.
   for (const auto &ObjCProtocol : API.getObjCProtocols())
     serializeObjCContainerRecord(*ObjCProtocol.second);
 
   for (const auto &Macro : API.getMacros())
     serializeMacroDefinitionRecord(*Macro.second);
 
   Root["symbols"] = std::move(Symbols);
-  Root["relationhips"] = std::move(Relationships);
+  Root["relationships"] = std::move(Relationships);
 
   return Root;
 }
 
 void SymbolGraphSerializer::serialize(raw_ostream &os) {
   Object root = serialize();
   if (Options.Compact)
     os << formatv("{0}", Value(std::move(root))) << "\n";
   else
     os << formatv("{0:2}", Value(std::move(root))) << "\n";
 }

clang/test/ExtractAPI/enum.c

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [
+  "relationships": [
     {
       "kind": "memberOf",
       "source": "c:@E@Vehicle@Bicycle",
       "target": "c:@E@Vehicle"
     },
     {
       "kind": "memberOf",
       "source": "c:@E@Vehicle@Car",
"relationships": [
     {
       "kind": "memberOf",
       "source": "c:@E@Direction@West",
       "target": "c:@E@Direction"
     }
   ],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "enum"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "c",
         "precise": "c:@E@Vehicle"
       },
       "kind": {
         "displayName": "Enumeration",
         "identifier": "c.enum"
       },
       "location": {
+        "position": {
           "character": 6,
-        "line": 2,
+          "line": 2
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Vehicle"
           }
         ],
         "title": "Vehicle"
-      }
+      },
+      "pathComponents": [
+        "Vehicle"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "Bicycle"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Vehicle@Bicycle"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 3,
+          "line": 3
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Bicycle"
           }
         ],
         "title": "Bicycle"
-      }
+      },
+      "pathComponents": [
+        "Vehicle",
+        "Bicycle"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "Car"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Vehicle@Car"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 4,
+          "line": 4
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Car"
           }
         ],
         "title": "Car"
-      }
+      },
+      "pathComponents": [
+        "Vehicle",
+        "Car"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "Train"
         }
       ],
       "docComment": {
         "lines": [
"symbols": [
         "interfaceLanguage": "c",
         "precise": "c:@E@Vehicle@Train"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 5,
+          "line": 5
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Train"
           }
         ],
         "title": "Train"
-      }
+      },
+      "pathComponents": [
+        "Vehicle",
+        "Train"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "Ship"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Vehicle@Ship"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 6,
+          "line": 6
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Ship"
           }
         ],
         "title": "Ship"
-      }
+      },
+      "pathComponents": [
+        "Vehicle",
+        "Ship"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "Airplane"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Vehicle@Airplane"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 7,
+          "line": 7
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Airplane"
           }
         ],
         "title": "Airplane"
-      }
+      },
+      "pathComponents": [
+        "Vehicle",
+        "Airplane"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "enum"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "c",
         "precise": "c:@E@Direction"
       },
       "kind": {
         "displayName": "Enumeration",
         "identifier": "c.enum"
       },
       "location": {
+        "position": {
           "character": 6,
-        "line": 10,
+          "line": 10
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Direction"
           }
         ],
         "title": "Direction"
-      }
+      },
+      "pathComponents": [
+        "Direction"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "North"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Direction@North"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 11,
+          "line": 11
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "North"
           }
         ],
         "title": "North"
-      }
+      },
+      "pathComponents": [
+        "Direction",
+        "North"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "East"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Direction@East"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 12,
+          "line": 12
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "East"
           }
         ],
         "title": "East"
-      }
+      },
+      "pathComponents": [
+        "Direction",
+        "East"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "South"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Direction@South"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 13,
+          "line": 13
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "South"
           }
         ],
         "title": "South"
-      }
+      },
+      "pathComponents": [
+        "Direction",
+        "South"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "West"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Direction@West"
       },
       "kind": {
         "displayName": "Enumeration Case",
         "identifier": "c.enum.case"
       },
       "location": {
+        "position": {
           "character": 3,
-        "line": 14,
+          "line": 14
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "West"
           }
         ],
         "title": "West"
-      }
+      },
+      "pathComponents": [
+        "Direction",
+        "West"
+      ]
     }
   ]
 }

clang/test/ExtractAPI/global_record.c

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [],
+  "relationships": [],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:I",
           "spelling": "int"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "num"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@num"
       },
       "kind": {
         "displayName": "Global Variable",
         "identifier": "c.var"
       },
       "location": {
+        "position": {
           "character": 5,
-        "line": 1,
+          "line": 1
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "num"
           }
         ],
         "title": "num"
-      }
+      },
+      "pathComponents": [
+        "num"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:v",
           "spelling": "void"
         },
         {
           "kind": "text",
"symbols": [
                 "character": 1,
                 "line": 8
               }
             },
             "text": " "
           }
         ]
       },
-      "identifier": {
-        "interfaceLanguage": "c",
-        "precise": "c:@F@add"
-      },
-      "kind": {
-        "displayName": "Function",
-        "identifier": "c.func"
-      },
-      "location": {
-        "character": 6,
-        "line": 9,
-        "uri": "file://INPUT_DIR/input.h"
-      },
-      "names": {
-        "subHeading": [
-          {
-            "kind": "identifier",
-            "spelling": "add"
-          }
-        ],
-        "title": "add"
-      },
-      "parameters": {
+      "functionSignature": {
         "parameters": [
           {
             "declarationFragments": [
               {
                 "kind": "keyword",
                 "spelling": "const"
               },
               {
"symbols": [
         ],
         "returns": [
           {
             "kind": "typeIdentifier",
             "preciseIdentifier": "c:v",
             "spelling": "void"
           }
         ]
+      },
+      "identifier": {
+        "interfaceLanguage": "c",
+        "precise": "c:@F@add"
+      },
+      "kind": {
+        "displayName": "Function",
+        "identifier": "c.func"
+      },
+      "location": {
+        "position": {
+          "character": 6,
+          "line": 9
+        },
+        "uri": "file://INPUT_DIR/input.h"
+      },
+      "names": {
+        "subHeading": [
+          {
+            "kind": "identifier",
+            "spelling": "add"
           }
+        ],
+        "title": "add"
+      },
+      "pathComponents": [
+        "add"
+      ]
     }
   ]
 }

clang/test/ExtractAPI/global_record_multifile.c

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [],
+  "relationships": [],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:I",
           "spelling": "int"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "num"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@num"
       },
       "kind": {
         "displayName": "Global Variable",
         "identifier": "c.var"
       },
       "location": {
+        "position": {
           "character": 5,
-        "line": 1,
+          "line": 1
+        },
         "uri": "file://INPUT_DIR/input1.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "num"
           }
         ],
         "title": "num"
-      }
+      },
+      "pathComponents": [
+        "num"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:v",
           "spelling": "void"
         },
         {
           "kind": "text",
"symbols": [
                 "character": 1,
                 "line": 6
               }
             },
             "text": " "
           }
         ]
       },
-      "identifier": {
-        "interfaceLanguage": "c",
-        "precise": "c:@F@add"
-      },
-      "kind": {
-        "displayName": "Function",
-        "identifier": "c.func"
-      },
-      "location": {
-        "character": 6,
-        "line": 7,
-        "uri": "file://INPUT_DIR/input2.h"
-      },
-      "names": {
-        "subHeading": [
-          {
-            "kind": "identifier",
-            "spelling": "add"
-          }
-        ],
-        "title": "add"
-      },
-      "parameters": {
+      "functionSignature": {
         "parameters": [
           {
             "declarationFragments": [
               {
                 "kind": "keyword",
                 "spelling": "const"
               },
               {
"symbols": [
         ],
         "returns": [
           {
             "kind": "typeIdentifier",
             "preciseIdentifier": "c:v",
             "spelling": "void"
           }
         ]
+      },
+      "identifier": {
+        "interfaceLanguage": "c",
+        "precise": "c:@F@add"
+      },
+      "kind": {
+        "displayName": "Function",
+        "identifier": "c.func"
+      },
+      "location": {
+        "position": {
+          "character": 6,
+          "line": 7
+        },
+        "uri": "file://INPUT_DIR/input2.h"
+      },
+      "names": {
+        "subHeading": [
+          {
+            "kind": "identifier",
+            "spelling": "add"
           }
+        ],
+        "title": "add"
+      },
+      "pathComponents": [
+        "add"
+      ]
     }
   ]
 }

clang/test/ExtractAPI/language.c

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [],
+  "relationships": [],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:C",
           "spelling": "char"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "c"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@c"
       },
       "kind": {
         "displayName": "Global Variable",
         "identifier": "c.var"
       },
       "location": {
+        "position": {
           "character": 6,
-        "line": 1,
+          "line": 1
+        },
         "uri": "file://INPUT_DIR/c.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "c"
           }
         ],
         "title": "c"
-      }
+      },
+      "pathComponents": [
+        "c"
+      ]
     }
   ]
 }
 //--- objc.reference.output.json.in
 {
   "metadata": {
     "formatVersion": {
       "major": 0,
"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [],
+  "relationships": [],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:C",
           "spelling": "char"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "objc"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:@objc"
       },
       "kind": {
         "displayName": "Global Variable",
         "identifier": "objective-c.var"
       },
       "location": {
+        "position": {
           "character": 6,
-        "line": 1,
+          "line": 1
+        },
         "uri": "file://INPUT_DIR/objc.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "objc"
           }
         ],
         "title": "objc"
-      }
+      },
+      "pathComponents": [
+        "objc"
+      ]
     }
   ]
 }

clang/test/ExtractAPI/macro_undefined.c

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [],
+  "relationships": [],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:v",
           "spelling": "void"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "foo"
         },
         {
           "kind": "text",
           "spelling": "()"
         }
       ],
+      "functionSignature": {
+        "returns": [
+          {
+            "kind": "typeIdentifier",
+            "preciseIdentifier": "c:v",
+            "spelling": "void"
+          }
+        ]
+      },
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:@F@foo"
       },
       "kind": {
         "displayName": "Function",
         "identifier": "objective-c.func"
       },
       "location": {
+        "position": {
           "character": 1,
-        "line": 3,
+          "line": 3
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "foo"
           }
         ],
         "title": "foo"
       },
-      "parameters": {
-        "returns": [
-          {
-            "kind": "typeIdentifier",
-            "preciseIdentifier": "c:v",
-            "spelling": "void"
-          }
-        ]
-      }
+      "pathComponents": [
+        "foo"
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:v",
           "spelling": "void"
         },
         {
           "kind": "text",
"symbols": [
           "kind": "internalParam",
           "spelling": ""
         },
         {
           "kind": "text",
           "spelling": ")"
         }
       ],
-      "identifier": {
-        "interfaceLanguage": "objective-c",
-        "precise": "c:@F@bar"
-      },
-      "kind": {
-        "displayName": "Function",
-        "identifier": "objective-c.func"
-      },
-      "location": {
-        "character": 1,
-        "line": 4,
-        "uri": "file://INPUT_DIR/input.h"
-      },
-      "names": {
-        "subHeading": [
-          {
-            "kind": "identifier",
-            "spelling": "bar"
-          }
-        ],
-        "title": "bar"
-      },
-      "parameters": {
+      "functionSignature": {
         "parameters": [
           {
             "declarationFragments": [
               {
                 "kind": "keyword",
                 "spelling": "const"
               },
               {
"symbols": [
         ],
         "returns": [
           {
             "kind": "typeIdentifier",
             "preciseIdentifier": "c:v",
             "spelling": "void"
           }
         ]
+      },
+      "identifier": {
+        "interfaceLanguage": "objective-c",
+        "precise": "c:@F@bar"
+      },
+      "kind": {
+        "displayName": "Function",
+        "identifier": "objective-c.func"
+      },
+      "location": {
+        "position": {
+          "character": 1,
+          "line": 4
+        },
+        "uri": "file://INPUT_DIR/input.h"
+      },
+      "names": {
+        "subHeading": [
+          {
+            "kind": "identifier",
+            "spelling": "bar"
           }
+        ],
+        "title": "bar"
+      },
+      "pathComponents": [
+        "bar"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "#define"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "HELLO"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@8@macro@HELLO"
       },
       "kind": {
         "displayName": "Macro",
         "identifier": "objective-c.macro"
       },
       "location": {
+        "position": {
           "character": 9,
-        "line": 1,
+          "line": 1
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "HELLO"
           }
         ],
         "title": "HELLO"
-      }
+      },
+      "pathComponents": [
+        "HELLO"
+      ]
     }
   ]
 }

clang/test/ExtractAPI/macros.c

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [],
+  "relationships": [],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "#define"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "HELLO"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@8@macro@HELLO"
       },
       "kind": {
         "displayName": "Macro",
         "identifier": "objective-c.macro"
       },
       "location": {
+        "position": {
           "character": 9,
-        "line": 1,
+          "line": 1
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "HELLO"
           }
         ],
         "title": "HELLO"
-      }
+      },
+      "pathComponents": [
+        "HELLO"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "#define"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "WORLD"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@24@macro@WORLD"
       },
       "kind": {
         "displayName": "Macro",
         "identifier": "objective-c.macro"
       },
       "location": {
+        "position": {
           "character": 9,
-        "line": 2,
+          "line": 2
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "WORLD"
           }
         ],
         "title": "WORLD"
-      }
+      },
+      "pathComponents": [
+        "WORLD"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "#define"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@40@macro@MACRO_FUN"
       },
       "kind": {
         "displayName": "Macro",
         "identifier": "objective-c.macro"
       },
       "location": {
+        "position": {
           "character": 9,
-        "line": 3,
+          "line": 3
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "MACRO_FUN"
           }
         ],
         "title": "MACRO_FUN"
-      }
+      },
+      "pathComponents": [
+        "MACRO_FUN"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "#define"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@65@macro@FUN"
       },
       "kind": {
         "displayName": "Macro",
         "identifier": "objective-c.macro"
       },
       "location": {
+        "position": {
           "character": 9,
-        "line": 4,
+          "line": 4
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "FUN"
           }
         ],
         "title": "FUN"
-      }
+      },
+      "pathComponents": [
+        "FUN"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "#define"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@96@macro@FUNC99"
       },
       "kind": {
         "displayName": "Macro",
         "identifier": "objective-c.macro"
       },
       "location": {
+        "position": {
           "character": 9,
-        "line": 5,
+          "line": 5
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "FUNC99"
           }
         ],
         "title": "FUNC99"
-      }
+      },
+      "pathComponents": [
+        "FUNC99"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "#define"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@119@macro@FUNGNU"
       },
       "kind": {
         "displayName": "Macro",
         "identifier": "objective-c.macro"
       },
       "location": {
+        "position": {
           "character": 9,
-        "line": 6,
+          "line": 6
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "FUNGNU"
           }
         ],
         "title": "FUNGNU"
-      }
+      },
+      "pathComponents": [
+        "FUNGNU"
+      ]
     }
   ]
 }

clang/test/ExtractAPI/objc_interface.m

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [
+  "relationships": [
     {
       "kind": "memberOf",
       "source": "c:objc(cs)Super(cm)getWithProperty:",
       "target": "c:objc(cs)Super"
     },
     {
       "kind": "memberOf",
       "source": "c:objc(cs)Super(py)Property",
"relationships": [
     {
       "kind": "inheritsFrom",
       "source": "c:objc(cs)Derived",
       "target": "c:objc(cs)Super"
     }
   ],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "@interface"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "Super"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Super"
       },
       "kind": {
         "displayName": "Class",
         "identifier": "objective-c.class"
       },
       "location": {
+        "position": {
           "character": 12,
-        "line": 3,
+          "line": 3
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Super"
           }
         ],
         "title": "Super"
-      }
+      },
+      "pathComponents": [
+        "Super"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "text",
           "spelling": "+ ("
         },
         {
           "kind": "keyword",
           "spelling": "id"
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Super(cm)getWithProperty:"
       },
       "kind": {
         "displayName": "Type Method",
         "identifier": "objective-c.type.method"
       },
       "location": {
+        "position": {
           "character": 1,
-        "line": 5,
+          "line": 5
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "text",
             "spelling": "+ "
           },
           {
             "kind": "identifier",
             "spelling": "getWithProperty:"
           }
         ],
         "title": "getWithProperty:"
-      }
+      },
+      "pathComponents": [
+        "Super",
+        "getWithProperty:"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "@property"
         },
         {
           "kind": "text",
           "spelling": " ("
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Super(py)Property"
       },
       "kind": {
         "displayName": "Instance Property",
         "identifier": "objective-c.property"
       },
       "location": {
+        "position": {
           "character": 50,
-        "line": 4,
+          "line": 4
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Property"
           }
         ],
         "title": "Property"
-      }
+      },
+      "pathComponents": [
+        "Super",
+        "Property"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "@interface"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Derived"
       },
       "kind": {
         "displayName": "Class",
         "identifier": "objective-c.class"
       },
       "location": {
+        "position": {
           "character": 12,
-        "line": 8,
+          "line": 8
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Derived"
           }
         ],
         "title": "Derived"
-      }
+      },
+      "pathComponents": [
+        "Derived"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:C",
           "spelling": "char"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "Ivar"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Derived@Ivar"
       },
       "kind": {
         "displayName": "Instance Variable",
         "identifier": "objective-c.ivar"
       },
       "location": {
+        "position": {
           "character": 8,
-        "line": 9,
+          "line": 9
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Ivar"
           }
         ],
         "title": "Ivar"
-      }
+      },
+      "pathComponents": [
+        "Derived",
+        "Ivar"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "text",
           "spelling": "- ("
         },
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:C",
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Derived(im)getIvar"
       },
       "kind": {
         "displayName": "Instance Method",
         "identifier": "objective-c.method"
       },
       "location": {
+        "position": {
           "character": 1,
-        "line": 11,
+          "line": 11
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "text",
             "spelling": "- "
           },
           {
             "kind": "identifier",
             "spelling": "getIvar"
           }
         ],
         "title": "getIvar"
-      }
+      },
+      "pathComponents": [
+        "Derived",
+        "getIvar"
+      ]
     }
   ]
 }

clang/test/ExtractAPI/objc_protocol.m

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [
+  "relationships": [
     {
       "kind": "conformsTo",
       "source": "c:objc(pl)AnotherProtocol",
       "target": "c:objc(pl)Protocol"
     }
   ],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "@protocol"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "Protocol"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(pl)Protocol"
       },
       "kind": {
         "displayName": "Protocol",
         "identifier": "objective-c.protocol"
       },
       "location": {
+        "position": {
           "character": 11,
-        "line": 1,
+          "line": 1
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Protocol"
           }
         ],
         "title": "Protocol"
-      }
+      },
+      "pathComponents": [
+        "Protocol"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "@protocol"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(pl)AnotherProtocol"
       },
       "kind": {
         "displayName": "Protocol",
         "identifier": "objective-c.protocol"
       },
       "location": {
+        "position": {
           "character": 11,
-        "line": 4,
+          "line": 4
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "AnotherProtocol"
           }
         ],
         "title": "AnotherProtocol"
-      }
+      },
+      "pathComponents": [
+        "AnotherProtocol"
+      ]
     }
   ]
 }

clang/test/ExtractAPI/struct.c

"platform": {
           "minor": 0,
           "patch": 0
         },
         "name": "macosx"
       },
       "vendor": "apple"
     }
   },
-  "relationhips": [
+  "relationships": [
     {
       "kind": "memberOf",
       "source": "c:@S@Color@FI@Red",
       "target": "c:@S@Color"
     },
     {
       "kind": "memberOf",
       "source": "c:@S@Color@FI@Green",
       "target": "c:@S@Color"
     },
     {
       "kind": "memberOf",
       "source": "c:@S@Color@FI@Blue",
       "target": "c:@S@Color"
     },
     {
       "kind": "memberOf",
       "source": "c:@S@Color@FI@Alpha",
       "target": "c:@S@Color"
     }
   ],
   "symbols": [
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
           "spelling": "struct"
         },
         {
           "kind": "text",
           "spelling": " "
"symbols": [
         "interfaceLanguage": "c",
         "precise": "c:@S@Color"
       },
       "kind": {
         "displayName": "Structure",
         "identifier": "c.struct"
       },
       "location": {
+        "position": {
           "character": 8,
-        "line": 2,
+          "line": 2
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Color"
           }
         ],
         "title": "Color"
-      }
+      },
+      "pathComponents": [
+        "Color"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "Red"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@S@Color@FI@Red"
       },
       "kind": {
         "displayName": "Instance Property",
         "identifier": "c.property"
       },
       "location": {
+        "position": {
           "character": 12,
-        "line": 3,
+          "line": 3
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Red"
           }
         ],
         "title": "Red"
-      }
+      },
+      "pathComponents": [
+        "Color",
+        "Red"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "Green"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@S@Color@FI@Green"
       },
       "kind": {
         "displayName": "Instance Property",
         "identifier": "c.property"
       },
       "location": {
+        "position": {
           "character": 12,
-        "line": 4,
+          "line": 4
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Green"
           }
         ],
         "title": "Green"
-      }
+      },
+      "pathComponents": [
+        "Color",
+        "Green"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "Blue"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@S@Color@FI@Blue"
       },
       "kind": {
         "displayName": "Instance Property",
         "identifier": "c.property"
       },
       "location": {
+        "position": {
           "character": 12,
-        "line": 5,
+          "line": 5
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Blue"
           }
         ],
         "title": "Blue"
-      }
+      },
+      "pathComponents": [
+        "Color",
+        "Blue"
+      ]
     },
     {
+      "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
         },
         {
           "kind": "text",
"symbols": [
         "interfaceLanguage": "c",
         "precise": "c:@S@Color@FI@Alpha"
       },
       "kind": {
         "displayName": "Instance Property",
         "identifier": "c.property"
       },
       "location": {
+        "position": {
           "character": 12,
-        "line": 7,
+          "line": 7
+        },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "subHeading": [
           {
             "kind": "identifier",
             "spelling": "Alpha"
           }
         ],
         "title": "Alpha"
-      }
+      },
+      "pathComponents": [
+        "Color",
+        "Alpha"
+      ]
     }
   ]
 }