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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2024-07-11 16:35:36 -07:00
parent bbbd0fc89e 4a2942bb4e
commit deb4d86f60
34 changed files with 68 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/libMockPlugin/MockPlugin.cpp
View File

@@ -113,7 +113,7 @@ static const llvm::json::Value substitute(const llvm::json::Value &value,
// '.' <alphanum> -> object key.
if (path.starts_with(".")) {
if (subst->kind() != llvm::json::Value::Object)
return "<substition error: not an object>";
return "<substitution error: not an object>";
path = path.substr(1);
auto keyLength =
path.find_if([](char c) { return !llvm::isAlnum(c) && c != '_'; });
@@ -125,7 +125,7 @@ static const llvm::json::Value substitute(const llvm::json::Value &value,
// '[' <digit>+ ']' -> array index.
if (path.starts_with("[")) {
if (subst->kind() != llvm::json::Value::Array)
return "<substition error: not an array>";
return "<substitution error: not an array>";
path = path.substr(1);
auto idxlength = path.find_if([](char c) { return !llvm::isDigit(c); });
size_t idx;
@@ -133,12 +133,12 @@ static const llvm::json::Value substitute(const llvm::json::Value &value,
subst = &(*subst->getAsArray())[idx];
path = path.substr(idxlength);
if (!path.starts_with("]"))
return "<substition error: missing ']' after digits>";
return "<substitution error: missing ']' after digits>";
path = path.substr(1);
continue;
}
// Malformed.
return "<substition error: malformed path>";
return "<substitution error: malformed path>";
}
return *subst;
}