Move MessageGenerator::GenerateSource over to Printer::Emit
There are whatespace changes because I couldn't get some of the
generated CPreProcessor things to line up in the exact same way.
PiperOrigin-RevId: 547188309
diff --git a/objectivec/GPBAny.pbobjc.m b/objectivec/GPBAny.pbobjc.m
index 9b7939d..f12bed9 100644
--- a/objectivec/GPBAny.pbobjc.m
+++ b/objectivec/GPBAny.pbobjc.m
@@ -86,14 +86,14 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBAny__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
- static const char *extraTextFormatInfo =
+ #if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
+ static const char *extraTextFormatInfo =
"\001\001\004\241!!\000";
- [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
-#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-#if defined(DEBUG) && DEBUG
+ [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
+ #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBApi.pbobjc.m b/objectivec/GPBApi.pbobjc.m
index b416445..a2b0e99 100644
--- a/objectivec/GPBApi.pbobjc.m
+++ b/objectivec/GPBApi.pbobjc.m
@@ -145,9 +145,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBApi__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -267,14 +267,14 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBMethod__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
- static const char *extraTextFormatInfo =
+ #if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
+ static const char *extraTextFormatInfo =
"\002\002\007\244\241!!\000\004\010\244\241!!\000";
- [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
-#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-#if defined(DEBUG) && DEBUG
+ [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
+ #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -341,9 +341,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBMixin__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBDuration.pbobjc.m b/objectivec/GPBDuration.pbobjc.m
index a618e9c..1a54a76 100644
--- a/objectivec/GPBDuration.pbobjc.m
+++ b/objectivec/GPBDuration.pbobjc.m
@@ -86,9 +86,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBDuration__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBEmpty.pbobjc.m b/objectivec/GPBEmpty.pbobjc.m
index c33be8b..b69738c 100644
--- a/objectivec/GPBEmpty.pbobjc.m
+++ b/objectivec/GPBEmpty.pbobjc.m
@@ -62,9 +62,9 @@
fieldCount:0
storageSize:sizeof(GPBEmpty__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBFieldMask.pbobjc.m b/objectivec/GPBFieldMask.pbobjc.m
index 347bcbe..8de5ad4 100644
--- a/objectivec/GPBFieldMask.pbobjc.m
+++ b/objectivec/GPBFieldMask.pbobjc.m
@@ -75,9 +75,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBFieldMask__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBSourceContext.pbobjc.m b/objectivec/GPBSourceContext.pbobjc.m
index cea417d..7ae605b 100644
--- a/objectivec/GPBSourceContext.pbobjc.m
+++ b/objectivec/GPBSourceContext.pbobjc.m
@@ -75,9 +75,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBSourceContext__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBStruct.pbobjc.m b/objectivec/GPBStruct.pbobjc.m
index 600b495..eabd761 100644
--- a/objectivec/GPBStruct.pbobjc.m
+++ b/objectivec/GPBStruct.pbobjc.m
@@ -115,9 +115,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBStruct__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -222,9 +222,9 @@
[localDescriptor setupOneofs:oneofs
count:(uint32_t)(sizeof(oneofs) / sizeof(char*))
firstHasIndex:-1];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -285,9 +285,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBListValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBTimestamp.pbobjc.m b/objectivec/GPBTimestamp.pbobjc.m
index dc6baeb..edd7349 100644
--- a/objectivec/GPBTimestamp.pbobjc.m
+++ b/objectivec/GPBTimestamp.pbobjc.m
@@ -86,9 +86,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBTimestamp__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBType.pbobjc.m b/objectivec/GPBType.pbobjc.m
index 7b44e39..11378b6 100644
--- a/objectivec/GPBType.pbobjc.m
+++ b/objectivec/GPBType.pbobjc.m
@@ -307,9 +307,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBType__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -463,14 +463,14 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBField__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
- static const char *extraTextFormatInfo =
+ #if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
+ static const char *extraTextFormatInfo =
"\001\006\004\241!!\000";
- [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
-#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-#if defined(DEBUG) && DEBUG
+ [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
+ #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -593,9 +593,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBEnum__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -673,9 +673,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBEnumValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -730,9 +730,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBOption__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
diff --git a/objectivec/GPBWrappers.pbobjc.m b/objectivec/GPBWrappers.pbobjc.m
index 30461e3..07be68b 100644
--- a/objectivec/GPBWrappers.pbobjc.m
+++ b/objectivec/GPBWrappers.pbobjc.m
@@ -83,9 +83,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBDoubleValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -129,9 +129,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBFloatValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -175,9 +175,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBInt64Value__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -221,9 +221,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBUInt64Value__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -267,9 +267,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBInt32Value__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -313,9 +313,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBUInt32Value__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -358,9 +358,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBBoolValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -404,9 +404,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBStringValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
@@ -450,9 +450,9 @@
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBBytesValue__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
-#if defined(DEBUG) && DEBUG
+ #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
-#endif // DEBUG
+ #endif // DEBUG
descriptor = localDescriptor;
}
return descriptor;
