Merge pull request apple#669 from tbkka/generated-namespacing

Move generated protos into a different package

Author: tbkka

Makefile

@@ -461,7 +461,7 @@ Protos/generated_swift_names_fields.proto: Protos/mined_words.txt
 	@echo '// Protoc errors imply this file is being generated incorrectly' >> $@
 	@echo '// Swift compile errors are probably bugs in protoc-gen-swift' >> $@
 	@echo 'syntax = "proto3";' >> $@
-	@echo 'package protobuf_unittest;' >> $@
+	@echo 'package protobuf_unittest_generated;' >> $@
 	@echo 'message GeneratedSwiftReservedFields {' >> $@
 	@cat Protos/mined_words.txt | awk 'BEGIN{n = 1} {print "  int32 " $$1 " = " n ";"; n += 1 }' >> $@
 	@echo '}' >> $@
@@ -473,7 +473,7 @@ Protos/generated_swift_names_enum_cases.proto: Protos/mined_words.txt
 	@echo '// Protoc errors imply this file is being generated incorrectly' >> $@
 	@echo '// Swift compile errors are probably bugs in protoc-gen-swift' >> $@
 	@echo 'syntax = "proto3";' >> $@
-	@echo 'package protobuf_unittest;' >> $@
+	@echo 'package protobuf_unittest_generated;' >> $@
 	@echo 'enum GeneratedSwiftReservedEnum {' >> $@
 	@echo '  NONE = 0;' >> $@
 	@cat Protos/mined_words.txt | awk 'BEGIN{n = 1} {print "  " $$1 " = " n ";"; n += 1 }' >> $@
@@ -486,7 +486,7 @@ Protos/generated_swift_names_messages.proto: Protos/mined_words.txt
 	@echo '// Protoc errors imply this file is being generated incorrectly' >> $@
 	@echo '// Swift compile errors are probably bugs in protoc-gen-swift' >> $@
 	@echo 'syntax = "proto3";' >> $@
-	@echo 'package protobuf_unittest;' >> $@
+	@echo 'package protobuf_unittest_generated;' >> $@
 	@echo 'message GeneratedSwiftReservedMessages {' >> $@
 	@cat Protos/mined_words.txt | awk '{print "  message " $$1 " { int32 " $$1 " = 1; }"}' >> $@
 	@echo '}' >> $@
@@ -498,7 +498,7 @@ Protos/generated_swift_names_enums.proto: Protos/mined_words.txt
 	@echo '// Protoc errors imply this file is being generated incorrectly' >> $@
 	@echo '// Swift compile errors are probably bugs in protoc-gen-swift' >> $@
 	@echo 'syntax = "proto3";' >> $@
-	@echo 'package protobuf_unittest;' >> $@
+	@echo 'package protobuf_unittest_generated;' >> $@
 	@echo 'message GeneratedSwiftReservedEnums {' >> $@
 	@cat Protos/mined_words.txt | awk '{print "  enum " $$1 " { NONE_" $$1 " = 0; }"}' >> $@
 	@echo '}' >> $@

Protos/generated_swift_names_enum_cases.proto

@@ -2,7 +2,7 @@
 // Protoc errors imply this file is being generated incorrectly
 // Swift compile errors are probably bugs in protoc-gen-swift
 syntax = "proto3";
