Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

$: Revert code changes in #4293 #4323

Merged
merged 2 commits into from
Mar 3, 2024
Merged

$: Revert code changes in #4293 #4323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddbaf92
Revert "$: Fix `$alias=$`<backtick>`cmd`<backtick> (#4293)"
kazarmy Mar 3, 2024
42130eb
Readd tests
kazarmy Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 9 additions & 42 deletions librz/core/cmd/cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3423,8 +3423,7 @@ static bool substitute_args(struct tsr2cmd_state *state, TSNode args, TSNode *ne
return res;
}

static RzCmdParsedArgs *ts_node_handle_arg_prargs(struct tsr2cmd_state *state, TSNode command, TSNode arg, uint32_t child_idx, bool do_unwrap,
char **new_command_str, bool *has_space_after_new_cmd) {
static RzCmdParsedArgs *ts_node_handle_arg_prargs(struct tsr2cmd_state *state, TSNode command, TSNode arg, uint32_t child_idx, bool do_unwrap) {
RzCmdParsedArgs *res = NULL;
TSNode new_command;
substitute_args_init(state, command);
Expand All @@ -3434,21 +3433,6 @@ static RzCmdParsedArgs *ts_node_handle_arg_prargs(struct tsr2cmd_state *state, T
goto err;
}

if (new_command_str || has_space_after_new_cmd) {
TSNode new_command_node = ts_node_child_by_field_name(new_command, "command", strlen("command"));
if (ts_node_is_null(new_command_node)) {
goto err;
}
if (new_command_str) {
*new_command_str = ts_node_sub_string(new_command_node, state->input);
}
if (has_space_after_new_cmd) {
TSNode args_node = ts_node_child_by_field_name(new_command, "args", strlen("args"));
*has_space_after_new_cmd = !ts_node_is_null(args_node) &&
ts_node_end_byte(new_command_node) < ts_node_start_byte(args_node);
}
}

arg = ts_node_named_child(new_command, child_idx);
res = parse_args(state, arg, do_unwrap);
if (res == NULL) {
Expand All @@ -3461,7 +3445,7 @@ static RzCmdParsedArgs *ts_node_handle_arg_prargs(struct tsr2cmd_state *state, T
}

static char *ts_node_handle_arg(struct tsr2cmd_state *state, TSNode command, TSNode arg, uint32_t child_idx) {
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, command, arg, child_idx, true, NULL, NULL);
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, command, arg, child_idx, true);
char *str = rz_cmd_parsed_args_argstr(a);
rz_cmd_parsed_args_free(a);
return str;
Expand Down Expand Up @@ -3510,7 +3494,6 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(arged_stmt) {
RZ_LOG_DEBUG("arged_stmt command: '%s'\n", command_str);
TSNode args = ts_node_child_by_field_name(node, "args", strlen("args"));
RzCmdStatus res = RZ_CMD_STATUS_INVALID;
bool has_space_after_cmd = !ts_node_is_null(args) && ts_node_end_byte(command) < ts_node_start_byte(args);

// FIXME: this special handling should be removed once we have a proper
// command tree
Expand All @@ -3529,23 +3512,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(arged_stmt) {
if (!ts_node_is_null(args)) {
RzCmdDesc *cd = rz_cmd_get_desc(state->core->rcmd, command_str);
bool do_unwrap = cd && cd->type != RZ_CMD_DESC_TYPE_OLDINPUT;
if (rz_str_startswith(command_str, "$") && strstr(command_str, "=$")) {
// Special handling for $alias=$`cmd`. For current code
// to work properly, "command_str" has to change after
// substitution to include the first token of `cmd`.
//
// FIXME: Convert to rzshell and/or simplify syntax.
char *new_command_str = NULL;
pr_args = ts_node_handle_arg_prargs(state, node, args, 1, do_unwrap,
&new_command_str, &has_space_after_cmd);
if (!new_command_str) {
goto err;
}
free(command_str);
command_str = new_command_str;
} else {
pr_args = ts_node_handle_arg_prargs(state, node, args, 1, do_unwrap, NULL, NULL);
}
pr_args = ts_node_handle_arg_prargs(state, node, args, 1, do_unwrap);
if (!pr_args) {
goto err;
}
Expand All @@ -3558,7 +3525,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(arged_stmt) {
}

pr_args->extra = command_extra_str;
pr_args->has_space_after_cmd = has_space_after_cmd;
pr_args->has_space_after_cmd = !ts_node_is_null(args) && ts_node_end_byte(command) < ts_node_start_byte(args);
res = rz_cmd_call_parsed_args(state->core->rcmd, pr_args);
if (res == RZ_CMD_STATUS_WRONG_ARGS) {
const char *cmdname = rz_cmd_parsed_args_cmd(pr_args);
Expand Down Expand Up @@ -3858,7 +3825,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(help_stmt) {
if (!ts_node_is_null(args)) {
RzCmdDesc *cd = rz_cmd_get_desc(state->core->rcmd, command_str);
bool do_unwrap = cd && cd->type != RZ_CMD_DESC_TYPE_OLDINPUT;
pr_args = ts_node_handle_arg_prargs(state, node, args, 1, do_unwrap, NULL, NULL);
pr_args = ts_node_handle_arg_prargs(state, node, args, 1, do_unwrap);
if (!pr_args) {
goto err_else;
}
Expand Down Expand Up @@ -3926,7 +3893,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fromto_stmt) {
RzCore *core = state->core;
TSNode command = ts_node_named_child(node, 0);
TSNode fromto = ts_node_named_child(node, 1);
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, node, fromto, 1, true, NULL, NULL);
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, node, fromto, 1, true);
if (!a || a->argc != 2 + 1) {
rz_cmd_parsed_args_free(a);
return RZ_CMD_STATUS_INVALID;
Expand Down Expand Up @@ -4428,7 +4395,7 @@ static RzCmdStatus iter_offsets_common(struct tsr2cmd_state *state, TSNode node,

TSNode args = ts_node_named_child(node, 1);

RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, node, args, 1, true, NULL, NULL);
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, node, args, 1, true);
if (!a || (has_size && (a->argc - 1) % 2 != 0)) {
RZ_LOG_ERROR("Cannot parse args\n");
rz_cmd_parsed_args_free(a);
Expand Down Expand Up @@ -4486,7 +4453,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(iter_instrs_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(iter_step_stmt) {
TSNode command = ts_node_named_child(node, 0);
TSNode args = ts_node_named_child(node, 1);
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, node, args, 1, true, NULL, NULL);
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, node, args, 1, true);
if (!a || a->argc != 3 + 1) {
rz_cmd_parsed_args_free(a);
return RZ_CMD_STATUS_INVALID;
Expand Down Expand Up @@ -5019,7 +4986,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(pipe_stmt) {
TSNode command_pipe = ts_node_named_child(node, 1);

RzCmdStatus res = RZ_CMD_STATUS_INVALID;
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, node, command_pipe, 1, true, NULL, NULL);
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, node, command_pipe, 1, true);
if (a && a->argc > 1) {
res = core_cmd_pipe(state->core, state, command_rizin, a->argc - 1, a->argv + 1);
}
Expand Down
Loading