summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2020-08-08 15:12:42 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2020-10-12 16:21:34 +0900
commit500f721f7080e79c2e41e306cc1d94471c10f173 (patch)
treeb86c37fc3ef84a6710e786807ca6b993b74987a3 /src
parentcb89e1f0d9d9f05e53705d228b69decbc428a650 (diff)
downloadmruby-500f721f7080e79c2e41e306cc1d94471c10f173.tar.gz
mruby-500f721f7080e79c2e41e306cc1d94471c10f173.zip
Fix typo `_hander` -> `_handler`.
Diffstat (limited to 'src')
-rw-r--r--src/codedump.c2
-rw-r--r--src/dump.c4
-rw-r--r--src/load.c4
-rw-r--r--src/vm.c8
4 files changed, 9 insertions, 9 deletions
diff --git a/src/codedump.c b/src/codedump.c
index 095028a39..389ed3c8f 100644
--- a/src/codedump.c
+++ b/src/codedump.c
@@ -83,7 +83,7 @@ codedump(mrb_state *mrb, const mrb_irep *irep)
if (irep->clen > 0) {
int i = irep->clen;
- const struct mrb_irep_catch_hander *e = mrb_irep_catch_handler_table(irep);
+ const struct mrb_irep_catch_handler *e = mrb_irep_catch_handler_table(irep);
for (; i > 0; i --, e ++) {
int begin = bin_to_uint16(e->begin);
diff --git a/src/dump.c b/src/dump.c
index b14fc4a1f..3bc95f629 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -279,7 +279,7 @@ get_catch_table_block_size(mrb_state *mrb, const mrb_irep *irep)
size_t size = 0;
size += sizeof(uint16_t); /* number of catch handler */
- size += (sizeof(struct mrb_irep_catch_hander)) * irep->clen;
+ size += (sizeof(struct mrb_irep_catch_handler)) * irep->clen;
return size;
}
@@ -288,7 +288,7 @@ static ptrdiff_t
write_catch_table_block(mrb_state *mrb, const mrb_irep *irep, uint8_t *buf)
{
uint8_t *cur = buf;
- const struct mrb_irep_catch_hander *e = mrb_irep_catch_handler_table(irep);
+ const struct mrb_irep_catch_handler *e = mrb_irep_catch_handler_table(irep);
mrb_static_assert1(sizeof(*e) == 7);
if (e == NULL) return 0;
diff --git a/src/load.c b/src/load.c
index 59790bc17..67217b128 100644
--- a/src/load.c
+++ b/src/load.c
@@ -105,8 +105,8 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, size_t *len, uint8_t flag
if (irep->ilen > 0) {
size_t data_len = sizeof(mrb_code) * irep->ilen +
- sizeof(struct mrb_irep_catch_hander) * irep->clen;
- mrb_static_assert1(sizeof(struct mrb_irep_catch_hander) == 7);
+ sizeof(struct mrb_irep_catch_handler) * irep->clen;
+ mrb_static_assert1(sizeof(struct mrb_irep_catch_handler) == 7);
if (SIZE_ERROR_MUL(irep->ilen, sizeof(mrb_code))) {
return NULL;
}
diff --git a/src/vm.c b/src/vm.c
index 4d3ab720a..727c37d53 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -788,13 +788,13 @@ break_new(mrb_state *mrb, uint32_t tag, const struct RProc *p, mrb_value val)
#define MRB_CATCH_FILTER_ENSURE (UINT32_C(1) << MRB_CATCH_ENSURE)
#define MRB_CATCH_FILTER_ALL (MRB_CATCH_FILTER_RESCUE | MRB_CATCH_FILTER_ENSURE)
-static const struct mrb_irep_catch_hander *
+static const struct mrb_irep_catch_handler *
catch_handler_find(mrb_state *mrb, mrb_callinfo *ci, const mrb_code *pc, uint32_t filter)
{
- mrb_irep *irep;
+ const mrb_irep *irep;
ptrdiff_t xpc;
size_t cnt;
- const struct mrb_irep_catch_hander *e;
+ const struct mrb_irep_catch_handler *e;
/* The comparison operators use `>` and `<=` because pc already points to the next instruction */
#define catch_cover_p(pc, beg, end) ((pc) > (beg) && (pc) <= (end))
@@ -1042,7 +1042,7 @@ mrb_vm_exec(mrb_state *mrb, const struct RProc *proc, const mrb_code *pc)
uint16_t b;
uint8_t c;
mrb_sym mid;
- const struct mrb_irep_catch_hander *ch;
+ const struct mrb_irep_catch_handler *ch;
#ifdef DIRECT_THREADED
static void *optable[] = {