shell: Refactor command getters #24219
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
nordic-krch
commented
Apr 9, 2020
| @@ -252,7 +252,7 @@ static bool tab_prepare(const struct shell *shell, | |||
| /* root command completion */ | |||
| if ((*argc == 0) || ((space == 0) && (*argc == 1))) { | |||
| *complete_arg_idx = SHELL_CMD_ROOT_LVL; | |||
| *cmd = NULL; | |||
| *cmd = shell->ctx->selected_cmd; | |||
There was a problem hiding this comment.
selected_cmd is null when no selection so it can be used to setup parent.
|
All checks are passing now. Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages. |
nordic-krch
commented
Apr 9, 2020
|
|
||
| if (!found) { | ||
| if (!is_empty_cmd(candidate) && is_candidate) { | ||
| *longest = Z_MAX(strlen(candidate->syntax), *longest); |
There was a problem hiding this comment.
Z_MAX is "evaluate once" version of MAX
nordic-krch
force-pushed
the
shell_cmd_get_refactor
branch
from
722a8b4 to
f31209f
Compare
|
|
|
@nordic-krch : Nice simplifaction! :) |
zephyrbot
added
area: API
nordic-krch
force-pushed
the
shell_cmd_get_refactor
branch
from
084fe15 to
f31209f
Compare
|
beware that more is coming 😄 #24329 |
jakub-uC
approved these changes
Apr 17, 2020
carlescufi
approved these changes
Apr 22, 2020
|
@nordic-krch could you please rebase? |
nordic-krch
force-pushed
the
shell_cmd_get_refactor
branch
2 times, most recently
from
a067c46 to
2ffab63
Compare
Refactor and simplified fetching commands from the tree of commands. Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
|
@carlescufi done |
|
@carlescufi can you merge? |
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.
Refactor and simplified fetching commands from the tree
of commands.
Main change is changing
shell_cmd_getto simply returnstruct shell_static_entry *. Previously it was getting as argument command level and pointer to command. Those arguments were redundant since command level was only used to distinguish between root command and others. Now, it is simpler as function gets pointer to parent command (null to get one of the root commands). Returns requested entry.Many algorithms now looks simpler, there is also 250bytes less code (not much but still something).
Note, this refactoring is a start point for further shell improvements around
selectcommand.Signed-off-by: Krzysztof Chruscinski krzysztof.chruscinski@nordicsemi.no