Implement a table-like shortcut to rpm macros in Lua #1419
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
DemiMarie
reviewed
Jan 10, 2021
doDefine() wants macro file-style "name body" string as an argument, but when called through rpmExpandThisMacro() you'd expect to put the name and body in separate arguments. Properly handling this in the macro engine guts is more than I'm prepared to do at the moment, but we can detect the multiple arguments case and turn the arguments into something that doDefine groks. This will matter when we add support for calling macros as native Lua elements.
|
Dusted this off and made macros.define() and macros.global() work. I think it's time to get this in. There are some quirks and inconsistencies present largely due to how convoluted this all is in the macro engine itself, but fixing all that is hard while there are no users for the code - ie this thing here. So unless there are some glaring bugs left, lets just get this merged so we can move forward with other stuff. |
Add rpm macro context as a global table-like entity named 'macros' for
a more Lua-native experience with rpm macros.
Support basic indexing syntaxes (macros[k] and macros.k) for access, define
and undefine operations. Undefined macros return nil here and assigning
to nil will undefine (pop) the macro.
As a specialty, parametric macros are returned as native callable
variadic Lua functions. A string argument is passed to expand as is,
but if arguments are passed as a table, eg `r = macros.foo({1, 2, 3})`,
they are passed entirely as-is.
The macro context pointer in the userdata is not consistently used for
all operations here, but then all the macro operations in Lua are hardwired
to the global context anyway so it doesn't matter in practise. Properly
passing the context around in all cases is left for later commits.
|
Realized that documentation is missing (added now), this has gone on so long now that a whole documentation project was started in the meanwhile... |
|
Since there are no further comments... |
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.
Add rpm macro context as a global table-like entity named 'macros' for
a more Lua-native experience with rpm macros.
Support basic indexing syntaxes (macros[k] and macros.k) for access, define
and undefine operations. Undefined macros return nil here and assigning
to nil will undefine (pop) the macro.
As a specialty, parametric macros are returned as native callable
variadic Lua functions. A string argument is passed to expand as is,
but if arguments are passed as a table, eg
r = macros.foo({1, 2, 3}),they are passed entirely as-is.
The macro context pointer in the userdata is not consistently used for
all operations here, but then all the macro operations in Lua are hardwired
to the global context anyway so it doesn't matter in practise. Properly
passing the context around in all cases is left for later commits.
GH is not letting me reopen #1398 馃槖 so opening a new one to pick up where we left off there, now that @mlschroe did all the heavy lifting 馃槃