From 5c251e67e28e0a441589b9c3f5150758b8034998 Mon Sep 17 00:00:00 2001 From: Jeremiah Orians Date: Wed, 8 May 2024 17:56:43 -0400 Subject: [PATCH] remove the need for union support in cc_* --- cc.h | 23 +++++++---------------- makefile | 2 +- test/test.answers | 14 +++++++------- test/test1000/proof.answer | 2 +- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/cc.h b/cc.h index 8bb8cfc..6dc8660 100644 --- a/cc.h +++ b/cc.h @@ -65,23 +65,14 @@ struct type struct token_list { struct token_list* next; - union - { - struct token_list* locals; - struct token_list* prev; - }; + struct token_list* locals; + struct token_list* prev; char* s; - union - { - struct type* type; - char* filename; - }; - union - { - struct token_list* arguments; - int depth; - int linenumber; - }; + struct type* type; + char* filename; + struct token_list* arguments; + int depth; + int linenumber; }; struct case_list diff --git a/makefile b/makefile index 36a5a02..fdc37d1 100644 --- a/makefile +++ b/makefile @@ -20,7 +20,7 @@ PACKAGE = m2-planet # C compiler settings CC?=gcc -CFLAGS:=$(CFLAGS) -D_GNU_SOURCE -O0 -std=c99 -ggdb -Wall -Wextra -Wstrict-prototypes +CFLAGS:=$(CFLAGS) -D_GNU_SOURCE -O0 -std=c99 -ggdb -Wall -Wextra -Wstrict-prototypes -pedantic all: bin/M2-Planet .NOTPARALLEL: diff --git a/test/test.answers b/test/test.answers index 5d2fa08..73e95a7 100644 --- a/test/test.answers +++ b/test/test.answers @@ -287,10 +287,10 @@ e9fa237a2c4d945490563795fee3adeb394171d65a6025c952c818941d1b0ee6 test/results/t e6bb2bfffabcb09bdf681fc63d03d039484e4ce3a8f6dcb4d616d6d02dc3d8c9 test/results/test0106-riscv32-binary ee0044cd67ad632f99d532f1cbfca9ac6c29f2e07eedf28a71110bd67edc6fae test/results/test0106-riscv64-binary d731bc662f99ba7413a10b112662083a3e1bf31e959e08dc84b57b23f3ef31a7 test/results/test0106-x86-binary -18862bb0e6fc7865c808c7ab411248c508b8566956798f85a790c5771a69043f test/results/test1000-aarch64-binary -0fe4864e879cde47cd7043429e8137a958791b24c82fbc3132cd9d5c65480b6f test/results/test1000-amd64-binary -4e31f7df67fb972702070e5e054211962f41ff298b60b9616c07d7a7bc0f6d2a test/results/test1000-armv7l-binary -8b1ec4933eeae6077c6ba0f5bad6e74e1c254019aaaf2de9212e5ccd7f7d6fbb test/results/test1000-knight-posix-binary -742bf37403bed9d176ff4b97cc84261c50850b904076950a9844b64d9a58a54a test/results/test1000-riscv32-binary -d1fc66424b7648b48816aabdf0a57e82f312ebc75d7ee02f96e52998742ce545 test/results/test1000-riscv64-binary -cc112cea151a8fd39904ba8970669a3982cc746001757d7d49c2582ca9fab8e2 test/results/test1000-x86-binary +f651cc81e79c7dce57a22741f13d30f82c8683e2617607e2006b3994071be8be test/results/test1000-aarch64-binary +a324a762841b8940399c996dbcf0dc65ab8accb6b482c0ca577b3b7eabe1437f test/results/test1000-amd64-binary +dafce106565c2a8f7232d461c6da1e0fdf8e8fe71fb63bfcf2891d418ad47e64 test/results/test1000-armv7l-binary +b4ab4b4e3787a2b839e4f52507ba56eb805ace78b013bd6404c1cd55d2636de3 test/results/test1000-knight-posix-binary +30a34438de13e7e39e2b069c85710eb9815109f4014f22113d173b67be7e2718 test/results/test1000-riscv32-binary +d4c2da04b4214f3a3bf5abfe097c669a9a4fd40446a381a4fd3391656b48be16 test/results/test1000-riscv64-binary +eaf3120755d1e9976fb35bc93f60b0228f045f273fe7adb0b62e0229b6e6b92d test/results/test1000-x86-binary diff --git a/test/test1000/proof.answer b/test/test1000/proof.answer index edea000..859f729 100644 --- a/test/test1000/proof.answer +++ b/test/test1000/proof.answer @@ -1 +1 @@ -c65b55473ef7333fbe83ea40328e401ae9e0b3ef6c9c6eeb68d240954dabde78 test/test1000/proof +20ad887bc3f1fbeb5cb1fb0427cfa6198c6b87a38c38bea95216c928c49c2e11 test/test1000/proof -- 2.45.2