From: Jérémie Astor Date: Wed, 21 Apr 2021 21:32:17 +0000 (+0200) Subject: :wrench: Fix windows X-Git-Tag: nightly~729 X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=82d491689cdea487c71cf9e704c0e8b5ce1aa6e9;p=gwion.git :wrench: Fix windows --- diff --git a/ast b/ast index 22dd7634..742af1c3 160000 --- a/ast +++ b/ast @@ -1 +1 @@ -Subproject commit 22dd7634ccd580fa2265cd554dbbaf572a8489be +Subproject commit 742af1c3723d56bef451ca480904689927ac7f7f diff --git a/src/clean.c b/src/clean.c index 628b1b83..c4069804 100644 --- a/src/clean.c +++ b/src/clean.c @@ -262,7 +262,7 @@ ANN static void clean_dummy(Clean *a NUSED, void *b NUSED) {} #define clean_stmt_pp clean_dummy #define clean_stmt_break clean_dummy #define clean_stmt_continue clean_dummy -#define clean_stmt_resume clean_dummy +#define clean_stmt_retry clean_dummy DECL_STMT_FUNC(clean, void, Clean*) ANN static void clean_stmt(Clean *a, Stmt b) { diff --git a/src/emit/emit.c b/src/emit/emit.c index 64cb2633..baad0e3f 100644 --- a/src/emit/emit.c +++ b/src/emit/emit.c @@ -2119,7 +2119,7 @@ ANN static m_bool emit_stmt_defer(const Emitter emit, const struct Stmt_Defer_* return GW_OK; } -ANN static m_bool emit_stmt_resume(const Emitter emit, const struct Stmt_Index_* stmt NUSED) { +ANN static m_bool emit_stmt_retry(const Emitter emit, const struct Stmt_Index_* stmt NUSED) { const Instr instr = emit_add_instr(emit, Goto); instr->m_val = emit->code->frame->try_top; return GW_OK; diff --git a/src/parse/check.c b/src/parse/check.c index 92cf2cff..0b76cd67 100644 --- a/src/parse/check.c +++ b/src/parse/check.c @@ -1258,7 +1258,7 @@ ANN static m_bool check_stmt_defer(const Env env, const Stmt_Defer stmt) { return check_stmt(env, stmt->stmt); } -#define check_stmt_resume dummy_func +#define check_stmt_retry dummy_func DECL_STMT_FUNC(check, m_bool , Env) ANN m_bool check_stmt(const Env env, const Stmt stmt) { diff --git a/src/parse/scan1.c b/src/parse/scan1.c index 126a36a2..a30610d6 100644 --- a/src/parse/scan1.c +++ b/src/parse/scan1.c @@ -469,7 +469,7 @@ ANN m_bool scan1_union_def(const Env env, const Union_Def udef) { #define scan1_stmt_continue dummy_func #define scan1_stmt_break dummy_func #define scan1_stmt_return scan1_stmt_exp -#define scan1_stmt_resume dummy_func +#define scan1_stmt_retry dummy_func ANN static m_bool scan1_stmt_pp(const Env env, const Stmt_PP stmt) { if(stmt->pp_type == ae_pp_include) diff --git a/src/parse/scan2.c b/src/parse/scan2.c index 3dd396d0..f7b9b400 100644 --- a/src/parse/scan2.c +++ b/src/parse/scan2.c @@ -261,7 +261,7 @@ ANN m_bool scan2_union_def(const Env env NUSED, const Union_Def udef) { #define scan2_stmt_continue dummy_func #define scan2_stmt_break dummy_func #define scan2_stmt_return scan2_stmt_exp -#define scan2_stmt_resume dummy_func +#define scan2_stmt_retry dummy_func ANN static m_bool scan2_stmt_pp(const Env env, const Stmt_PP stmt) { if(stmt->pp_type == ae_pp_include)