averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add error for invalid SDKNodeKind

Browse Source
This commit is contained in:
Brent Royal-Gordon
2018-08-17 00:06:11 -07:00
parent ec87277e56
commit 88ac6f11a2
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/AST/DiagnosticsCommon.def
View File

@@ -94,9 +94,11 @@ ERROR(function_type_no_parens,none,
"single argument function types require parentheses", ()) "single argument function types require parentheses", ())
// FIXME: Used by swift-api-digester. Don't want to set up a separate diagnostics // FIXME: Used by swift-api-digester. Don't want to set up a separate diagnostics
// file just for one error. // file just for two errors.
ERROR(sdk_node_unrecognized_key,none, ERROR(sdk_node_unrecognized_key,none,
"unrecognized key '%0' in SDK node", (StringRef)) "unrecognized key '%0' in SDK node", (StringRef))
ERROR(sdk_node_unrecognized_node_kind,none,
"unrecognized SDK node kind '%0'", (StringRef))
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// MARK: Circular reference diagnostics // MARK: Circular reference diagnostics

2
include/swift/IDE/APIDigesterData.h
View File

@@ -33,7 +33,7 @@ enum class SDKNodeKind: uint8_t {
#include "DigesterEnums.def" #include "DigesterEnums.def"
}; };
SDKNodeKind parseSDKNodeKind(StringRef Content); Optional<SDKNodeKind> parseSDKNodeKind(StringRef Content);
enum class NodeAnnotation: uint8_t{ enum class NodeAnnotation: uint8_t{
#define NODE_ANNOTATION(NAME) NAME, #define NODE_ANNOTATION(NAME) NAME,

7
lib/IDE/APIDigesterData.cpp
View File

@@ -39,10 +39,11 @@ operator<<(raw_ostream &Out, const NodeAnnotation Value) {
llvm_unreachable("Undefined SDK node kind."); llvm_unreachable("Undefined SDK node kind.");
} }
SDKNodeKind swift::ide::api::parseSDKNodeKind(StringRef Content) { Optional<SDKNodeKind> swift::ide::api::parseSDKNodeKind(StringRef Content) {
return llvm::StringSwitch<SDKNodeKind>(Content) return llvm::StringSwitch<Optional<SDKNodeKind>>(Content)
#define NODE_KIND(NAME, VALUE) .Case(#VALUE, SDKNodeKind::NAME) #define NODE_KIND(NAME, VALUE) .Case(#VALUE, SDKNodeKind::NAME)
#include "swift/IDE/DigesterEnums.def" #include "swift/IDE/DigesterEnums.def"
.Default(None)
; ;
} }
@@ -326,7 +327,7 @@ serializeDiffItem(llvm::BumpPtrAllocator &Alloc,
switch (parseDiffItemKind(DiffItemKind)) { switch (parseDiffItemKind(DiffItemKind)) {
case APIDiffItemKind::ADK_CommonDiffItem: { case APIDiffItemKind::ADK_CommonDiffItem: {
return new (Alloc.Allocate<CommonDiffItem>()) return new (Alloc.Allocate<CommonDiffItem>())
CommonDiffItem(parseSDKNodeKind(NodeKind), CommonDiffItem(*parseSDKNodeKind(NodeKind),
parseSDKNodeAnnotation(NodeAnnotation), ChildIndex, parseSDKNodeAnnotation(NodeAnnotation), ChildIndex,
LeftUsr, RightUsr, LeftComment, RightComment, ModuleName); LeftUsr, RightUsr, LeftComment, RightComment, ModuleName);
} }

6
test/api-digester/diagnostics.json
View File

@@ -2,6 +2,8 @@
"kind": "Root", "kind": "Root",
"name": "TopLevel", "name": "TopLevel",
"printedName": "TopLevel", "printedName": "TopLevel",
"children": [], "badKey": ["foo", "bar", "baz"],
"badKey": ["foo", "bar", "baz"] "children": [
{ "kind": "Zyzyx" }
]
} }

3
test/api-digester/diagnostics.swift
View File

@@ -1,7 +1,8 @@
// REQUIRES: OS=macosx // REQUIRES: OS=macosx
// RUN: not %api-digester -deserialize-sdk -input-paths %S/diagnostics.json -o - 2>&1 | %FileCheck %s // RUN: not %api-digester -deserialize-sdk -input-paths %S/diagnostics.json -o - 2>&1 | %FileCheck %s
// CHECK: diagnostics.json:6:3: error: unrecognized key 'badKey' in SDK node // CHECK: diagnostics.json:5:3: error: unrecognized key 'badKey' in SDK node
// CHECK: diagnostics.json:7:15: error: unrecognized SDK node kind 'Zyzyx'
// Make sure we don't try to output a result: // Make sure we don't try to output a result:
// CHECK-NOT: "kind": "Root", // CHECK-NOT: "kind": "Root",

9
tools/swift-api-digester/swift-api-digester.cpp
View File

@@ -1057,7 +1057,14 @@ SDKNode* SDKNode::constructSDKNode(SDKContext &Ctx,
if (auto keyKind = parseKeyKind(keyString)) { if (auto keyKind = parseKeyKind(keyString)) {
switch(*keyKind) { switch(*keyKind) {
case KeyKind::KK_kind: case KeyKind::KK_kind:
Kind = parseSDKNodeKind(GetScalarString(Pair.getValue())); if (auto parsedKind = parseSDKNodeKind(GetScalarString(Pair.getValue()))) {
Kind = *parsedKind;
} else {
auto range = convertRange(Pair.getValue()->getSourceRange());
Ctx.getDiags().diagnose(range.Start, diag::sdk_node_unrecognized_node_kind,
GetScalarString(Pair.getValue()))
.highlight(range);
}
break; break;
case KeyKind::KK_name: case KeyKind::KK_name:
Info.Name = GetScalarString(Pair.getValue()); Info.Name = GetScalarString(Pair.getValue());