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

@@ -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;

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: {

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;

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<AstNode> lhs,

explorer/ast/ast_test_matchers_internal.cpp

@@ -39,9 +39,9 @@ auto MatchesIntLiteralMatcher::MatchAndExplainImpl(
 auto BinaryOperatorExpressionMatcher::MatchAndExplainImpl(
     Nonnull<const AstNode*> node, ::testing::MatchResultListener* out) const
     -> bool {
-  const auto* op = llvm::dyn_cast<PrimitiveOperatorExpression>(node);
+  const auto* op = llvm::dyn_cast<OperatorExpression>(node);
   if (op == nullptr) {
-    *out << "which is not a PrimitiveOperatorExpression";
+    *out << "which is not a OperatorExpression";
     return false;
   }
   if (op->arguments().size() != 2) {

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,

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) {

explorer/ast/expression.cpp

@@ -130,9 +130,9 @@ void Expression::Print(llvm::raw_ostream& out) const {
       PrintFields(out, cast<StructTypeLiteral>(*this).fields(), ": ");
       out << "}";
       break;
-    case ExpressionKind::PrimitiveOperatorExpression: {
+    case ExpressionKind::OperatorExpression: {
       out << "(";
-      const auto& op = cast<PrimitiveOperatorExpression>(*this);
+      const auto& op = cast<OperatorExpression>(*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:

explorer/ast/expression.h

@@ -486,17 +486,16 @@ class StructTypeLiteral : public Expression {
   std::vector<FieldInitializer> fields_;
 };
 
-class PrimitiveOperatorExpression : public Expression {
+class OperatorExpression : public Expression {
  public:
-  explicit PrimitiveOperatorExpression(
-      SourceLocation source_loc, Operator op,
-      std::vector<Nonnull<Expression*>> arguments)
-      : Expression(AstNodeKind::PrimitiveOperatorExpression, source_loc),
+  explicit OperatorExpression(SourceLocation source_loc, Operator op,
+                              std::vector<Nonnull<Expression*>> 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_; }

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<PrimitiveOperatorExpression>(expression);
-      auto* operator_proto = expression_proto.mutable_primitive_operator();
-      operator_proto->set_op(OperatorToProtoEnum(primitive_operator.op()));
-      for (Nonnull<const Expression*> arg : primitive_operator.arguments()) {
+    case ExpressionKind::OperatorExpression: {
+      const auto& operator_expr = cast<OperatorExpression>(expression);
+      auto* operator_proto = expression_proto.mutable_operator_();
+      operator_proto->set_op(OperatorToProtoEnum(operator_expr.op()));
+      for (Nonnull<const Expression*> arg : operator_expr.arguments()) {
         *operator_proto->add_arguments() = ExpressionToProto(*arg);
       }
       break;

explorer/fuzzing/fuzzer_corpus/8eaa02f849c34965729a56884c3543ab71016965 → explorer/fuzzing/fuzzer_corpus/00a8aa40e52dba3fe5692f4454543d100ba47c7c

@@ -58,7 +58,7 @@ compilation_unit {
               statement {
                 return_statement {
                   expression {
-                    primitive_operator {
+                    operator {
                       op: Sub
                       arguments {
                         identifier {

explorer/fuzzing/fuzzer_corpus/e5377a543f316428d1ad502f23a0f81511633aa9 → explorer/fuzzing/fuzzer_corpus/049f6e3a81538ad088e95b45ce1bb1849cb7ea09

@@ -41,7 +41,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Add
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/0b3e4c5e7dd250b4a9b90a96f71929e5c211a077 → explorer/fuzzing/fuzzer_corpus/060a7f4ecdc31892cf0e2ebb5e53563bc0f254a0

@@ -32,7 +32,7 @@ compilation_unit {
               }
             }
             init {
-              primitive_operator {
+              operator {
                 op: Neg
                 arguments {
                   int_literal {

explorer/fuzzing/fuzzer_corpus/67f5eba036e94be0f60df4fb137d81e1dded6b7b → 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 {

explorer/fuzzing/fuzzer_corpus/4969109f00a31dd06730d3aa44cb87b5ccbb3587 → explorer/fuzzing/fuzzer_corpus/0aaa138320ae521ac62573912738cae88d71f96e

@@ -92,7 +92,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   simple_member_access {

explorer/fuzzing/fuzzer_corpus/713cf9469d63bd75c1e35014758c535d04427ac1 → explorer/fuzzing/fuzzer_corpus/0cad2b9a3a6fc8cc8cd69df93c665c44a4cf09da

@@ -123,7 +123,7 @@ compilation_unit {
                         fields {
                           name: "n"
                           expression {
-                            primitive_operator {
+                            operator {
                               op: Add
                               arguments {
                                 simple_member_access {

explorer/fuzzing/fuzzer_corpus/2ea7343e45493dfdf9eb1e3d8c4095915c8ab0fa → 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 {

explorer/fuzzing/fuzzer_corpus/c9f1c0de38bb3c727339fd8dc9018254673de352 → explorer/fuzzing/fuzzer_corpus/0f4c4d6e5a54a66b39402352989b709fee66e91b

@@ -129,7 +129,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   simple_member_access {

explorer/fuzzing/fuzzer_corpus/1264b05271a5415c6aeb98da568e2f44766f5c6a → 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 {

explorer/fuzzing/fuzzer_corpus/02143c9b0d2b75fba43c584f62b43411a07136a2 → 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 {

explorer/fuzzing/fuzzer_corpus/a5f8643a0b70df9173a87902eab8a04d45cd94e5 → explorer/fuzzing/fuzzer_corpus/12130855e555d8e6e588564bfd1a3f206f578720

@@ -41,7 +41,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/7b7e24319e8f63e6c3e99f8cbc81da7e9e47390a → 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 {

explorer/fuzzing/fuzzer_corpus/e4909f9f7d6923c33db7e3dd3e292860721acfd3 → explorer/fuzzing/fuzzer_corpus/14094da539080d20eebd0cca6fac5ad4fa57069e

@@ -87,7 +87,7 @@ compilation_unit {
                     argument {
                       tuple_literal {
                         fields {
-                          primitive_operator {
+                          operator {
                             op: Add
                             arguments {
                               identifier {

explorer/fuzzing/fuzzer_corpus/017a765e283355ded618ed95de5da4e3f2dd4b52 → 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 {

explorer/fuzzing/fuzzer_corpus/9bfccfc76e487b03760f88664fa41ac35032b309 → explorer/fuzzing/fuzzer_corpus/1635d5dc579e814aaf860cb99b583fd06decd95e

@@ -81,7 +81,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/9b3c43975c7084e9b2df23fbdc40e74f563d0732 → 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 {

explorer/fuzzing/fuzzer_corpus/472b9f7d613316693d56e49f236877cde0caaa75 → explorer/fuzzing/fuzzer_corpus/18b53ef8c05b1929dd8e1790c84ea9c463a43434

@@ -222,7 +222,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Add
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/afa03ca87919d5338ae7a96eea4047ff62d7bfc6 → 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 {

explorer/fuzzing/fuzzer_corpus/354874b52fc3aca31201e7162e739e91dbe02ffd → 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 {

explorer/fuzzing/fuzzer_corpus/3db1646f25e3f628cf0219a651539b07f20df403 → 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 {

explorer/fuzzing/fuzzer_corpus/fc9f4460e5852abce29efaa44ce6451404b7d7be → explorer/fuzzing/fuzzer_corpus/1d3fda03a0e7a36ebb1e70237c64398b5342a8cf

@@ -249,7 +249,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Add
                 arguments {
                   call {

explorer/fuzzing/fuzzer_corpus/b6ca27aa9276f7a23bdf2a6a0a94f6f4798b1c3c → 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 {

explorer/fuzzing/fuzzer_corpus/eb4f0d50944e631f91288d5b2550ad77b54f0658 → 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 {

explorer/fuzzing/fuzzer_corpus/cc53603327b15d1ec403cb0d83a7b65e388baa10 → explorer/fuzzing/fuzzer_corpus/2bbbfc37b0f9199a50d33d34c488d0a197872033

@@ -123,7 +123,7 @@ compilation_unit {
                         fields {
                           name: "n"
                           expression {
-                            primitive_operator {
+                            operator {
                               op: Add
                               arguments {
                                 simple_member_access {

explorer/fuzzing/fuzzer_corpus/1f6ec7038b7bc8ebd4d5778566dde5445804bbf7 → 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 {

explorer/fuzzing/fuzzer_corpus/3ccfbfc0cfe6cc7e4160a331ae91ab0af700f250 → explorer/fuzzing/fuzzer_corpus/2d8f362c9aa1fb508c8f25ea687905183abeadcf

@@ -19,7 +19,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   simple_member_access {

explorer/fuzzing/fuzzer_corpus/0ee3d72e3cab1b0907f04f35b2d33fb946ab32c9 → 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 {

explorer/fuzzing/fuzzer_corpus/b66e41a2708c436beb8806408f41f8b6d037cc87 → 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 {

explorer/fuzzing/fuzzer_corpus/49b5049f30108d298ae81466aac0b67f7da97cb2 → explorer/fuzzing/fuzzer_corpus/30c1e7882614e0f5ea10aeee8df59d7006a2f7f2

@@ -55,7 +55,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   call {

explorer/fuzzing/fuzzer_corpus/ca47433beaff74d16e5e64e4c4e9acd58fce4423 → 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 {

explorer/fuzzing/fuzzer_corpus/6c86299b17c54466628587a48c2ec0e9d3029fc7 → 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 {

explorer/fuzzing/fuzzer_corpus/3207c66d4cecd4b86b181734b79f670443d51506 → 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 {

explorer/fuzzing/fuzzer_corpus/b9378e44d8b809e19d29c58997a302f6596c34e5 → 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 {

explorer/fuzzing/fuzzer_corpus/035c3272740456e2748925f3ba854ccacadd029e → explorer/fuzzing/fuzzer_corpus/3ed98bf1fbcba428e58d83ef31c9297bdcfc53a2

@@ -143,7 +143,7 @@ compilation_unit {
               statements {
                 return_statement {
                   expression {
-                    primitive_operator {
+                    operator {
                       op: Neg
                       arguments {
                         int_literal {

explorer/fuzzing/fuzzer_corpus/522da9a0308eba58c432f7aa35e79b795467ca21 → 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 {

explorer/fuzzing/fuzzer_corpus/1c051deb5a752c0fdd02d90e044b2fecc8c2c82c → 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 {

explorer/fuzzing/fuzzer_corpus/5de34aef9f4d90ab58516942a3244cd6115d5e07 → explorer/fuzzing/fuzzer_corpus/41d094ff917771777c18c19c259d06adf1cf4c25

@@ -45,7 +45,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Add
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/5941fbba153aeb0d90c912ec46695d52159eb62f → explorer/fuzzing/fuzzer_corpus/4350883f5979d19cc4021925d68282c2aaac39f3

@@ -88,7 +88,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/2caf42dcf02bff184fa653bf36054b9d83704e30 → 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 {

explorer/fuzzing/fuzzer_corpus/d44b1b3f6ff018d0829e0d73f551d0144b39e638 → 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 {

explorer/fuzzing/fuzzer_corpus/4ad1c12963bd40b215904199ae894d5e0246f399 → explorer/fuzzing/fuzzer_corpus/449b97eee9c6e02464330b1443e99398e05d2c87

@@ -95,7 +95,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   simple_member_access {

explorer/fuzzing/fuzzer_corpus/c75bdca473d96d91e931aca3e606e53e88890a9c → 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 {

explorer/fuzzing/fuzzer_corpus/b1573ca8e10fba91022153f79d51a3a8cd989c98 → explorer/fuzzing/fuzzer_corpus/457c811489db1e3f987633ce1fb2dce7d984fb66

@@ -235,7 +235,7 @@ compilation_unit {
                     }
                   }
                   rhs {
-                    primitive_operator {
+                    operator {
                       op: Add
                       arguments {
                         identifier {

explorer/fuzzing/fuzzer_corpus/58260e75087e0170a67885bc34e4c05898dd1638 → explorer/fuzzing/fuzzer_corpus/474fc14cf33f61c51a24a9cf6c6709f7ed649ecb

@@ -21,7 +21,7 @@ compilation_unit {
                     }
                     parameter {
                       fields {
-                        primitive_operator {
+                        operator {
                           op: Neg
                           arguments {
                             bool_literal {

explorer/fuzzing/fuzzer_corpus/334c6a14986f5653fd352f1bb200e80fddf7d697 → explorer/fuzzing/fuzzer_corpus/4be7c1e91a372d8fffc65158bb22572f42233e30

@@ -139,7 +139,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   simple_member_access {

explorer/fuzzing/fuzzer_corpus/9e6859766e9d34eec973a9b4d98b638ba6c00748 → explorer/fuzzing/fuzzer_corpus/4c73d357564823c15f11b5d4c47a7b16f4c34aea

@@ -97,7 +97,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/f322da95d8d8422e659c3c23d2f7aa3193efb25f → 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 {

explorer/fuzzing/fuzzer_corpus/b015582cdd9a7b03f83d7001537d32e4ea123946 → 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 {

explorer/fuzzing/fuzzer_corpus/6387e3e0d1ddb4ad2178b62b08b5812d4181fc75 → explorer/fuzzing/fuzzer_corpus/55ccba2998142de2e42b6f1daf02d8753579f38e

@@ -384,7 +384,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   simple_member_access {

explorer/fuzzing/fuzzer_corpus/7d932ad9cdc1f4052e0bd1768f7f07fed0a23c67 → 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 {

explorer/fuzzing/fuzzer_corpus/c7c6e4477db2a3b777e740964a09a379684261d8 → 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 {
                           }

explorer/fuzzing/fuzzer_corpus/a89eea46cc9aa7ca66868c4f2874ab2b61262980 → explorer/fuzzing/fuzzer_corpus/5a2e47fbeef7d44dadb53a69fa0012cd0846a507

@@ -50,7 +50,7 @@ compilation_unit {
                     }
                   }
                   rhs {
-                    primitive_operator {
+                    operator {
                       op: Add
                       arguments {
                         identifier {

explorer/fuzzing/fuzzer_corpus/698d8440e42574d1db112842642ff8c0ecc66374 → explorer/fuzzing/fuzzer_corpus/5d5019434454636690d87a9656afc1d95deee8df

@@ -41,7 +41,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/32e0eb929035d7c53b3d8566ac48ef0c3b82b32e → 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 {

explorer/fuzzing/fuzzer_corpus/5a5e0f23676f5b95ddb2d0101131f22c1fc5515c → 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 {

explorer/fuzzing/fuzzer_corpus/81b5d416277f5b28d98ac9b175f73389d9857655 → 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 {

explorer/fuzzing/fuzzer_corpus/6feffd83f7b5bfd3f870e4365a8c0d58df0689b4 → explorer/fuzzing/fuzzer_corpus/659e20bff50e0abe4f7d58e8e0b739ad2a5048b9

@@ -123,7 +123,7 @@ compilation_unit {
                         fields {
                           name: "n"
                           expression {
-                            primitive_operator {
+                            operator {
                               op: Add
                               arguments {
                                 simple_member_access {

explorer/fuzzing/fuzzer_corpus/fda984fd483f47ca29fd55b54173f77ef690b4ee → explorer/fuzzing/fuzzer_corpus/65c24d040bbc26b5e1fea735ddf1755392471a18

@@ -491,7 +491,7 @@ compilation_unit {
             statements {
               return_statement {
                 expression {
-                  primitive_operator {
+                  operator {
                     op: Add
                     arguments {
                       identifier {

explorer/fuzzing/fuzzer_corpus/8807065998e566eda4a26e9d9ec50f8938b46253 → explorer/fuzzing/fuzzer_corpus/71035d013bdc57394db132778f7934164475cff1

@@ -55,7 +55,7 @@ compilation_unit {
                     fields {
                       name: "n"
                       expression {
-                        primitive_operator {
+                        operator {
                           op: Add
                           arguments {
                             simple_member_access {

explorer/fuzzing/fuzzer_corpus/9e4d44b35fbe54f77aa09998b95423f36f44158c → explorer/fuzzing/fuzzer_corpus/733898e2c7730693eb323caa6b2a827a547db97a

@@ -96,7 +96,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   index {

explorer/fuzzing/fuzzer_corpus/0c441139ce210274afe7f2964745701c9957c672 → 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 {

explorer/fuzzing/fuzzer_corpus/f0249ef671686916199dbce1467d741102a68717 → 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 {

explorer/fuzzing/fuzzer_corpus/5357de7edef4e3bff993192d9538493ae80f5fa8 → explorer/fuzzing/fuzzer_corpus/76e8a4678c5aa0cfcce078571739a299702810b7

@@ -453,7 +453,7 @@ compilation_unit {
             statements {
               return_statement {
                 expression {
-                  primitive_operator {
+                  operator {
                     op: Add
                     arguments {
                       identifier {

explorer/fuzzing/fuzzer_corpus/95fb9a0f4e59b497ae6b0bd59d4ff5bf1adc1d9b → 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 {

explorer/fuzzing/fuzzer_corpus/0dc3ae8a543d130071a2efc462dabf1946794c28 → 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 {

explorer/fuzzing/fuzzer_corpus/61074429b7c420d6021c2e22019df74bcf0349a7 → explorer/fuzzing/fuzzer_corpus/85954afca87c50274902e103f0f2c757af19f9eb

@@ -175,7 +175,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Add
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/9d26cfc5faadd68c4fe601c70f56976fc8265ae6 → explorer/fuzzing/fuzzer_corpus/8821717e6334ce28e0ea3b0dc71cbcb5f63238d7

@@ -32,7 +32,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/6d67acbc349af1d8c183162793004dd676007700 → 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 {

explorer/fuzzing/fuzzer_corpus/8b702dcbe3970e2456a09d5fc1b7b1d3b36f52c0 → 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 {

explorer/fuzzing/fuzzer_corpus/8d84de249cf5ef3b256b81d68fd0a5cc22f16326 → explorer/fuzzing/fuzzer_corpus/96c23d870abc34df6a29ffbb8c36d1244d25920c

@@ -32,7 +32,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/7f14266137c07dea7d4c7fa0f7f2ca6346cf4c66 → 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 {

explorer/fuzzing/fuzzer_corpus/6108cd2ce5a08c8c845d5c11372c99fe56dd9674 → 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 {

explorer/fuzzing/fuzzer_corpus/9bb0b055035cb4965aa9432c34bdb1be0f8c3b80 → 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 {

explorer/fuzzing/fuzzer_corpus/22446e9de1d328cd4bfc97b3a8e464165a70c39d → explorer/fuzzing/fuzzer_corpus/9923f966584d04a529ba2c6bf1fc8f56fe796c9a

@@ -97,7 +97,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   identifier {

explorer/fuzzing/fuzzer_corpus/e97942ad3c0748fc89d5b8b69ac78dc0648a9899 → 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 {

explorer/fuzzing/fuzzer_corpus/1698e7837995809f728e980d4e48734a342845a9 → 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 {

explorer/fuzzing/fuzzer_corpus/4e152163ab362aecbbb2d91e08f8183e822ef8be → 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 {

explorer/fuzzing/fuzzer_corpus/eb994d3adcbf502d7b0f931e6aab38d4cfb3e57f → explorer/fuzzing/fuzzer_corpus/a40b0664416dcb8ed41bbcc88d8be9969947e2bb

@@ -19,7 +19,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   int_literal {

explorer/fuzzing/fuzzer_corpus/bba918f99eb10030663ee97d5febc5e86c43a871 → 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 {

explorer/fuzzing/fuzzer_corpus/50ad01e0992fce22cc4b6e1d744f5286ad4439b6 → 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 {

explorer/fuzzing/fuzzer_corpus/5e4bce73c210e45269126773f257d95d4d269072 → 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 {

explorer/fuzzing/fuzzer_corpus/75395dbe8c9c56e1353f345b1dc8e79390827fcc → 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 {

explorer/fuzzing/fuzzer_corpus/a849a3e84c366f91252584c20727c3fb49d3fc84 → 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 {

explorer/fuzzing/fuzzer_corpus/74c8e2e43c65d4be09ca220e6512569aeecec513 → 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 {

explorer/fuzzing/fuzzer_corpus/36d9cf1dcaccaa9ca5c49a9029dc1f0e85ea1071 → 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 {

explorer/fuzzing/fuzzer_corpus/99aed9e0efcdc0473a19a23e77d687971bf6fb08 → 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 {

explorer/fuzzing/fuzzer_corpus/2584c688c48bb0fcc5f1b1f91292e0688e759cd0 → 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 {

explorer/fuzzing/fuzzer_corpus/55ad26679e49fd8efa9e12e5079739869cfebe5c → explorer/fuzzing/fuzzer_corpus/ba5e2359010d698d23761ea30b812784c01fd77d

@@ -84,7 +84,7 @@ compilation_unit {
         statements {
           return_statement {
             expression {
-              primitive_operator {
+              operator {
                 op: Sub
                 arguments {
                   simple_member_access {

explorer/fuzzing/fuzzer_corpus/9a673afc783655f19212b53bb4fde1c6c9073e58 → explorer/fuzzing/fuzzer_corpus/bc69558bf2eb9f0abc9a611e4a707fd0426bd3c5

@@ -50,7 +50,7 @@ compilation_unit {
                     }
                   }
                   rhs {
-                    primitive_operator {
+                    operator {
                       op: Add
                       arguments {
                         identifier {

explorer/fuzzing/fuzzer_corpus/2a94a0b8d31c467d3642cd470ca483d333b27962 → explorer/fuzzing/fuzzer_corpus/bdde4f02aaec2f0757312762ba4226ec6c647bd2

@@ -121,7 +121,7 @@ compilation_unit {
         statements {
           if_statement {
             condition {
-              primitive_operator {
+              operator {
                 op: Eq
                 arguments {
                   identifier {