From c2cbc518f9c073436845cae2bdecf01ffdb1afbd Mon Sep 17 00:00:00 2001 From: Jeremiah Orians Date: Sat, 26 Oct 2019 15:40:35 -0400 Subject: [PATCH] Fixed missing updated test23 answers and added support for mes.c types --- cc_types.c | 23 +++++++++++++++++++++++ test/test.answers | 16 ++++++++-------- test/test100/proof.answer | 2 +- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/cc_types.c b/cc_types.c index 9d206ab..8860db0 100644 --- a/cc_types.c +++ b/cc_types.c @@ -95,7 +95,25 @@ void initialize_types() h->size = register_size; h->indirect = h; + struct type* i = calloc(1, sizeof(struct type)); + i->name = "long"; + i->size = register_size; + i->indirect = i; + + struct type* j = calloc(1, sizeof(struct type)); + j->name = "size_t"; + j->size = register_size; + j->indirect = j; + + struct type* k = calloc(1, sizeof(struct type)); + k->name = "ssize_t"; + k->size = register_size; + k->indirect = k; + /* Finalize type list */ + j->next = k; + i->next = j; + h->next = i; g->next = h; f->next = g; e->next = f; @@ -264,6 +282,11 @@ struct type* type_name() global_token = global_token->next; + if(match("const", global_token->s)) + { + global_token = global_token->next; + } + while(global_token->s[0] == '*') { ret = ret->indirect; diff --git a/test/test.answers b/test/test.answers index dae6388..d55ac24 100644 --- a/test/test.answers +++ b/test/test.answers @@ -53,10 +53,10 @@ a9cf4422e05075395ad75bbfe4b2659aec4541edd46d8c6b5064d3496b06a0b6 test/results/t 1154f39f25dcd6d914e9a542306f95280926baf985d011b2152c7ea0b87ab42d test/results/test10-knight-native-binary c1b5a2a3cd46c5e95e5540e871c2a916e028684ca80f51c001ef489342e27625 test/results/test10-knight-posix-binary b3e13d54aab689137628fb9c4487bfd8288f9bd18bef8fe756577c8d2dce1f1f test/results/test10-x86-binary -52a174a84c3d3c9ab23ebc527dd154a48e5fcaab827266804594d4256d7ee888 test/results/test100-amd64-binary -2ac769acac9ca48470cedab3bf1e8bb5b3730deabeb42f17484977ce08ccc1f8 test/results/test100-armv7l-binary -8e784d7557476e0df6b529b61fb5f936354200e25c89655bd1514233ab9e5ed9 test/results/test100-knight-posix-binary -a15139bca25c0219cca8827ba183d6542c06b9ee022ae2f5d62afe758d975f01 test/results/test100-x86-binary +67fe5708ecb58ff63262d002c81e007177395613166649c23119c154cd347254 test/results/test100-amd64-binary +057cbf1a026f80c6f377af1eeeba6e38007697e8c12546ec853a4ca68f7869ce test/results/test100-armv7l-binary +0c563f8028cc93be2091992ef1210cd1a25e006680ec3b1bac5ecc61370c9258 test/results/test100-knight-posix-binary +84db585b6a8f51151c658ecbbcbd97a411d88d7379d5e416841ca616cf723374 test/results/test100-x86-binary 34e6d535e30ef8826a4ad1a4d08b76cfa370c54595599ad3be784b64c9cd8ec5 test/results/test11-amd64-binary d9d465340abbce2d5964a6bc58e6cdd0ef93fb3d0199eaa823c86ec6abd0452a test/results/test11-armv7l-binary 955b564d2c89abf2cfc6c80d766cd11479d146b828dec69e654b0958a62d5e6e test/results/test11-knight-native-binary @@ -111,10 +111,10 @@ f5d6430d6fade0d4acdaeda1662d9bfdeff881a75e2c877dc738f3485ddb4e63 test/results/t 883b112bca57ddab502af939327765508fa37ea3a588c37094d3798b2267171b test/results/test22-armv7l-binary 7ccc16255ce81a9b35934649b5446face10db899cadaf00008c582934eefaa37 test/results/test22-knight-posix-binary f30be64f9bbebb5c1bfa16f584754106de5d95d48b6882b4458beb5e72b2c473 test/results/test22-x86-binary -0c836dacd7ef5813b22a435fd8f5072acaadb67bc0d9054314f96ddabda3de59 test/results/test23-amd64-binary -b70c97824a6008dd1be8a4360874c794d8d027004cab9b86a53fda95fef2e4cc test/results/test23-armv7l-binary -1b86c800067f64ffd6cfd4b39155b81e3b0fc7ffa6d43d1edd75852edd2d583f test/results/test23-knight-posix-binary -f25bbe673256a099030a1d7dcf4d1c85fbdc22da3dfb30c11f93ad72e3356414 test/results/test23-x86-binary +7d4a07733fa071d52494f936b313a08581e4fe9d7dd94e16c77552a71a22068a test/results/test23-amd64-binary +df39200be9f9f560eb51dfaf262bbf98f98774db7b1165bcdd4c49540e91587e test/results/test23-armv7l-binary +a097d5e213b7fa9441d782056d28a0855f7b98108e988f9b1d4ede0418ae63ff test/results/test23-knight-posix-binary +777074010248bf3910ef2c4630e59c2c5f34d9d23ad83c3daf00b0b5517a2e6b test/results/test23-x86-binary 44d06216e0bf9c2f8dfcb6684f6f6c0c0276f73c78c36a96454be84c8dc066af test/results/test24-amd64-binary 1deae7d8b3ed2373afb1dba21d192ce642d17b47483c9ec72f3081089ac46725 test/results/test24-armv7l-binary a1053415b79f08f8bcc9ebda8c9b096ed4e66c483504ba3d7d4dbebad2e3fabf test/results/test24-knight-posix-binary diff --git a/test/test100/proof.answer b/test/test100/proof.answer index 8d77c35..bc33ff4 100644 --- a/test/test100/proof.answer +++ b/test/test100/proof.answer @@ -1 +1 @@ -a71ae17bdeb430b4080ce70c42887db53cfd914d1f8a8fd7d65d1be1367c1103 test/test100/proof +d37c7ede25b79a5ba457fd80aec9f4a21df5a8c3d467e52c4f1d7146d83d2d64 test/test100/proof