andrius
/
mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mescc: initialize missing struct fields to 0 #2

Merged
andrius merged 1 commits from tmp into wip-riscv 2023-08-21 19:50:23 +01:00
Conversation 0 Commits 1 Files Changed 3 +43 -1
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/check-mescc.sh
View File

@ -3,6 +3,7 @@
# GNU Mes --- Maxwell Equations of Software
# Copyright © 2017,2018,2019,2020,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
# Copyright © 2023 Andrius Štikonas <andrius@stikonas.eu>
# Copyright © 2023 Ekaitz Zarraga <ekaitz@elenq.tech>
#
# This file is part of GNU Mes.
#
@ -192,6 +193,7 @@ lib/tests/scaffold/7u-inc-byte-word.c
lib/tests/scaffold/7u-struct-func.c
lib/tests/scaffold/7u-struct-size10.c
lib/tests/scaffold/7u-vstack.c
lib/tests/scaffold/7v-struct-initialize-zeroes.c
lib/tests/scaffold/70-array-in-struct-init.c
lib/tests/scaffold/70-struct-short-enum-init.c
lib/tests/scaffold/70-struct-post.c

40
lib/tests/scaffold/7v-struct-initialize-zeroes.c Normal file
View File

@ -0,0 +1,40 @@
/* -*-comment-start: "//";comment-end:""-*-
* GNU Mes --- Maxwell Equations of Software
* Copyright © 2023 Ekaitz Zarraga <ekaitz@elenq.tech>
*
* This file is part of GNU Mes.
*
* GNU Mes is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version.
*
* GNU Mes is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
*/
struct A {
int a;
int b;
int c;
};
int
main ()
{
struct A x = {0};
if (x.a != 0)
return 1;
if (x.b != 0)
return 2;
if (x.c != 0)
return 3;
return 0;
}

2
module/mescc/compile.scm
View File

@ -2171,7 +2171,7 @@
(let* ((missing (max 0 (- (length field+counts) (length inits))))
(counts (map cdr field+counts))
(fields (map car field+counts))
(info (fold (cut init-struct-field local <> <> <> <>) info fields counts (append inits (map (const '(p-expr (fixed "22"))) (iota missing))))))
(info (fold (cut init-struct-field local <> <> <> <>) info fields counts (append inits (map (const '(p-expr (fixed 0))) (iota missing))))))
;; bah, loopme!
;;(loop (list-tail field+counts (length field-fields)) (list-tail inits (length field-inits)) info)
info)))))))