mescc: Add 70-struct-short-enum-init.c test with fix.

* module/mescc/compile.scm (init->data): Respect type of size.
* lib/tests/scaffold/70-struct-short-enum-init.c: New file.
* lib/tests/scaffold/70-struct-short-enum-init.stdout: New file.
* build-aux/check-mescc.sh (TESTS): Add test.
This commit is contained in:
Jan Nieuwenhuizen 2019-07-21 16:48:26 +02:00
parent 8e01a68357
commit 2f77f506b1
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
4 changed files with 50 additions and 1 deletions

View file

@ -181,6 +181,7 @@ lib/tests/scaffold/7u-struct-func.c
lib/tests/scaffold/7u-struct-size10.c lib/tests/scaffold/7u-struct-size10.c
lib/tests/scaffold/7u-vstack.c lib/tests/scaffold/7u-vstack.c
lib/tests/scaffold/70-array-in-struct-init.c lib/tests/scaffold/70-array-in-struct-init.c
lib/tests/scaffold/70-struct-short-enum-init.c
lib/tests/setjmp/80-setjmp.c lib/tests/setjmp/80-setjmp.c
lib/tests/stdio/80-sscanf.c lib/tests/stdio/80-sscanf.c
lib/tests/stdlib/80-qsort.c lib/tests/stdlib/80-qsort.c

View file

@ -0,0 +1,46 @@
/* -*-comment-start: "//";comment-end:""-*-
* GNU Mes --- Maxwell Equations of Software
* Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
*
* 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/>.
*/
#include <mes/lib.h>
struct foo
{
short one;
short two;
};
enum bar
{
baz = 22
};
struct foo foe = { baz, 33 };
int
main ()
{
oputs ("struct foo foe = {");
oputs (itoa (foe.one));
oputs (",");
oputs (itoa (foe.two));
oputs ("};");
oputs ("\n");
return 0;
}

View file

@ -0,0 +1 @@
struct foo foe = {22,33};

View file

@ -2402,7 +2402,8 @@
(if (= reg-size 8) `((#:string ,(string-join strings "")) "%0") (if (= reg-size 8) `((#:string ,(string-join strings "")) "%0")
`((#:string ,(string-join strings "")))))) `((#:string ,(string-join strings ""))))))
((ident ,name) (let ((var (ident->variable info name))) ((ident ,name) (let ((var (ident->variable info name)))
`((#:address ,var)))) (if (number? var) (int->bv type var info)
`((#:address ,var)))))
((initzer-list . ,inits) ((initzer-list . ,inits)
(cond ((structured-type? type) (cond ((structured-type? type)
(map (cut init->data <> <> info) (map cdr (struct->init-fields type)) inits)) (map (cut init->data <> <> info) (map cdr (struct->init-fields type)) inits))