From 59ae6e31b612e8086c7d791541534776ef225abd Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Fri, 22 Jul 2022 14:36:36 -0400 Subject: [PATCH] Rename PrimitiveOperatorExpression to OperatorExpression. (#1530) This isn't modeling only primitive operators any more: it also models operators that are rewritten as calls to an interface function. --- common/fuzzing/carbon.proto | 4 +- common/fuzzing/proto_to_carbon.cpp | 47 ++++++++--------- explorer/ast/ast_rtti.txt | 2 +- explorer/ast/ast_test_matchers.h | 2 +- explorer/ast/ast_test_matchers_internal.cpp | 4 +- explorer/ast/ast_test_matchers_internal.h | 4 +- explorer/ast/ast_test_matchers_test.cpp | 31 +++++------ explorer/ast/expression.cpp | 6 +-- explorer/ast/expression.h | 11 ++-- explorer/fuzzing/ast_to_proto.cpp | 39 +++++++------- ... 00a8aa40e52dba3fe5692f4454543d100ba47c7c} | 2 +- ... 049f6e3a81538ad088e95b45ce1bb1849cb7ea09} | 2 +- ... 060a7f4ecdc31892cf0e2ebb5e53563bc0f254a0} | 2 +- ... 0757dd4989238f5666b76d398c78a6463a6aff0b} | 8 +-- ... 0aaa138320ae521ac62573912738cae88d71f96e} | 2 +- ... 0cad2b9a3a6fc8cc8cd69df93c665c44a4cf09da} | 2 +- ... 0efb68ab631d0a132d9eb73c0af9c731ca6b3c2a} | 10 ++-- ... 0f4c4d6e5a54a66b39402352989b709fee66e91b} | 2 +- ... 0ff442dbe10ec026a2bddde2a00fc6d12bd8e762} | 4 +- ... 107acd88c054dc0dac785ec2eb48470502708450} | 4 +- ... 12130855e555d8e6e588564bfd1a3f206f578720} | 2 +- ... 127b893cd279bdcff0f2d37493b3e975aa86c4e3} | 10 ++-- ... 14094da539080d20eebd0cca6fac5ad4fa57069e} | 2 +- ... 14f8edf9c4ee423d1613fbbf76c6f9b4ce62be0c} | 14 ++--- ... 1635d5dc579e814aaf860cb99b583fd06decd95e} | 2 +- ... 1889235095c87ec99be04e8004aabff19f2169e8} | 6 +-- ... 18b53ef8c05b1929dd8e1790c84ea9c463a43434} | 2 +- ... 192dc5815905d8b0540486bfc0638c978d20039c} | 6 +-- ... 1a936ffdb9b920899f786c3e0b9c8ef8524261e8} | 4 +- ... 1c52c6482c396a582135715d8e633cca4febe2b6} | 52 +++++++++---------- ... 1d3fda03a0e7a36ebb1e70237c64398b5342a8cf} | 2 +- ... 228b7cbcd2164dce7c187785d32ed92dd24a5cc3} | 16 +++--- ... 2baf4d05d30daedf3a9c722b678dea7297d144d5} | 12 ++--- ... 2bbbfc37b0f9199a50d33d34c488d0a197872033} | 2 +- ... 2c094d4acb7c84057d558588e094414e1eb97552} | 14 ++--- ... 2d8f362c9aa1fb508c8f25ea687905183abeadcf} | 2 +- ... 2db6570b8cfc6e5021152d0424c6c068a868355d} | 10 ++-- ... 2f4d8beb260713992ac947221dff3dc7cdd75096} | 8 +-- ... 30c1e7882614e0f5ea10aeee8df59d7006a2f7f2} | 2 +- ... 31556246fe3ad54547e31a86e29aa33f670de52d} | 4 +- ... 350c28992cc3659ed0d99c0cd88376346e9958cc} | 28 +++++----- ... 3aeb897b8945e310d0ba09d0f630b58634203b0e} | 4 +- ... 3ec79d5d498edae7c9cc422fd5087a7dedf6394c} | 10 ++-- ... 3ed98bf1fbcba428e58d83ef31c9297bdcfc53a2} | 2 +- ... 409a3e4b8dcbe38b5a8ca74e701205708d8c05a4} | 6 +-- ... 40f9a726dcbfc06cba7b9c857d8e5f5fd565aa34} | 4 +- ... 41d094ff917771777c18c19c259d06adf1cf4c25} | 2 +- ... 4350883f5979d19cc4021925d68282c2aaac39f3} | 2 +- ... 43a5f1124cf3bf76c63cd184ba30cb654a790ff7} | 8 +-- ... 44032fb64eaa572d1e2ae4d500db23ae32355380} | 10 ++-- ... 449b97eee9c6e02464330b1443e99398e05d2c87} | 2 +- ... 452707129ac2d03d141b9064cc34530f1d40d134} | 4 +- ... 457c811489db1e3f987633ce1fb2dce7d984fb66} | 2 +- ... 474fc14cf33f61c51a24a9cf6c6709f7ed649ecb} | 2 +- ... 4be7c1e91a372d8fffc65158bb22572f42233e30} | 2 +- ... 4c73d357564823c15f11b5d4c47a7b16f4c34aea} | 2 +- ... 4ce3a6280cb42032b421b2ada1018f692720e17d} | 12 ++--- ... 536c060cc8df53b0132be40dbbc67f1df1775bac} | 8 +-- ... 55ccba2998142de2e42b6f1daf02d8753579f38e} | 2 +- ... 57182bf25e23bdbb8db74996446c7e510d08323e} | 10 ++-- ... 57c675d871863121251bb2e1e185a67934ab45c0} | 4 +- ... 5a2e47fbeef7d44dadb53a69fa0012cd0846a507} | 2 +- ... 5d5019434454636690d87a9656afc1d95deee8df} | 2 +- ... 5fc78caa03024255c5c7015e6e3c0bc97f5a4c1e} | 4 +- ... 60469f199bd3244e105b0446c25cc23b6a768eae} | 4 +- ... 62c7aa55a12ef5ad4a7cec26ea7c3f0ed82ae24a} | 10 ++-- ... 659e20bff50e0abe4f7d58e8e0b739ad2a5048b9} | 2 +- ... 65c24d040bbc26b5e1fea735ddf1755392471a18} | 2 +- ... 71035d013bdc57394db132778f7934164475cff1} | 2 +- ... 733898e2c7730693eb323caa6b2a827a547db97a} | 2 +- ... 74bd01b6ca01991c40cb7e2129d34602c5807542} | 6 +-- ... 75c68060eb8633b81c8c183d8e52b386a6f40b6e} | 4 +- ... 76e8a4678c5aa0cfcce078571739a299702810b7} | 2 +- ... 7ad32d9be7562a912db6fab452936c5f5a09f25f} | 18 +++---- ... 7f0f1bc85599a63045bfc3d2a4a7d0e5865beff0} | 4 +- ... 85954afca87c50274902e103f0f2c757af19f9eb} | 2 +- ... 8821717e6334ce28e0ea3b0dc71cbcb5f63238d7} | 2 +- ... 8eac818658b38a8b283b30c5a4051f5f7e98707a} | 16 +++--- ... 95541ac2e9dbf1287d9834257c03d3b26e0d2bc1} | 4 +- ... 96c23d870abc34df6a29ffbb8c36d1244d25920c} | 2 +- ... 975fcd972f9644c64177a30109d358cde488ec9c} | 8 +-- ... 97db8e7450ecd1b9310a1083eaafba6ae24454dd} | 6 +-- ... 988b50fcd2641207a813cbb1fd6d8e5b3c82b07b} | 10 ++-- ... 9923f966584d04a529ba2c6bf1fc8f56fe796c9a} | 2 +- ... 9bf15acc7e7afc8dbcbd76b118230a73bfcaeecb} | 4 +- ... a36abe9b8a973d68485fd1a917d3404b97e9af93} | 4 +- ... a3849c4ee936d86c6e1aa5fe989eb32902009e45} | 4 +- ... a40b0664416dcb8ed41bbcc88d8be9969947e2bb} | 2 +- ... a99d1bd6964262913c36dbe95f200a569205bd57} | 4 +- ... a9f79cd2e7bfd3f4e51a5053298c4e3018d36f44} | 4 +- ... ab1a6d3ba7f35f95cd5aafdbf1f4b031de1a0f6b} | 10 ++-- ... adb602ba9f22045e62faf571ba97b36a44977b21} | 4 +- ... b54f068b3b15bed007bd4bba0f917c562e376142} | 4 +- ... b717b68f111caf8b50c27f029988cd55d8d6eb83} | 14 ++--- ... b975f0686fbaedb1c887681cb7030b0c6a44ebba} | 4 +- ... b9a64e39653c7cced9aad24e6e5d325ef5830379} | 10 ++-- ... ba1f80b94d3fbfede410d99944c2f916f18a66d9} | 18 +++---- ... ba5e2359010d698d23761ea30b812784c01fd77d} | 2 +- ... bc69558bf2eb9f0abc9a611e4a707fd0426bd3c5} | 2 +- ... bdde4f02aaec2f0757312762ba4226ec6c647bd2} | 2 +- ... c116435f7dd22725b10b27575133dab38a178ae7} | 4 +- ... c258828edd9181d61e184e6e73c9b34729ea69cc} | 2 +- ... c9606ffaf4f210c8a238c44b9df1cc0e2b331568} | 4 +- ... cb515a6f74a44b0f9bfdabbfde50e202ec558b3e} | 2 +- ... cc4eceeba65c5547929371ff26806e82c5a776f3} | 10 ++-- ... cc75d644ce6877826e667f652023a50411ccc230} | 2 +- ... cd34239ea7c7fb125a300068dce22b77d9e1effa} | 2 +- ... cfe4d757eaf9742119d64bf76425028db4306fec} | 4 +- ... d3246684febd37c2ab16e1e957217999280dcefe} | 4 +- ... d4060117085d164112756d399d7e3822e83f6c7a} | 10 ++-- ... d4b619d251d6dfce95a22df11bcc2654baa969a7} | 2 +- ... d50d7893f761dd4ee6e3916290f09091dfd5727c} | 2 +- ... d66f6dd50287a3f1d0d2ab22a9b7a6aee9d3a435} | 4 +- ... d6b7c3221459dc162ed6bb981183b8ac85b70b55} | 4 +- ... dc2e50336df6ff0869998c617d892af54733cbd6} | 4 +- ... dca5d37a4707f5a0f2480f1b079ab82a1d148006} | 4 +- ... dd3ba18239f1a0b8d128fb996df5957c04676354} | 2 +- ... ddc186e96a5fe30c4fb2670d538bb7c0b63af107} | 2 +- ... ddc79d5332adec4bc848e3715a08d02acc56205e} | 2 +- ... de61c912b8d3923ee9b6f46603394c1171c06f40} | 6 +-- ... df26c1e8e0e4003833b754f9265c211e25e3e9d6} | 4 +- ... e080ed5c98dbf7596eff953be7d16264e1432e2e} | 2 +- ... e11964b8cea5f2258b439a87cf3e923660e96540} | 10 ++-- ... e1c453736537967e5b9abe27e7406745fec06e96} | 16 +++--- ... e29416b2e088d3d756f1a240f889787b67d5d02f} | 8 +-- ... e5ba54dcd7ba2c5ce8ccc16ae9745c148644d837} | 2 +- ... e629764c8d1fa144b53709998d97097c64b8777e} | 8 +-- ... ec71d604f3ad77986eef7d9e78385bb475528dff} | 10 ++-- ... ecc03b44aab6d3c9bfbf15051a34cfa4220e231c} | 2 +- ... efe09ef251a6e3ef7985266ffb678ed459c7a179} | 30 +++++------ ... f01c3cd4ddb860f686ff9085e845439f4c2e08c1} | 2 +- ... f0e552994f20073c41ba3144361b4050767e34ae} | 2 +- ... f1cd0eda5c6c5b8782bb45164e4c431795d91ed8} | 2 +- ... f20297ba361c988c75a880854a7402e02beb4f1f} | 4 +- ... f6c7f3c7192ebe59a4329e3a991597d864cb43d9} | 10 ++-- ... fb39dc5f6bf908bbf92cff5b9c9d208ebbc98a6d} | 2 +- ... fd9996464706e8a5f7a4e4285f7686bba9d87c6f} | 8 +-- ... fde210ff5a67c2b595b17353fb8ef9ff9275c4db} | 10 ++-- explorer/interpreter/interpreter.cpp | 8 +-- explorer/interpreter/resolve_names.cpp | 4 +- explorer/interpreter/type_checker.cpp | 4 +- explorer/syntax/parser.ypp | 30 +++++------ 142 files changed, 470 insertions(+), 478 deletions(-) rename explorer/fuzzing/fuzzer_corpus/{8eaa02f849c34965729a56884c3543ab71016965 => 00a8aa40e52dba3fe5692f4454543d100ba47c7c} (97%) rename explorer/fuzzing/fuzzer_corpus/{e5377a543f316428d1ad502f23a0f81511633aa9 => 049f6e3a81538ad088e95b45ce1bb1849cb7ea09} (98%) rename explorer/fuzzing/fuzzer_corpus/{0b3e4c5e7dd250b4a9b90a96f71929e5c211a077 => 060a7f4ecdc31892cf0e2ebb5e53563bc0f254a0} (98%) rename explorer/fuzzing/fuzzer_corpus/{67f5eba036e94be0f60df4fb137d81e1dded6b7b => 0757dd4989238f5666b76d398c78a6463a6aff0b} (96%) rename explorer/fuzzing/fuzzer_corpus/{4969109f00a31dd06730d3aa44cb87b5ccbb3587 => 0aaa138320ae521ac62573912738cae88d71f96e} (98%) rename explorer/fuzzing/fuzzer_corpus/{713cf9469d63bd75c1e35014758c535d04427ac1 => 0cad2b9a3a6fc8cc8cd69df93c665c44a4cf09da} (99%) rename explorer/fuzzing/fuzzer_corpus/{2ea7343e45493dfdf9eb1e3d8c4095915c8ab0fa => 0efb68ab631d0a132d9eb73c0af9c731ca6b3c2a} (98%) rename explorer/fuzzing/fuzzer_corpus/{c9f1c0de38bb3c727339fd8dc9018254673de352 => 0f4c4d6e5a54a66b39402352989b709fee66e91b} (98%) rename explorer/fuzzing/fuzzer_corpus/{1264b05271a5415c6aeb98da568e2f44766f5c6a => 0ff442dbe10ec026a2bddde2a00fc6d12bd8e762} (98%) rename explorer/fuzzing/fuzzer_corpus/{02143c9b0d2b75fba43c584f62b43411a07136a2 => 107acd88c054dc0dac785ec2eb48470502708450} (96%) rename explorer/fuzzing/fuzzer_corpus/{a5f8643a0b70df9173a87902eab8a04d45cd94e5 => 12130855e555d8e6e588564bfd1a3f206f578720} (98%) rename explorer/fuzzing/fuzzer_corpus/{7b7e24319e8f63e6c3e99f8cbc81da7e9e47390a => 127b893cd279bdcff0f2d37493b3e975aa86c4e3} (98%) rename explorer/fuzzing/fuzzer_corpus/{e4909f9f7d6923c33db7e3dd3e292860721acfd3 => 14094da539080d20eebd0cca6fac5ad4fa57069e} (98%) rename explorer/fuzzing/fuzzer_corpus/{017a765e283355ded618ed95de5da4e3f2dd4b52 => 14f8edf9c4ee423d1613fbbf76c6f9b4ce62be0c} (98%) rename explorer/fuzzing/fuzzer_corpus/{9bfccfc76e487b03760f88664fa41ac35032b309 => 1635d5dc579e814aaf860cb99b583fd06decd95e} (99%) rename explorer/fuzzing/fuzzer_corpus/{9b3c43975c7084e9b2df23fbdc40e74f563d0732 => 1889235095c87ec99be04e8004aabff19f2169e8} (95%) rename explorer/fuzzing/fuzzer_corpus/{472b9f7d613316693d56e49f236877cde0caaa75 => 18b53ef8c05b1929dd8e1790c84ea9c463a43434} (99%) rename explorer/fuzzing/fuzzer_corpus/{afa03ca87919d5338ae7a96eea4047ff62d7bfc6 => 192dc5815905d8b0540486bfc0638c978d20039c} (99%) rename explorer/fuzzing/fuzzer_corpus/{354874b52fc3aca31201e7162e739e91dbe02ffd => 1a936ffdb9b920899f786c3e0b9c8ef8524261e8} (97%) rename explorer/fuzzing/fuzzer_corpus/{3db1646f25e3f628cf0219a651539b07f20df403 => 1c52c6482c396a582135715d8e633cca4febe2b6} (96%) rename explorer/fuzzing/fuzzer_corpus/{fc9f4460e5852abce29efaa44ce6451404b7d7be => 1d3fda03a0e7a36ebb1e70237c64398b5342a8cf} (99%) rename explorer/fuzzing/fuzzer_corpus/{b6ca27aa9276f7a23bdf2a6a0a94f6f4798b1c3c => 228b7cbcd2164dce7c187785d32ed92dd24a5cc3} (93%) rename explorer/fuzzing/fuzzer_corpus/{eb4f0d50944e631f91288d5b2550ad77b54f0658 => 2baf4d05d30daedf3a9c722b678dea7297d144d5} (95%) rename explorer/fuzzing/fuzzer_corpus/{cc53603327b15d1ec403cb0d83a7b65e388baa10 => 2bbbfc37b0f9199a50d33d34c488d0a197872033} (99%) rename explorer/fuzzing/fuzzer_corpus/{1f6ec7038b7bc8ebd4d5778566dde5445804bbf7 => 2c094d4acb7c84057d558588e094414e1eb97552} (96%) rename explorer/fuzzing/fuzzer_corpus/{3ccfbfc0cfe6cc7e4160a331ae91ab0af700f250 => 2d8f362c9aa1fb508c8f25ea687905183abeadcf} (97%) rename explorer/fuzzing/fuzzer_corpus/{0ee3d72e3cab1b0907f04f35b2d33fb946ab32c9 => 2db6570b8cfc6e5021152d0424c6c068a868355d} (98%) rename explorer/fuzzing/fuzzer_corpus/{b66e41a2708c436beb8806408f41f8b6d037cc87 => 2f4d8beb260713992ac947221dff3dc7cdd75096} (97%) rename explorer/fuzzing/fuzzer_corpus/{49b5049f30108d298ae81466aac0b67f7da97cb2 => 30c1e7882614e0f5ea10aeee8df59d7006a2f7f2} (98%) rename explorer/fuzzing/fuzzer_corpus/{ca47433beaff74d16e5e64e4c4e9acd58fce4423 => 31556246fe3ad54547e31a86e29aa33f670de52d} (98%) rename explorer/fuzzing/fuzzer_corpus/{6c86299b17c54466628587a48c2ec0e9d3029fc7 => 350c28992cc3659ed0d99c0cd88376346e9958cc} (97%) rename explorer/fuzzing/fuzzer_corpus/{3207c66d4cecd4b86b181734b79f670443d51506 => 3aeb897b8945e310d0ba09d0f630b58634203b0e} (97%) rename explorer/fuzzing/fuzzer_corpus/{b9378e44d8b809e19d29c58997a302f6596c34e5 => 3ec79d5d498edae7c9cc422fd5087a7dedf6394c} (98%) rename explorer/fuzzing/fuzzer_corpus/{035c3272740456e2748925f3ba854ccacadd029e => 3ed98bf1fbcba428e58d83ef31c9297bdcfc53a2} (99%) rename explorer/fuzzing/fuzzer_corpus/{522da9a0308eba58c432f7aa35e79b795467ca21 => 409a3e4b8dcbe38b5a8ca74e701205708d8c05a4} (99%) rename explorer/fuzzing/fuzzer_corpus/{1c051deb5a752c0fdd02d90e044b2fecc8c2c82c => 40f9a726dcbfc06cba7b9c857d8e5f5fd565aa34} (97%) rename explorer/fuzzing/fuzzer_corpus/{5de34aef9f4d90ab58516942a3244cd6115d5e07 => 41d094ff917771777c18c19c259d06adf1cf4c25} (98%) rename explorer/fuzzing/fuzzer_corpus/{5941fbba153aeb0d90c912ec46695d52159eb62f => 4350883f5979d19cc4021925d68282c2aaac39f3} (98%) rename explorer/fuzzing/fuzzer_corpus/{2caf42dcf02bff184fa653bf36054b9d83704e30 => 43a5f1124cf3bf76c63cd184ba30cb654a790ff7} (98%) rename explorer/fuzzing/fuzzer_corpus/{d44b1b3f6ff018d0829e0d73f551d0144b39e638 => 44032fb64eaa572d1e2ae4d500db23ae32355380} (98%) rename explorer/fuzzing/fuzzer_corpus/{4ad1c12963bd40b215904199ae894d5e0246f399 => 449b97eee9c6e02464330b1443e99398e05d2c87} (98%) rename explorer/fuzzing/fuzzer_corpus/{c75bdca473d96d91e931aca3e606e53e88890a9c => 452707129ac2d03d141b9064cc34530f1d40d134} (98%) rename explorer/fuzzing/fuzzer_corpus/{b1573ca8e10fba91022153f79d51a3a8cd989c98 => 457c811489db1e3f987633ce1fb2dce7d984fb66} (99%) rename explorer/fuzzing/fuzzer_corpus/{58260e75087e0170a67885bc34e4c05898dd1638 => 474fc14cf33f61c51a24a9cf6c6709f7ed649ecb} (96%) rename explorer/fuzzing/fuzzer_corpus/{334c6a14986f5653fd352f1bb200e80fddf7d697 => 4be7c1e91a372d8fffc65158bb22572f42233e30} (99%) rename explorer/fuzzing/fuzzer_corpus/{9e6859766e9d34eec973a9b4d98b638ba6c00748 => 4c73d357564823c15f11b5d4c47a7b16f4c34aea} (98%) rename explorer/fuzzing/fuzzer_corpus/{f322da95d8d8422e659c3c23d2f7aa3193efb25f => 4ce3a6280cb42032b421b2ada1018f692720e17d} (97%) rename explorer/fuzzing/fuzzer_corpus/{b015582cdd9a7b03f83d7001537d32e4ea123946 => 536c060cc8df53b0132be40dbbc67f1df1775bac} (97%) rename explorer/fuzzing/fuzzer_corpus/{6387e3e0d1ddb4ad2178b62b08b5812d4181fc75 => 55ccba2998142de2e42b6f1daf02d8753579f38e} (99%) rename explorer/fuzzing/fuzzer_corpus/{7d932ad9cdc1f4052e0bd1768f7f07fed0a23c67 => 57182bf25e23bdbb8db74996446c7e510d08323e} (98%) rename explorer/fuzzing/fuzzer_corpus/{c7c6e4477db2a3b777e740964a09a379684261d8 => 57c675d871863121251bb2e1e185a67934ab45c0} (86%) rename explorer/fuzzing/fuzzer_corpus/{a89eea46cc9aa7ca66868c4f2874ab2b61262980 => 5a2e47fbeef7d44dadb53a69fa0012cd0846a507} (97%) rename explorer/fuzzing/fuzzer_corpus/{698d8440e42574d1db112842642ff8c0ecc66374 => 5d5019434454636690d87a9656afc1d95deee8df} (98%) rename explorer/fuzzing/fuzzer_corpus/{32e0eb929035d7c53b3d8566ac48ef0c3b82b32e => 5fc78caa03024255c5c7015e6e3c0bc97f5a4c1e} (99%) rename explorer/fuzzing/fuzzer_corpus/{5a5e0f23676f5b95ddb2d0101131f22c1fc5515c => 60469f199bd3244e105b0446c25cc23b6a768eae} (99%) rename explorer/fuzzing/fuzzer_corpus/{81b5d416277f5b28d98ac9b175f73389d9857655 => 62c7aa55a12ef5ad4a7cec26ea7c3f0ed82ae24a} (98%) rename explorer/fuzzing/fuzzer_corpus/{6feffd83f7b5bfd3f870e4365a8c0d58df0689b4 => 659e20bff50e0abe4f7d58e8e0b739ad2a5048b9} (99%) rename explorer/fuzzing/fuzzer_corpus/{fda984fd483f47ca29fd55b54173f77ef690b4ee => 65c24d040bbc26b5e1fea735ddf1755392471a18} (99%) rename explorer/fuzzing/fuzzer_corpus/{8807065998e566eda4a26e9d9ec50f8938b46253 => 71035d013bdc57394db132778f7934164475cff1} (99%) rename explorer/fuzzing/fuzzer_corpus/{9e4d44b35fbe54f77aa09998b95423f36f44158c => 733898e2c7730693eb323caa6b2a827a547db97a} (98%) rename explorer/fuzzing/fuzzer_corpus/{0c441139ce210274afe7f2964745701c9957c672 => 74bd01b6ca01991c40cb7e2129d34602c5807542} (98%) rename explorer/fuzzing/fuzzer_corpus/{f0249ef671686916199dbce1467d741102a68717 => 75c68060eb8633b81c8c183d8e52b386a6f40b6e} (99%) rename explorer/fuzzing/fuzzer_corpus/{5357de7edef4e3bff993192d9538493ae80f5fa8 => 76e8a4678c5aa0cfcce078571739a299702810b7} (99%) rename explorer/fuzzing/fuzzer_corpus/{95fb9a0f4e59b497ae6b0bd59d4ff5bf1adc1d9b => 7ad32d9be7562a912db6fab452936c5f5a09f25f} (92%) rename explorer/fuzzing/fuzzer_corpus/{0dc3ae8a543d130071a2efc462dabf1946794c28 => 7f0f1bc85599a63045bfc3d2a4a7d0e5865beff0} (97%) rename explorer/fuzzing/fuzzer_corpus/{61074429b7c420d6021c2e22019df74bcf0349a7 => 85954afca87c50274902e103f0f2c757af19f9eb} (99%) rename explorer/fuzzing/fuzzer_corpus/{9d26cfc5faadd68c4fe601c70f56976fc8265ae6 => 8821717e6334ce28e0ea3b0dc71cbcb5f63238d7} (98%) rename explorer/fuzzing/fuzzer_corpus/{6d67acbc349af1d8c183162793004dd676007700 => 8eac818658b38a8b283b30c5a4051f5f7e98707a} (94%) rename explorer/fuzzing/fuzzer_corpus/{8b702dcbe3970e2456a09d5fc1b7b1d3b36f52c0 => 95541ac2e9dbf1287d9834257c03d3b26e0d2bc1} (97%) rename explorer/fuzzing/fuzzer_corpus/{8d84de249cf5ef3b256b81d68fd0a5cc22f16326 => 96c23d870abc34df6a29ffbb8c36d1244d25920c} (98%) rename explorer/fuzzing/fuzzer_corpus/{7f14266137c07dea7d4c7fa0f7f2ca6346cf4c66 => 975fcd972f9644c64177a30109d358cde488ec9c} (97%) rename explorer/fuzzing/fuzzer_corpus/{6108cd2ce5a08c8c845d5c11372c99fe56dd9674 => 97db8e7450ecd1b9310a1083eaafba6ae24454dd} (94%) rename explorer/fuzzing/fuzzer_corpus/{9bb0b055035cb4965aa9432c34bdb1be0f8c3b80 => 988b50fcd2641207a813cbb1fd6d8e5b3c82b07b} (98%) rename explorer/fuzzing/fuzzer_corpus/{22446e9de1d328cd4bfc97b3a8e464165a70c39d => 9923f966584d04a529ba2c6bf1fc8f56fe796c9a} (98%) rename explorer/fuzzing/fuzzer_corpus/{e97942ad3c0748fc89d5b8b69ac78dc0648a9899 => 9bf15acc7e7afc8dbcbd76b118230a73bfcaeecb} (96%) rename explorer/fuzzing/fuzzer_corpus/{1698e7837995809f728e980d4e48734a342845a9 => a36abe9b8a973d68485fd1a917d3404b97e9af93} (96%) rename explorer/fuzzing/fuzzer_corpus/{4e152163ab362aecbbb2d91e08f8183e822ef8be => a3849c4ee936d86c6e1aa5fe989eb32902009e45} (97%) rename explorer/fuzzing/fuzzer_corpus/{eb994d3adcbf502d7b0f931e6aab38d4cfb3e57f => a40b0664416dcb8ed41bbcc88d8be9969947e2bb} (97%) rename explorer/fuzzing/fuzzer_corpus/{bba918f99eb10030663ee97d5febc5e86c43a871 => a99d1bd6964262913c36dbe95f200a569205bd57} (97%) rename explorer/fuzzing/fuzzer_corpus/{50ad01e0992fce22cc4b6e1d744f5286ad4439b6 => a9f79cd2e7bfd3f4e51a5053298c4e3018d36f44} (97%) rename explorer/fuzzing/fuzzer_corpus/{5e4bce73c210e45269126773f257d95d4d269072 => ab1a6d3ba7f35f95cd5aafdbf1f4b031de1a0f6b} (98%) rename explorer/fuzzing/fuzzer_corpus/{75395dbe8c9c56e1353f345b1dc8e79390827fcc => adb602ba9f22045e62faf571ba97b36a44977b21} (96%) rename explorer/fuzzing/fuzzer_corpus/{a849a3e84c366f91252584c20727c3fb49d3fc84 => b54f068b3b15bed007bd4bba0f917c562e376142} (96%) rename explorer/fuzzing/fuzzer_corpus/{74c8e2e43c65d4be09ca220e6512569aeecec513 => b717b68f111caf8b50c27f029988cd55d8d6eb83} (98%) rename explorer/fuzzing/fuzzer_corpus/{36d9cf1dcaccaa9ca5c49a9029dc1f0e85ea1071 => b975f0686fbaedb1c887681cb7030b0c6a44ebba} (97%) rename explorer/fuzzing/fuzzer_corpus/{99aed9e0efcdc0473a19a23e77d687971bf6fb08 => b9a64e39653c7cced9aad24e6e5d325ef5830379} (98%) rename explorer/fuzzing/fuzzer_corpus/{2584c688c48bb0fcc5f1b1f91292e0688e759cd0 => ba1f80b94d3fbfede410d99944c2f916f18a66d9} (98%) rename explorer/fuzzing/fuzzer_corpus/{55ad26679e49fd8efa9e12e5079739869cfebe5c => ba5e2359010d698d23761ea30b812784c01fd77d} (98%) rename explorer/fuzzing/fuzzer_corpus/{9a673afc783655f19212b53bb4fde1c6c9073e58 => bc69558bf2eb9f0abc9a611e4a707fd0426bd3c5} (97%) rename explorer/fuzzing/fuzzer_corpus/{2a94a0b8d31c467d3642cd470ca483d333b27962 => bdde4f02aaec2f0757312762ba4226ec6c647bd2} (99%) rename explorer/fuzzing/fuzzer_corpus/{f3b84370a6d8e93298efe8781f6a8740d33768fc => c116435f7dd22725b10b27575133dab38a178ae7} (96%) rename explorer/fuzzing/fuzzer_corpus/{c9bb494385213d19905103032c24c394b4c1a363 => c258828edd9181d61e184e6e73c9b34729ea69cc} (99%) rename explorer/fuzzing/fuzzer_corpus/{71840029bebe786dedc2616bbf6de131bdab85aa => c9606ffaf4f210c8a238c44b9df1cc0e2b331568} (95%) rename explorer/fuzzing/fuzzer_corpus/{56d565b238ea83cf4531248632733c0f3f89897f => cb515a6f74a44b0f9bfdabbfde50e202ec558b3e} (99%) rename explorer/fuzzing/fuzzer_corpus/{f986b7976441ebd0928d8f4d13c6ff2be6a05f50 => cc4eceeba65c5547929371ff26806e82c5a776f3} (98%) rename explorer/fuzzing/fuzzer_corpus/{8a7df30d2028cf70cf27098b2161bdc3dd024170 => cc75d644ce6877826e667f652023a50411ccc230} (99%) rename explorer/fuzzing/fuzzer_corpus/{72624c04b293dcee7ecc0129b6e196195ca84332 => cd34239ea7c7fb125a300068dce22b77d9e1effa} (99%) rename explorer/fuzzing/fuzzer_corpus/{4adc56b3525679bbc7446ca944a935496f6dd21e => cfe4d757eaf9742119d64bf76425028db4306fec} (97%) rename explorer/fuzzing/fuzzer_corpus/{2c13f446fae8b3d480832d35cd4bfe0f8222c6d2 => d3246684febd37c2ab16e1e957217999280dcefe} (97%) rename explorer/fuzzing/fuzzer_corpus/{1844089b39db6518836420fcb6a5d37b3e99424f => d4060117085d164112756d399d7e3822e83f6c7a} (98%) rename explorer/fuzzing/fuzzer_corpus/{ea1790b107947cbe13badc5ef54b9d5ed24944e7 => d4b619d251d6dfce95a22df11bcc2654baa969a7} (98%) rename explorer/fuzzing/fuzzer_corpus/{6e8c48e06c16788763d4c866fdfe33ad81baacee => d50d7893f761dd4ee6e3916290f09091dfd5727c} (98%) rename explorer/fuzzing/fuzzer_corpus/{87081db4d0965def5a5a56b274d6c38473f15367 => d66f6dd50287a3f1d0d2ab22a9b7a6aee9d3a435} (98%) rename explorer/fuzzing/fuzzer_corpus/{bf61b59a040069ea8d7de3fe5dd5c6a935baae3b => d6b7c3221459dc162ed6bb981183b8ac85b70b55} (98%) rename explorer/fuzzing/fuzzer_corpus/{7af9272c630e0db4cb8016e7b0013b1902ee455d => dc2e50336df6ff0869998c617d892af54733cbd6} (97%) rename explorer/fuzzing/fuzzer_corpus/{97924d7176a041aaa1854a8525047a71d604bad8 => dca5d37a4707f5a0f2480f1b079ab82a1d148006} (97%) rename explorer/fuzzing/fuzzer_corpus/{a04fd176eb32a1a2500bf298f4f5deb37b9fa406 => dd3ba18239f1a0b8d128fb996df5957c04676354} (99%) rename explorer/fuzzing/fuzzer_corpus/{4418629d31bc639ef02a0ee166806a8d60abc617 => ddc186e96a5fe30c4fb2670d538bb7c0b63af107} (98%) rename explorer/fuzzing/fuzzer_corpus/{00f0094e829126778228c3fdefec8654ceab30e4 => ddc79d5332adec4bc848e3715a08d02acc56205e} (89%) rename explorer/fuzzing/fuzzer_corpus/{03db728d09b4ef55c73a6cf6c16bb6b7b53e3fc4 => de61c912b8d3923ee9b6f46603394c1171c06f40} (98%) rename explorer/fuzzing/fuzzer_corpus/{9a79849f37e616453382dcd0ff273c080d3b4f7f => df26c1e8e0e4003833b754f9265c211e25e3e9d6} (99%) rename explorer/fuzzing/fuzzer_corpus/{b3e70cf8d33ef2418325c6bf3fa734874899a6d7 => e080ed5c98dbf7596eff953be7d16264e1432e2e} (97%) rename explorer/fuzzing/fuzzer_corpus/{3a2e6f830b6edea6bcf31348f30a12a27b36d496 => e11964b8cea5f2258b439a87cf3e923660e96540} (98%) rename explorer/fuzzing/fuzzer_corpus/{3ed19517e54217efcbf37ee3910599a7b09d2e96 => e1c453736537967e5b9abe27e7406745fec06e96} (98%) rename explorer/fuzzing/fuzzer_corpus/{b75b97a6e7c72881ecab24867b7161a9c0ac2510 => e29416b2e088d3d756f1a240f889787b67d5d02f} (96%) rename explorer/fuzzing/fuzzer_corpus/{f7aeea2890977521805eb676011bb0223b46872f => e5ba54dcd7ba2c5ce8ccc16ae9745c148644d837} (99%) rename explorer/fuzzing/fuzzer_corpus/{65fd2bf8e57cee5e4dd1168a3ef1d46b352d1e61 => e629764c8d1fa144b53709998d97097c64b8777e} (98%) rename explorer/fuzzing/fuzzer_corpus/{fe3c5db046e0dae74603f2c43ed1af68eea9a6ae => ec71d604f3ad77986eef7d9e78385bb475528dff} (98%) rename explorer/fuzzing/fuzzer_corpus/{0506216cfdc69a30b71fdf75230fedbcb0fea735 => ecc03b44aab6d3c9bfbf15051a34cfa4220e231c} (98%) rename explorer/fuzzing/fuzzer_corpus/{7c49aec191759d49dbd11193692cbc21debc2adb => efe09ef251a6e3ef7985266ffb678ed459c7a179} (90%) rename explorer/fuzzing/fuzzer_corpus/{8629c08345c6aca03a64815cde238de3cd177e28 => f01c3cd4ddb860f686ff9085e845439f4c2e08c1} (98%) rename explorer/fuzzing/fuzzer_corpus/{0be3f7db7a24dada6b44d8894d3e1db8cf8f52d6 => f0e552994f20073c41ba3144361b4050767e34ae} (97%) rename explorer/fuzzing/fuzzer_corpus/{d2952341225c953f6a485f213f187232cdedbd68 => f1cd0eda5c6c5b8782bb45164e4c431795d91ed8} (99%) rename explorer/fuzzing/fuzzer_corpus/{94aa90fd09dbe26ed04043283fe43ba77ac8eadb => f20297ba361c988c75a880854a7402e02beb4f1f} (97%) rename explorer/fuzzing/fuzzer_corpus/{8fa92df904a230ee4b0ecf1362170a2551aec98b => f6c7f3c7192ebe59a4329e3a991597d864cb43d9} (98%) rename explorer/fuzzing/fuzzer_corpus/{2077abf20ccf4867c76c853ca2668a6fee2e5373 => fb39dc5f6bf908bbf92cff5b9c9d208ebbc98a6d} (97%) rename explorer/fuzzing/fuzzer_corpus/{b035159146bece69ba05681a5db14529b71adf48 => fd9996464706e8a5f7a4e4285f7686bba9d87c6f} (94%) rename explorer/fuzzing/fuzzer_corpus/{6f589265e1e503d2e01043d6a332026d1693095e => fde210ff5a67c2b595b17353fb8ef9ff9275c4db} (98%) diff --git a/common/fuzzing/carbon.proto b/common/fuzzing/carbon.proto index b6c20d8f51e4..fc44021e5a87 100644 --- a/common/fuzzing/carbon.proto +++ b/common/fuzzing/carbon.proto @@ -38,7 +38,7 @@ message IndexExpression { optional Expression offset = 2; } -message PrimitiveOperatorExpression { +message OperatorExpression { enum Operator { UnknownOperator = 0; Add = 1; @@ -156,7 +156,7 @@ message Expression { FunctionTypeLiteral function_type = 2; SimpleMemberAccessExpression simple_member_access = 3; IndexExpression index = 4; - PrimitiveOperatorExpression primitive_operator = 5; + OperatorExpression operator = 5; TupleLiteralExpression tuple_literal = 6; StructLiteralExpression struct_literal = 7; StructTypeLiteralExpression struct_type_literal = 8; diff --git a/common/fuzzing/proto_to_carbon.cpp b/common/fuzzing/proto_to_carbon.cpp index d3909bb90c73..06d6630677c5 100644 --- a/common/fuzzing/proto_to_carbon.cpp +++ b/common/fuzzing/proto_to_carbon.cpp @@ -84,74 +84,73 @@ static auto BinaryOperatorToCarbon(const Fuzzing::Expression& lhs, ExpressionToCarbon(rhs, out); } -static auto PrimitiveOperatorToCarbon( - const Fuzzing::PrimitiveOperatorExpression& primitive_operator, - llvm::raw_ostream& out) -> void { +static auto OperatorToCarbon(const Fuzzing::OperatorExpression& operator_expr, + llvm::raw_ostream& out) -> void { const Fuzzing::Expression& arg0 = - !primitive_operator.arguments().empty() - ? primitive_operator.arguments(0) + !operator_expr.arguments().empty() + ? operator_expr.arguments(0) : Fuzzing::Expression::default_instance(); const Fuzzing::Expression& arg1 = - primitive_operator.arguments().size() > 1 - ? primitive_operator.arguments(1) + operator_expr.arguments().size() > 1 + ? operator_expr.arguments(1) : Fuzzing::Expression::default_instance(); out << "("; - switch (primitive_operator.op()) { - case Fuzzing::PrimitiveOperatorExpression::UnknownOperator: + switch (operator_expr.op()) { + case Fuzzing::OperatorExpression::UnknownOperator: // `-` is an arbitrary default to avoid getting invalid syntax. PrefixUnaryOperatorToCarbon("-", arg0, out); break; - case Fuzzing::PrimitiveOperatorExpression::AddressOf: + case Fuzzing::OperatorExpression::AddressOf: PrefixUnaryOperatorToCarbon("&", arg0, out); break; - case Fuzzing::PrimitiveOperatorExpression::As: + case Fuzzing::OperatorExpression::As: BinaryOperatorToCarbon(arg0, " as ", arg1, out); break; - case Fuzzing::PrimitiveOperatorExpression::Deref: + case Fuzzing::OperatorExpression::Deref: PrefixUnaryOperatorToCarbon("*", arg0, out); break; - case Fuzzing::PrimitiveOperatorExpression::Mul: + case Fuzzing::OperatorExpression::Mul: BinaryOperatorToCarbon(arg0, " * ", arg1, out); break; - case Fuzzing::PrimitiveOperatorExpression::Ptr: + case Fuzzing::OperatorExpression::Ptr: PostfixUnaryOperatorToCarbon(arg0, "*", out); break; - case Fuzzing::PrimitiveOperatorExpression::Neg: + case Fuzzing::OperatorExpression::Neg: PrefixUnaryOperatorToCarbon("-", arg0, out); break; - case Fuzzing::PrimitiveOperatorExpression::Sub: + case Fuzzing::OperatorExpression::Sub: BinaryOperatorToCarbon(arg0, " - ", arg1, out); break; - case Fuzzing::PrimitiveOperatorExpression::Not: + case Fuzzing::OperatorExpression::Not: // Needs a space to 'unglue' from the operand. PrefixUnaryOperatorToCarbon("not ", arg0, out); break; - case Fuzzing::PrimitiveOperatorExpression::Add: + case Fuzzing::OperatorExpression::Add: BinaryOperatorToCarbon(arg0, " + ", arg1, out); break; - case Fuzzing::PrimitiveOperatorExpression::And: + case Fuzzing::OperatorExpression::And: BinaryOperatorToCarbon(arg0, " and ", arg1, out); break; - case Fuzzing::PrimitiveOperatorExpression::Eq: + case Fuzzing::OperatorExpression::Eq: BinaryOperatorToCarbon(arg0, " == ", arg1, out); break; - case Fuzzing::PrimitiveOperatorExpression::Or: + case Fuzzing::OperatorExpression::Or: BinaryOperatorToCarbon(arg0, " or ", arg1, out); break; - case Fuzzing::PrimitiveOperatorExpression::Combine: + case Fuzzing::OperatorExpression::Combine: BinaryOperatorToCarbon(arg0, " & ", arg1, out); break; } @@ -240,8 +239,8 @@ static auto ExpressionToCarbon(const Fuzzing::Expression& expression, break; } - case Fuzzing::Expression::kPrimitiveOperator: - PrimitiveOperatorToCarbon(expression.primitive_operator(), out); + case Fuzzing::Expression::kOperator: + OperatorToCarbon(expression.operator_(), out); break; case Fuzzing::Expression::kTupleLiteral: { diff --git a/explorer/ast/ast_rtti.txt b/explorer/ast/ast_rtti.txt index 2289ce0ff986..d6cefab3a115 100644 --- a/explorer/ast/ast_rtti.txt +++ b/explorer/ast/ast_rtti.txt @@ -51,7 +51,7 @@ abstract class Expression : AstNode; class IntTypeLiteral : Expression; class ContinuationTypeLiteral : Expression; class IntLiteral : Expression; - class PrimitiveOperatorExpression : Expression; + class OperatorExpression : Expression; class StringLiteral : Expression; class StringTypeLiteral : Expression; class TupleLiteral : Expression; diff --git a/explorer/ast/ast_test_matchers.h b/explorer/ast/ast_test_matchers.h index 323dab05371e..2c37afd9d88b 100644 --- a/explorer/ast/ast_test_matchers.h +++ b/explorer/ast/ast_test_matchers.h @@ -35,7 +35,7 @@ inline auto MatchesLiteral(int value) { return TestingInternal::MatchesIntLiteralMatcher(value); } -// The following functions all match a PrimitiveOperatorExpression with two +// The following functions all match a OperatorExpression with two // operands that match `lhs` and `rhs` (respectively). The name of the function // indicates what value of `.op()` they match. inline auto MatchesMul(::testing::Matcher lhs, diff --git a/explorer/ast/ast_test_matchers_internal.cpp b/explorer/ast/ast_test_matchers_internal.cpp index 7b0d0d3ff810..a6ef93574232 100644 --- a/explorer/ast/ast_test_matchers_internal.cpp +++ b/explorer/ast/ast_test_matchers_internal.cpp @@ -39,9 +39,9 @@ auto MatchesIntLiteralMatcher::MatchAndExplainImpl( auto BinaryOperatorExpressionMatcher::MatchAndExplainImpl( Nonnull node, ::testing::MatchResultListener* out) const -> bool { - const auto* op = llvm::dyn_cast(node); + const auto* op = llvm::dyn_cast(node); if (op == nullptr) { - *out << "which is not a PrimitiveOperatorExpression"; + *out << "which is not a OperatorExpression"; return false; } if (op->arguments().size() != 2) { diff --git a/explorer/ast/ast_test_matchers_internal.h b/explorer/ast/ast_test_matchers_internal.h index 65843fad7429..dea9dd14714d 100644 --- a/explorer/ast/ast_test_matchers_internal.h +++ b/explorer/ast/ast_test_matchers_internal.h @@ -104,10 +104,10 @@ class MatchesIntLiteralMatcher : public AstNodeMatcherBase { int value_; }; -// Matches a PrimitiveOperatorExpression that has two operands. +// Matches a OperatorExpression that has two operands. class BinaryOperatorExpressionMatcher : public AstNodeMatcherBase { public: - // Constructs a matcher which matches a PrimitiveOperatorExpression whose + // Constructs a matcher which matches a OperatorExpression whose // operator is `op`, and which has two operands that match `lhs` and `rhs` // respectively. explicit BinaryOperatorExpressionMatcher(Operator op, diff --git a/explorer/ast/ast_test_matchers_test.cpp b/explorer/ast/ast_test_matchers_test.cpp index aa79009f70c2..9ccf8afef7de 100644 --- a/explorer/ast/ast_test_matchers_test.cpp +++ b/explorer/ast/ast_test_matchers_test.cpp @@ -46,16 +46,16 @@ TEST(MatchesLiteralTest, BasicUsage) { TEST(MatchesMulTest, BasicUsage) { IntLiteral two(DummyLoc, 2); IntLiteral three(DummyLoc, 3); - PrimitiveOperatorExpression mul(DummyLoc, Operator::Mul, {&two, &three}); + OperatorExpression mul(DummyLoc, Operator::Mul, {&two, &three}); EXPECT_THAT(mul, MatchesMul(MatchesLiteral(2), MatchesLiteral(3))); EXPECT_THAT(&mul, MatchesMul(MatchesLiteral(2), MatchesLiteral(3))); EXPECT_THAT(mul, MatchesMul(_, _)); EXPECT_THAT(mul, Not(MatchesMul(MatchesLiteral(2), MatchesLiteral(2)))); EXPECT_THAT(StringLiteral(DummyLoc, "foo"), Not(MatchesMul(_, _))); - EXPECT_THAT(PrimitiveOperatorExpression(DummyLoc, Operator::Deref, {&two}), + EXPECT_THAT(OperatorExpression(DummyLoc, Operator::Deref, {&two}), Not(MatchesMul(_, _))); - PrimitiveOperatorExpression nested(DummyLoc, Operator::Mul, {&two, &mul}); + OperatorExpression nested(DummyLoc, Operator::Mul, {&two, &mul}); EXPECT_THAT(nested, MatchesMul(MatchesLiteral(2), MatchesMul(MatchesLiteral(2), MatchesLiteral(3)))); @@ -68,21 +68,16 @@ TEST(MatchesBinaryOpTest, BasicUsage) { // Testing of MatchesMul provides most of the coverage for these matchers, // since they are thin wrappers around a common implementation. We only test // the others enough to detect copy-paste errors in the wrappers. - EXPECT_THAT( - PrimitiveOperatorExpression(DummyLoc, Operator::Add, {&two, &three}), - MatchesAdd(MatchesLiteral(2), MatchesLiteral(3))); - EXPECT_THAT( - PrimitiveOperatorExpression(DummyLoc, Operator::And, {&two, &three}), - MatchesAnd(MatchesLiteral(2), MatchesLiteral(3))); - EXPECT_THAT( - PrimitiveOperatorExpression(DummyLoc, Operator::Eq, {&two, &three}), - MatchesEq(MatchesLiteral(2), MatchesLiteral(3))); - EXPECT_THAT( - PrimitiveOperatorExpression(DummyLoc, Operator::Or, {&two, &three}), - MatchesOr(MatchesLiteral(2), MatchesLiteral(3))); - EXPECT_THAT( - PrimitiveOperatorExpression(DummyLoc, Operator::Sub, {&two, &three}), - MatchesSub(MatchesLiteral(2), MatchesLiteral(3))); + EXPECT_THAT(OperatorExpression(DummyLoc, Operator::Add, {&two, &three}), + MatchesAdd(MatchesLiteral(2), MatchesLiteral(3))); + EXPECT_THAT(OperatorExpression(DummyLoc, Operator::And, {&two, &three}), + MatchesAnd(MatchesLiteral(2), MatchesLiteral(3))); + EXPECT_THAT(OperatorExpression(DummyLoc, Operator::Eq, {&two, &three}), + MatchesEq(MatchesLiteral(2), MatchesLiteral(3))); + EXPECT_THAT(OperatorExpression(DummyLoc, Operator::Or, {&two, &three}), + MatchesOr(MatchesLiteral(2), MatchesLiteral(3))); + EXPECT_THAT(OperatorExpression(DummyLoc, Operator::Sub, {&two, &three}), + MatchesSub(MatchesLiteral(2), MatchesLiteral(3))); } TEST(MatchesReturnTest, BasicUsage) { diff --git a/explorer/ast/expression.cpp b/explorer/ast/expression.cpp index 13e07e5420fd..a986f2e78573 100644 --- a/explorer/ast/expression.cpp +++ b/explorer/ast/expression.cpp @@ -130,9 +130,9 @@ void Expression::Print(llvm::raw_ostream& out) const { PrintFields(out, cast(*this).fields(), ": "); out << "}"; break; - case ExpressionKind::PrimitiveOperatorExpression: { + case ExpressionKind::OperatorExpression: { out << "("; - const auto& op = cast(*this); + const auto& op = cast(*this); switch (op.arguments().size()) { case 0: out << ToString(op.op()); @@ -287,7 +287,7 @@ void Expression::PrintID(llvm::raw_ostream& out) const { case ExpressionKind::StructLiteral: case ExpressionKind::StructTypeLiteral: case ExpressionKind::CallExpression: - case ExpressionKind::PrimitiveOperatorExpression: + case ExpressionKind::OperatorExpression: case ExpressionKind::IntrinsicExpression: case ExpressionKind::UnimplementedExpression: case ExpressionKind::FunctionTypeLiteral: diff --git a/explorer/ast/expression.h b/explorer/ast/expression.h index ed96add403ce..e9b1331399f4 100644 --- a/explorer/ast/expression.h +++ b/explorer/ast/expression.h @@ -486,17 +486,16 @@ class StructTypeLiteral : public Expression { std::vector fields_; }; -class PrimitiveOperatorExpression : public Expression { +class OperatorExpression : public Expression { public: - explicit PrimitiveOperatorExpression( - SourceLocation source_loc, Operator op, - std::vector> arguments) - : Expression(AstNodeKind::PrimitiveOperatorExpression, source_loc), + explicit OperatorExpression(SourceLocation source_loc, Operator op, + std::vector> arguments) + : Expression(AstNodeKind::OperatorExpression, source_loc), op_(op), arguments_(std::move(arguments)) {} static auto classof(const AstNode* node) -> bool { - return InheritsFromPrimitiveOperatorExpression(node->kind()); + return InheritsFromOperatorExpression(node->kind()); } auto op() const -> Operator { return op_; } diff --git a/explorer/fuzzing/ast_to_proto.cpp b/explorer/fuzzing/ast_to_proto.cpp index 9a8f332c32e1..d14e0c7ddbf5 100644 --- a/explorer/fuzzing/ast_to_proto.cpp +++ b/explorer/fuzzing/ast_to_proto.cpp @@ -33,34 +33,34 @@ static auto LibraryNameToProto(const LibraryName& library_name) } static auto OperatorToProtoEnum(const Operator op) - -> Fuzzing::PrimitiveOperatorExpression::Operator { + -> Fuzzing::OperatorExpression::Operator { switch (op) { case Operator::AddressOf: - return Fuzzing::PrimitiveOperatorExpression::AddressOf; + return Fuzzing::OperatorExpression::AddressOf; case Operator::As: - return Fuzzing::PrimitiveOperatorExpression::As; + return Fuzzing::OperatorExpression::As; case Operator::Deref: - return Fuzzing::PrimitiveOperatorExpression::Deref; + return Fuzzing::OperatorExpression::Deref; case Operator::Neg: - return Fuzzing::PrimitiveOperatorExpression::Neg; + return Fuzzing::OperatorExpression::Neg; case Operator::Not: - return Fuzzing::PrimitiveOperatorExpression::Not; + return Fuzzing::OperatorExpression::Not; case Operator::Ptr: - return Fuzzing::PrimitiveOperatorExpression::Ptr; + return Fuzzing::OperatorExpression::Ptr; case Operator::Add: - return Fuzzing::PrimitiveOperatorExpression::Add; + return Fuzzing::OperatorExpression::Add; case Operator::And: - return Fuzzing::PrimitiveOperatorExpression::And; + return Fuzzing::OperatorExpression::And; case Operator::Eq: - return Fuzzing::PrimitiveOperatorExpression::Eq; + return Fuzzing::OperatorExpression::Eq; case Operator::Mul: - return Fuzzing::PrimitiveOperatorExpression::Mul; + return Fuzzing::OperatorExpression::Mul; case Operator::Or: - return Fuzzing::PrimitiveOperatorExpression::Or; + return Fuzzing::OperatorExpression::Or; case Operator::Sub: - return Fuzzing::PrimitiveOperatorExpression::Sub; + return Fuzzing::OperatorExpression::Sub; case Operator::Combine: - return Fuzzing::PrimitiveOperatorExpression::Combine; + return Fuzzing::OperatorExpression::Combine; } } @@ -146,12 +146,11 @@ static auto ExpressionToProto(const Expression& expression) break; } - case ExpressionKind::PrimitiveOperatorExpression: { - const auto& primitive_operator = - cast(expression); - auto* operator_proto = expression_proto.mutable_primitive_operator(); - operator_proto->set_op(OperatorToProtoEnum(primitive_operator.op())); - for (Nonnull arg : primitive_operator.arguments()) { + case ExpressionKind::OperatorExpression: { + const auto& operator_expr = cast(expression); + auto* operator_proto = expression_proto.mutable_operator_(); + operator_proto->set_op(OperatorToProtoEnum(operator_expr.op())); + for (Nonnull arg : operator_expr.arguments()) { *operator_proto->add_arguments() = ExpressionToProto(*arg); } break; diff --git a/explorer/fuzzing/fuzzer_corpus/8eaa02f849c34965729a56884c3543ab71016965 b/explorer/fuzzing/fuzzer_corpus/00a8aa40e52dba3fe5692f4454543d100ba47c7c similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/8eaa02f849c34965729a56884c3543ab71016965 rename to explorer/fuzzing/fuzzer_corpus/00a8aa40e52dba3fe5692f4454543d100ba47c7c index 2d0ed36ae1e5..735f0646f509 100644 --- a/explorer/fuzzing/fuzzer_corpus/8eaa02f849c34965729a56884c3543ab71016965 +++ b/explorer/fuzzing/fuzzer_corpus/00a8aa40e52dba3fe5692f4454543d100ba47c7c @@ -58,7 +58,7 @@ compilation_unit { statement { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/e5377a543f316428d1ad502f23a0f81511633aa9 b/explorer/fuzzing/fuzzer_corpus/049f6e3a81538ad088e95b45ce1bb1849cb7ea09 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/e5377a543f316428d1ad502f23a0f81511633aa9 rename to explorer/fuzzing/fuzzer_corpus/049f6e3a81538ad088e95b45ce1bb1849cb7ea09 index 28a4d29d5d38..0d5f3f611c31 100644 --- a/explorer/fuzzing/fuzzer_corpus/e5377a543f316428d1ad502f23a0f81511633aa9 +++ b/explorer/fuzzing/fuzzer_corpus/049f6e3a81538ad088e95b45ce1bb1849cb7ea09 @@ -41,7 +41,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/0b3e4c5e7dd250b4a9b90a96f71929e5c211a077 b/explorer/fuzzing/fuzzer_corpus/060a7f4ecdc31892cf0e2ebb5e53563bc0f254a0 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/0b3e4c5e7dd250b4a9b90a96f71929e5c211a077 rename to explorer/fuzzing/fuzzer_corpus/060a7f4ecdc31892cf0e2ebb5e53563bc0f254a0 index 20920ca266cd..b51d8378cec6 100644 --- a/explorer/fuzzing/fuzzer_corpus/0b3e4c5e7dd250b4a9b90a96f71929e5c211a077 +++ b/explorer/fuzzing/fuzzer_corpus/060a7f4ecdc31892cf0e2ebb5e53563bc0f254a0 @@ -32,7 +32,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: Neg arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/67f5eba036e94be0f60df4fb137d81e1dded6b7b b/explorer/fuzzing/fuzzer_corpus/0757dd4989238f5666b76d398c78a6463a6aff0b similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/67f5eba036e94be0f60df4fb137d81e1dded6b7b rename to explorer/fuzzing/fuzzer_corpus/0757dd4989238f5666b76d398c78a6463a6aff0b index e4cc8fbf2313..204b41bee3c5 100644 --- a/explorer/fuzzing/fuzzer_corpus/67f5eba036e94be0f60df4fb137d81e1dded6b7b +++ b/explorer/fuzzing/fuzzer_corpus/0757dd4989238f5666b76d398c78a6463a6aff0b @@ -107,16 +107,16 @@ compilation_unit { statement { return_statement { expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/4969109f00a31dd06730d3aa44cb87b5ccbb3587 b/explorer/fuzzing/fuzzer_corpus/0aaa138320ae521ac62573912738cae88d71f96e similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/4969109f00a31dd06730d3aa44cb87b5ccbb3587 rename to explorer/fuzzing/fuzzer_corpus/0aaa138320ae521ac62573912738cae88d71f96e index 38f70b14cef0..a0349a8e413b 100644 --- a/explorer/fuzzing/fuzzer_corpus/4969109f00a31dd06730d3aa44cb87b5ccbb3587 +++ b/explorer/fuzzing/fuzzer_corpus/0aaa138320ae521ac62573912738cae88d71f96e @@ -92,7 +92,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/713cf9469d63bd75c1e35014758c535d04427ac1 b/explorer/fuzzing/fuzzer_corpus/0cad2b9a3a6fc8cc8cd69df93c665c44a4cf09da similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/713cf9469d63bd75c1e35014758c535d04427ac1 rename to explorer/fuzzing/fuzzer_corpus/0cad2b9a3a6fc8cc8cd69df93c665c44a4cf09da index 92e41e0b2d9b..c5f03dc1ecea 100644 --- a/explorer/fuzzing/fuzzer_corpus/713cf9469d63bd75c1e35014758c535d04427ac1 +++ b/explorer/fuzzing/fuzzer_corpus/0cad2b9a3a6fc8cc8cd69df93c665c44a4cf09da @@ -123,7 +123,7 @@ compilation_unit { fields { name: "n" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/2ea7343e45493dfdf9eb1e3d8c4095915c8ab0fa b/explorer/fuzzing/fuzzer_corpus/0efb68ab631d0a132d9eb73c0af9c731ca6b3c2a similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/2ea7343e45493dfdf9eb1e3d8c4095915c8ab0fa rename to explorer/fuzzing/fuzzer_corpus/0efb68ab631d0a132d9eb73c0af9c731ca6b3c2a index e1854b272116..401d6b41d97e 100644 --- a/explorer/fuzzing/fuzzer_corpus/2ea7343e45493dfdf9eb1e3d8c4095915c8ab0fa +++ b/explorer/fuzzing/fuzzer_corpus/0efb68ab631d0a132d9eb73c0af9c731ca6b3c2a @@ -169,7 +169,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -216,10 +216,10 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Add arguments { identifier { @@ -328,7 +328,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -376,7 +376,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/c9f1c0de38bb3c727339fd8dc9018254673de352 b/explorer/fuzzing/fuzzer_corpus/0f4c4d6e5a54a66b39402352989b709fee66e91b similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/c9f1c0de38bb3c727339fd8dc9018254673de352 rename to explorer/fuzzing/fuzzer_corpus/0f4c4d6e5a54a66b39402352989b709fee66e91b index b78b0fc13d35..401824d34306 100644 --- a/explorer/fuzzing/fuzzer_corpus/c9f1c0de38bb3c727339fd8dc9018254673de352 +++ b/explorer/fuzzing/fuzzer_corpus/0f4c4d6e5a54a66b39402352989b709fee66e91b @@ -129,7 +129,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/1264b05271a5415c6aeb98da568e2f44766f5c6a b/explorer/fuzzing/fuzzer_corpus/0ff442dbe10ec026a2bddde2a00fc6d12bd8e762 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/1264b05271a5415c6aeb98da568e2f44766f5c6a rename to explorer/fuzzing/fuzzer_corpus/0ff442dbe10ec026a2bddde2a00fc6d12bd8e762 index f2737e1dad1e..16226d51dcc4 100644 --- a/explorer/fuzzing/fuzzer_corpus/1264b05271a5415c6aeb98da568e2f44766f5c6a +++ b/explorer/fuzzing/fuzzer_corpus/0ff442dbe10ec026a2bddde2a00fc6d12bd8e762 @@ -106,10 +106,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/02143c9b0d2b75fba43c584f62b43411a07136a2 b/explorer/fuzzing/fuzzer_corpus/107acd88c054dc0dac785ec2eb48470502708450 similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/02143c9b0d2b75fba43c584f62b43411a07136a2 rename to explorer/fuzzing/fuzzer_corpus/107acd88c054dc0dac785ec2eb48470502708450 index cb1714747151..7f363c98cf51 100644 --- a/explorer/fuzzing/fuzzer_corpus/02143c9b0d2b75fba43c584f62b43411a07136a2 +++ b/explorer/fuzzing/fuzzer_corpus/107acd88c054dc0dac785ec2eb48470502708450 @@ -59,10 +59,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/a5f8643a0b70df9173a87902eab8a04d45cd94e5 b/explorer/fuzzing/fuzzer_corpus/12130855e555d8e6e588564bfd1a3f206f578720 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/a5f8643a0b70df9173a87902eab8a04d45cd94e5 rename to explorer/fuzzing/fuzzer_corpus/12130855e555d8e6e588564bfd1a3f206f578720 index 2d8fcebfdc71..0cce47f06cf4 100644 --- a/explorer/fuzzing/fuzzer_corpus/a5f8643a0b70df9173a87902eab8a04d45cd94e5 +++ b/explorer/fuzzing/fuzzer_corpus/12130855e555d8e6e588564bfd1a3f206f578720 @@ -41,7 +41,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/7b7e24319e8f63e6c3e99f8cbc81da7e9e47390a b/explorer/fuzzing/fuzzer_corpus/127b893cd279bdcff0f2d37493b3e975aa86c4e3 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/7b7e24319e8f63e6c3e99f8cbc81da7e9e47390a rename to explorer/fuzzing/fuzzer_corpus/127b893cd279bdcff0f2d37493b3e975aa86c4e3 index e13d1cf4d475..744f70b18126 100644 --- a/explorer/fuzzing/fuzzer_corpus/7b7e24319e8f63e6c3e99f8cbc81da7e9e47390a +++ b/explorer/fuzzing/fuzzer_corpus/127b893cd279bdcff0f2d37493b3e975aa86c4e3 @@ -251,7 +251,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -279,7 +279,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -359,7 +359,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -382,7 +382,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -618,7 +618,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/e4909f9f7d6923c33db7e3dd3e292860721acfd3 b/explorer/fuzzing/fuzzer_corpus/14094da539080d20eebd0cca6fac5ad4fa57069e similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/e4909f9f7d6923c33db7e3dd3e292860721acfd3 rename to explorer/fuzzing/fuzzer_corpus/14094da539080d20eebd0cca6fac5ad4fa57069e index 59f56ec98ca6..c8480e948886 100644 --- a/explorer/fuzzing/fuzzer_corpus/e4909f9f7d6923c33db7e3dd3e292860721acfd3 +++ b/explorer/fuzzing/fuzzer_corpus/14094da539080d20eebd0cca6fac5ad4fa57069e @@ -87,7 +87,7 @@ compilation_unit { argument { tuple_literal { fields { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/017a765e283355ded618ed95de5da4e3f2dd4b52 b/explorer/fuzzing/fuzzer_corpus/14f8edf9c4ee423d1613fbbf76c6f9b4ce62be0c similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/017a765e283355ded618ed95de5da4e3f2dd4b52 rename to explorer/fuzzing/fuzzer_corpus/14f8edf9c4ee423d1613fbbf76c6f9b4ce62be0c index 4de48decfd4f..252b16dca99e 100644 --- a/explorer/fuzzing/fuzzer_corpus/017a765e283355ded618ed95de5da4e3f2dd4b52 +++ b/explorer/fuzzing/fuzzer_corpus/14f8edf9c4ee423d1613fbbf76c6f9b4ce62be0c @@ -155,7 +155,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -216,7 +216,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Mul arguments { identifier { @@ -587,7 +587,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -615,7 +615,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -695,7 +695,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -718,7 +718,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -1071,7 +1071,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/9bfccfc76e487b03760f88664fa41ac35032b309 b/explorer/fuzzing/fuzzer_corpus/1635d5dc579e814aaf860cb99b583fd06decd95e similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/9bfccfc76e487b03760f88664fa41ac35032b309 rename to explorer/fuzzing/fuzzer_corpus/1635d5dc579e814aaf860cb99b583fd06decd95e index 58db00f73b09..6413cafe0d47 100644 --- a/explorer/fuzzing/fuzzer_corpus/9bfccfc76e487b03760f88664fa41ac35032b309 +++ b/explorer/fuzzing/fuzzer_corpus/1635d5dc579e814aaf860cb99b583fd06decd95e @@ -81,7 +81,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/9b3c43975c7084e9b2df23fbdc40e74f563d0732 b/explorer/fuzzing/fuzzer_corpus/1889235095c87ec99be04e8004aabff19f2169e8 similarity index 95% rename from explorer/fuzzing/fuzzer_corpus/9b3c43975c7084e9b2df23fbdc40e74f563d0732 rename to explorer/fuzzing/fuzzer_corpus/1889235095c87ec99be04e8004aabff19f2169e8 index 589d30b4b54b..0bbd5bd87fcb 100644 --- a/explorer/fuzzing/fuzzer_corpus/9b3c43975c7084e9b2df23fbdc40e74f563d0732 +++ b/explorer/fuzzing/fuzzer_corpus/1889235095c87ec99be04e8004aabff19f2169e8 @@ -57,7 +57,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { int_type_literal { @@ -70,7 +70,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: AddressOf arguments { simple_member_access { @@ -89,7 +89,7 @@ compilation_unit { statements { assign { lhs { - primitive_operator { + operator { op: Deref arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/472b9f7d613316693d56e49f236877cde0caaa75 b/explorer/fuzzing/fuzzer_corpus/18b53ef8c05b1929dd8e1790c84ea9c463a43434 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/472b9f7d613316693d56e49f236877cde0caaa75 rename to explorer/fuzzing/fuzzer_corpus/18b53ef8c05b1929dd8e1790c84ea9c463a43434 index dabeca9e629c..cada50db1336 100644 --- a/explorer/fuzzing/fuzzer_corpus/472b9f7d613316693d56e49f236877cde0caaa75 +++ b/explorer/fuzzing/fuzzer_corpus/18b53ef8c05b1929dd8e1790c84ea9c463a43434 @@ -222,7 +222,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/afa03ca87919d5338ae7a96eea4047ff62d7bfc6 b/explorer/fuzzing/fuzzer_corpus/192dc5815905d8b0540486bfc0638c978d20039c similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/afa03ca87919d5338ae7a96eea4047ff62d7bfc6 rename to explorer/fuzzing/fuzzer_corpus/192dc5815905d8b0540486bfc0638c978d20039c index d8fb2d240c85..b55bc1b42a3f 100644 --- a/explorer/fuzzing/fuzzer_corpus/afa03ca87919d5338ae7a96eea4047ff62d7bfc6 +++ b/explorer/fuzzing/fuzzer_corpus/192dc5815905d8b0540486bfc0638c978d20039c @@ -195,7 +195,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -223,7 +223,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -596,7 +596,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/354874b52fc3aca31201e7162e739e91dbe02ffd b/explorer/fuzzing/fuzzer_corpus/1a936ffdb9b920899f786c3e0b9c8ef8524261e8 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/354874b52fc3aca31201e7162e739e91dbe02ffd rename to explorer/fuzzing/fuzzer_corpus/1a936ffdb9b920899f786c3e0b9c8ef8524261e8 index 675512289630..700580d7b117 100644 --- a/explorer/fuzzing/fuzzer_corpus/354874b52fc3aca31201e7162e739e91dbe02ffd +++ b/explorer/fuzzing/fuzzer_corpus/1a936ffdb9b920899f786c3e0b9c8ef8524261e8 @@ -41,7 +41,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -76,7 +76,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { call { diff --git a/explorer/fuzzing/fuzzer_corpus/3db1646f25e3f628cf0219a651539b07f20df403 b/explorer/fuzzing/fuzzer_corpus/1c52c6482c396a582135715d8e633cca4febe2b6 similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/3db1646f25e3f628cf0219a651539b07f20df403 rename to explorer/fuzzing/fuzzer_corpus/1c52c6482c396a582135715d8e633cca4febe2b6 index 7068551a77cc..beb63987c9f9 100644 --- a/explorer/fuzzing/fuzzer_corpus/3db1646f25e3f628cf0219a651539b07f20df403 +++ b/explorer/fuzzing/fuzzer_corpus/1c52c6482c396a582135715d8e633cca4febe2b6 @@ -438,10 +438,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -490,10 +490,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -542,10 +542,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -594,10 +594,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -655,10 +655,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -698,10 +698,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -750,10 +750,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -802,10 +802,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -853,10 +853,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -905,10 +905,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -957,10 +957,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -1017,10 +1017,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { @@ -1060,10 +1060,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { call { diff --git a/explorer/fuzzing/fuzzer_corpus/fc9f4460e5852abce29efaa44ce6451404b7d7be b/explorer/fuzzing/fuzzer_corpus/1d3fda03a0e7a36ebb1e70237c64398b5342a8cf similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/fc9f4460e5852abce29efaa44ce6451404b7d7be rename to explorer/fuzzing/fuzzer_corpus/1d3fda03a0e7a36ebb1e70237c64398b5342a8cf index 32de22b94d33..a4faa5c60054 100644 --- a/explorer/fuzzing/fuzzer_corpus/fc9f4460e5852abce29efaa44ce6451404b7d7be +++ b/explorer/fuzzing/fuzzer_corpus/1d3fda03a0e7a36ebb1e70237c64398b5342a8cf @@ -249,7 +249,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { call { diff --git a/explorer/fuzzing/fuzzer_corpus/b6ca27aa9276f7a23bdf2a6a0a94f6f4798b1c3c b/explorer/fuzzing/fuzzer_corpus/228b7cbcd2164dce7c187785d32ed92dd24a5cc3 similarity index 93% rename from explorer/fuzzing/fuzzer_corpus/b6ca27aa9276f7a23bdf2a6a0a94f6f4798b1c3c rename to explorer/fuzzing/fuzzer_corpus/228b7cbcd2164dce7c187785d32ed92dd24a5cc3 index f2239a7a70a1..b1501abb5d4b 100644 --- a/explorer/fuzzing/fuzzer_corpus/b6ca27aa9276f7a23bdf2a6a0a94f6f4798b1c3c +++ b/explorer/fuzzing/fuzzer_corpus/228b7cbcd2164dce7c187785d32ed92dd24a5cc3 @@ -60,7 +60,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { int_type_literal { @@ -73,7 +73,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: AddressOf arguments { identifier { @@ -87,7 +87,7 @@ compilation_unit { statements { assign { lhs { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -111,7 +111,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { int_type_literal { @@ -124,10 +124,10 @@ compilation_unit { } } init { - primitive_operator { + operator { op: AddressOf arguments { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -143,7 +143,7 @@ compilation_unit { statements { assign { lhs { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -175,7 +175,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: Deref arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/eb4f0d50944e631f91288d5b2550ad77b54f0658 b/explorer/fuzzing/fuzzer_corpus/2baf4d05d30daedf3a9c722b678dea7297d144d5 similarity index 95% rename from explorer/fuzzing/fuzzer_corpus/eb4f0d50944e631f91288d5b2550ad77b54f0658 rename to explorer/fuzzing/fuzzer_corpus/2baf4d05d30daedf3a9c722b678dea7297d144d5 index 59233b23d4c7..8db27be1f416 100644 --- a/explorer/fuzzing/fuzzer_corpus/eb4f0d50944e631f91288d5b2550ad77b54f0658 +++ b/explorer/fuzzing/fuzzer_corpus/2baf4d05d30daedf3a9c722b678dea7297d144d5 @@ -126,16 +126,16 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -155,7 +155,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -177,7 +177,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/cc53603327b15d1ec403cb0d83a7b65e388baa10 b/explorer/fuzzing/fuzzer_corpus/2bbbfc37b0f9199a50d33d34c488d0a197872033 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/cc53603327b15d1ec403cb0d83a7b65e388baa10 rename to explorer/fuzzing/fuzzer_corpus/2bbbfc37b0f9199a50d33d34c488d0a197872033 index bf13c0c33a9d..a5e8bed521c8 100644 --- a/explorer/fuzzing/fuzzer_corpus/cc53603327b15d1ec403cb0d83a7b65e388baa10 +++ b/explorer/fuzzing/fuzzer_corpus/2bbbfc37b0f9199a50d33d34c488d0a197872033 @@ -123,7 +123,7 @@ compilation_unit { fields { name: "n" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/1f6ec7038b7bc8ebd4d5778566dde5445804bbf7 b/explorer/fuzzing/fuzzer_corpus/2c094d4acb7c84057d558588e094414e1eb97552 similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/1f6ec7038b7bc8ebd4d5778566dde5445804bbf7 rename to explorer/fuzzing/fuzzer_corpus/2c094d4acb7c84057d558588e094414e1eb97552 index a8b2671a05f2..112c3c804f94 100644 --- a/explorer/fuzzing/fuzzer_corpus/1f6ec7038b7bc8ebd4d5778566dde5445804bbf7 +++ b/explorer/fuzzing/fuzzer_corpus/2c094d4acb7c84057d558588e094414e1eb97552 @@ -52,7 +52,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { @@ -104,7 +104,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { int_literal { @@ -121,7 +121,7 @@ compilation_unit { argument { tuple_literal { fields { - primitive_operator { + operator { op: Sub arguments { identifier { @@ -251,10 +251,10 @@ compilation_unit { statements { while_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { identifier { @@ -288,7 +288,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -312,7 +312,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/3ccfbfc0cfe6cc7e4160a331ae91ab0af700f250 b/explorer/fuzzing/fuzzer_corpus/2d8f362c9aa1fb508c8f25ea687905183abeadcf similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/3ccfbfc0cfe6cc7e4160a331ae91ab0af700f250 rename to explorer/fuzzing/fuzzer_corpus/2d8f362c9aa1fb508c8f25ea687905183abeadcf index 52ac1a670acb..195b951ae29e 100644 --- a/explorer/fuzzing/fuzzer_corpus/3ccfbfc0cfe6cc7e4160a331ae91ab0af700f250 +++ b/explorer/fuzzing/fuzzer_corpus/2d8f362c9aa1fb508c8f25ea687905183abeadcf @@ -19,7 +19,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/0ee3d72e3cab1b0907f04f35b2d33fb946ab32c9 b/explorer/fuzzing/fuzzer_corpus/2db6570b8cfc6e5021152d0424c6c068a868355d similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/0ee3d72e3cab1b0907f04f35b2d33fb946ab32c9 rename to explorer/fuzzing/fuzzer_corpus/2db6570b8cfc6e5021152d0424c6c068a868355d index 1e1fb7b6af62..c59a8917ed9c 100644 --- a/explorer/fuzzing/fuzzer_corpus/0ee3d72e3cab1b0907f04f35b2d33fb946ab32c9 +++ b/explorer/fuzzing/fuzzer_corpus/2db6570b8cfc6e5021152d0424c6c068a868355d @@ -326,7 +326,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -354,7 +354,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -458,7 +458,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -481,7 +481,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -739,7 +739,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/b66e41a2708c436beb8806408f41f8b6d037cc87 b/explorer/fuzzing/fuzzer_corpus/2f4d8beb260713992ac947221dff3dc7cdd75096 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/b66e41a2708c436beb8806408f41f8b6d037cc87 rename to explorer/fuzzing/fuzzer_corpus/2f4d8beb260713992ac947221dff3dc7cdd75096 index e097468501e0..3e2ff4e72bcd 100644 --- a/explorer/fuzzing/fuzzer_corpus/b66e41a2708c436beb8806408f41f8b6d037cc87 +++ b/explorer/fuzzing/fuzzer_corpus/2f4d8beb260713992ac947221dff3dc7cdd75096 @@ -77,7 +77,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { identifier { @@ -129,7 +129,7 @@ compilation_unit { simple_member_access { field: "x" object { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -148,7 +148,7 @@ compilation_unit { simple_member_access { field: "x" object { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -298,7 +298,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/49b5049f30108d298ae81466aac0b67f7da97cb2 b/explorer/fuzzing/fuzzer_corpus/30c1e7882614e0f5ea10aeee8df59d7006a2f7f2 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/49b5049f30108d298ae81466aac0b67f7da97cb2 rename to explorer/fuzzing/fuzzer_corpus/30c1e7882614e0f5ea10aeee8df59d7006a2f7f2 index 39a3683f870a..ba902f2304d0 100644 --- a/explorer/fuzzing/fuzzer_corpus/49b5049f30108d298ae81466aac0b67f7da97cb2 +++ b/explorer/fuzzing/fuzzer_corpus/30c1e7882614e0f5ea10aeee8df59d7006a2f7f2 @@ -55,7 +55,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { call { diff --git a/explorer/fuzzing/fuzzer_corpus/ca47433beaff74d16e5e64e4c4e9acd58fce4423 b/explorer/fuzzing/fuzzer_corpus/31556246fe3ad54547e31a86e29aa33f670de52d similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/ca47433beaff74d16e5e64e4c4e9acd58fce4423 rename to explorer/fuzzing/fuzzer_corpus/31556246fe3ad54547e31a86e29aa33f670de52d index 315d39916cbb..0d954f488d08 100644 --- a/explorer/fuzzing/fuzzer_corpus/ca47433beaff74d16e5e64e4c4e9acd58fce4423 +++ b/explorer/fuzzing/fuzzer_corpus/31556246fe3ad54547e31a86e29aa33f670de52d @@ -55,7 +55,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -157,7 +157,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { call { diff --git a/explorer/fuzzing/fuzzer_corpus/6c86299b17c54466628587a48c2ec0e9d3029fc7 b/explorer/fuzzing/fuzzer_corpus/350c28992cc3659ed0d99c0cd88376346e9958cc similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/6c86299b17c54466628587a48c2ec0e9d3029fc7 rename to explorer/fuzzing/fuzzer_corpus/350c28992cc3659ed0d99c0cd88376346e9958cc index 5f5a0d1e2f80..4a21698c6fa4 100644 --- a/explorer/fuzzing/fuzzer_corpus/6c86299b17c54466628587a48c2ec0e9d3029fc7 +++ b/explorer/fuzzing/fuzzer_corpus/350c28992cc3659ed0d99c0cd88376346e9958cc @@ -195,7 +195,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -223,7 +223,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -303,7 +303,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -326,7 +326,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -452,10 +452,10 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -490,10 +490,10 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -580,10 +580,10 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -613,10 +613,10 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -1062,10 +1062,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/3207c66d4cecd4b86b181734b79f670443d51506 b/explorer/fuzzing/fuzzer_corpus/3aeb897b8945e310d0ba09d0f630b58634203b0e similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/3207c66d4cecd4b86b181734b79f670443d51506 rename to explorer/fuzzing/fuzzer_corpus/3aeb897b8945e310d0ba09d0f630b58634203b0e index 535c39278fad..477b15d01251 100644 --- a/explorer/fuzzing/fuzzer_corpus/3207c66d4cecd4b86b181734b79f670443d51506 +++ b/explorer/fuzzing/fuzzer_corpus/3aeb897b8945e310d0ba09d0f630b58634203b0e @@ -32,7 +32,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { @@ -70,7 +70,7 @@ compilation_unit { argument { tuple_literal { fields { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/b9378e44d8b809e19d29c58997a302f6596c34e5 b/explorer/fuzzing/fuzzer_corpus/3ec79d5d498edae7c9cc422fd5087a7dedf6394c similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/b9378e44d8b809e19d29c58997a302f6596c34e5 rename to explorer/fuzzing/fuzzer_corpus/3ec79d5d498edae7c9cc422fd5087a7dedf6394c index 62aca5348508..9225f5c9d9da 100644 --- a/explorer/fuzzing/fuzzer_corpus/b9378e44d8b809e19d29c58997a302f6596c34e5 +++ b/explorer/fuzzing/fuzzer_corpus/3ec79d5d498edae7c9cc422fd5087a7dedf6394c @@ -113,7 +113,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -474,13 +474,13 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -500,7 +500,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/035c3272740456e2748925f3ba854ccacadd029e b/explorer/fuzzing/fuzzer_corpus/3ed98bf1fbcba428e58d83ef31c9297bdcfc53a2 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/035c3272740456e2748925f3ba854ccacadd029e rename to explorer/fuzzing/fuzzer_corpus/3ed98bf1fbcba428e58d83ef31c9297bdcfc53a2 index 86e252f3e523..083eed8ef976 100644 --- a/explorer/fuzzing/fuzzer_corpus/035c3272740456e2748925f3ba854ccacadd029e +++ b/explorer/fuzzing/fuzzer_corpus/3ed98bf1fbcba428e58d83ef31c9297bdcfc53a2 @@ -143,7 +143,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Neg arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/522da9a0308eba58c432f7aa35e79b795467ca21 b/explorer/fuzzing/fuzzer_corpus/409a3e4b8dcbe38b5a8ca74e701205708d8c05a4 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/522da9a0308eba58c432f7aa35e79b795467ca21 rename to explorer/fuzzing/fuzzer_corpus/409a3e4b8dcbe38b5a8ca74e701205708d8c05a4 index 1b8d829e9287..7bd055ac781f 100644 --- a/explorer/fuzzing/fuzzer_corpus/522da9a0308eba58c432f7aa35e79b795467ca21 +++ b/explorer/fuzzing/fuzzer_corpus/409a3e4b8dcbe38b5a8ca74e701205708d8c05a4 @@ -195,7 +195,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -223,7 +223,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -544,7 +544,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/1c051deb5a752c0fdd02d90e044b2fecc8c2c82c b/explorer/fuzzing/fuzzer_corpus/40f9a726dcbfc06cba7b9c857d8e5f5fd565aa34 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/1c051deb5a752c0fdd02d90e044b2fecc8c2c82c rename to explorer/fuzzing/fuzzer_corpus/40f9a726dcbfc06cba7b9c857d8e5f5fd565aa34 index 1dbefa3216d5..dbf63a6de42f 100644 --- a/explorer/fuzzing/fuzzer_corpus/1c051deb5a752c0fdd02d90e044b2fecc8c2c82c +++ b/explorer/fuzzing/fuzzer_corpus/40f9a726dcbfc06cba7b9c857d8e5f5fd565aa34 @@ -90,10 +90,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/5de34aef9f4d90ab58516942a3244cd6115d5e07 b/explorer/fuzzing/fuzzer_corpus/41d094ff917771777c18c19c259d06adf1cf4c25 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/5de34aef9f4d90ab58516942a3244cd6115d5e07 rename to explorer/fuzzing/fuzzer_corpus/41d094ff917771777c18c19c259d06adf1cf4c25 index 517907301723..f7f13d7f31e1 100644 --- a/explorer/fuzzing/fuzzer_corpus/5de34aef9f4d90ab58516942a3244cd6115d5e07 +++ b/explorer/fuzzing/fuzzer_corpus/41d094ff917771777c18c19c259d06adf1cf4c25 @@ -45,7 +45,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/5941fbba153aeb0d90c912ec46695d52159eb62f b/explorer/fuzzing/fuzzer_corpus/4350883f5979d19cc4021925d68282c2aaac39f3 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/5941fbba153aeb0d90c912ec46695d52159eb62f rename to explorer/fuzzing/fuzzer_corpus/4350883f5979d19cc4021925d68282c2aaac39f3 index 8a80464d63d3..76cce8a50acc 100644 --- a/explorer/fuzzing/fuzzer_corpus/5941fbba153aeb0d90c912ec46695d52159eb62f +++ b/explorer/fuzzing/fuzzer_corpus/4350883f5979d19cc4021925d68282c2aaac39f3 @@ -88,7 +88,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/2caf42dcf02bff184fa653bf36054b9d83704e30 b/explorer/fuzzing/fuzzer_corpus/43a5f1124cf3bf76c63cd184ba30cb654a790ff7 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/2caf42dcf02bff184fa653bf36054b9d83704e30 rename to explorer/fuzzing/fuzzer_corpus/43a5f1124cf3bf76c63cd184ba30cb654a790ff7 index 2c7b0163df84..e180f9000181 100644 --- a/explorer/fuzzing/fuzzer_corpus/2caf42dcf02bff184fa653bf36054b9d83704e30 +++ b/explorer/fuzzing/fuzzer_corpus/43a5f1124cf3bf76c63cd184ba30cb654a790ff7 @@ -168,7 +168,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -196,7 +196,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -463,10 +463,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/d44b1b3f6ff018d0829e0d73f551d0144b39e638 b/explorer/fuzzing/fuzzer_corpus/44032fb64eaa572d1e2ae4d500db23ae32355380 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/d44b1b3f6ff018d0829e0d73f551d0144b39e638 rename to explorer/fuzzing/fuzzer_corpus/44032fb64eaa572d1e2ae4d500db23ae32355380 index 29e8b2dde783..46fbdae0a5fa 100644 --- a/explorer/fuzzing/fuzzer_corpus/d44b1b3f6ff018d0829e0d73f551d0144b39e638 +++ b/explorer/fuzzing/fuzzer_corpus/44032fb64eaa572d1e2ae4d500db23ae32355380 @@ -197,7 +197,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -225,7 +225,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -305,7 +305,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -328,7 +328,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -642,7 +642,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/4ad1c12963bd40b215904199ae894d5e0246f399 b/explorer/fuzzing/fuzzer_corpus/449b97eee9c6e02464330b1443e99398e05d2c87 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/4ad1c12963bd40b215904199ae894d5e0246f399 rename to explorer/fuzzing/fuzzer_corpus/449b97eee9c6e02464330b1443e99398e05d2c87 index fc1dea10363d..dc20da2c9ad2 100644 --- a/explorer/fuzzing/fuzzer_corpus/4ad1c12963bd40b215904199ae894d5e0246f399 +++ b/explorer/fuzzing/fuzzer_corpus/449b97eee9c6e02464330b1443e99398e05d2c87 @@ -95,7 +95,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/c75bdca473d96d91e931aca3e606e53e88890a9c b/explorer/fuzzing/fuzzer_corpus/452707129ac2d03d141b9064cc34530f1d40d134 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/c75bdca473d96d91e931aca3e606e53e88890a9c rename to explorer/fuzzing/fuzzer_corpus/452707129ac2d03d141b9064cc34530f1d40d134 index 1b05dae1b7c9..9a278f4427a2 100644 --- a/explorer/fuzzing/fuzzer_corpus/c75bdca473d96d91e931aca3e606e53e88890a9c +++ b/explorer/fuzzing/fuzzer_corpus/452707129ac2d03d141b9064cc34530f1d40d134 @@ -84,10 +84,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Add arguments { index { diff --git a/explorer/fuzzing/fuzzer_corpus/b1573ca8e10fba91022153f79d51a3a8cd989c98 b/explorer/fuzzing/fuzzer_corpus/457c811489db1e3f987633ce1fb2dce7d984fb66 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/b1573ca8e10fba91022153f79d51a3a8cd989c98 rename to explorer/fuzzing/fuzzer_corpus/457c811489db1e3f987633ce1fb2dce7d984fb66 index 1b8bf97e8293..a9015f3ddfab 100644 --- a/explorer/fuzzing/fuzzer_corpus/b1573ca8e10fba91022153f79d51a3a8cd989c98 +++ b/explorer/fuzzing/fuzzer_corpus/457c811489db1e3f987633ce1fb2dce7d984fb66 @@ -235,7 +235,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/58260e75087e0170a67885bc34e4c05898dd1638 b/explorer/fuzzing/fuzzer_corpus/474fc14cf33f61c51a24a9cf6c6709f7ed649ecb similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/58260e75087e0170a67885bc34e4c05898dd1638 rename to explorer/fuzzing/fuzzer_corpus/474fc14cf33f61c51a24a9cf6c6709f7ed649ecb index 7826a8f2c1db..eeff393ad7b4 100644 --- a/explorer/fuzzing/fuzzer_corpus/58260e75087e0170a67885bc34e4c05898dd1638 +++ b/explorer/fuzzing/fuzzer_corpus/474fc14cf33f61c51a24a9cf6c6709f7ed649ecb @@ -21,7 +21,7 @@ compilation_unit { } parameter { fields { - primitive_operator { + operator { op: Neg arguments { bool_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/334c6a14986f5653fd352f1bb200e80fddf7d697 b/explorer/fuzzing/fuzzer_corpus/4be7c1e91a372d8fffc65158bb22572f42233e30 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/334c6a14986f5653fd352f1bb200e80fddf7d697 rename to explorer/fuzzing/fuzzer_corpus/4be7c1e91a372d8fffc65158bb22572f42233e30 index 4e05d4276589..4dfb38dcbf73 100644 --- a/explorer/fuzzing/fuzzer_corpus/334c6a14986f5653fd352f1bb200e80fddf7d697 +++ b/explorer/fuzzing/fuzzer_corpus/4be7c1e91a372d8fffc65158bb22572f42233e30 @@ -139,7 +139,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/9e6859766e9d34eec973a9b4d98b638ba6c00748 b/explorer/fuzzing/fuzzer_corpus/4c73d357564823c15f11b5d4c47a7b16f4c34aea similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/9e6859766e9d34eec973a9b4d98b638ba6c00748 rename to explorer/fuzzing/fuzzer_corpus/4c73d357564823c15f11b5d4c47a7b16f4c34aea index 251d9533201d..e08ed019ca30 100644 --- a/explorer/fuzzing/fuzzer_corpus/9e6859766e9d34eec973a9b4d98b638ba6c00748 +++ b/explorer/fuzzing/fuzzer_corpus/4c73d357564823c15f11b5d4c47a7b16f4c34aea @@ -97,7 +97,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/f322da95d8d8422e659c3c23d2f7aa3193efb25f b/explorer/fuzzing/fuzzer_corpus/4ce3a6280cb42032b421b2ada1018f692720e17d similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/f322da95d8d8422e659c3c23d2f7aa3193efb25f rename to explorer/fuzzing/fuzzer_corpus/4ce3a6280cb42032b421b2ada1018f692720e17d index 81585fbccec4..4c11895de5be 100644 --- a/explorer/fuzzing/fuzzer_corpus/f322da95d8d8422e659c3c23d2f7aa3193efb25f +++ b/explorer/fuzzing/fuzzer_corpus/4ce3a6280cb42032b421b2ada1018f692720e17d @@ -170,16 +170,16 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -212,7 +212,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -248,7 +248,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/b015582cdd9a7b03f83d7001537d32e4ea123946 b/explorer/fuzzing/fuzzer_corpus/536c060cc8df53b0132be40dbbc67f1df1775bac similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/b015582cdd9a7b03f83d7001537d32e4ea123946 rename to explorer/fuzzing/fuzzer_corpus/536c060cc8df53b0132be40dbbc67f1df1775bac index c1dcef35fde0..091ee9cbd93d 100644 --- a/explorer/fuzzing/fuzzer_corpus/b015582cdd9a7b03f83d7001537d32e4ea123946 +++ b/explorer/fuzzing/fuzzer_corpus/536c060cc8df53b0132be40dbbc67f1df1775bac @@ -57,7 +57,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { identifier { @@ -109,7 +109,7 @@ compilation_unit { simple_member_access { field: "x" object { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -128,7 +128,7 @@ compilation_unit { simple_member_access { field: "x" object { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -278,7 +278,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/6387e3e0d1ddb4ad2178b62b08b5812d4181fc75 b/explorer/fuzzing/fuzzer_corpus/55ccba2998142de2e42b6f1daf02d8753579f38e similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/6387e3e0d1ddb4ad2178b62b08b5812d4181fc75 rename to explorer/fuzzing/fuzzer_corpus/55ccba2998142de2e42b6f1daf02d8753579f38e index 200461474cf3..0a9b7a38931b 100644 --- a/explorer/fuzzing/fuzzer_corpus/6387e3e0d1ddb4ad2178b62b08b5812d4181fc75 +++ b/explorer/fuzzing/fuzzer_corpus/55ccba2998142de2e42b6f1daf02d8753579f38e @@ -384,7 +384,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/7d932ad9cdc1f4052e0bd1768f7f07fed0a23c67 b/explorer/fuzzing/fuzzer_corpus/57182bf25e23bdbb8db74996446c7e510d08323e similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/7d932ad9cdc1f4052e0bd1768f7f07fed0a23c67 rename to explorer/fuzzing/fuzzer_corpus/57182bf25e23bdbb8db74996446c7e510d08323e index 8ed9bd4bade2..4d98e4c2b0f7 100644 --- a/explorer/fuzzing/fuzzer_corpus/7d932ad9cdc1f4052e0bd1768f7f07fed0a23c67 +++ b/explorer/fuzzing/fuzzer_corpus/57182bf25e23bdbb8db74996446c7e510d08323e @@ -185,7 +185,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -232,10 +232,10 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Add arguments { identifier { @@ -344,7 +344,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -392,7 +392,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/c7c6e4477db2a3b777e740964a09a379684261d8 b/explorer/fuzzing/fuzzer_corpus/57c675d871863121251bb2e1e185a67934ab45c0 similarity index 86% rename from explorer/fuzzing/fuzzer_corpus/c7c6e4477db2a3b777e740964a09a379684261d8 rename to explorer/fuzzing/fuzzer_corpus/57c675d871863121251bb2e1e185a67934ab45c0 index bef4a83a0c95..80ff4cc8a3e5 100644 --- a/explorer/fuzzing/fuzzer_corpus/c7c6e4477db2a3b777e740964a09a379684261d8 +++ b/explorer/fuzzing/fuzzer_corpus/57c675d871863121251bb2e1e185a67934ab45c0 @@ -4,12 +4,12 @@ compilation_unit { alternatives { signature { fields { - primitive_operator { + operator { arguments { intrinsic { argument { fields { - primitive_operator { + operator { arguments { identifier { } diff --git a/explorer/fuzzing/fuzzer_corpus/a89eea46cc9aa7ca66868c4f2874ab2b61262980 b/explorer/fuzzing/fuzzer_corpus/5a2e47fbeef7d44dadb53a69fa0012cd0846a507 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/a89eea46cc9aa7ca66868c4f2874ab2b61262980 rename to explorer/fuzzing/fuzzer_corpus/5a2e47fbeef7d44dadb53a69fa0012cd0846a507 index 2cfd75ddcba0..517a2e86d3f6 100644 --- a/explorer/fuzzing/fuzzer_corpus/a89eea46cc9aa7ca66868c4f2874ab2b61262980 +++ b/explorer/fuzzing/fuzzer_corpus/5a2e47fbeef7d44dadb53a69fa0012cd0846a507 @@ -50,7 +50,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/698d8440e42574d1db112842642ff8c0ecc66374 b/explorer/fuzzing/fuzzer_corpus/5d5019434454636690d87a9656afc1d95deee8df similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/698d8440e42574d1db112842642ff8c0ecc66374 rename to explorer/fuzzing/fuzzer_corpus/5d5019434454636690d87a9656afc1d95deee8df index 73bdcb56ad3a..1c64cfb67571 100644 --- a/explorer/fuzzing/fuzzer_corpus/698d8440e42574d1db112842642ff8c0ecc66374 +++ b/explorer/fuzzing/fuzzer_corpus/5d5019434454636690d87a9656afc1d95deee8df @@ -41,7 +41,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/32e0eb929035d7c53b3d8566ac48ef0c3b82b32e b/explorer/fuzzing/fuzzer_corpus/5fc78caa03024255c5c7015e6e3c0bc97f5a4c1e similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/32e0eb929035d7c53b3d8566ac48ef0c3b82b32e rename to explorer/fuzzing/fuzzer_corpus/5fc78caa03024255c5c7015e6e3c0bc97f5a4c1e index 97189db61713..d57406441b31 100644 --- a/explorer/fuzzing/fuzzer_corpus/32e0eb929035d7c53b3d8566ac48ef0c3b82b32e +++ b/explorer/fuzzing/fuzzer_corpus/5fc78caa03024255c5c7015e6e3c0bc97f5a4c1e @@ -201,7 +201,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -773,7 +773,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/5a5e0f23676f5b95ddb2d0101131f22c1fc5515c b/explorer/fuzzing/fuzzer_corpus/60469f199bd3244e105b0446c25cc23b6a768eae similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/5a5e0f23676f5b95ddb2d0101131f22c1fc5515c rename to explorer/fuzzing/fuzzer_corpus/60469f199bd3244e105b0446c25cc23b6a768eae index a42c4ab1be1f..e89e35c75b45 100644 --- a/explorer/fuzzing/fuzzer_corpus/5a5e0f23676f5b95ddb2d0101131f22c1fc5515c +++ b/explorer/fuzzing/fuzzer_corpus/60469f199bd3244e105b0446c25cc23b6a768eae @@ -201,7 +201,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -773,7 +773,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/81b5d416277f5b28d98ac9b175f73389d9857655 b/explorer/fuzzing/fuzzer_corpus/62c7aa55a12ef5ad4a7cec26ea7c3f0ed82ae24a similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/81b5d416277f5b28d98ac9b175f73389d9857655 rename to explorer/fuzzing/fuzzer_corpus/62c7aa55a12ef5ad4a7cec26ea7c3f0ed82ae24a index d52266788357..ef2333bea6a7 100644 --- a/explorer/fuzzing/fuzzer_corpus/81b5d416277f5b28d98ac9b175f73389d9857655 +++ b/explorer/fuzzing/fuzzer_corpus/62c7aa55a12ef5ad4a7cec26ea7c3f0ed82ae24a @@ -278,7 +278,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -306,7 +306,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -386,7 +386,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -409,7 +409,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -667,7 +667,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/6feffd83f7b5bfd3f870e4365a8c0d58df0689b4 b/explorer/fuzzing/fuzzer_corpus/659e20bff50e0abe4f7d58e8e0b739ad2a5048b9 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/6feffd83f7b5bfd3f870e4365a8c0d58df0689b4 rename to explorer/fuzzing/fuzzer_corpus/659e20bff50e0abe4f7d58e8e0b739ad2a5048b9 index bc5316358f61..eba6eb0df0a1 100644 --- a/explorer/fuzzing/fuzzer_corpus/6feffd83f7b5bfd3f870e4365a8c0d58df0689b4 +++ b/explorer/fuzzing/fuzzer_corpus/659e20bff50e0abe4f7d58e8e0b739ad2a5048b9 @@ -123,7 +123,7 @@ compilation_unit { fields { name: "n" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/fda984fd483f47ca29fd55b54173f77ef690b4ee b/explorer/fuzzing/fuzzer_corpus/65c24d040bbc26b5e1fea735ddf1755392471a18 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/fda984fd483f47ca29fd55b54173f77ef690b4ee rename to explorer/fuzzing/fuzzer_corpus/65c24d040bbc26b5e1fea735ddf1755392471a18 index 68f73f1db476..292e835e8753 100644 --- a/explorer/fuzzing/fuzzer_corpus/fda984fd483f47ca29fd55b54173f77ef690b4ee +++ b/explorer/fuzzing/fuzzer_corpus/65c24d040bbc26b5e1fea735ddf1755392471a18 @@ -491,7 +491,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/8807065998e566eda4a26e9d9ec50f8938b46253 b/explorer/fuzzing/fuzzer_corpus/71035d013bdc57394db132778f7934164475cff1 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/8807065998e566eda4a26e9d9ec50f8938b46253 rename to explorer/fuzzing/fuzzer_corpus/71035d013bdc57394db132778f7934164475cff1 index afb28da6aaa1..f4ccbb5fdc89 100644 --- a/explorer/fuzzing/fuzzer_corpus/8807065998e566eda4a26e9d9ec50f8938b46253 +++ b/explorer/fuzzing/fuzzer_corpus/71035d013bdc57394db132778f7934164475cff1 @@ -55,7 +55,7 @@ compilation_unit { fields { name: "n" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/9e4d44b35fbe54f77aa09998b95423f36f44158c b/explorer/fuzzing/fuzzer_corpus/733898e2c7730693eb323caa6b2a827a547db97a similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/9e4d44b35fbe54f77aa09998b95423f36f44158c rename to explorer/fuzzing/fuzzer_corpus/733898e2c7730693eb323caa6b2a827a547db97a index cebd67a6c727..0fe8d3bc50b9 100644 --- a/explorer/fuzzing/fuzzer_corpus/9e4d44b35fbe54f77aa09998b95423f36f44158c +++ b/explorer/fuzzing/fuzzer_corpus/733898e2c7730693eb323caa6b2a827a547db97a @@ -96,7 +96,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { index { diff --git a/explorer/fuzzing/fuzzer_corpus/0c441139ce210274afe7f2964745701c9957c672 b/explorer/fuzzing/fuzzer_corpus/74bd01b6ca01991c40cb7e2129d34602c5807542 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/0c441139ce210274afe7f2964745701c9957c672 rename to explorer/fuzzing/fuzzer_corpus/74bd01b6ca01991c40cb7e2129d34602c5807542 index f56f801dae80..d4788a7add73 100644 --- a/explorer/fuzzing/fuzzer_corpus/0c441139ce210274afe7f2964745701c9957c672 +++ b/explorer/fuzzing/fuzzer_corpus/74bd01b6ca01991c40cb7e2129d34602c5807542 @@ -232,7 +232,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -260,7 +260,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -391,7 +391,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/f0249ef671686916199dbce1467d741102a68717 b/explorer/fuzzing/fuzzer_corpus/75c68060eb8633b81c8c183d8e52b386a6f40b6e similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/f0249ef671686916199dbce1467d741102a68717 rename to explorer/fuzzing/fuzzer_corpus/75c68060eb8633b81c8c183d8e52b386a6f40b6e index 6d5544f5b956..b82122b280db 100644 --- a/explorer/fuzzing/fuzzer_corpus/f0249ef671686916199dbce1467d741102a68717 +++ b/explorer/fuzzing/fuzzer_corpus/75c68060eb8633b81c8c183d8e52b386a6f40b6e @@ -201,7 +201,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -825,7 +825,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/5357de7edef4e3bff993192d9538493ae80f5fa8 b/explorer/fuzzing/fuzzer_corpus/76e8a4678c5aa0cfcce078571739a299702810b7 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/5357de7edef4e3bff993192d9538493ae80f5fa8 rename to explorer/fuzzing/fuzzer_corpus/76e8a4678c5aa0cfcce078571739a299702810b7 index 36344b9b2eb5..be2804ee45a0 100644 --- a/explorer/fuzzing/fuzzer_corpus/5357de7edef4e3bff993192d9538493ae80f5fa8 +++ b/explorer/fuzzing/fuzzer_corpus/76e8a4678c5aa0cfcce078571739a299702810b7 @@ -453,7 +453,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/95fb9a0f4e59b497ae6b0bd59d4ff5bf1adc1d9b b/explorer/fuzzing/fuzzer_corpus/7ad32d9be7562a912db6fab452936c5f5a09f25f similarity index 92% rename from explorer/fuzzing/fuzzer_corpus/95fb9a0f4e59b497ae6b0bd59d4ff5bf1adc1d9b rename to explorer/fuzzing/fuzzer_corpus/7ad32d9be7562a912db6fab452936c5f5a09f25f index 2817a3a686d7..e51b4e4fa774 100644 --- a/explorer/fuzzing/fuzzer_corpus/95fb9a0f4e59b497ae6b0bd59d4ff5bf1adc1d9b +++ b/explorer/fuzzing/fuzzer_corpus/7ad32d9be7562a912db6fab452936c5f5a09f25f @@ -79,7 +79,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { int_type_literal { @@ -92,7 +92,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: AddressOf arguments { identifier { @@ -111,7 +111,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { identifier { @@ -125,7 +125,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: AddressOf arguments { identifier { @@ -139,16 +139,16 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -158,7 +158,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Deref arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/0dc3ae8a543d130071a2efc462dabf1946794c28 b/explorer/fuzzing/fuzzer_corpus/7f0f1bc85599a63045bfc3d2a4a7d0e5865beff0 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/0dc3ae8a543d130071a2efc462dabf1946794c28 rename to explorer/fuzzing/fuzzer_corpus/7f0f1bc85599a63045bfc3d2a4a7d0e5865beff0 index b9152594ee9c..b5e69477b491 100644 --- a/explorer/fuzzing/fuzzer_corpus/0dc3ae8a543d130071a2efc462dabf1946794c28 +++ b/explorer/fuzzing/fuzzer_corpus/7f0f1bc85599a63045bfc3d2a4a7d0e5865beff0 @@ -103,10 +103,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { index { diff --git a/explorer/fuzzing/fuzzer_corpus/61074429b7c420d6021c2e22019df74bcf0349a7 b/explorer/fuzzing/fuzzer_corpus/85954afca87c50274902e103f0f2c757af19f9eb similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/61074429b7c420d6021c2e22019df74bcf0349a7 rename to explorer/fuzzing/fuzzer_corpus/85954afca87c50274902e103f0f2c757af19f9eb index 4e3f0cf599d5..a39df97d6b00 100644 --- a/explorer/fuzzing/fuzzer_corpus/61074429b7c420d6021c2e22019df74bcf0349a7 +++ b/explorer/fuzzing/fuzzer_corpus/85954afca87c50274902e103f0f2c757af19f9eb @@ -175,7 +175,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/9d26cfc5faadd68c4fe601c70f56976fc8265ae6 b/explorer/fuzzing/fuzzer_corpus/8821717e6334ce28e0ea3b0dc71cbcb5f63238d7 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/9d26cfc5faadd68c4fe601c70f56976fc8265ae6 rename to explorer/fuzzing/fuzzer_corpus/8821717e6334ce28e0ea3b0dc71cbcb5f63238d7 index 7ea2750d4228..f6b072992570 100644 --- a/explorer/fuzzing/fuzzer_corpus/9d26cfc5faadd68c4fe601c70f56976fc8265ae6 +++ b/explorer/fuzzing/fuzzer_corpus/8821717e6334ce28e0ea3b0dc71cbcb5f63238d7 @@ -32,7 +32,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/6d67acbc349af1d8c183162793004dd676007700 b/explorer/fuzzing/fuzzer_corpus/8eac818658b38a8b283b30c5a4051f5f7e98707a similarity index 94% rename from explorer/fuzzing/fuzzer_corpus/6d67acbc349af1d8c183162793004dd676007700 rename to explorer/fuzzing/fuzzer_corpus/8eac818658b38a8b283b30c5a4051f5f7e98707a index 67bda855c9d5..6190182d1585 100644 --- a/explorer/fuzzing/fuzzer_corpus/6d67acbc349af1d8c183162793004dd676007700 +++ b/explorer/fuzzing/fuzzer_corpus/8eac818658b38a8b283b30c5a4051f5f7e98707a @@ -113,7 +113,7 @@ compilation_unit { } } then_expression { - primitive_operator { + operator { op: Or arguments { bool_literal { @@ -128,7 +128,7 @@ compilation_unit { } } else_expression { - primitive_operator { + operator { op: And arguments { bool_literal { @@ -147,7 +147,7 @@ compilation_unit { then_expression { if_expression { condition { - primitive_operator { + operator { op: Not arguments { identifier { @@ -157,7 +157,7 @@ compilation_unit { } } then_expression { - primitive_operator { + operator { op: Add arguments { int_literal { @@ -172,7 +172,7 @@ compilation_unit { } } else_expression { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -191,7 +191,7 @@ compilation_unit { else_expression { if_expression { condition { - primitive_operator { + operator { op: Not arguments { identifier { @@ -201,7 +201,7 @@ compilation_unit { } } then_expression { - primitive_operator { + operator { op: Add arguments { int_literal { @@ -216,7 +216,7 @@ compilation_unit { } } else_expression { - primitive_operator { + operator { op: Mul arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/8b702dcbe3970e2456a09d5fc1b7b1d3b36f52c0 b/explorer/fuzzing/fuzzer_corpus/95541ac2e9dbf1287d9834257c03d3b26e0d2bc1 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/8b702dcbe3970e2456a09d5fc1b7b1d3b36f52c0 rename to explorer/fuzzing/fuzzer_corpus/95541ac2e9dbf1287d9834257c03d3b26e0d2bc1 index 572c2ca95de4..71398c8ebafe 100644 --- a/explorer/fuzzing/fuzzer_corpus/8b702dcbe3970e2456a09d5fc1b7b1d3b36f52c0 +++ b/explorer/fuzzing/fuzzer_corpus/95541ac2e9dbf1287d9834257c03d3b26e0d2bc1 @@ -53,10 +53,10 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/8d84de249cf5ef3b256b81d68fd0a5cc22f16326 b/explorer/fuzzing/fuzzer_corpus/96c23d870abc34df6a29ffbb8c36d1244d25920c similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/8d84de249cf5ef3b256b81d68fd0a5cc22f16326 rename to explorer/fuzzing/fuzzer_corpus/96c23d870abc34df6a29ffbb8c36d1244d25920c index 3124c167d22c..8adca4670863 100644 --- a/explorer/fuzzing/fuzzer_corpus/8d84de249cf5ef3b256b81d68fd0a5cc22f16326 +++ b/explorer/fuzzing/fuzzer_corpus/96c23d870abc34df6a29ffbb8c36d1244d25920c @@ -32,7 +32,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/7f14266137c07dea7d4c7fa0f7f2ca6346cf4c66 b/explorer/fuzzing/fuzzer_corpus/975fcd972f9644c64177a30109d358cde488ec9c similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/7f14266137c07dea7d4c7fa0f7f2ca6346cf4c66 rename to explorer/fuzzing/fuzzer_corpus/975fcd972f9644c64177a30109d358cde488ec9c index 1bf4d7422450..acf98fc9f0d5 100644 --- a/explorer/fuzzing/fuzzer_corpus/7f14266137c07dea7d4c7fa0f7f2ca6346cf4c66 +++ b/explorer/fuzzing/fuzzer_corpus/975fcd972f9644c64177a30109d358cde488ec9c @@ -31,7 +31,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { identifier { @@ -83,7 +83,7 @@ compilation_unit { simple_member_access { field: "x" object { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -102,7 +102,7 @@ compilation_unit { simple_member_access { field: "x" object { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -272,7 +272,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/6108cd2ce5a08c8c845d5c11372c99fe56dd9674 b/explorer/fuzzing/fuzzer_corpus/97db8e7450ecd1b9310a1083eaafba6ae24454dd similarity index 94% rename from explorer/fuzzing/fuzzer_corpus/6108cd2ce5a08c8c845d5c11372c99fe56dd9674 rename to explorer/fuzzing/fuzzer_corpus/97db8e7450ecd1b9310a1083eaafba6ae24454dd index e6b3e381c8f8..9bcb73adaa38 100644 --- a/explorer/fuzzing/fuzzer_corpus/6108cd2ce5a08c8c845d5c11372c99fe56dd9674 +++ b/explorer/fuzzing/fuzzer_corpus/97db8e7450ecd1b9310a1083eaafba6ae24454dd @@ -37,10 +37,10 @@ compilation_unit { statements { while_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { identifier { @@ -65,7 +65,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/9bb0b055035cb4965aa9432c34bdb1be0f8c3b80 b/explorer/fuzzing/fuzzer_corpus/988b50fcd2641207a813cbb1fd6d8e5b3c82b07b similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/9bb0b055035cb4965aa9432c34bdb1be0f8c3b80 rename to explorer/fuzzing/fuzzer_corpus/988b50fcd2641207a813cbb1fd6d8e5b3c82b07b index ec0a2dd28ec8..e41d424e0aaf 100644 --- a/explorer/fuzzing/fuzzer_corpus/9bb0b055035cb4965aa9432c34bdb1be0f8c3b80 +++ b/explorer/fuzzing/fuzzer_corpus/988b50fcd2641207a813cbb1fd6d8e5b3c82b07b @@ -195,7 +195,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -223,7 +223,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -303,7 +303,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -326,7 +326,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -659,7 +659,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/22446e9de1d328cd4bfc97b3a8e464165a70c39d b/explorer/fuzzing/fuzzer_corpus/9923f966584d04a529ba2c6bf1fc8f56fe796c9a similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/22446e9de1d328cd4bfc97b3a8e464165a70c39d rename to explorer/fuzzing/fuzzer_corpus/9923f966584d04a529ba2c6bf1fc8f56fe796c9a index c073f594774f..53dd3c766cf0 100644 --- a/explorer/fuzzing/fuzzer_corpus/22446e9de1d328cd4bfc97b3a8e464165a70c39d +++ b/explorer/fuzzing/fuzzer_corpus/9923f966584d04a529ba2c6bf1fc8f56fe796c9a @@ -97,7 +97,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/e97942ad3c0748fc89d5b8b69ac78dc0648a9899 b/explorer/fuzzing/fuzzer_corpus/9bf15acc7e7afc8dbcbd76b118230a73bfcaeecb similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/e97942ad3c0748fc89d5b8b69ac78dc0648a9899 rename to explorer/fuzzing/fuzzer_corpus/9bf15acc7e7afc8dbcbd76b118230a73bfcaeecb index fc4fda575dd9..d56a0403e48b 100644 --- a/explorer/fuzzing/fuzzer_corpus/e97942ad3c0748fc89d5b8b69ac78dc0648a9899 +++ b/explorer/fuzzing/fuzzer_corpus/9bf15acc7e7afc8dbcbd76b118230a73bfcaeecb @@ -54,7 +54,7 @@ compilation_unit { statement { return_statement { expression { - primitive_operator { + operator { op: Neg arguments { int_literal { @@ -79,7 +79,7 @@ compilation_unit { statement { return_statement { expression { - primitive_operator { + operator { op: Neg arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/1698e7837995809f728e980d4e48734a342845a9 b/explorer/fuzzing/fuzzer_corpus/a36abe9b8a973d68485fd1a917d3404b97e9af93 similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/1698e7837995809f728e980d4e48734a342845a9 rename to explorer/fuzzing/fuzzer_corpus/a36abe9b8a973d68485fd1a917d3404b97e9af93 index 94f5af5bd478..526aa57dd9ea 100644 --- a/explorer/fuzzing/fuzzer_corpus/1698e7837995809f728e980d4e48734a342845a9 +++ b/explorer/fuzzing/fuzzer_corpus/a36abe9b8a973d68485fd1a917d3404b97e9af93 @@ -19,7 +19,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { int_literal { @@ -48,7 +48,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/4e152163ab362aecbbb2d91e08f8183e822ef8be b/explorer/fuzzing/fuzzer_corpus/a3849c4ee936d86c6e1aa5fe989eb32902009e45 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/4e152163ab362aecbbb2d91e08f8183e822ef8be rename to explorer/fuzzing/fuzzer_corpus/a3849c4ee936d86c6e1aa5fe989eb32902009e45 index a8af44e4c82e..66e4677d25df 100644 --- a/explorer/fuzzing/fuzzer_corpus/4e152163ab362aecbbb2d91e08f8183e822ef8be +++ b/explorer/fuzzing/fuzzer_corpus/a3849c4ee936d86c6e1aa5fe989eb32902009e45 @@ -32,7 +32,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -108,7 +108,7 @@ compilation_unit { argument { tuple_literal { fields { - primitive_operator { + operator { op: Neg arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/eb994d3adcbf502d7b0f931e6aab38d4cfb3e57f b/explorer/fuzzing/fuzzer_corpus/a40b0664416dcb8ed41bbcc88d8be9969947e2bb similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/eb994d3adcbf502d7b0f931e6aab38d4cfb3e57f rename to explorer/fuzzing/fuzzer_corpus/a40b0664416dcb8ed41bbcc88d8be9969947e2bb index 50fe3a9922d0..334fd91aec1c 100644 --- a/explorer/fuzzing/fuzzer_corpus/eb994d3adcbf502d7b0f931e6aab38d4cfb3e57f +++ b/explorer/fuzzing/fuzzer_corpus/a40b0664416dcb8ed41bbcc88d8be9969947e2bb @@ -19,7 +19,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/bba918f99eb10030663ee97d5febc5e86c43a871 b/explorer/fuzzing/fuzzer_corpus/a99d1bd6964262913c36dbe95f200a569205bd57 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/bba918f99eb10030663ee97d5febc5e86c43a871 rename to explorer/fuzzing/fuzzer_corpus/a99d1bd6964262913c36dbe95f200a569205bd57 index bb469a0a3d46..174098128d9f 100644 --- a/explorer/fuzzing/fuzzer_corpus/bba918f99eb10030663ee97d5febc5e86c43a871 +++ b/explorer/fuzzing/fuzzer_corpus/a99d1bd6964262913c36dbe95f200a569205bd57 @@ -112,10 +112,10 @@ compilation_unit { statement { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/50ad01e0992fce22cc4b6e1d744f5286ad4439b6 b/explorer/fuzzing/fuzzer_corpus/a9f79cd2e7bfd3f4e51a5053298c4e3018d36f44 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/50ad01e0992fce22cc4b6e1d744f5286ad4439b6 rename to explorer/fuzzing/fuzzer_corpus/a9f79cd2e7bfd3f4e51a5053298c4e3018d36f44 index a0156ad159e8..be74834e1f05 100644 --- a/explorer/fuzzing/fuzzer_corpus/50ad01e0992fce22cc4b6e1d744f5286ad4439b6 +++ b/explorer/fuzzing/fuzzer_corpus/a9f79cd2e7bfd3f4e51a5053298c4e3018d36f44 @@ -50,7 +50,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -78,7 +78,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/5e4bce73c210e45269126773f257d95d4d269072 b/explorer/fuzzing/fuzzer_corpus/ab1a6d3ba7f35f95cd5aafdbf1f4b031de1a0f6b similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/5e4bce73c210e45269126773f257d95d4d269072 rename to explorer/fuzzing/fuzzer_corpus/ab1a6d3ba7f35f95cd5aafdbf1f4b031de1a0f6b index e9aa35dfc447..7ed752845ec4 100644 --- a/explorer/fuzzing/fuzzer_corpus/5e4bce73c210e45269126773f257d95d4d269072 +++ b/explorer/fuzzing/fuzzer_corpus/ab1a6d3ba7f35f95cd5aafdbf1f4b031de1a0f6b @@ -197,7 +197,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -225,7 +225,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -305,7 +305,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -328,7 +328,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -642,7 +642,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/75395dbe8c9c56e1353f345b1dc8e79390827fcc b/explorer/fuzzing/fuzzer_corpus/adb602ba9f22045e62faf571ba97b36a44977b21 similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/75395dbe8c9c56e1353f345b1dc8e79390827fcc rename to explorer/fuzzing/fuzzer_corpus/adb602ba9f22045e62faf571ba97b36a44977b21 index 33980c050f1f..f80f022b6b7e 100644 --- a/explorer/fuzzing/fuzzer_corpus/75395dbe8c9c56e1353f345b1dc8e79390827fcc +++ b/explorer/fuzzing/fuzzer_corpus/adb602ba9f22045e62faf571ba97b36a44977b21 @@ -76,10 +76,10 @@ compilation_unit { statement { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/a849a3e84c366f91252584c20727c3fb49d3fc84 b/explorer/fuzzing/fuzzer_corpus/b54f068b3b15bed007bd4bba0f917c562e376142 similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/a849a3e84c366f91252584c20727c3fb49d3fc84 rename to explorer/fuzzing/fuzzer_corpus/b54f068b3b15bed007bd4bba0f917c562e376142 index ebdeb7c6fd3f..d13f27d550b8 100644 --- a/explorer/fuzzing/fuzzer_corpus/a849a3e84c366f91252584c20727c3fb49d3fc84 +++ b/explorer/fuzzing/fuzzer_corpus/b54f068b3b15bed007bd4bba0f917c562e376142 @@ -49,7 +49,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { @@ -78,7 +78,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/74c8e2e43c65d4be09ca220e6512569aeecec513 b/explorer/fuzzing/fuzzer_corpus/b717b68f111caf8b50c27f029988cd55d8d6eb83 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/74c8e2e43c65d4be09ca220e6512569aeecec513 rename to explorer/fuzzing/fuzzer_corpus/b717b68f111caf8b50c27f029988cd55d8d6eb83 index 2747607e98b8..9c1a253a209b 100644 --- a/explorer/fuzzing/fuzzer_corpus/74c8e2e43c65d4be09ca220e6512569aeecec513 +++ b/explorer/fuzzing/fuzzer_corpus/b717b68f111caf8b50c27f029988cd55d8d6eb83 @@ -172,7 +172,7 @@ compilation_unit { fields { name: "n" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -696,16 +696,16 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Mul arguments { identifier { @@ -720,7 +720,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { identifier { @@ -737,7 +737,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/36d9cf1dcaccaa9ca5c49a9029dc1f0e85ea1071 b/explorer/fuzzing/fuzzer_corpus/b975f0686fbaedb1c887681cb7030b0c6a44ebba similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/36d9cf1dcaccaa9ca5c49a9029dc1f0e85ea1071 rename to explorer/fuzzing/fuzzer_corpus/b975f0686fbaedb1c887681cb7030b0c6a44ebba index d35541583b4f..555f0ec5e24e 100644 --- a/explorer/fuzzing/fuzzer_corpus/36d9cf1dcaccaa9ca5c49a9029dc1f0e85ea1071 +++ b/explorer/fuzzing/fuzzer_corpus/b975f0686fbaedb1c887681cb7030b0c6a44ebba @@ -89,10 +89,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/99aed9e0efcdc0473a19a23e77d687971bf6fb08 b/explorer/fuzzing/fuzzer_corpus/b9a64e39653c7cced9aad24e6e5d325ef5830379 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/99aed9e0efcdc0473a19a23e77d687971bf6fb08 rename to explorer/fuzzing/fuzzer_corpus/b9a64e39653c7cced9aad24e6e5d325ef5830379 index 1434ddeff37e..509a0089b018 100644 --- a/explorer/fuzzing/fuzzer_corpus/99aed9e0efcdc0473a19a23e77d687971bf6fb08 +++ b/explorer/fuzzing/fuzzer_corpus/b9a64e39653c7cced9aad24e6e5d325ef5830379 @@ -251,7 +251,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -279,7 +279,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -359,7 +359,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -382,7 +382,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -618,7 +618,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/2584c688c48bb0fcc5f1b1f91292e0688e759cd0 b/explorer/fuzzing/fuzzer_corpus/ba1f80b94d3fbfede410d99944c2f916f18a66d9 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/2584c688c48bb0fcc5f1b1f91292e0688e759cd0 rename to explorer/fuzzing/fuzzer_corpus/ba1f80b94d3fbfede410d99944c2f916f18a66d9 index 30097390bc23..754f3239c852 100644 --- a/explorer/fuzzing/fuzzer_corpus/2584c688c48bb0fcc5f1b1f91292e0688e759cd0 +++ b/explorer/fuzzing/fuzzer_corpus/ba1f80b94d3fbfede410d99944c2f916f18a66d9 @@ -197,7 +197,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -225,7 +225,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -305,7 +305,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -328,7 +328,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -419,7 +419,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -447,7 +447,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -527,7 +527,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -550,7 +550,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -828,7 +828,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/55ad26679e49fd8efa9e12e5079739869cfebe5c b/explorer/fuzzing/fuzzer_corpus/ba5e2359010d698d23761ea30b812784c01fd77d similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/55ad26679e49fd8efa9e12e5079739869cfebe5c rename to explorer/fuzzing/fuzzer_corpus/ba5e2359010d698d23761ea30b812784c01fd77d index f680d09ad5b1..ae1dee10fd78 100644 --- a/explorer/fuzzing/fuzzer_corpus/55ad26679e49fd8efa9e12e5079739869cfebe5c +++ b/explorer/fuzzing/fuzzer_corpus/ba5e2359010d698d23761ea30b812784c01fd77d @@ -84,7 +84,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/9a673afc783655f19212b53bb4fde1c6c9073e58 b/explorer/fuzzing/fuzzer_corpus/bc69558bf2eb9f0abc9a611e4a707fd0426bd3c5 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/9a673afc783655f19212b53bb4fde1c6c9073e58 rename to explorer/fuzzing/fuzzer_corpus/bc69558bf2eb9f0abc9a611e4a707fd0426bd3c5 index c434ac08b459..74c489ceb021 100644 --- a/explorer/fuzzing/fuzzer_corpus/9a673afc783655f19212b53bb4fde1c6c9073e58 +++ b/explorer/fuzzing/fuzzer_corpus/bc69558bf2eb9f0abc9a611e4a707fd0426bd3c5 @@ -50,7 +50,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/2a94a0b8d31c467d3642cd470ca483d333b27962 b/explorer/fuzzing/fuzzer_corpus/bdde4f02aaec2f0757312762ba4226ec6c647bd2 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/2a94a0b8d31c467d3642cd470ca483d333b27962 rename to explorer/fuzzing/fuzzer_corpus/bdde4f02aaec2f0757312762ba4226ec6c647bd2 index d90f546b327c..256c5dfa1691 100644 --- a/explorer/fuzzing/fuzzer_corpus/2a94a0b8d31c467d3642cd470ca483d333b27962 +++ b/explorer/fuzzing/fuzzer_corpus/bdde4f02aaec2f0757312762ba4226ec6c647bd2 @@ -121,7 +121,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/f3b84370a6d8e93298efe8781f6a8740d33768fc b/explorer/fuzzing/fuzzer_corpus/c116435f7dd22725b10b27575133dab38a178ae7 similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/f3b84370a6d8e93298efe8781f6a8740d33768fc rename to explorer/fuzzing/fuzzer_corpus/c116435f7dd22725b10b27575133dab38a178ae7 index b3987e54aeb9..efba88d56148 100644 --- a/explorer/fuzzing/fuzzer_corpus/f3b84370a6d8e93298efe8781f6a8740d33768fc +++ b/explorer/fuzzing/fuzzer_corpus/c116435f7dd22725b10b27575133dab38a178ae7 @@ -19,7 +19,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { int_literal { @@ -48,7 +48,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/c9bb494385213d19905103032c24c394b4c1a363 b/explorer/fuzzing/fuzzer_corpus/c258828edd9181d61e184e6e73c9b34729ea69cc similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/c9bb494385213d19905103032c24c394b4c1a363 rename to explorer/fuzzing/fuzzer_corpus/c258828edd9181d61e184e6e73c9b34729ea69cc index 03696a41cc9c..228dfc44ab6c 100644 --- a/explorer/fuzzing/fuzzer_corpus/c9bb494385213d19905103032c24c394b4c1a363 +++ b/explorer/fuzzing/fuzzer_corpus/c258828edd9181d61e184e6e73c9b34729ea69cc @@ -55,7 +55,7 @@ compilation_unit { fields { name: "n" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/71840029bebe786dedc2616bbf6de131bdab85aa b/explorer/fuzzing/fuzzer_corpus/c9606ffaf4f210c8a238c44b9df1cc0e2b331568 similarity index 95% rename from explorer/fuzzing/fuzzer_corpus/71840029bebe786dedc2616bbf6de131bdab85aa rename to explorer/fuzzing/fuzzer_corpus/c9606ffaf4f210c8a238c44b9df1cc0e2b331568 index 7bdfbd398234..46ada9b8be0e 100644 --- a/explorer/fuzzing/fuzzer_corpus/71840029bebe786dedc2616bbf6de131bdab85aa +++ b/explorer/fuzzing/fuzzer_corpus/c9606ffaf4f210c8a238c44b9df1cc0e2b331568 @@ -46,7 +46,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { int_type_literal { @@ -59,7 +59,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: AddressOf arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/56d565b238ea83cf4531248632733c0f3f89897f b/explorer/fuzzing/fuzzer_corpus/cb515a6f74a44b0f9bfdabbfde50e202ec558b3e similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/56d565b238ea83cf4531248632733c0f3f89897f rename to explorer/fuzzing/fuzzer_corpus/cb515a6f74a44b0f9bfdabbfde50e202ec558b3e index 87a44ab9852e..5b4aae59aafe 100644 --- a/explorer/fuzzing/fuzzer_corpus/56d565b238ea83cf4531248632733c0f3f89897f +++ b/explorer/fuzzing/fuzzer_corpus/cb515a6f74a44b0f9bfdabbfde50e202ec558b3e @@ -121,7 +121,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/f986b7976441ebd0928d8f4d13c6ff2be6a05f50 b/explorer/fuzzing/fuzzer_corpus/cc4eceeba65c5547929371ff26806e82c5a776f3 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/f986b7976441ebd0928d8f4d13c6ff2be6a05f50 rename to explorer/fuzzing/fuzzer_corpus/cc4eceeba65c5547929371ff26806e82c5a776f3 index 9c474643a6a1..994fbbefc149 100644 --- a/explorer/fuzzing/fuzzer_corpus/f986b7976441ebd0928d8f4d13c6ff2be6a05f50 +++ b/explorer/fuzzing/fuzzer_corpus/cc4eceeba65c5547929371ff26806e82c5a776f3 @@ -195,7 +195,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -223,7 +223,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -303,7 +303,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -326,7 +326,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -685,7 +685,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/8a7df30d2028cf70cf27098b2161bdc3dd024170 b/explorer/fuzzing/fuzzer_corpus/cc75d644ce6877826e667f652023a50411ccc230 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/8a7df30d2028cf70cf27098b2161bdc3dd024170 rename to explorer/fuzzing/fuzzer_corpus/cc75d644ce6877826e667f652023a50411ccc230 index f50b4f942d1d..53701541b4c4 100644 --- a/explorer/fuzzing/fuzzer_corpus/8a7df30d2028cf70cf27098b2161bdc3dd024170 +++ b/explorer/fuzzing/fuzzer_corpus/cc75d644ce6877826e667f652023a50411ccc230 @@ -106,7 +106,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/72624c04b293dcee7ecc0129b6e196195ca84332 b/explorer/fuzzing/fuzzer_corpus/cd34239ea7c7fb125a300068dce22b77d9e1effa similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/72624c04b293dcee7ecc0129b6e196195ca84332 rename to explorer/fuzzing/fuzzer_corpus/cd34239ea7c7fb125a300068dce22b77d9e1effa index d475e844bb21..dabfefa36076 100644 --- a/explorer/fuzzing/fuzzer_corpus/72624c04b293dcee7ecc0129b6e196195ca84332 +++ b/explorer/fuzzing/fuzzer_corpus/cd34239ea7c7fb125a300068dce22b77d9e1effa @@ -281,7 +281,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/4adc56b3525679bbc7446ca944a935496f6dd21e b/explorer/fuzzing/fuzzer_corpus/cfe4d757eaf9742119d64bf76425028db4306fec similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/4adc56b3525679bbc7446ca944a935496f6dd21e rename to explorer/fuzzing/fuzzer_corpus/cfe4d757eaf9742119d64bf76425028db4306fec index eccd387cd711..0277617d1d20 100644 --- a/explorer/fuzzing/fuzzer_corpus/4adc56b3525679bbc7446ca944a935496f6dd21e +++ b/explorer/fuzzing/fuzzer_corpus/cfe4d757eaf9742119d64bf76425028db4306fec @@ -88,10 +88,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { index { diff --git a/explorer/fuzzing/fuzzer_corpus/2c13f446fae8b3d480832d35cd4bfe0f8222c6d2 b/explorer/fuzzing/fuzzer_corpus/d3246684febd37c2ab16e1e957217999280dcefe similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/2c13f446fae8b3d480832d35cd4bfe0f8222c6d2 rename to explorer/fuzzing/fuzzer_corpus/d3246684febd37c2ab16e1e957217999280dcefe index e60a1f684644..93ab6fcbd718 100644 --- a/explorer/fuzzing/fuzzer_corpus/2c13f446fae8b3d480832d35cd4bfe0f8222c6d2 +++ b/explorer/fuzzing/fuzzer_corpus/d3246684febd37c2ab16e1e957217999280dcefe @@ -92,10 +92,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/1844089b39db6518836420fcb6a5d37b3e99424f b/explorer/fuzzing/fuzzer_corpus/d4060117085d164112756d399d7e3822e83f6c7a similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/1844089b39db6518836420fcb6a5d37b3e99424f rename to explorer/fuzzing/fuzzer_corpus/d4060117085d164112756d399d7e3822e83f6c7a index d8618786223a..ea7b6f0796a0 100644 --- a/explorer/fuzzing/fuzzer_corpus/1844089b39db6518836420fcb6a5d37b3e99424f +++ b/explorer/fuzzing/fuzzer_corpus/d4060117085d164112756d399d7e3822e83f6c7a @@ -195,7 +195,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -223,7 +223,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -303,7 +303,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -326,7 +326,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -673,7 +673,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/ea1790b107947cbe13badc5ef54b9d5ed24944e7 b/explorer/fuzzing/fuzzer_corpus/d4b619d251d6dfce95a22df11bcc2654baa969a7 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/ea1790b107947cbe13badc5ef54b9d5ed24944e7 rename to explorer/fuzzing/fuzzer_corpus/d4b619d251d6dfce95a22df11bcc2654baa969a7 index 92833efd6145..2bd612d43e58 100644 --- a/explorer/fuzzing/fuzzer_corpus/ea1790b107947cbe13badc5ef54b9d5ed24944e7 +++ b/explorer/fuzzing/fuzzer_corpus/d4b619d251d6dfce95a22df11bcc2654baa969a7 @@ -89,7 +89,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/6e8c48e06c16788763d4c866fdfe33ad81baacee b/explorer/fuzzing/fuzzer_corpus/d50d7893f761dd4ee6e3916290f09091dfd5727c similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/6e8c48e06c16788763d4c866fdfe33ad81baacee rename to explorer/fuzzing/fuzzer_corpus/d50d7893f761dd4ee6e3916290f09091dfd5727c index 9ac4552078f6..30ef32388bfd 100644 --- a/explorer/fuzzing/fuzzer_corpus/6e8c48e06c16788763d4c866fdfe33ad81baacee +++ b/explorer/fuzzing/fuzzer_corpus/d50d7893f761dd4ee6e3916290f09091dfd5727c @@ -92,7 +92,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/87081db4d0965def5a5a56b274d6c38473f15367 b/explorer/fuzzing/fuzzer_corpus/d66f6dd50287a3f1d0d2ab22a9b7a6aee9d3a435 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/87081db4d0965def5a5a56b274d6c38473f15367 rename to explorer/fuzzing/fuzzer_corpus/d66f6dd50287a3f1d0d2ab22a9b7a6aee9d3a435 index a28cdad02da2..f7a67051bfa9 100644 --- a/explorer/fuzzing/fuzzer_corpus/87081db4d0965def5a5a56b274d6c38473f15367 +++ b/explorer/fuzzing/fuzzer_corpus/d66f6dd50287a3f1d0d2ab22a9b7a6aee9d3a435 @@ -91,7 +91,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Eq arguments { simple_member_access { @@ -228,7 +228,7 @@ compilation_unit { } } fields { - primitive_operator { + operator { op: Add arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/bf61b59a040069ea8d7de3fe5dd5c6a935baae3b b/explorer/fuzzing/fuzzer_corpus/d6b7c3221459dc162ed6bb981183b8ac85b70b55 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/bf61b59a040069ea8d7de3fe5dd5c6a935baae3b rename to explorer/fuzzing/fuzzer_corpus/d6b7c3221459dc162ed6bb981183b8ac85b70b55 index b5bae5a29851..f5c71cdef848 100644 --- a/explorer/fuzzing/fuzzer_corpus/bf61b59a040069ea8d7de3fe5dd5c6a935baae3b +++ b/explorer/fuzzing/fuzzer_corpus/d6b7c3221459dc162ed6bb981183b8ac85b70b55 @@ -40,7 +40,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -68,7 +68,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/7af9272c630e0db4cb8016e7b0013b1902ee455d b/explorer/fuzzing/fuzzer_corpus/dc2e50336df6ff0869998c617d892af54733cbd6 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/7af9272c630e0db4cb8016e7b0013b1902ee455d rename to explorer/fuzzing/fuzzer_corpus/dc2e50336df6ff0869998c617d892af54733cbd6 index 24ae8f39ddef..e347881581a6 100644 --- a/explorer/fuzzing/fuzzer_corpus/7af9272c630e0db4cb8016e7b0013b1902ee455d +++ b/explorer/fuzzing/fuzzer_corpus/dc2e50336df6ff0869998c617d892af54733cbd6 @@ -72,7 +72,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -100,7 +100,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/97924d7176a041aaa1854a8525047a71d604bad8 b/explorer/fuzzing/fuzzer_corpus/dca5d37a4707f5a0f2480f1b079ab82a1d148006 similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/97924d7176a041aaa1854a8525047a71d604bad8 rename to explorer/fuzzing/fuzzer_corpus/dca5d37a4707f5a0f2480f1b079ab82a1d148006 index a71db139f078..d77350aa18f7 100644 --- a/explorer/fuzzing/fuzzer_corpus/97924d7176a041aaa1854a8525047a71d604bad8 +++ b/explorer/fuzzing/fuzzer_corpus/dca5d37a4707f5a0f2480f1b079ab82a1d148006 @@ -69,7 +69,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Neg arguments { int_literal { @@ -86,7 +86,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/a04fd176eb32a1a2500bf298f4f5deb37b9fa406 b/explorer/fuzzing/fuzzer_corpus/dd3ba18239f1a0b8d128fb996df5957c04676354 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/a04fd176eb32a1a2500bf298f4f5deb37b9fa406 rename to explorer/fuzzing/fuzzer_corpus/dd3ba18239f1a0b8d128fb996df5957c04676354 index 986e6f18d715..6d9f92e209cd 100644 --- a/explorer/fuzzing/fuzzer_corpus/a04fd176eb32a1a2500bf298f4f5deb37b9fa406 +++ b/explorer/fuzzing/fuzzer_corpus/dd3ba18239f1a0b8d128fb996df5957c04676354 @@ -430,7 +430,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/4418629d31bc639ef02a0ee166806a8d60abc617 b/explorer/fuzzing/fuzzer_corpus/ddc186e96a5fe30c4fb2670d538bb7c0b63af107 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/4418629d31bc639ef02a0ee166806a8d60abc617 rename to explorer/fuzzing/fuzzer_corpus/ddc186e96a5fe30c4fb2670d538bb7c0b63af107 index 0631acd1ddef..e208e4286a85 100644 --- a/explorer/fuzzing/fuzzer_corpus/4418629d31bc639ef02a0ee166806a8d60abc617 +++ b/explorer/fuzzing/fuzzer_corpus/ddc186e96a5fe30c4fb2670d538bb7c0b63af107 @@ -32,7 +32,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/00f0094e829126778228c3fdefec8654ceab30e4 b/explorer/fuzzing/fuzzer_corpus/ddc79d5332adec4bc848e3715a08d02acc56205e similarity index 89% rename from explorer/fuzzing/fuzzer_corpus/00f0094e829126778228c3fdefec8654ceab30e4 rename to explorer/fuzzing/fuzzer_corpus/ddc79d5332adec4bc848e3715a08d02acc56205e index f7f082f6d270..8ed27cf88e38 100644 --- a/explorer/fuzzing/fuzzer_corpus/00f0094e829126778228c3fdefec8654ceab30e4 +++ b/explorer/fuzzing/fuzzer_corpus/ddc79d5332adec4bc848e3715a08d02acc56205e @@ -8,7 +8,7 @@ compilation_unit { function_type { parameter { fields { - primitive_operator { + operator { } } } diff --git a/explorer/fuzzing/fuzzer_corpus/03db728d09b4ef55c73a6cf6c16bb6b7b53e3fc4 b/explorer/fuzzing/fuzzer_corpus/de61c912b8d3923ee9b6f46603394c1171c06f40 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/03db728d09b4ef55c73a6cf6c16bb6b7b53e3fc4 rename to explorer/fuzzing/fuzzer_corpus/de61c912b8d3923ee9b6f46603394c1171c06f40 index 5dbb83c8d2ff..5b9e55de1fd5 100644 --- a/explorer/fuzzing/fuzzer_corpus/03db728d09b4ef55c73a6cf6c16bb6b7b53e3fc4 +++ b/explorer/fuzzing/fuzzer_corpus/de61c912b8d3923ee9b6f46603394c1171c06f40 @@ -91,10 +91,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { simple_member_access { @@ -266,7 +266,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/9a79849f37e616453382dcd0ff273c080d3b4f7f b/explorer/fuzzing/fuzzer_corpus/df26c1e8e0e4003833b754f9265c211e25e3e9d6 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/9a79849f37e616453382dcd0ff273c080d3b4f7f rename to explorer/fuzzing/fuzzer_corpus/df26c1e8e0e4003833b754f9265c211e25e3e9d6 index 2cdbe10db4a3..2961cdb675d1 100644 --- a/explorer/fuzzing/fuzzer_corpus/9a79849f37e616453382dcd0ff273c080d3b4f7f +++ b/explorer/fuzzing/fuzzer_corpus/df26c1e8e0e4003833b754f9265c211e25e3e9d6 @@ -201,7 +201,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -944,7 +944,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/b3e70cf8d33ef2418325c6bf3fa734874899a6d7 b/explorer/fuzzing/fuzzer_corpus/e080ed5c98dbf7596eff953be7d16264e1432e2e similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/b3e70cf8d33ef2418325c6bf3fa734874899a6d7 rename to explorer/fuzzing/fuzzer_corpus/e080ed5c98dbf7596eff953be7d16264e1432e2e index b6fbb0def579..754a62418a39 100644 --- a/explorer/fuzzing/fuzzer_corpus/b3e70cf8d33ef2418325c6bf3fa734874899a6d7 +++ b/explorer/fuzzing/fuzzer_corpus/e080ed5c98dbf7596eff953be7d16264e1432e2e @@ -50,7 +50,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/3a2e6f830b6edea6bcf31348f30a12a27b36d496 b/explorer/fuzzing/fuzzer_corpus/e11964b8cea5f2258b439a87cf3e923660e96540 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/3a2e6f830b6edea6bcf31348f30a12a27b36d496 rename to explorer/fuzzing/fuzzer_corpus/e11964b8cea5f2258b439a87cf3e923660e96540 index c2b5d220588e..02090182cb2f 100644 --- a/explorer/fuzzing/fuzzer_corpus/3a2e6f830b6edea6bcf31348f30a12a27b36d496 +++ b/explorer/fuzzing/fuzzer_corpus/e11964b8cea5f2258b439a87cf3e923660e96540 @@ -163,7 +163,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -210,10 +210,10 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { - primitive_operator { + operator { op: Add arguments { identifier { @@ -322,7 +322,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { @@ -370,7 +370,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/3ed19517e54217efcbf37ee3910599a7b09d2e96 b/explorer/fuzzing/fuzzer_corpus/e1c453736537967e5b9abe27e7406745fec06e96 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/3ed19517e54217efcbf37ee3910599a7b09d2e96 rename to explorer/fuzzing/fuzzer_corpus/e1c453736537967e5b9abe27e7406745fec06e96 index 4b58edeaa1bf..e18893c93cf4 100644 --- a/explorer/fuzzing/fuzzer_corpus/3ed19517e54217efcbf37ee3910599a7b09d2e96 +++ b/explorer/fuzzing/fuzzer_corpus/e1c453736537967e5b9abe27e7406745fec06e96 @@ -977,19 +977,19 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -1009,7 +1009,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -1031,7 +1031,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -1048,7 +1048,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/b75b97a6e7c72881ecab24867b7161a9c0ac2510 b/explorer/fuzzing/fuzzer_corpus/e29416b2e088d3d756f1a240f889787b67d5d02f similarity index 96% rename from explorer/fuzzing/fuzzer_corpus/b75b97a6e7c72881ecab24867b7161a9c0ac2510 rename to explorer/fuzzing/fuzzer_corpus/e29416b2e088d3d756f1a240f889787b67d5d02f index a8fa62916819..eaef44d8df03 100644 --- a/explorer/fuzzing/fuzzer_corpus/b75b97a6e7c72881ecab24867b7161a9c0ac2510 +++ b/explorer/fuzzing/fuzzer_corpus/e29416b2e088d3d756f1a240f889787b67d5d02f @@ -41,7 +41,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { @@ -70,7 +70,7 @@ compilation_unit { statements { if_statement { condition { - primitive_operator { + operator { op: Eq arguments { identifier { @@ -99,7 +99,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -140,7 +140,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { call { diff --git a/explorer/fuzzing/fuzzer_corpus/f7aeea2890977521805eb676011bb0223b46872f b/explorer/fuzzing/fuzzer_corpus/e5ba54dcd7ba2c5ce8ccc16ae9745c148644d837 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/f7aeea2890977521805eb676011bb0223b46872f rename to explorer/fuzzing/fuzzer_corpus/e5ba54dcd7ba2c5ce8ccc16ae9745c148644d837 index 7f9fb81a782c..84ecd932d9d1 100644 --- a/explorer/fuzzing/fuzzer_corpus/f7aeea2890977521805eb676011bb0223b46872f +++ b/explorer/fuzzing/fuzzer_corpus/e5ba54dcd7ba2c5ce8ccc16ae9745c148644d837 @@ -123,7 +123,7 @@ compilation_unit { fields { name: "n" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/65fd2bf8e57cee5e4dd1168a3ef1d46b352d1e61 b/explorer/fuzzing/fuzzer_corpus/e629764c8d1fa144b53709998d97097c64b8777e similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/65fd2bf8e57cee5e4dd1168a3ef1d46b352d1e61 rename to explorer/fuzzing/fuzzer_corpus/e629764c8d1fa144b53709998d97097c64b8777e index 985dcce4be90..447e45df0273 100644 --- a/explorer/fuzzing/fuzzer_corpus/65fd2bf8e57cee5e4dd1168a3ef1d46b352d1e61 +++ b/explorer/fuzzing/fuzzer_corpus/e629764c8d1fa144b53709998d97097c64b8777e @@ -291,13 +291,13 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Add arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { @@ -312,7 +312,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Mul arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/fe3c5db046e0dae74603f2c43ed1af68eea9a6ae b/explorer/fuzzing/fuzzer_corpus/ec71d604f3ad77986eef7d9e78385bb475528dff similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/fe3c5db046e0dae74603f2c43ed1af68eea9a6ae rename to explorer/fuzzing/fuzzer_corpus/ec71d604f3ad77986eef7d9e78385bb475528dff index 9bc4df435ada..4699008c0728 100644 --- a/explorer/fuzzing/fuzzer_corpus/fe3c5db046e0dae74603f2c43ed1af68eea9a6ae +++ b/explorer/fuzzing/fuzzer_corpus/ec71d604f3ad77986eef7d9e78385bb475528dff @@ -264,7 +264,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -292,7 +292,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -372,7 +372,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -395,7 +395,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -652,7 +652,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/0506216cfdc69a30b71fdf75230fedbcb0fea735 b/explorer/fuzzing/fuzzer_corpus/ecc03b44aab6d3c9bfbf15051a34cfa4220e231c similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/0506216cfdc69a30b71fdf75230fedbcb0fea735 rename to explorer/fuzzing/fuzzer_corpus/ecc03b44aab6d3c9bfbf15051a34cfa4220e231c index 558d139efe07..7f6640fb0018 100644 --- a/explorer/fuzzing/fuzzer_corpus/0506216cfdc69a30b71fdf75230fedbcb0fea735 +++ b/explorer/fuzzing/fuzzer_corpus/ecc03b44aab6d3c9bfbf15051a34cfa4220e231c @@ -104,7 +104,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { call { diff --git a/explorer/fuzzing/fuzzer_corpus/7c49aec191759d49dbd11193692cbc21debc2adb b/explorer/fuzzing/fuzzer_corpus/efe09ef251a6e3ef7985266ffb678ed459c7a179 similarity index 90% rename from explorer/fuzzing/fuzzer_corpus/7c49aec191759d49dbd11193692cbc21debc2adb rename to explorer/fuzzing/fuzzer_corpus/efe09ef251a6e3ef7985266ffb678ed459c7a179 index 848ac1276596..2fa387851ff7 100644 --- a/explorer/fuzzing/fuzzer_corpus/7c49aec191759d49dbd11193692cbc21debc2adb +++ b/explorer/fuzzing/fuzzer_corpus/efe09ef251a6e3ef7985266ffb678ed459c7a179 @@ -26,7 +26,7 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { int_type_literal { @@ -44,13 +44,13 @@ compilation_unit { type { expression_pattern { expression { - primitive_operator { + operator { op: Ptr arguments { - primitive_operator { + operator { op: Ptr arguments { - primitive_operator { + operator { op: Ptr arguments { int_type_literal { @@ -70,7 +70,7 @@ compilation_unit { return_term { kind: Expression type { - primitive_operator { + operator { op: Ptr arguments { int_type_literal { @@ -96,7 +96,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: Mul arguments { identifier { @@ -104,7 +104,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -133,7 +133,7 @@ compilation_unit { } } init { - primitive_operator { + operator { op: Mul arguments { identifier { @@ -152,7 +152,7 @@ compilation_unit { statements { assign { lhs { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -162,7 +162,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Mul arguments { identifier { @@ -170,7 +170,7 @@ compilation_unit { } } arguments { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -186,10 +186,10 @@ compilation_unit { statements { assign { lhs { - primitive_operator { + operator { op: Deref arguments { - primitive_operator { + operator { op: Deref arguments { identifier { @@ -210,10 +210,10 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Deref arguments { - primitive_operator { + operator { op: Deref arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/8629c08345c6aca03a64815cde238de3cd177e28 b/explorer/fuzzing/fuzzer_corpus/f01c3cd4ddb860f686ff9085e845439f4c2e08c1 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/8629c08345c6aca03a64815cde238de3cd177e28 rename to explorer/fuzzing/fuzzer_corpus/f01c3cd4ddb860f686ff9085e845439f4c2e08c1 index 2716b843d635..bf31bd937577 100644 --- a/explorer/fuzzing/fuzzer_corpus/8629c08345c6aca03a64815cde238de3cd177e28 +++ b/explorer/fuzzing/fuzzer_corpus/f01c3cd4ddb860f686ff9085e845439f4c2e08c1 @@ -104,7 +104,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { index { diff --git a/explorer/fuzzing/fuzzer_corpus/0be3f7db7a24dada6b44d8894d3e1db8cf8f52d6 b/explorer/fuzzing/fuzzer_corpus/f0e552994f20073c41ba3144361b4050767e34ae similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/0be3f7db7a24dada6b44d8894d3e1db8cf8f52d6 rename to explorer/fuzzing/fuzzer_corpus/f0e552994f20073c41ba3144361b4050767e34ae index edba5e88f649..5aa366abcd03 100644 --- a/explorer/fuzzing/fuzzer_corpus/0be3f7db7a24dada6b44d8894d3e1db8cf8f52d6 +++ b/explorer/fuzzing/fuzzer_corpus/f0e552994f20073c41ba3144361b4050767e34ae @@ -30,7 +30,7 @@ compilation_unit { } } size { - primitive_operator { + operator { op: Neg arguments { int_literal { diff --git a/explorer/fuzzing/fuzzer_corpus/d2952341225c953f6a485f213f187232cdedbd68 b/explorer/fuzzing/fuzzer_corpus/f1cd0eda5c6c5b8782bb45164e4c431795d91ed8 similarity index 99% rename from explorer/fuzzing/fuzzer_corpus/d2952341225c953f6a485f213f187232cdedbd68 rename to explorer/fuzzing/fuzzer_corpus/f1cd0eda5c6c5b8782bb45164e4c431795d91ed8 index 3438d199a843..fd4cc2a3d990 100644 --- a/explorer/fuzzing/fuzzer_corpus/d2952341225c953f6a485f213f187232cdedbd68 +++ b/explorer/fuzzing/fuzzer_corpus/f1cd0eda5c6c5b8782bb45164e4c431795d91ed8 @@ -176,7 +176,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/94aa90fd09dbe26ed04043283fe43ba77ac8eadb b/explorer/fuzzing/fuzzer_corpus/f20297ba361c988c75a880854a7402e02beb4f1f similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/94aa90fd09dbe26ed04043283fe43ba77ac8eadb rename to explorer/fuzzing/fuzzer_corpus/f20297ba361c988c75a880854a7402e02beb4f1f index 14745523a81b..590c36ebf9ab 100644 --- a/explorer/fuzzing/fuzzer_corpus/94aa90fd09dbe26ed04043283fe43ba77ac8eadb +++ b/explorer/fuzzing/fuzzer_corpus/f20297ba361c988c75a880854a7402e02beb4f1f @@ -45,7 +45,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Add arguments { identifier { @@ -80,7 +80,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { call { diff --git a/explorer/fuzzing/fuzzer_corpus/8fa92df904a230ee4b0ecf1362170a2551aec98b b/explorer/fuzzing/fuzzer_corpus/f6c7f3c7192ebe59a4329e3a991597d864cb43d9 similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/8fa92df904a230ee4b0ecf1362170a2551aec98b rename to explorer/fuzzing/fuzzer_corpus/f6c7f3c7192ebe59a4329e3a991597d864cb43d9 index 0abb7fb7c2f9..203bf9c6c799 100644 --- a/explorer/fuzzing/fuzzer_corpus/8fa92df904a230ee4b0ecf1362170a2551aec98b +++ b/explorer/fuzzing/fuzzer_corpus/f6c7f3c7192ebe59a4329e3a991597d864cb43d9 @@ -251,7 +251,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -279,7 +279,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -359,7 +359,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -382,7 +382,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -618,7 +618,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/2077abf20ccf4867c76c853ca2668a6fee2e5373 b/explorer/fuzzing/fuzzer_corpus/fb39dc5f6bf908bbf92cff5b9c9d208ebbc98a6d similarity index 97% rename from explorer/fuzzing/fuzzer_corpus/2077abf20ccf4867c76c853ca2668a6fee2e5373 rename to explorer/fuzzing/fuzzer_corpus/fb39dc5f6bf908bbf92cff5b9c9d208ebbc98a6d index 71d3edac6cda..473f262f7465 100644 --- a/explorer/fuzzing/fuzzer_corpus/2077abf20ccf4867c76c853ca2668a6fee2e5373 +++ b/explorer/fuzzing/fuzzer_corpus/fb39dc5f6bf908bbf92cff5b9c9d208ebbc98a6d @@ -19,7 +19,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/fuzzing/fuzzer_corpus/b035159146bece69ba05681a5db14529b71adf48 b/explorer/fuzzing/fuzzer_corpus/fd9996464706e8a5f7a4e4285f7686bba9d87c6f similarity index 94% rename from explorer/fuzzing/fuzzer_corpus/b035159146bece69ba05681a5db14529b71adf48 rename to explorer/fuzzing/fuzzer_corpus/fd9996464706e8a5f7a4e4285f7686bba9d87c6f index e71e4ee4de55..690db61462e9 100644 --- a/explorer/fuzzing/fuzzer_corpus/b035159146bece69ba05681a5db14529b71adf48 +++ b/explorer/fuzzing/fuzzer_corpus/fd9996464706e8a5f7a4e4285f7686bba9d87c6f @@ -37,10 +37,10 @@ compilation_unit { statements { while_statement { condition { - primitive_operator { + operator { op: Not arguments { - primitive_operator { + operator { op: Eq arguments { identifier { @@ -65,7 +65,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Sub arguments { identifier { @@ -93,7 +93,7 @@ compilation_unit { } } rhs { - primitive_operator { + operator { op: Add arguments { identifier { diff --git a/explorer/fuzzing/fuzzer_corpus/6f589265e1e503d2e01043d6a332026d1693095e b/explorer/fuzzing/fuzzer_corpus/fde210ff5a67c2b595b17353fb8ef9ff9275c4db similarity index 98% rename from explorer/fuzzing/fuzzer_corpus/6f589265e1e503d2e01043d6a332026d1693095e rename to explorer/fuzzing/fuzzer_corpus/fde210ff5a67c2b595b17353fb8ef9ff9275c4db index d8c3f5bd4f70..70f546f296b5 100644 --- a/explorer/fuzzing/fuzzer_corpus/6f589265e1e503d2e01043d6a332026d1693095e +++ b/explorer/fuzzing/fuzzer_corpus/fde210ff5a67c2b595b17353fb8ef9ff9275c4db @@ -251,7 +251,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -279,7 +279,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Add arguments { simple_member_access { @@ -359,7 +359,7 @@ compilation_unit { fields { name: "x" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -382,7 +382,7 @@ compilation_unit { fields { name: "y" expression { - primitive_operator { + operator { op: Mul arguments { simple_member_access { @@ -618,7 +618,7 @@ compilation_unit { statements { return_statement { expression { - primitive_operator { + operator { op: Sub arguments { simple_member_access { diff --git a/explorer/interpreter/interpreter.cpp b/explorer/interpreter/interpreter.cpp index a11330fdfdae..5fcfc6bb4524 100644 --- a/explorer/interpreter/interpreter.cpp +++ b/explorer/interpreter/interpreter.cpp @@ -420,8 +420,8 @@ auto Interpreter::StepLvalue() -> ErrorOr { return todo_.FinishAction(arena_->New(field)); } } - case ExpressionKind::PrimitiveOperatorExpression: { - const auto& op = cast(exp); + case ExpressionKind::OperatorExpression: { + const auto& op = cast(exp); if (auto rewrite = op.rewritten_form()) { return todo_.ReplaceWith(std::make_unique(*rewrite)); } @@ -1082,8 +1082,8 @@ auto Interpreter::StepExp() -> ErrorOr { // { {n :: C, E, F} :: S, H} -> { {n' :: C, E, F} :: S, H} return todo_.FinishAction( arena_->New(cast(exp).value())); - case ExpressionKind::PrimitiveOperatorExpression: { - const auto& op = cast(exp); + case ExpressionKind::OperatorExpression: { + const auto& op = cast(exp); if (auto rewrite = op.rewritten_form()) { return todo_.ReplaceWith(std::make_unique(*rewrite)); } diff --git a/explorer/interpreter/resolve_names.cpp b/explorer/interpreter/resolve_names.cpp index b96c940411e8..107074255814 100644 --- a/explorer/interpreter/resolve_names.cpp +++ b/explorer/interpreter/resolve_names.cpp @@ -160,9 +160,9 @@ static auto ResolveNames(Expression& expression, CARBON_RETURN_IF_ERROR(ResolveNames(index.offset(), enclosing_scope)); break; } - case ExpressionKind::PrimitiveOperatorExpression: + case ExpressionKind::OperatorExpression: for (Nonnull operand : - cast(expression).arguments()) { + cast(expression).arguments()) { CARBON_RETURN_IF_ERROR(ResolveNames(*operand, enclosing_scope)); } break; diff --git a/explorer/interpreter/type_checker.cpp b/explorer/interpreter/type_checker.cpp index 60d6f833e91c..804c6e2ecf0c 100644 --- a/explorer/interpreter/type_checker.cpp +++ b/explorer/interpreter/type_checker.cpp @@ -1931,8 +1931,8 @@ auto TypeChecker::TypeCheckExp(Nonnull e, e->set_value_category(ValueCategory::Let); e->set_static_type(arena_->New()); return Success(); - case ExpressionKind::PrimitiveOperatorExpression: { - auto& op = cast(*e); + case ExpressionKind::OperatorExpression: { + auto& op = cast(*e); std::vector> ts; for (Nonnull argument : op.arguments()) { CARBON_RETURN_IF_ERROR(TypeCheckExp(argument, impl_scope)); diff --git a/explorer/syntax/parser.ypp b/explorer/syntax/parser.ypp index 2587ec8401cb..79e9357baee9 100644 --- a/explorer/syntax/parser.ypp +++ b/explorer/syntax/parser.ypp @@ -367,13 +367,13 @@ postfix_expression: { $$ = arena->New(context.source_loc(), $1, $2); } | postfix_expression POSTFIX_STAR { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Ptr, std::vector>({$1})); } | postfix_expression UNARY_STAR { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Ptr, std::vector>({$1})); } @@ -382,19 +382,19 @@ ref_deref_expression: postfix_expression | PREFIX_STAR ref_deref_expression { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Deref, std::vector>({$2})); } | UNARY_STAR ref_deref_expression { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Deref, std::vector>({$2})); } | AMPERSAND ref_deref_expression { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::AddressOf, std::vector>({$2})); } @@ -410,7 +410,7 @@ combine_lhs: combine_expression: combine_lhs AMPERSAND ref_deref_expression { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Combine, std::vector>({$1, $3})); } @@ -424,7 +424,7 @@ minus_expression: // ref_deref_expression excluded due to precedence diamond. MINUS ref_deref_expression { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Neg, std::vector>({$2})); } @@ -441,7 +441,7 @@ multiplicative_expression: minus_expression | multiplicative_lhs BINARY_STAR multiplicative_operand { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Mul, std::vector>({$1, $3})); } @@ -458,13 +458,13 @@ additive_expression: multiplicative_expression | additive_lhs PLUS additive_operand { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Add, std::vector>({$1, $3})); } | additive_lhs MINUS additive_operand { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Sub, std::vector>({$1, $3})); } @@ -476,7 +476,7 @@ as_operand: as_expression: as_operand AS as_operand { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::As, std::vector>{$1, $3}); } @@ -505,7 +505,7 @@ comparison_expression: value_expression | comparison_operand EQUAL_EQUAL comparison_operand { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Eq, std::vector>({$1, $3})); } @@ -513,7 +513,7 @@ comparison_expression: not_expression: NOT ref_deref_expression { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Not, std::vector>({$2})); } @@ -535,7 +535,7 @@ and_expression: // predicate_expression excluded due to precedence diamond. and_lhs AND and_or_operand { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::And, std::vector>({$1, $3})); } @@ -548,7 +548,7 @@ or_expression: // predicate_expression excluded due to precedence diamond. or_lhs OR and_or_operand { - $$ = arena->New( + $$ = arena->New( context.source_loc(), Operator::Or, std::vector>({$1, $3})); }