Skip to content

Commit b4f36b1

Browse files
committed
Merge branch 'master' into stable
2 parents 23aa5f9 + 3a7e138 commit b4f36b1

9 files changed

Lines changed: 1965 additions & 1581 deletions

File tree

.github/workflows/super-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# Full git history is needed to get a proper list of changed files within `super-linter`
2020
fetch-depth: 0
2121
- name: Lint Code Base
22-
uses: github/super-linter/slim@v4.10.0
22+
uses: github/super-linter/slim@v4.10.1
2323
env:
2424
ERROR_ON_MISSING_EXEC_BIT: true
2525
VALIDATE_BASH: true

include/mruby/internal.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ int mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *
3838
#endif
3939
#endif
4040

41+
/* codedump */
42+
void mrb_codedump_all(mrb_state *mrb, struct RProc *proc);
43+
#ifndef MRB_NO_STDIO
44+
void mrb_codedump_all_file(mrb_state *mrb, struct RProc *proc, FILE *out);
45+
#endif
46+
4147
/* error */
4248
mrb_value mrb_exc_inspect(mrb_state *mrb, mrb_value exc);
4349
mrb_value mrb_exc_backtrace(mrb_state *mrb, mrb_value exc);
@@ -104,6 +110,7 @@ void mrb_rational_copy(mrb_state *mrb, mrb_value x, mrb_value y);
104110
struct RProc *mrb_closure_new(mrb_state*, const mrb_irep*);
105111
void mrb_proc_copy(mrb_state *mrb, struct RProc *a, struct RProc *b);
106112
mrb_int mrb_proc_arity(const struct RProc *p);
113+
struct REnv *mrb_env_new(mrb_state *mrb, struct mrb_context *c, mrb_callinfo *ci, int nstacks, mrb_value *stack, struct RClass *tc);
107114
#endif
108115

109116
/* range */

mrbgems/mruby-bin-mirb/tools/mirb/mirb.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <mruby/variable.h>
2121
#include <mruby/error.h>
2222
#include <mruby/presym.h>
23+
#include <mruby/internal.h>
2324

2425
#include <stdlib.h>
2526
#include <string.h>
@@ -380,8 +381,6 @@ print_cmdline(int code_block_open)
380381
}
381382
#endif
382383

383-
void mrb_codedump_all(mrb_state*, struct RProc*);
384-
385384
static int
386385
check_keyword(const char *buf, const char *word)
387386
{

mrbgems/mruby-compiler/core/parse.y

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6627,7 +6627,6 @@ parser_update_cxt(parser_state *p, mrbc_context *cxt)
66276627
}
66286628
}
66296629

6630-
void mrb_codedump_all(mrb_state*, struct RProc*);
66316630
void mrb_parser_dump(mrb_state *mrb, node *tree, int offset);
66326631

66336632
MRB_API void

0 commit comments

Comments
 (0)