-package protobuf_unittest;
+package protobuf_unittest_generated;
 enum GeneratedSwiftReservedEnum {
   NONE = 0;
   adjusted = 1;
@@ -452,166 +452,168 @@ enum GeneratedSwiftReservedEnum {
   root = 445;
   s = 446;
   sawBackslash = 447;
-  scanner = 448;
-  seconds = 449;
-  self = 450;
-  separator = 451;
-  serialize = 452;
-  serializedData = 453;
-  serializedSize = 454;
-  set = 455;
-  setExtensionValue = 456;
-  shift = 457;
-  SimpleExtensionMap = 458;
-  sizer = 459;
-  source = 460;
-  sourceContext = 461;
-  sourceEncoding = 462;
-  split = 463;
-  start = 464;
-  startArray = 465;
-  startField = 466;
-  startIndex = 467;
-  startMessageField = 468;
-  startObject = 469;
-  startRegularField = 470;
-  state = 471;
-  static = 472;
-  StaticString = 473;
-  storage = 474;
-  String = 475;
-  stringLiteral = 476;
-  StringLiteralType = 477;
-  stringResult = 478;
-  stringValue = 479;
-  struct = 480;
-  structValue = 481;
-  subDecoder = 482;
-  subscript = 483;
-  subVisitor = 484;
-  Swift = 485;
-  SwiftProtobuf = 486;
-  syntax = 487;
-  T = 488;
-  tag = 489;
-  terminator = 490;
-  testDecoder = 491;
-  text = 492;
-  textDecoder = 493;
-  TextFormatDecoder = 494;
-  TextFormatDecodingError = 495;
-  TextFormatEncodingVisitor = 496;
-  textFormatString = 497;
-  throws = 498;
-  timeInterval = 499;
-  timeIntervalSince1970 = 500;
-  timeIntervalSinceReferenceDate = 501;
-  Timestamp = 502;
-  total = 503;
-  totalSize = 504;
-  traverse = 505;
-  true = 506;
-  try = 507;
-  type = 508;
-  typealias = 509;
-  typePrefix = 510;
-  typeStart = 511;
-  typeUnknown = 512;
-  typeURL = 513;
-  UInt32 = 514;
-  UInt32Value = 515;
-  UInt64 = 516;
-  UInt64Value = 517;
-  UInt8 = 518;
-  unicodeScalarLiteral = 519;
-  UnicodeScalarLiteralType = 520;
-  unicodeScalars = 521;
-  UnicodeScalarView = 522;
-  union = 523;
-  unknown = 524;
-  unknownFields = 525;
-  UnknownStorage = 526;
-  unpackTo = 527;
-  UnsafeBufferPointer = 528;
-  UnsafeMutablePointer = 529;
-  UnsafePointer = 530;
-  updatedOptions = 531;
-  url = 532;
-  utf8 = 533;
-  utf8Codec = 534;
-  utf8ToDouble = 535;
-  UTF8View = 536;
-  v = 537;
-  value = 538;
-  valueField = 539;
-  values = 540;
-  ValueType = 541;
-  var = 542;
-  Version = 543;
-  versionString = 544;
-  visitExtensionFields = 545;
-  visitExtensionFieldsAsMessageSet = 546;
-  visitMapField = 547;
-  visitor = 548;
-  visitPacked = 549;
-  visitPackedBoolField = 550;
-  visitPackedDoubleField = 551;
-  visitPackedEnumField = 552;
-  visitPackedFixed32Field = 553;
-  visitPackedFixed64Field = 554;
-  visitPackedFloatField = 555;
-  visitPackedInt32Field = 556;
-  visitPackedInt64Field = 557;
-  visitPackedSFixed32Field = 558;
-  visitPackedSFixed64Field = 559;
-  visitPackedSInt32Field = 560;
-  visitPackedSInt64Field = 561;
-  visitPackedUInt32Field = 562;
-  visitPackedUInt64Field = 563;
-  visitRepeated = 564;
-  visitRepeatedBoolField = 565;
-  visitRepeatedBytesField = 566;
-  visitRepeatedDoubleField = 567;
-  visitRepeatedEnumField = 568;
-  visitRepeatedFixed32Field = 569;
-  visitRepeatedFixed64Field = 570;
-  visitRepeatedFloatField = 571;
-  visitRepeatedGroupField = 572;
-  visitRepeatedInt32Field = 573;
-  visitRepeatedInt64Field = 574;
-  visitRepeatedMessageField = 575;
-  visitRepeatedSFixed32Field = 576;
-  visitRepeatedSFixed64Field = 577;
-  visitRepeatedSInt32Field = 578;
-  visitRepeatedSInt64Field = 579;
-  visitRepeatedStringField = 580;
-  visitRepeatedUInt32Field = 581;
-  visitRepeatedUInt64Field = 582;
-  visitSingular = 583;
-  visitSingularBoolField = 584;
-  visitSingularBytesField = 585;
-  visitSingularDoubleField = 586;
-  visitSingularEnumField = 587;
-  visitSingularFixed32Field = 588;
-  visitSingularFixed64Field = 589;
-  visitSingularFloatField = 590;
-  visitSingularGroupField = 591;
-  visitSingularInt32Field = 592;
-  visitSingularInt64Field = 593;
-  visitSingularMessageField = 594;
-  visitSingularSFixed32Field = 595;
-  visitSingularSFixed64Field = 596;
-  visitSingularSInt32Field = 597;
-  visitSingularSInt64Field = 598;
-  visitSingularStringField = 599;
-  visitSingularUInt32Field = 600;
-  visitSingularUInt64Field = 601;
-  visitUnknown = 602;
-  wasDecoded = 603;
-  where = 604;
-  wireFormat = 605;
-  with = 606;
-  WrappedType = 607;
-  written = 608;
-  yday = 609;
+  sawSection4Characters = 448;
+  sawSection5Characters = 449;
+  scanner = 450;
+  seconds = 451;
+  self = 452;
+  separator = 453;
+  serialize = 454;
+  serializedData = 455;
+  serializedSize = 456;
+  set = 457;
+  setExtensionValue = 458;
+  shift = 459;
+  SimpleExtensionMap = 460;
+  sizer = 461;
+  source = 462;
+  sourceContext = 463;
+  sourceEncoding = 464;
+  split = 465;
+  start = 466;
+  startArray = 467;
+  startField = 468;
+  startIndex = 469;
+  startMessageField = 470;
+  startObject = 471;
+  startRegularField = 472;
+  state = 473;
+  static = 474;
+  StaticString = 475;
+  storage = 476;
+  String = 477;
+  stringLiteral = 478;
+  StringLiteralType = 479;
+  stringResult = 480;
+  stringValue = 481;
+  struct = 482;
+  structValue = 483;
+  subDecoder = 484;
+  subscript = 485;
+  subVisitor = 486;
+  Swift = 487;
+  SwiftProtobuf = 488;
+  syntax = 489;
+  T = 490;
+  tag = 491;
+  terminator = 492;
+  testDecoder = 493;
+  text = 494;
+  textDecoder = 495;
+  TextFormatDecoder = 496;
+  TextFormatDecodingError = 497;
+  TextFormatEncodingVisitor = 498;
+  textFormatString = 499;
+  throws = 500;
+  timeInterval = 501;
+  timeIntervalSince1970 = 502;
+  timeIntervalSinceReferenceDate = 503;
+  Timestamp = 504;
+  total = 505;
+  totalSize = 506;
+  traverse = 507;
+  true = 508;
+  try = 509;
+  type = 510;
+  typealias = 511;
+  typePrefix = 512;
+  typeStart = 513;
+  typeUnknown = 514;
+  typeURL = 515;
+  UInt32 = 516;
+  UInt32Value = 517;
+  UInt64 = 518;
+  UInt64Value = 519;
+  UInt8 = 520;
+  unicodeScalarLiteral = 521;
+  UnicodeScalarLiteralType = 522;
+  unicodeScalars = 523;
+  UnicodeScalarView = 524;
+  union = 525;
+  unknown = 526;
+  unknownFields = 527;
+  UnknownStorage = 528;
+  unpackTo = 529;
+  UnsafeBufferPointer = 530;
+  UnsafeMutablePointer = 531;
+  UnsafePointer = 532;
+  updatedOptions = 533;
+  url = 534;
+  utf8 = 535;
+  utf8Codec = 536;
+  utf8ToDouble = 537;
+  UTF8View = 538;
+  v = 539;
+  value = 540;
+  valueField = 541;
+  values = 542;
+  ValueType = 543;
+  var = 544;
+  Version = 545;
+  versionString = 546;
+  visitExtensionFields = 547;
+  visitExtensionFieldsAsMessageSet = 548;
+  visitMapField = 549;
+  visitor = 550;
+  visitPacked = 551;
+  visitPackedBoolField = 552;
+  visitPackedDoubleField = 553;
+  visitPackedEnumField = 554;
+  visitPackedFixed32Field = 555;
+  visitPackedFixed64Field = 556;
+  visitPackedFloatField = 557;
+  visitPackedInt32Field = 558;
+  visitPackedInt64Field = 559;
+  visitPackedSFixed32Field = 560;
+  visitPackedSFixed64Field = 561;
+  visitPackedSInt32Field = 562;
+  visitPackedSInt64Field = 563;
+  visitPackedUInt32Field = 564;
+  visitPackedUInt64Field = 565;
+  visitRepeated = 566;
+  visitRepeatedBoolField = 567;
+  visitRepeatedBytesField = 568;
+  visitRepeatedDoubleField = 569;
+  visitRepeatedEnumField = 570;
+  visitRepeatedFixed32Field = 571;
+  visitRepeatedFixed64Field = 572;
+  visitRepeatedFloatField = 573;
+  visitRepeatedGroupField = 574;
+  visitRepeatedInt32Field = 575;
+  visitRepeatedInt64Field = 576;
+  visitRepeatedMessageField = 577;
+  visitRepeatedSFixed32Field = 578;
+  visitRepeatedSFixed64Field = 579;
+  visitRepeatedSInt32Field = 580;
+  visitRepeatedSInt64Field = 581;
+  visitRepeatedStringField = 582;
+  visitRepeatedUInt32Field = 583;
+  visitRepeatedUInt64Field = 584;
+  visitSingular = 585;
+  visitSingularBoolField = 586;
+  visitSingularBytesField = 587;
+  visitSingularDoubleField = 588;
+  visitSingularEnumField = 589;
+  visitSingularFixed32Field = 590;
+  visitSingularFixed64Field = 591;
+  visitSingularFloatField = 592;
+  visitSingularGroupField = 593;
+  visitSingularInt32Field = 594;
+  visitSingularInt64Field = 595;
+  visitSingularMessageField = 596;
+  visitSingularSFixed32Field = 597;
+  visitSingularSFixed64Field = 598;
+  visitSingularSInt32Field = 599;
+  visitSingularSInt64Field = 600;
+  visitSingularStringField = 601;
+  visitSingularUInt32Field = 602;
+  visitSingularUInt64Field = 603;
+  visitUnknown = 604;
+  wasDecoded = 605;
+  where = 606;
+  wireFormat = 607;
+  with = 608;
+  WrappedType = 609;
+  written = 610;
+  yday = 611;
 }

Protos/generated_swift_names_enums.proto

@@ -2,7 +2,7 @@
 // Protoc errors imply this file is being generated incorrectly
 // Swift compile errors are probably bugs in protoc-gen-swift
 syntax = "proto3";
-package protobuf_unittest;
+package protobuf_unittest_generated;
 message GeneratedSwiftReservedEnums {
   enum adjusted { NONE_adjusted = 0; }
   enum allocate { NONE_allocate = 0; }
@@ -451,6 +451,8 @@ message GeneratedSwiftReservedEnums {
   enum root { NONE_root = 0; }
   enum s { NONE_s = 0; }
   enum sawBackslash { NONE_sawBackslash = 0; }
+  enum sawSection4Characters { NONE_sawSection4Characters = 0; }
+  enum sawSection5Characters { NONE_sawSection5Characters = 0; }
   enum scanner { NONE_scanner = 0; }
   enum seconds { NONE_seconds = 0; }
   enum self { NONE_self = 0; }