Merge remote-tracking branch 'apple/master' into master-next

This commit is contained in:
Xi Ge
2019-10-28 10:19:36 -07:00
609 changed files with 15200 additions and 14950 deletions

View File

@@ -155,7 +155,6 @@ private:
node.present = true;
}
public:
OpaqueSyntaxNode recordToken(tok tokenKind,
ArrayRef<ParsedTriviaPiece> leadingTrivia,
ArrayRef<ParsedTriviaPiece> trailingTrivia,
@@ -206,10 +205,6 @@ public:
auto result = NodeLookup(lexerOffset, ckind);
return {result.length, result.node};
}
OpaqueSyntaxNodeKind getOpaqueKind() override {
return OpaqueSyntaxNodeKind::SwiftSyntax;
}
};
static swiftparser_diagnostic_severity_t getSeverity(DiagnosticKind Kind) {