vm: move ExpandToAst logic into own instruction
#281
Merged
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
saem
requested changes
Apr 17, 2022
compiler/vm/vm.nim
Outdated
| templCall.add(node) | ||
|
|
||
| var a = evalTemplate(templCall, prc, genSymOwner, c.config, c.cache, c.templInstCounter, c.idgen) | ||
| if a.kind == nkStmtList and a.len == 1: a = a[0] |
There was a problem hiding this comment.
Suggested change
| if a.kind == nkStmtList and a.len == 1: a = a[0] | |
| if a.kind == nkStmtList and a.len == 1: # flatten if a single statement | |
| a = a[0] |
Also, reading this code, what if it's empty? Should this be an nkEmpty then?
There was a problem hiding this comment.
I don't know. In order to preserve the previous behaviour, I left this as is
There was a problem hiding this comment.
OK, let's stick with it for now, it does feel like a bug waiting to happen. 😬
zerbina
force-pushed
the
vm-expand-to-ast
branch
2 times, most recently
from
b747342 to
9d8abbd
Compare
The logic for template expansion as needed by the `mExpandToAst` magic
(used by `quote`) is now implemented as a separate instruction instead
of as part of `IndCallAsgn`. This makes the role of template expansion
less confusing ("why are templates 'called' inside the VM?", "weren't
they expanded already?") and also allows for a different instruction
argument make-up. The latter is required by both a future overhaul
of macro expansion and the refactored VM.
User-facing behaviour stays the same
|
Build succeeded: |
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.
The logic for template expansion as needed by the
mExpandToAstmagic(used by
quote) is now implemented as a separate instruction insteadof as part of
IndCallAsgn. This makes the role of template expansionless confusing ("why are templates 'called' inside the VM?", "weren't
they expanded already?") and also allows for a different instruction
argument make-up. The latter is required for both a future overhaul
of macro expansion and the refactored VM.
User-facing behaviour stays the same