Fix type and enum leaking from one imported KSY to another#303
Open
Mingun wants to merge 16 commits into
Open
Conversation
Mingun
force-pushed
the
fix-type-leaking
branch
from
2b88fde to
6d08f2e
Compare
Mingun
force-pushed
the
fix-type-leaking
branch
from
6d08f2e to
11c1318
Compare
Contributor
Author
Mingun
force-pushed
the
fix-type-leaking
branch
from
11c1318 to
f4f8fbf
Compare
The same names makes it difficult to recognize where which function is used even with help from IDE Also make some functions private to not pollute public namespace. The other methods will be tested so cannot be made private because it creates difficulties to test them
…ssage is a type name Especially when the type name is something very generic, like 'test'
Error text does not checked yet, because it will be changed and even those tests which passed now, would fail due to that Failures (12): [info] ClassTypeProvider$Test: [info] - doesn't resolve 'one::two' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:287) [info] - doesn't resolve 'one::two' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:324) [info] - doesn't resolve 'two::one' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:336) [info] - doesn't resolve 'one::two' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:361) [info] - doesn't resolve 'one::two' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:398) [info] - doesn't resolve 'one::two' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:435) [info] - doesn't resolve 'two::one' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:447) [info] - doesn't resolve 'one::two' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:472) [info] - doesn't resolve 'two::one' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:484) [info] - doesn't resolve 'one::two' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:509) [info] - doesn't resolve 'one::two' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:546) [info] - doesn't resolve 'two::one' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.TypeNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:558)
Error text does not checked yet, because it will be changed and even those tests which passed now, would fail due to that Failures (6): [info] ClassTypeProvider$Test: [info] - doesn't resolve 'one::e' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.EnumNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:690) [info] - doesn't resolve 'one::e' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.EnumNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:740) [info] - doesn't resolve 'one::e' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.EnumNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:765) [info] - doesn't resolve 'one::e' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.EnumNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:790) [info] - doesn't resolve 'one::e' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.EnumNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:815) [info] - doesn't resolve 'one::e' *** FAILED *** [info] Expected exception io.kaitai.struct.precompile.EnumNotFoundError to be thrown, but no exception was thrown (ClassTypeProvider$Test.scala:840)
This commit also unify enum resolution in expression language and in `enum` keys Fixes kaitai-io/kaitai_struct#1028
This commit also unify type resolution in expression language and in `type` keys Fixes kaitai-io/kaitai_struct#786
It not so big and this unifies handling of types and enums
Because of new types type system enforses fixing kaitai-io/kaitai_struct#857 This test need to be updated: [info] - expr_compare_enum2 *** FAILED *** [info] [expr_compare_enum2.ksy: /seq/1/if: [info] error: can't compare EnumType(EnumRef(false,List(),animal),Int1Type(false)) and Int1Type(true) [info] ] [info] did not equal [info] [expr_compare_enum2.ksy: /seq/1/if: [info] error: can't compare EnumType(List(animal),Int1Type(false)) and Int1Type(true) [info] ] (SimpleMatchers.scala:34)
…ch does not import them explicitly
…lative In all cases this methods called with Some(...)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR implements solution from my comment. Each top-level
ClassSpecnow have a list of other top-levelClassSpecs which is explicitly import it. When resolve types and enums now checked if spec with the type/enum was explicitly imported or not and if not, it does not resolves.Related links: