Don't use syntax()

vitalybuka · vitalybuka · commit af3bb18749db · 2022-12-07T15:21:20.000-08:00
diff --git a/src/mutator.cc b/src/mutator.cc
@@ -87,11 +87,7 @@ bool GetRandomBool(RandomEngine* random, size_t n = 2) {
 }
 
 bool IsProto3SimpleField(const FieldDescriptor& field) {
-  assert(field.file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ||
-         field.file()->syntax() == FileDescriptor::SYNTAX_PROTO2);
-  return field.file()->syntax() == FileDescriptor::SYNTAX_PROTO3 &&
-         field.cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE &&
-         !field.containing_oneof() && !field.is_repeated();
+  return !field.is_repeated() && !field.has_presence();
 }
 
 struct CreateDefaultField : public FieldFunction<CreateDefaultField> {

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,7 @@ bool GetRandomBool(RandomEngine* random, size_t n = 2) {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`bool IsProto3SimpleField(const FieldDescriptor& field) {`
`90`		`- assert(field.file()->syntax() == FileDescriptor::SYNTAX_PROTO3 \|\|`
`91`		`- field.file()->syntax() == FileDescriptor::SYNTAX_PROTO2);`
`92`		`- return field.file()->syntax() == FileDescriptor::SYNTAX_PROTO3 &&`
`93`		`- field.cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE &&`
`94`		`- !field.containing_oneof() && !field.is_repeated();`
	`90`	`+ return !field.is_repeated() && !field.has_presence();`
`95`	`91`	`}`
`96`	`92`
`97`	`93`	`struct CreateDefaultField : public FieldFunction<CreateDefaultField> {`