Remove conditional compilation from AssetsMacro class.
#1764
Conversation
This file contains 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
And while I'm at it, the `if` statement doesn't need to span the whole function. It can be a simple guard clause.
Sure they're private, but even then they shouldn't be writable.
This was likely added when `#if hl` began to fail, hiding the problem. With the issue fixed, there's no more need for a workaround.
|
The tests aren't going to check this, since none of the sample projects embed their assets. But I tested it on my machine at least. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A recent change to the macro context seems to prevent us from using some conditional compilation flags. I have only ever relied on
#if macroworking during a macro context, and suspect it was a fluke that#if html5ever worked.In fact, it seems that
#if hlnever worked. ddd19af adds the check but prefers to callembedBytesHL()instead, so it doesn't get checked. Similarly,#if jsand Haxe-provided flags never work in macros; only Lime's flags ever stood a chance.This PR switches to a more future-proof approach, and also tries to make the code more readable. I believe this closes #1763 (unless more errors get revealed once these are fixed).