Skip to content

Commit 7d4093f

Browse files
MingunGreyCat
authored andcommitted
Use filename (which fallback to root type name) in locations of import messages
Fixes the test: ``` [info] - meta_imports_abs_unknown *** FAILED *** [info] meta_imports_abs_unknown: /meta/imports/0: [info] error: unable to find 'unknown_absolute_name.ksy' in import search paths, using: List() [info] did not equal meta_imports_abs_unknown.ksy: /meta/imports/0: [info] error: unable to find 'unknown_absolute_name.ksy' in import search paths, using: List() (SimpleMatchers.scala:34) ``` Changes filename in the following tests: ``` [info] - meta_imports_rel2 *** FAILED *** [info] meta_imports_rel_unknown: /meta/imports/0: [info] error: unknown_relative_name.ksy (No such file or directory) [info] did not equal meta_imports_rel_unknown: /meta/imports/0: [info] error: ../tests/formats_err/unknown_relative_name.ksy (No such file or directory) (SimpleMatchers.scala:34) [info] - meta_imports_rel_unknown *** FAILED *** [info] meta_imports_rel_unknown: /meta/imports/0: [info] error: unknown_relative_name.ksy (No such file or directory) [info] did not equal meta_imports_rel_unknown: /meta/imports/0: [info] error: ../tests/formats_err/unknown_relative_name.ksy (No such file or directory) (SimpleMatchers.scala:34) ```
1 parent 972ddc4 commit 7d4093f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

shared/src/main/scala/io/kaitai/struct/precompile/LoadImports.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class LoadImports(specs: ClassSpecs) {
3232
loadImport(
3333
name,
3434
curClass.meta.path ++ List("imports", idx.toString),
35-
Some(curClass.nameAsStr),
35+
Some(curClass.fileNameAsStr),
3636
workDir
3737
)
3838
}).map((x) => x.flatten)

0 commit comments

Comments
 (0)