From fd30e99f93313bec0af3ff5ec3735d90dd025dce Mon Sep 17 00:00:00 2001 From: Kimplul Date: Fri, 24 May 2024 14:04:49 +0300 Subject: fix bmake compilation --- src/actualize.c | 5 +++-- src/lower.c | 17 ++++++++++++----- src/source.mk | 8 +------- src/vec.c | 2 ++ 4 files changed, 18 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/actualize.c b/src/actualize.c index 0c9d09e..4f3bae6 100644 --- a/src/actualize.c +++ b/src/actualize.c @@ -2235,8 +2235,9 @@ static int actualize_init(struct act_state *state, struct init_helper arg = vect_at(struct init_helper, init_args, ai); - struct init_helper mem = vect_at(struct init_helper, struct_members, - ai); + struct init_helper mem = vect_at(struct init_helper, + struct_members, + ai); /* not the best error message but works for now */ if (!same_id(arg.id, mem.id)) { diff --git a/src/lower.c b/src/lower.c index 58ffe7a..2209b8e 100644 --- a/src/lower.c +++ b/src/lower.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: copyleft-next-0.3.1 */ + #include #include #include @@ -389,7 +391,8 @@ static void do_store(struct lower_state *s, struct retval *from, int64_t addr = strtoll(o.s, 0, 0); /* doesn't really take into account possible padding etc, should * probably fix at some point */ - printf("%s >> %s %s %zi;\n", from->s, retval_type_str(*from), t.s, addr); + printf("%s >> %s %s %zi;\n", from->s, retval_type_str(*from), t.s, + addr); } static int lower_cast(struct lower_state *s, struct ast *e, @@ -427,7 +430,8 @@ static int lower_const(struct lower_state *s, struct ast *c, return 0; } -static int lower_deref_assign(struct lower_state *s, struct ast *d, struct retval *retval) +static int lower_deref_assign(struct lower_state *s, struct ast *d, + struct retval *retval) { struct ast *base = unop_expr(d); struct retval loc = retval_create(); @@ -441,7 +445,8 @@ static int lower_deref_assign(struct lower_state *s, struct ast *d, struct retva return 0; } -static int lower_dot_assign(struct lower_state *s, struct ast *d, struct retval *retval) +static int lower_dot_assign(struct lower_state *s, struct ast *d, + struct retval *retval) { struct ast *base = dot_expr(d); struct retval loc = retval_create(); @@ -454,11 +459,13 @@ static int lower_dot_assign(struct lower_state *s, struct ast *d, struct retval size_t offset = type_offsetof(base->t, dot_id(d)); if (d->t->k == TYPE_STRUCT) { size_t size = type_size(base->t); - printf("i27 %s%s = %s + %zd;\n", retval->s, dot_id(d), retval->s, offset); + printf("i27 %s%s = %s + %zd;\n", retval->s, dot_id(d), + retval->s, offset); printf("%s%s <<* %zd %s;\n", retval->s, dot_id(d), size, loc.s); } else { - struct retval r = build_retval(CONST_I27, build_str("%zd", offset)); + struct retval r = build_retval(CONST_I27, + build_str("%zd", offset)); do_store(s, retval, &loc, &r); retval_destroy(&r); } diff --git a/src/source.mk b/src/source.mk index 9fad368..e6e5182 100644 --- a/src/source.mk +++ b/src/source.mk @@ -1,8 +1,2 @@ SRC_LOCAL != echo src/*.c -SOURCES += $(SRC_LOCAL) gen/gen_parser.c - -gen/gen_parser.c: src/parser.y gen/gen_lexer.inc - bison -Wcounterexamples -o gen/gen_parser.c src/parser.y - -gen/gen_lexer.inc: src/lexer.l - flex -o gen/gen_lexer.inc src/lexer.l +EK_SOURCES := $(EK_SOURCES) $(SRC_LOCAL) gen/gen_parser.c diff --git a/src/vec.c b/src/vec.c index 8e8d2ea..89c5500 100644 --- a/src/vec.c +++ b/src/vec.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: copyleft-next-0.3.1 */ + #include #include #include -- cgit v1.3