zeroc-ice 3.7.11 → 3.8.1

data/dist/ice/cpp/src/Slice/DocCommentParser.cpp

@@ -0,0 +1,736 @@
+// Copyright (c) ZeroC, Inc.
+
+#include "DocCommentParser.h"
+#include "Ice/StringUtil.h"
+
+#include <algorithm>
+#include <cassert>
+
+using namespace std;
+using namespace Slice;
+
+namespace Slice
+{
+    class DocCommentParser final : public ParserVisitor
+    {
+    public:
+        DocCommentParser(DocCommentFormatter& formatter) : _formatter(formatter) {}
+
+        bool visitModuleStart(const ModulePtr& p) final;
+        void visitClassDecl(const ClassDeclPtr& p) final;
+        bool visitClassDefStart(const ClassDefPtr& p) final;
+        void visitInterfaceDecl(const InterfaceDeclPtr& p) final;
+        bool visitInterfaceDefStart(const InterfaceDefPtr& p) final;
+        bool visitExceptionStart(const ExceptionPtr& p) final;
+        bool visitStructStart(const StructPtr& p) final;
+        void visitOperation(const OperationPtr& p) final;
+        void visitDataMember(const DataMemberPtr& p) final;
+        void visitSequence(const SequencePtr& p) final;
+        void visitDictionary(const DictionaryPtr& p) final;
+        void visitEnum(const EnumPtr& p) final;
+        void visitConst(const ConstPtr& p) final;
+
+        [[nodiscard]] bool shouldVisitIncludedDefinitions() const final { return true; }
+
+    private:
+        /// Parses the doc-comment for @p p in-place.
+        /// @remark This function must be called on a doc-comment before it's usable for code-gen purposes.
+        void parseDocCommentFor(const ContainedPtr& p);
+
+        DocCommentFormatter& _formatter;
+    };
+}
+
+void
+Slice::parseAllDocComments(const UnitPtr& unit, DocCommentFormatter& formatter)
+{
+    DocCommentParser visitor{formatter};
+    unit->visit(&visitor);
+}
+
+void
+DocCommentFormatter::preprocess(StringList&)
+{
+}
+
+string
+DocCommentFormatter::formatCode(const string& rawText)
+{
+    return "`" + rawText + "`";
+}
+
+string
+DocCommentFormatter::formatParamRef(const string& param)
+{
+    return formatCode(param);
+}
+
+string
+DocCommentFormatter::formatSeeAlso(const string& rawLink, const ContainedPtr& source, const SyntaxTreeBasePtr& target)
+{
+    // Many languages don't support 'see-also' tags, so by default we map them to regular doc-links.
+    return formatLink(rawLink, source, target);
+}
+
+bool
+DocCommentParser::visitModuleStart(const ModulePtr& p)
+{
+    parseDocCommentFor(p);
+    return true;
+}
+
+void
+DocCommentParser::visitClassDecl(const ClassDeclPtr& p)
+{
+    parseDocCommentFor(p);
+}
+
+bool
+DocCommentParser::visitClassDefStart(const ClassDefPtr& p)
+{
+    parseDocCommentFor(p);
+    return true;
+}
+
+void
+DocCommentParser::visitInterfaceDecl(const InterfaceDeclPtr& p)
+{
+    parseDocCommentFor(p);
+}
+
+bool
+DocCommentParser::visitInterfaceDefStart(const InterfaceDefPtr& p)
+{
+    parseDocCommentFor(p);
+    return true;
+}
+
+bool
+DocCommentParser::visitExceptionStart(const ExceptionPtr& p)
+{
+    parseDocCommentFor(p);
+    return true;
+}
+
+bool
+DocCommentParser::visitStructStart(const StructPtr& p)
+{
+    parseDocCommentFor(p);
+    return true;
+}
+
+void
+DocCommentParser::visitOperation(const OperationPtr& p)
+{
+    parseDocCommentFor(p);
+    for (const auto& param : p->parameters())
+    {
+        parseDocCommentFor(param);
+    }
+}
+
+void
+DocCommentParser::visitDataMember(const DataMemberPtr& p)
+{
+    parseDocCommentFor(p);
+}
+
+void
+DocCommentParser::visitSequence(const SequencePtr& p)
+{
+    parseDocCommentFor(p);
+}
+
+void
+DocCommentParser::visitDictionary(const DictionaryPtr& p)
+{
+    parseDocCommentFor(p);
+}
+
+void
+DocCommentParser::visitEnum(const EnumPtr& p)
+{
+    parseDocCommentFor(p);
+    for (const auto& enumerator : p->enumerators())
+    {
+        parseDocCommentFor(enumerator);
+    }
+}
+
+void
+DocCommentParser::visitConst(const ConstPtr& p)
+{
+    parseDocCommentFor(p);
+}
+
+namespace
+{
+    void trimLines(StringList& lines)
+    {
+        // Remove empty trailing lines.
+        while (!lines.empty() && lines.back().empty())
+        {
+            lines.pop_back();
+        }
+    }
+
+    bool parseCommentLine(string_view line, string_view tag, string& doc)
+    {
+        const string ws = " \t";
+        const auto tagLength = tag.size();
+
+        // If the line doesn't start with the provided tag, we immediately return false.
+        // Note that any leading whitespace has already been stripped off here.
+        if (line.find(tag) != 0)
+        {
+            return false;
+        }
+
+        // The tag must be immediately followed by whitespace, or be the entire line (for multiline tags).
+        if (line.find_first_of(ws, tagLength) != tagLength && line.length() != tagLength)
+        {
+            return false;
+        }
+
+        // Find the first non-whitespace character after the tag. This marks the start of the `doc` string.
+        const auto docSplitPos = line.find_first_not_of(ws, tagLength);
+        if (docSplitPos != string::npos)
+        {
+            doc = line.substr(docSplitPos);
+        }
+        return true;
+    }
+
+    bool parseNamedCommentLine(string_view line, string_view tag, string& name, string& doc)
+    {
+        const string ws = " \t";
+
+        // First we check for the tag and parse the doc-comment normally.
+        if (parseCommentLine(line, tag, doc))
+        {
+            // Then we perform additional parsing to extract the name...
+
+            auto nameStart = line.find_first_not_of(ws, tag.size());
+            if (nameStart == string::npos)
+            {
+                return false; // Malformed line, ignore it.
+            }
+
+            auto nameEnd = line.find_first_of(ws, nameStart);
+            if (nameEnd == string::npos)
+            {
+                return false; // Malformed line, ignore it.
+            }
+            name = line.substr(nameStart, nameEnd - nameStart);
+
+            // Store whatever remains of the doc comment in the `doc` string.
+            auto docSplitPos = line.find_first_not_of(ws, nameEnd);
+            if (docSplitPos != string::npos)
+            {
+                doc = line.substr(docSplitPos);
+            }
+
+            return true;
+        }
+        return false;
+    }
+
+    /// Returns a pointer to the Slice element referenced by `linkText`, relative to the scope of `source`.
+    /// If the link cannot be resolved, `nullptr` is returned instead.
+    SyntaxTreeBasePtr resolveDocLink(string linkText, const ContainedPtr& source)
+    {
+        // First we check if the link is to a builtin type.
+        if (auto kind = Builtin::kindFromString(linkText))
+        {
+            return source->unit()->createBuiltin(kind.value());
+        }
+
+        // Then, before checking for user-defined types, we determine which scope we'll be searching relative to.
+        ContainerPtr linkSourceScope = dynamic_pointer_cast<Container>(source);
+        if (!linkSourceScope || dynamic_pointer_cast<Operation>(source))
+        {
+            linkSourceScope = source->container();
+        }
+
+        // Perform the actual lookup.
+        auto separatorPos = linkText.find('#');
+        if (separatorPos == 0)
+        {
+            // If the link starts with '#', it is explicitly relative to the `linkSourceScope` container.
+            ContainedList results = source->unit()->findContents(linkSourceScope->thisScope() + linkText.substr(1));
+            return (results.empty() ? nullptr : results.front());
+        }
+        else if (separatorPos != string::npos)
+        {
+            // If the link has a '#' anywhere else, convert it to '::' so we can look it up.
+            linkText.replace(separatorPos, 1, "::");
+        }
+        ContainedList results = linkSourceScope->lookupContained(linkText, false);
+        return (results.empty() ? nullptr : results.front());
+    }
+
+    /// Formats a code-span starting at \p pos.
+    /// Slice fully supports Markdown's backtick handling, so normal text backticks can be escaped with a backslash
+    /// '\`', and we allow multiple backticks to be used as a single delimiter: '`` wow ` is cool``'.
+    /// @param line The line containing the code-span. This line will be edited in place to remove the original
+    ///             Slice-style code-span and replace it with a properly formatted code-span.
+    /// @param pos The position where the '`' appears in the line. This value should be updated to account for
+    ///            any characters this function inserts to avoid double-parsing things.
+    void formatCodeElement(const ContainedPtr& p, DocCommentFormatter& formatter, string& line, size_t& pos)
+    {
+        // If this backtick is escaped with a backslash, remove the backslash but do nothing else.
+        // This isn't a code-span, just a normal backtick.
+        if (pos > 0 && line[pos - 1] == '\\')
+        {
+            line.erase(pos - 1, 1);
+            return;
+        }
+
+        // Count the number of successive backticks. The end of the code-span must have the same number.
+        auto openingEnd = line.find_first_not_of('`', pos);
+        openingEnd = (openingEnd == string::npos ? line.size() : openingEnd);
+        auto count = openingEnd - pos;
+
+        // Find the closing delimeter, starting for the end of the opening delimeter.
+        auto delimiter = string(count, '`');
+        auto closingStart = line.find(delimiter, openingEnd);
+        if (closingStart == string::npos)
+        {
+            // No matching delimeter was found. Emit a warning, then skip to the next line. This one is broken.
+            const string msg = "unterminated code span: missing closing backtick delimiter";
+            p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+
+            pos = line.size();
+        }
+        else
+        {
+            // Format the span's text, and replace the entire raw code-span with the returned string.
+            const string spanText = line.substr(openingEnd, closingStart - openingEnd);
+            const string formattedSpan = formatter.formatCode(spanText);
+            line.erase(pos, closingStart + count - pos);
+            line.insert(pos, formattedSpan);
+
+            // Go on to check for the next code-span, skipping past the one we just formatted.
+            pos += formattedSpan.size();
+        }
+    }
+
+    /// Formats an `@link` element starting at \p pos.
+    /// @param line The line containing the link. This line will be edited in place to remove the original
+    ///             Slice-style link and replace it with a properly formatted link for the target language.
+    /// @param pos The starting position of the `@link` in the line. This value should be updated to account for
+    ///            any characters this function inserts to avoid double-parsing things.
+    void formatLinkElement(const ContainedPtr& p, DocCommentFormatter& formatter, string& line, size_t& pos)
+    {
+        const string linkTag = "{@link ";
+
+        auto endpos = line.find('}', pos);
+        if (endpos != string::npos)
+        {
+            // Extract the linked-to identifier.
+            auto identStart = line.find_first_not_of(" \t", pos + linkTag.size());
+            auto identEnd = line.find_last_not_of(" \t", endpos);
+            string linkText = line.substr(identStart, identEnd - identStart);
+
+            // Then erase the entire '{@link foo}' tag from the comment.
+            line.erase(pos, endpos - pos + 1);
+
+            // Attempt to resolve the link, and issue a warning if the link is invalid.
+            SyntaxTreeBasePtr linkTarget = resolveDocLink(linkText, p);
+            if (!linkTarget)
+            {
+                string msg = "no Slice element with identifier '" + linkText + "' could be found in this context";
+                p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+            }
+            if (dynamic_pointer_cast<Parameter>(linkTarget))
+            {
+                // We don't support linking to parameters with '@link' tags.
+                // Parameter links must be done with '@p' tags, and can only appear on the enclosing operation.
+                string msg = "cannot link parameter '" + linkText + "'; parameters can only be referenced with @p";
+                p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                linkTarget = nullptr;
+            }
+
+            // Finally, insert a correctly formatted link where the '{@link foo}' used to be.
+            string formattedLink = formatter.formatLink(linkText, p, linkTarget);
+            line.insert(pos, formattedLink);
+            pos += formattedLink.length();
+        }
+    }
+
+    /// Formats an `@p name` element starting at \p pos.
+    /// @param line The line containing the paramref. This line will be edited in place to remove the original
+    ///             Slice-style paramref and replace it with a properly formatted paramref for the target language.
+    /// @param pos The starting position of the `@p` in the line. This value should be updated to account for
+    ///            any characters this function inserts to avoid double-parsing things.
+    void formatParamrefElement(const ContainedPtr& p, DocCommentFormatter& formatter, string& line, size_t& pos)
+    {
+        const string paramrefTag = "@p";
+
+        // Param-refs always look like "@p<whitespace><name>".
+        // First we find the starting position of the name.
+        auto nameStart = line.find_first_not_of(" \t", pos + paramrefTag.size());
+
+        // If we hit EOL before finding a non-whitespace character, then the 'name' is missing.
+        if (nameStart == string::npos)
+        {
+            p->unit()->warning(p->file(), p->line(), InvalidComment, "missing parameter name after '@p' tag");
+            pos += 2; // Skip the '@p' tag and continue parsing.
+            return;
+        }
+        // If a non-whitespace character comes directly after '@p', it's probably '@param'. Just skip it.
+        if (nameStart == pos + paramrefTag.size())
+        {
+            pos = nameStart;
+            return;
+        }
+
+        // Then find the ending position of the name.
+        const string identifierChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
+        auto nameEnd = line.find_first_not_of(identifierChars, nameStart);
+        if (nameEnd == string::npos)
+        {
+            // If there isn't any whitespace after the name, that means it runs to the end of the line.
+            nameEnd = line.size();
+        }
+
+        // Extract the parameter's name and check if matches an operation parameter.
+        // If it does, make sure to use the mapped name instead of the Slice name.
+        string parameterName = line.substr(nameStart, nameEnd - nameStart);
+        if (auto operationTarget = dynamic_pointer_cast<Operation>(p))
+        {
+            bool doesParameterExist = false;
+            for (const auto& param : operationTarget->parameters())
+            {
+                if (param->name() == parameterName)
+                {
+                    parameterName = param->mappedName();
+                    doesParameterExist = true;
+                    break;
+                }
+            }
+            if (!doesParameterExist)
+            {
+                string opName = operationTarget->name();
+                string msg = "No parameter named '" + parameterName + "' exists on operation '" + opName + "'";
+                p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+            }
+        }
+        else
+        {
+            p->unit()->warning(p->file(), p->line(), InvalidComment, "'@p' tags can only be used on operations");
+        }
+
+        // Format the parameter's name and insert it in-place of the original '@p name'.
+        const string formattedParamName = formatter.formatParamRef(parameterName);
+        line.erase(pos, nameEnd - pos);
+        line.insert(pos, formattedParamName);
+
+        // Check for the next '@p' tag, skipping past the formatted tag we just emitted.
+        pos += formattedParamName.size();
+    }
+}
+
+void
+DocCommentParser::parseDocCommentFor(const ContainedPtr& p)
+{
+    optional<DocComment>& docComment = p->_docComment;
+    if (!docComment)
+    {
+        // If 'p' didn't have a doc-comment, there's nothing to parse. Return immediately.
+        return;
+    }
+
+    // Get the comment's raw lines, and let the formatter perform any preprocessing it wants to.
+    StringList lines = docComment->_rawDocCommentLines;
+    _formatter.preprocess(lines);
+
+    // Then, validate and map any inline tags/formatting characters.
+    for (auto& line : lines)
+    {
+        size_t pos = 0;
+        while (true)
+        {
+            // We check for all inline tags all at the same time, to prevent overlap.
+            // For example: `@p hello` should _only_ be a code-span, not also a param-ref.
+            size_t nextBacktickPos = line.find('`', pos);
+            size_t nextLinkPos = line.find("{@link ", pos);
+            size_t nextParamrefPos = line.find("@p", pos);
+
+            // Remember, `string::npos` is `size_t::max`. So `npos` can _never_ be less than another position.
+            if (nextBacktickPos < nextLinkPos && nextBacktickPos < nextParamrefPos)
+            {
+                // If the next element to handle is a code-span.
+                pos = nextBacktickPos;
+                formatCodeElement(p, _formatter, line, pos);
+            }
+            else if (nextLinkPos < nextBacktickPos && nextLinkPos < nextParamrefPos)
+            {
+                // If the next element to handle is a link.
+                pos = nextLinkPos;
+                formatLinkElement(p, _formatter, line, pos);
+            }
+            else if (nextParamrefPos < nextBacktickPos && nextParamrefPos < nextLinkPos)
+            {
+                // If the next element to handle is a param-ref.
+                pos = nextParamrefPos;
+                formatParamrefElement(p, _formatter, line, pos);
+            }
+            else
+            {
+                // If there's no more inline tags to fix on this line, move on to the next line.
+                break;
+            }
+        }
+    }
+
+    // Some tags are only valid if they're applied to an operation.
+    // And we need a reference to the operation to make sure any names used in the tag match the names in the operation.
+    OperationPtr operationTarget = dynamic_pointer_cast<Operation>(p);
+
+    const string ws = " \t";
+    const string paramTag = "@param";
+    const string throwsTag = "@throws";
+    const string exceptionTag = "@exception";
+    const string remarkTag = "@remark";
+    const string remarksTag = "@remarks";
+    const string seeTag = "@see";
+    const string returnTag = "@return";
+    const string deprecatedTag = "@deprecated";
+
+    StringList* currentSection = &docComment->_overview;
+    string lineText;
+    string name;
+
+    // Parse the comment's text.
+    for (const auto& line : lines)
+    {
+        lineText.clear();
+
+        if (parseNamedCommentLine(line, paramTag, name, lineText))
+        {
+            if (!operationTarget)
+            {
+                // If '@param' was put on anything other than an operation, ignore it and issue a warning.
+                const string msg = "the '" + paramTag + "' tag is only valid on operations";
+                p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                currentSection = nullptr;
+            }
+            else
+            {
+                // Check that the '@param <name>' corresponds to an actual parameter in the operation.
+                const ParameterList params = operationTarget->parameters();
+                const auto paramNameCheck = [&name](const ParameterPtr& param) { return param->name() == name; };
+                if (std::none_of(params.begin(), params.end(), paramNameCheck))
+                {
+                    const string msg = "'" + paramTag + " " + name +
+                                       "' does not correspond to any parameter in operation '" + p->name() + "'";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                }
+
+                // Check if this is a duplicate tag. If it is, ignore it and issue a warning.
+                if (docComment->_parameters.count(name) != 0)
+                {
+                    const string msg = "ignoring duplicate doc-comment tag: '" + paramTag + " " + name + "'";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                    currentSection = nullptr;
+                }
+                else
+                {
+                    docComment->_parameters[name] = {};
+                    currentSection = &docComment->_parameters[name];
+                }
+            }
+        }
+        else if (
+            parseNamedCommentLine(line, throwsTag, name, lineText) ||
+            parseNamedCommentLine(line, exceptionTag, name, lineText))
+        {
+            // '@throws' and '@exception' are equivalent. But we want to use the correct one in our warning messages.
+            const string actualTag = (line.find(throwsTag) == 0) ? throwsTag : exceptionTag;
+            if (!operationTarget)
+            {
+                // If '@throws'/'@exception' was put on anything other than an operation, ignore it and issue a warning.
+                const string msg = "the '" + actualTag + "' tag is only valid on operations";
+                p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                currentSection = nullptr;
+            }
+            else
+            {
+                // Check if the exception exists...
+                const ExceptionPtr exceptionTarget = operationTarget->lookupException(name, false);
+                if (!exceptionTarget)
+                {
+                    const string msg = "'" + actualTag + " " + name +
+                                       "': no exception with this name could be found from the current scope";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                }
+                else
+                {
+                    // ... and matches one of the exceptions in the operation's specification.
+                    const ExceptionList exceptionSpec = operationTarget->throws();
+                    const auto exceptionCheck = [&exceptionTarget](const ExceptionPtr& ex)
+                    { return ex->scoped() == exceptionTarget->scoped(); };
+                    if (std::none_of(exceptionSpec.begin(), exceptionSpec.end(), exceptionCheck))
+                    {
+                        const string msg = "'" + actualTag + " " + name + "': this exception is not listed in the " +
+                                           "exception specification of '" + operationTarget->name() + "'";
+                        p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                    }
+
+                    // Check if this is a duplicate tag. If it is, ignore it and issue a warning.
+                    if (docComment->_exceptions.count(name) != 0)
+                    {
+                        const string msg = "ignoring duplicate doc-comment tag: '" + actualTag + " " + name + "'";
+                        p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                        currentSection = nullptr;
+                    }
+                    else
+                    {
+                        docComment->_exceptions[name] = {};
+                        currentSection = &docComment->_exceptions[name];
+                    }
+                }
+            }
+        }
+        else if (parseCommentLine(line, remarkTag, lineText) || parseCommentLine(line, remarksTag, lineText))
+        {
+            currentSection = &docComment->_remarks;
+        }
+        else if (parseCommentLine(line, seeTag, lineText))
+        {
+            currentSection = &docComment->_seeAlso;
+
+            // Remove any leading and trailing whitespace from the line.
+            // There's no concern of losing formatting for `@see` due to its simplicity.
+            lineText = IceInternal::trim(lineText);
+            if (lineText.empty())
+            {
+                const string msg = "missing link target after '" + seeTag + "' tag";
+                p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+            }
+            else
+            {
+                // If the line ends with a period, remove it and warn users that '@see' tags are not sentences.
+                // Trailing periods will trip up some language's doc-comments.
+                if (lineText.back() == '.')
+                {
+                    const string msg = "ignoring trailing '.' character in '" + seeTag + "' tag";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                    lineText.pop_back();
+                }
+
+                // Attempt to resolve the Slice element being referenced by the '@see' tag.
+                SyntaxTreeBasePtr seeTarget = resolveDocLink(lineText, p);
+                if (!seeTarget)
+                {
+                    string msg = "no Slice element with identifier '" + lineText + "' could be found in this context";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                }
+                if (dynamic_pointer_cast<Parameter>(seeTarget))
+                {
+                    // We don't support referencing parameters with '@see' tags.
+                    // Parameter references must be done with '@p' tags, and can only appear on the enclosing operation.
+                    string msg = "cannot link parameter '" + lineText + "'; parameters can only be referenced with @p";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                    seeTarget = nullptr;
+                }
+
+                // Run the '@see's content through the doc-comment formatter to map it into the target language.
+                // `lineText` will automatically be added to the `DocComment` struct later in this function.
+                lineText = _formatter.formatSeeAlso(lineText, p, seeTarget);
+            }
+        }
+        else if (parseCommentLine(line, returnTag, lineText))
+        {
+            if (!operationTarget)
+            {
+                // If '@return' was put on anything other than an operation, ignore it and issue a warning.
+                const string msg = "the '" + returnTag + "' tag is only valid on operations";
+                p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                currentSection = nullptr;
+            }
+            else
+            {
+                if (!operationTarget->returnType())
+                {
+                    // If '@return' was applied to a void operation (one without a return-type), issue a warning.
+                    const string msg = "'" + returnTag + "' is only valid on operations with non-void return types";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                }
+
+                // Check if this is a duplicate tag. If it is, ignore it and issue a warning.
+                if (!docComment->_returns.empty())
+                {
+                    const string msg = "ignoring duplicate doc-comment tag: '" + returnTag + "'";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                    currentSection = nullptr;
+                }
+                else
+                {
+                    currentSection = &docComment->_returns;
+                }
+            }
+        }
+        else if (parseCommentLine(line, deprecatedTag, lineText))
+        {
+            // Check if this is a duplicate tag (ie. multiple '@deprecated'). If it is, ignore it and issue a warning.
+            if (docComment->_isDeprecated)
+            {
+                const string msg = "ignoring duplicate doc-comment tag: '" + deprecatedTag + "'";
+                p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                currentSection = nullptr;
+            }
+            else
+            {
+                docComment->_isDeprecated = true;
+                currentSection = &docComment->_deprecated;
+            }
+        }
+        else // This line didn't introduce a new tag. Either we're in the overview or a tag whose content is multi-line.
+        {
+            if (!line.empty())
+            {
+                // We've encountered an unknown doc tag.
+                if (line[0] == '@')
+                {
+                    auto unknownTag = line.substr(0, line.find_first_of(" \t"));
+                    if (unknownTag != "@p")
+                    {
+                        const string msg = "ignoring unknown doc tag '" + unknownTag + "' in comment";
+                        p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                        currentSection = nullptr;
+                    }
+                }
+
+                // '@see' tags are not allowed to span multiple lines.
+                if (currentSection == &docComment->_seeAlso)
+                {
+                    string msg = "'@see' tags cannot span multiple lines and must be of the form: '@see identifier'";
+                    p->unit()->warning(p->file(), p->line(), InvalidComment, msg);
+                    currentSection = nullptr;
+                }
+            }
+
+            // Here we allow empty lines, since they could be used for formatting to separate lines.
+            if (currentSection)
+            {
+                currentSection->push_back(line);
+            }
+            continue;
+        }
+
+        // Reaching here means that this line introduced a new tag. We reject empty lines to handle comments which
+        // are formatted like: `@param myVeryCoolParam\nvery long explanation that\nspans multiple lines`.
+        // We don't want an empty line at the top just because the user's content didn't start until the next line.
+        if (currentSection && !lineText.empty())
+        {
+            currentSection->push_back(lineText);
+        }
+    }
+
+    trimLines(docComment->_overview);
+    trimLines(docComment->_remarks);
+    trimLines(docComment->_deprecated);
+    trimLines(docComment->_returns);
+}