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 messages for Swift module map parser

Browse Source 
Parser errors with large Swift module map files can be hard to diagnose.
Refactor the parser to return an llvm::Error so clearer diagnostics can
be passed to the user.
This commit is contained in:
Richard Howell
2025-09-05 13:26:07 -07:00
parent 61cb1a9126
commit 0b829bfab1
5 changed files with 114 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
test/Frontend/explicit-swift-module-map-file-parser.swift Normal file
View File

@@ -0,0 +1,78 @@
// RUN: %empty-directory(%t)
// RUN: split-file %s %t
// RUN: not %target-swift-frontend -typecheck %t/test.swift \
// RUN: -explicit-swift-module-map-file %t/invalid_root_object.json \
// RUN: 2>&1 | %FileCheck %s -check-prefix=CHECK-ROOT
// CHECK-ROOT: malformed: invalid JSON root object
// RUN: not %target-swift-frontend -typecheck %t/test.swift \
// RUN: -explicit-swift-module-map-file %t/invalid_entry_type.json \
// RUN: 2>&1 | %FileCheck %s -check-prefix=CHECK-ENTRY-TYPE
// CHECK-ENTRY-TYPE: malformed: incorrect entry type
// RUN: not %target-swift-frontend -typecheck %t/test.swift \
// RUN: -explicit-swift-module-map-file %t/missing_module_name.json \
// RUN: 2>&1 | %FileCheck %s -check-prefix=CHECK-NAME
// CHECK-NAME: malformed: entry is missing module name
// RUN: not %target-swift-frontend -typecheck %t/test.swift \
// RUN: -explicit-swift-module-map-file %t/duplicate_swift_module.json \
// RUN: 2>&1 | %FileCheck %s -check-prefix=CHECK-DUP-SWIFT
// CHECK-DUP-SWIFT: malformed: duplicate Swift module with name SwiftMod
// RUN: not %target-swift-frontend -typecheck %t/test.swift \
// RUN: -explicit-swift-module-map-file %t/duplicate_clang_module.json \
// RUN: 2>&1 | %FileCheck %s -check-prefix=CHECK-DUP-CLANG
// CHECK-DUP-CLANG: malformed: duplicate Clang module with name ClangMod
//--- invalid_root_object.json
{
"some_key": "some_val"
}
//--- invalid_entry_type.json
[
[
{"some_key": "some_val"}
]
]
//--- missing_module_name.json
[
{
"isFramework": false,
"modulePath": "/some/path"
}
]
//--- duplicate_swift_module.json
[
{
"isFramework": false,
"moduleName": "SwiftMod",
"modulePath": "/some/path"
},
{
"isFramework": false,
"moduleName": "SwiftMod",
"modulePath": "/some/path"
}
]
//--- duplicate_clang_module.json
[
{
"isFramework": false,
"moduleName": "ClangMod",
"clangModulePath": "/some/path"
},
{
"isFramework": false,
"moduleName": "ClangMod",
"clangModulePath": "/some/path"
}
]
//--- test.swift
import Swift