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.

diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh
index c745b33f6de91054fd414e5a19aa6faeac849b10..cdd5f0600a7fb71751e2aa5e86c0b0901833f181 100755 (executable)
--- a/build-aux/check-mescc.sh
+++ b/build-aux/check-mescc.sh
@@ -181,6 +181,7 @@ lib/tests/scaffold/7u-struct-func.c
 lib/tests/scaffold/7u-struct-size10.c
 lib/tests/scaffold/7u-vstack.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/stdio/80-sscanf.c
 lib/tests/stdlib/80-qsort.c

diff --git a/lib/tests/scaffold/70-struct-short-enum-init.c b/lib/tests/scaffold/70-struct-short-enum-init.c
new file mode 100644 (file)
index 0000000..95447df
--- /dev/null
+++ b/lib/tests/scaffold/70-struct-short-enum-init.c
@@ -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;
+}

diff --git a/lib/tests/scaffold/70-struct-short-enum-init.stdout b/lib/tests/scaffold/70-struct-short-enum-init.stdout
new file mode 100644 (file)
index 0000000..5b5a06b
--- /dev/null
+++ b/lib/tests/scaffold/70-struct-short-enum-init.stdout
@@ -0,0 +1 @@
+struct foo foe = {22,33};

diff --git a/module/mescc/compile.scm b/module/mescc/compile.scm
index a7362f77fcb8c8b7734f1740d9e2ccde64917c86..4a5907ea82a694c941d32478eaf0a0957afa43c7 100644 (file)
--- a/module/mescc/compile.scm
+++ b/module/mescc/compile.scm
@@ -2402,7 +2402,8 @@
        (if (= reg-size 8) `((#:string ,(string-join strings "")) "%0")
            `((#:string ,(string-join strings ""))))))
     ((ident ,name) (let ((var (ident->variable info name)))
-                     `((#:address ,var))))
+                     (if (number? var) (int->bv type var info)
+                         `((#:address ,var)))))
     ((initzer-list . ,inits)
      (cond ((structured-type? type)
             (map (cut init->data <> <> info) (map cdr (struct->init-fields type)) inits))