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

grammar: Rename tmp_*_stmt to tmp_*_op #4837

Merged
merged 4 commits into from
Jan 14, 2025
Merged

grammar: Rename tmp_*_stmt to tmp_*_op #4837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bec9e4b
Rename `_tmp_stmt` to `_tmp_op`
kazarmy Jan 14, 2025
59e15b2
Rename `tmp_*_stmt` to `tmp_*_op`
kazarmy Jan 14, 2025
71641a7
Update comment
kazarmy Jan 14, 2025
a228041
cautocmpl.c: `"_stmt"` -> `"_op"`
kazarmy Jan 14, 2025
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
34 changes: 17 additions & 17 deletions librz/core/cautocmpl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ static bool is_arg_identifier_in_tmp_stmt(TSNode node) {
}
const char *node_type = ts_node_type(node);
bool is_iter_or_tmp = rz_str_startswith(node_type, "tmp_") || rz_str_startswith(node_type, "iter_");
return is_iter_or_tmp && rz_str_endswith(node_type, "_stmt");
return is_iter_or_tmp && rz_str_endswith(node_type, "_op");
}

static bool find_autocmplt_type_at_stmt(struct autocmplt_data_t *ad, RzCore *core, RzLineBuffer *buf) {
Expand Down Expand Up @@ -974,21 +974,21 @@ static bool find_autocmplt_type_quoted_arg(struct autocmplt_data_t *ad, RzCore *

static bool find_autocmplt_type_arg_identifier(struct autocmplt_data_t *ad, RzCore *core, TSNode root, RzLineBuffer *buf, ut32 lstart, ut32 lend) {
TSNode parent = get_arg_parent(root);
if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_seek_stmt")) {
if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_seek_op")) {
return fill_autocmplt_data(ad, AUTOCMPLT_RZNUM, lstart, lend);
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_fromto_stmt")) {
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_fromto_op")) {
return fill_autocmplt_data(ad, AUTOCMPLT_RZNUM, lstart, lend);
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_arch_stmt")) {
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_arch_op")) {
return fill_autocmplt_data(ad, AUTOCMPLT_ARCH, lstart, lend);
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_bits_stmt")) {
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_bits_op")) {
return fill_autocmplt_data(ad, AUTOCMPLT_BITS, lstart, lend);
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_file_stmt")) {
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_file_op")) {
return fill_autocmplt_data(ad, AUTOCMPLT_FILE, lstart, lend);
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_fs_stmt")) {
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_fs_op")) {
return fill_autocmplt_data(ad, AUTOCMPLT_FLAG_SPACE, lstart, lend);
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_reg_stmt")) {
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_reg_op")) {
return fill_autocmplt_data(ad, AUTOCMPLT_REG, lstart, lend);
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_eval_stmt")) {
} else if (!ts_node_is_null(parent) && !strcmp(ts_node_type(parent), "tmp_eval_op")) {
return fill_autocmplt_data(ad, AUTOCMPLT_EVAL_FULL, lstart, lend);
} else {
return fill_autocmplt_data_cmdarg(ad, lstart, lend, buf->data, root, core);
Expand Down Expand Up @@ -1049,21 +1049,21 @@ static bool find_autocmplt_type(struct autocmplt_data_t *ad, RzCore *core, TSNod
} else if (find_autocmplt_type_quoted_arg(ad, core, buf, "'", "single_quoted_arg")) {
ad->res->end_string = "' ";
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_seek_stmt", "a", AUTOCMPLT_RZNUM)) {
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_seek_op", "a", AUTOCMPLT_RZNUM)) {
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_fromto_stmt", "a b)", AUTOCMPLT_RZNUM)) {
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_fromto_op", "a b)", AUTOCMPLT_RZNUM)) {
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_arch_stmt", "a", AUTOCMPLT_ARCH)) {
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_arch_op", "a", AUTOCMPLT_ARCH)) {
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_bits_stmt", "1", AUTOCMPLT_BITS)) {
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_bits_op", "1", AUTOCMPLT_BITS)) {
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_file_stmt", "a", AUTOCMPLT_FILE)) {
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_file_op", "a", AUTOCMPLT_FILE)) {
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_fs_stmt", "a", AUTOCMPLT_FLAG_SPACE)) {
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_fs_op", "a", AUTOCMPLT_FLAG_SPACE)) {
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_reg_stmt", "a", AUTOCMPLT_REG)) {
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_reg_op", "a", AUTOCMPLT_REG)) {
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_eval_stmt", "a", AUTOCMPLT_EVAL_FULL)) {
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "tmp_eval_op", "a", AUTOCMPLT_EVAL_FULL)) {
return true;
} else if (find_autocmplt_type_at_stmt_op(ad, core, buf, "iter_offsets_stmt", "a", AUTOCMPLT_RZNUM)) {
return true;
Expand Down
38 changes: 19 additions & 19 deletions librz/core/cmd/cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3564,7 +3564,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_stmt) {
return handle_ts_stmt(state, first_tmp);
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_seek_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_seek_op) {
TSNode offset = ts_node_named_child(node, 0);
char *offset_string = ts_node_handle_arg(state, ts_node_parent(node), offset, tmp_get_idx(node), true);
if (!offset_string) {
Expand All @@ -3582,7 +3582,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_seek_stmt) {
if (offset_string[0] == '-' || offset_string[0] == '+') {
offset_val += state->core->offset;
}
RZ_LOG_DEBUG("tmp_seek_stmt, changing offset to %" PFMT64x "\n", offset_val);
RZ_LOG_DEBUG("tmp_seek_op, changing offset to %" PFMT64x "\n", offset_val);
rz_core_seek(state->core, offset_val, true);
TSNode next = tmp_get_next_node(node);
RzCmdStatus res = handle_ts_stmt_tmpseek(state, next);
Expand All @@ -3591,14 +3591,14 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_seek_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_blksz_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_blksz_op) {
TSNode blksz = ts_node_named_child(node, 0);
char *blksz_string = ts_node_handle_arg(state, ts_node_parent(node), blksz, tmp_get_idx(node), true);
if (!blksz_string) {
return RZ_CMD_STATUS_INVALID;
}
ut64 orig_blksz = state->core->blocksize;
RZ_LOG_DEBUG("tmp_blksz_stmt, changing blksz to %s\n", blksz_string);
RZ_LOG_DEBUG("tmp_blksz_op, changing blksz to %s\n", blksz_string);
rz_core_block_size(state->core, rz_num_math(state->core->num, blksz_string));
TSNode next = tmp_get_next_node(node);
RzCmdStatus res = handle_ts_stmt(state, next);
Expand All @@ -3607,7 +3607,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_blksz_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fromto_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fromto_op) {
RzCore *core = state->core;
TSNode fromto = ts_node_named_child(node, 0);
RzCmdParsedArgs *a = ts_node_handle_arg_prargs(state, ts_node_parent(node), fromto, tmp_get_idx(node),
Expand All @@ -3626,7 +3626,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fromto_stmt) {
"search.to", "zoom.to", NULL };
ut64 from_val = rz_num_math(core->num, from_str);
ut64 to_val = rz_num_math(core->num, to_str);
RZ_LOG_DEBUG("tmp_fromto_stmt, changing fromto to (%" PFMT64x ", %" PFMT64x ")\n", from_val, to_val);
RZ_LOG_DEBUG("tmp_fromto_op, changing fromto to (%" PFMT64x ", %" PFMT64x ")\n", from_val, to_val);

RzConfigHold *hc = rz_config_hold_new(core->config);
int i;
Expand All @@ -3649,7 +3649,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fromto_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_arch_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_arch_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand Down Expand Up @@ -3692,7 +3692,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_arch_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_bits_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_bits_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand All @@ -3718,7 +3718,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_bits_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_nthi_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_nthi_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand All @@ -3741,7 +3741,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_nthi_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_eval_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_eval_op) {
// TODO: support cmd_substitution in tmp_eval_args
RzCore *core = state->core;
TSNode args = ts_node_named_child(node, 0);
Expand Down Expand Up @@ -3770,7 +3770,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_eval_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fs_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fs_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand All @@ -3785,7 +3785,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fs_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_reli_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_reli_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand All @@ -3804,7 +3804,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_reli_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_kuery_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_kuery_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand All @@ -3824,7 +3824,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_kuery_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fd_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fd_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand All @@ -3840,7 +3840,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_fd_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_reg_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_reg_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand Down Expand Up @@ -3893,7 +3893,7 @@ static bool handle_tmp_desc(struct tsr2cmd_state *state, TSNode command, const u
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_file_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_file_op) {
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
if (!arg_str) {
Expand All @@ -3917,7 +3917,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_file_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_string_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_string_op) {
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
if (!arg_str) {
Expand All @@ -3935,7 +3935,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_string_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_value_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_value_op) {
RzCore *core = state->core;
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
Expand All @@ -3958,7 +3958,7 @@ DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_value_stmt) {
return res;
}

DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_hex_stmt) {
DEFINE_HANDLE_TS_FCN_AND_SYMBOL(tmp_hex_op) {
TSNode arg = ts_node_named_child(node, 0);
char *arg_str = ts_node_handle_arg(state, ts_node_parent(node), arg, tmp_get_idx(node), true);
if (!arg_str) {
Expand Down
34 changes: 17 additions & 17 deletions librz/core/cmd/rz-shell-parser-cmds.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
// SPDX-License-Identifier: LGPL-3.0-only
//
// mark with HANDLER_RULE_OP every rule that is a _stmt
// mark with HANDLER_RULE_OP every rule that is a _stmt or _op
// mark with RULE_OP every rule that you use with DEFINE_IS_TS_FCN or with its TSSymbol (e.g. ts_##name##_symbol)
HANDLER_RULE_OP(statements)
HANDLER_RULE_OP(arged_stmt)
Expand All @@ -11,22 +11,22 @@ HANDLER_RULE_OP(repeat_stmt)
HANDLER_RULE_OP(redirect_stmt)
HANDLER_RULE_OP(help_stmt)
HANDLER_RULE_OP(tmp_stmt)
HANDLER_RULE_OP(tmp_seek_stmt)
HANDLER_RULE_OP(tmp_blksz_stmt)
HANDLER_RULE_OP(tmp_fromto_stmt)
HANDLER_RULE_OP(tmp_arch_stmt)
HANDLER_RULE_OP(tmp_bits_stmt)
HANDLER_RULE_OP(tmp_nthi_stmt)
HANDLER_RULE_OP(tmp_eval_stmt)
HANDLER_RULE_OP(tmp_fs_stmt)
HANDLER_RULE_OP(tmp_reli_stmt)
HANDLER_RULE_OP(tmp_kuery_stmt)
HANDLER_RULE_OP(tmp_fd_stmt)
HANDLER_RULE_OP(tmp_reg_stmt)
HANDLER_RULE_OP(tmp_file_stmt)
HANDLER_RULE_OP(tmp_string_stmt)
HANDLER_RULE_OP(tmp_value_stmt)
HANDLER_RULE_OP(tmp_hex_stmt)
HANDLER_RULE_OP(tmp_seek_op)
HANDLER_RULE_OP(tmp_blksz_op)
HANDLER_RULE_OP(tmp_fromto_op)
HANDLER_RULE_OP(tmp_arch_op)
HANDLER_RULE_OP(tmp_bits_op)
HANDLER_RULE_OP(tmp_nthi_op)
HANDLER_RULE_OP(tmp_eval_op)
HANDLER_RULE_OP(tmp_fs_op)
HANDLER_RULE_OP(tmp_reli_op)
HANDLER_RULE_OP(tmp_kuery_op)
HANDLER_RULE_OP(tmp_fd_op)
HANDLER_RULE_OP(tmp_reg_op)
HANDLER_RULE_OP(tmp_file_op)
HANDLER_RULE_OP(tmp_string_op)
HANDLER_RULE_OP(tmp_value_op)
HANDLER_RULE_OP(tmp_hex_op)
HANDLER_RULE_OP(grep_stmt)
HANDLER_RULE_OP(iter_file_lines_stmt)
HANDLER_RULE_OP(iter_offsets_stmt)
Expand Down
2 changes: 1 addition & 1 deletion subprojects/rizin-shell-parser/corpus/cmd_substitution.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ echo $(p8 10; p8 4 @ 0xdeadbeef)
args: (args
(arg
(arg_identifier))))
(tmp_seek_stmt
(tmp_seek_op
(args
(arg
(arg_identifier))))))))))
Expand Down
2 changes: 1 addition & 1 deletion subprojects/rizin-shell-parser/corpus/repeated_commands.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Repeat with tmp seek
(args
(arg
(arg_identifier)))))
(tmp_seek_stmt
(tmp_seek_op
(args
(arg
(arg_identifier))))))
4 changes: 2 additions & 2 deletions subprojects/rizin-shell-parser/corpus/special_commands.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Macro statements
(args
(arg
(arg_identifier))))
(tmp_seek_stmt
(tmp_seek_op
(args
(arg
(arg_identifier))))))))
Expand All @@ -129,7 +129,7 @@ Macro statements
(args
(arg
(arg_identifier))))
(tmp_seek_stmt
(tmp_seek_op
(args
(arg
(arg_identifier)))))))
Expand Down
Loading
Loading