protobuf 2.8.13 → 3.0.0.rc1

data/spec/support/test/google_unittest.pb.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
@@ -112,205 +110,205 @@ module GoogleUnittest
   #
   class TestAllTypes
     class NestedMessage
-      optional ::Protobuf::Field::Int32Field, :bb, 1
+      optional :int32, :bb, 1
     end
 
-    optional ::Protobuf::Field::Int32Field, :optional_int32, 1
-    optional ::Protobuf::Field::Int64Field, :optional_int64, 2
-    optional ::Protobuf::Field::Uint32Field, :optional_uint32, 3
-    optional ::Protobuf::Field::Uint64Field, :optional_uint64, 4
-    optional ::Protobuf::Field::Sint32Field, :optional_sint32, 5
-    optional ::Protobuf::Field::Sint64Field, :optional_sint64, 6
-    optional ::Protobuf::Field::Fixed32Field, :optional_fixed32, 7
-    optional ::Protobuf::Field::Fixed64Field, :optional_fixed64, 8
-    optional ::Protobuf::Field::Sfixed32Field, :optional_sfixed32, 9
-    optional ::Protobuf::Field::Sfixed64Field, :optional_sfixed64, 10
-    optional ::Protobuf::Field::FloatField, :optional_float, 11
-    optional ::Protobuf::Field::DoubleField, :optional_double, 12
-    optional ::Protobuf::Field::BoolField, :optional_bool, 13
-    optional ::Protobuf::Field::StringField, :optional_string, 14
-    optional ::Protobuf::Field::BytesField, :optional_bytes, 15
+    optional :int32, :optional_int32, 1
+    optional :int64, :optional_int64, 2
+    optional :uint32, :optional_uint32, 3
+    optional :uint64, :optional_uint64, 4
+    optional :sint32, :optional_sint32, 5
+    optional :sint64, :optional_sint64, 6
+    optional :fixed32, :optional_fixed32, 7
+    optional :fixed64, :optional_fixed64, 8
+    optional :sfixed32, :optional_sfixed32, 9
+    optional :sfixed64, :optional_sfixed64, 10
+    optional :float, :optional_float, 11
+    optional :double, :optional_double, 12
+    optional :bool, :optional_bool, 13
+    optional :string, :optional_string, 14
+    optional :bytes, :optional_bytes, 15
     optional ::GoogleUnittest::TestAllTypes::NestedMessage, :optional_nested_message, 18
     optional ::GoogleUnittest::ForeignMessage, :optional_foreign_message, 19
     optional ::GoogleUnittestImport::ImportMessage, :optional_import_message, 20
     optional ::GoogleUnittest::TestAllTypes::NestedEnum, :optional_nested_enum, 21
     optional ::GoogleUnittest::ForeignEnum, :optional_foreign_enum, 22
     optional ::GoogleUnittestImport::ImportEnum, :optional_import_enum, 23
-    optional ::Protobuf::Field::StringField, :optional_string_piece, 24
-    optional ::Protobuf::Field::StringField, :optional_cord, 25
+    optional :string, :optional_string_piece, 24
+    optional :string, :optional_cord, 25
     optional ::GoogleUnittestImport::PublicImportMessage, :optional_public_import_message, 26
     optional ::GoogleUnittest::TestAllTypes::NestedMessage, :optional_lazy_message, 27
-    repeated ::Protobuf::Field::Int32Field, :repeated_int32, 31
-    repeated ::Protobuf::Field::Int64Field, :repeated_int64, 32
-    repeated ::Protobuf::Field::Uint32Field, :repeated_uint32, 33
-    repeated ::Protobuf::Field::Uint64Field, :repeated_uint64, 34
-    repeated ::Protobuf::Field::Sint32Field, :repeated_sint32, 35
-    repeated ::Protobuf::Field::Sint64Field, :repeated_sint64, 36
-    repeated ::Protobuf::Field::Fixed32Field, :repeated_fixed32, 37
-    repeated ::Protobuf::Field::Fixed64Field, :repeated_fixed64, 38
-    repeated ::Protobuf::Field::Sfixed32Field, :repeated_sfixed32, 39
-    repeated ::Protobuf::Field::Sfixed64Field, :repeated_sfixed64, 40
-    repeated ::Protobuf::Field::FloatField, :repeated_float, 41
-    repeated ::Protobuf::Field::DoubleField, :repeated_double, 42
-    repeated ::Protobuf::Field::BoolField, :repeated_bool, 43
-    repeated ::Protobuf::Field::StringField, :repeated_string, 44
-    repeated ::Protobuf::Field::BytesField, :repeated_bytes, 45
+    repeated :int32, :repeated_int32, 31
+    repeated :int64, :repeated_int64, 32
+    repeated :uint32, :repeated_uint32, 33
+    repeated :uint64, :repeated_uint64, 34
+    repeated :sint32, :repeated_sint32, 35
+    repeated :sint64, :repeated_sint64, 36
+    repeated :fixed32, :repeated_fixed32, 37
+    repeated :fixed64, :repeated_fixed64, 38
+    repeated :sfixed32, :repeated_sfixed32, 39
+    repeated :sfixed64, :repeated_sfixed64, 40
+    repeated :float, :repeated_float, 41
+    repeated :double, :repeated_double, 42
+    repeated :bool, :repeated_bool, 43
+    repeated :string, :repeated_string, 44
+    repeated :bytes, :repeated_bytes, 45
     repeated ::GoogleUnittest::TestAllTypes::NestedMessage, :repeated_nested_message, 48
     repeated ::GoogleUnittest::ForeignMessage, :repeated_foreign_message, 49
     repeated ::GoogleUnittestImport::ImportMessage, :repeated_import_message, 50
     repeated ::GoogleUnittest::TestAllTypes::NestedEnum, :repeated_nested_enum, 51
     repeated ::GoogleUnittest::ForeignEnum, :repeated_foreign_enum, 52
     repeated ::GoogleUnittestImport::ImportEnum, :repeated_import_enum, 53
-    repeated ::Protobuf::Field::StringField, :repeated_string_piece, 54
-    repeated ::Protobuf::Field::StringField, :repeated_cord, 55
+    repeated :string, :repeated_string_piece, 54
+    repeated :string, :repeated_cord, 55
     repeated ::GoogleUnittest::TestAllTypes::NestedMessage, :repeated_lazy_message, 57
-    optional ::Protobuf::Field::Int32Field, :default_int32, 61, :default => 41
-    optional ::Protobuf::Field::Int64Field, :default_int64, 62, :default => 42
-    optional ::Protobuf::Field::Uint32Field, :default_uint32, 63, :default => 43
-    optional ::Protobuf::Field::Uint64Field, :default_uint64, 64, :default => 44
-    optional ::Protobuf::Field::Sint32Field, :default_sint32, 65, :default => -45
-    optional ::Protobuf::Field::Sint64Field, :default_sint64, 66, :default => 46
-    optional ::Protobuf::Field::Fixed32Field, :default_fixed32, 67, :default => 47
-    optional ::Protobuf::Field::Fixed64Field, :default_fixed64, 68, :default => 48
-    optional ::Protobuf::Field::Sfixed32Field, :default_sfixed32, 69, :default => 49
-    optional ::Protobuf::Field::Sfixed64Field, :default_sfixed64, 70, :default => -50
-    optional ::Protobuf::Field::FloatField, :default_float, 71, :default => 51.5
-    optional ::Protobuf::Field::DoubleField, :default_double, 72, :default => 52000
-    optional ::Protobuf::Field::BoolField, :default_bool, 73, :default => true
-    optional ::Protobuf::Field::StringField, :default_string, 74, :default => "hello"
-    optional ::Protobuf::Field::BytesField, :default_bytes, 75, :default => "world"
+    optional :int32, :default_int32, 61, :default => 41
+    optional :int64, :default_int64, 62, :default => 42
+    optional :uint32, :default_uint32, 63, :default => 43
+    optional :uint64, :default_uint64, 64, :default => 44
+    optional :sint32, :default_sint32, 65, :default => -45
+    optional :sint64, :default_sint64, 66, :default => 46
+    optional :fixed32, :default_fixed32, 67, :default => 47
+    optional :fixed64, :default_fixed64, 68, :default => 48
+    optional :sfixed32, :default_sfixed32, 69, :default => 49
+    optional :sfixed64, :default_sfixed64, 70, :default => -50
+    optional :float, :default_float, 71, :default => 51.5
+    optional :double, :default_double, 72, :default => 52000
+    optional :bool, :default_bool, 73, :default => true
+    optional :string, :default_string, 74, :default => "hello"
+    optional :bytes, :default_bytes, 75, :default => "world"
     optional ::GoogleUnittest::TestAllTypes::NestedEnum, :default_nested_enum, 81, :default => ::GoogleUnittest::TestAllTypes::NestedEnum::BAR
     optional ::GoogleUnittest::ForeignEnum, :default_foreign_enum, 82, :default => ::GoogleUnittest::ForeignEnum::FOREIGN_BAR
     optional ::GoogleUnittestImport::ImportEnum, :default_import_enum, 83, :default => ::GoogleUnittestImport::ImportEnum::IMPORT_BAR
-    optional ::Protobuf::Field::StringField, :default_string_piece, 84, :default => "abc"
-    optional ::Protobuf::Field::StringField, :default_cord, 85, :default => "123"
+    optional :string, :default_string_piece, 84, :default => "abc"
+    optional :string, :default_cord, 85, :default => "123"
   end
 
   class TestDeprecatedFields
-    optional ::Protobuf::Field::Int32Field, :deprecated_int32, 1, :deprecated => true
+    optional :int32, :deprecated_int32, 1, :deprecated => true
   end
 
   class ForeignMessage
-    optional ::Protobuf::Field::Int32Field, :c, 1
+    optional :int32, :c, 1
   end
 
   class TestAllExtensions
     # Extension Fields
     extensions 1...536870912
-    optional ::Protobuf::Field::Int32Field, :optional_int32_extension, 1, :extension => true
-    optional ::Protobuf::Field::Int64Field, :optional_int64_extension, 2, :extension => true
-    optional ::Protobuf::Field::Uint32Field, :optional_uint32_extension, 3, :extension => true
-    optional ::Protobuf::Field::Uint64Field, :optional_uint64_extension, 4, :extension => true
-    optional ::Protobuf::Field::Sint32Field, :optional_sint32_extension, 5, :extension => true
-    optional ::Protobuf::Field::Sint64Field, :optional_sint64_extension, 6, :extension => true
-    optional ::Protobuf::Field::Fixed32Field, :optional_fixed32_extension, 7, :extension => true
-    optional ::Protobuf::Field::Fixed64Field, :optional_fixed64_extension, 8, :extension => true
-    optional ::Protobuf::Field::Sfixed32Field, :optional_sfixed32_extension, 9, :extension => true
-    optional ::Protobuf::Field::Sfixed64Field, :optional_sfixed64_extension, 10, :extension => true
-    optional ::Protobuf::Field::FloatField, :optional_float_extension, 11, :extension => true
-    optional ::Protobuf::Field::DoubleField, :optional_double_extension, 12, :extension => true
-    optional ::Protobuf::Field::BoolField, :optional_bool_extension, 13, :extension => true
-    optional ::Protobuf::Field::StringField, :optional_string_extension, 14, :extension => true
-    optional ::Protobuf::Field::BytesField, :optional_bytes_extension, 15, :extension => true
+    optional :int32, :optional_int32_extension, 1, :extension => true
+    optional :int64, :optional_int64_extension, 2, :extension => true
+    optional :uint32, :optional_uint32_extension, 3, :extension => true
+    optional :uint64, :optional_uint64_extension, 4, :extension => true
+    optional :sint32, :optional_sint32_extension, 5, :extension => true
+    optional :sint64, :optional_sint64_extension, 6, :extension => true
+    optional :fixed32, :optional_fixed32_extension, 7, :extension => true
+    optional :fixed64, :optional_fixed64_extension, 8, :extension => true
+    optional :sfixed32, :optional_sfixed32_extension, 9, :extension => true
+    optional :sfixed64, :optional_sfixed64_extension, 10, :extension => true
+    optional :float, :optional_float_extension, 11, :extension => true
+    optional :double, :optional_double_extension, 12, :extension => true
+    optional :bool, :optional_bool_extension, 13, :extension => true
+    optional :string, :optional_string_extension, 14, :extension => true
+    optional :bytes, :optional_bytes_extension, 15, :extension => true
     optional ::GoogleUnittest::TestAllTypes::NestedMessage, :optional_nested_message_extension, 18, :extension => true
     optional ::GoogleUnittest::ForeignMessage, :optional_foreign_message_extension, 19, :extension => true
     optional ::GoogleUnittestImport::ImportMessage, :optional_import_message_extension, 20, :extension => true
     optional ::GoogleUnittest::TestAllTypes::NestedEnum, :optional_nested_enum_extension, 21, :extension => true
     optional ::GoogleUnittest::ForeignEnum, :optional_foreign_enum_extension, 22, :extension => true
     optional ::GoogleUnittestImport::ImportEnum, :optional_import_enum_extension, 23, :extension => true
-    optional ::Protobuf::Field::StringField, :optional_string_piece_extension, 24, :extension => true
-    optional ::Protobuf::Field::StringField, :optional_cord_extension, 25, :extension => true
+    optional :string, :optional_string_piece_extension, 24, :extension => true
+    optional :string, :optional_cord_extension, 25, :extension => true
     optional ::GoogleUnittestImport::PublicImportMessage, :optional_public_import_message_extension, 26, :extension => true
     optional ::GoogleUnittest::TestAllTypes::NestedMessage, :optional_lazy_message_extension, 27, :extension => true
-    repeated ::Protobuf::Field::Int32Field, :repeated_int32_extension, 31, :extension => true
-    repeated ::Protobuf::Field::Int64Field, :repeated_int64_extension, 32, :extension => true
-    repeated ::Protobuf::Field::Uint32Field, :repeated_uint32_extension, 33, :extension => true
-    repeated ::Protobuf::Field::Uint64Field, :repeated_uint64_extension, 34, :extension => true
-    repeated ::Protobuf::Field::Sint32Field, :repeated_sint32_extension, 35, :extension => true
-    repeated ::Protobuf::Field::Sint64Field, :repeated_sint64_extension, 36, :extension => true
-    repeated ::Protobuf::Field::Fixed32Field, :repeated_fixed32_extension, 37, :extension => true
-    repeated ::Protobuf::Field::Fixed64Field, :repeated_fixed64_extension, 38, :extension => true
-    repeated ::Protobuf::Field::Sfixed32Field, :repeated_sfixed32_extension, 39, :extension => true
-    repeated ::Protobuf::Field::Sfixed64Field, :repeated_sfixed64_extension, 40, :extension => true
-    repeated ::Protobuf::Field::FloatField, :repeated_float_extension, 41, :extension => true
-    repeated ::Protobuf::Field::DoubleField, :repeated_double_extension, 42, :extension => true
-    repeated ::Protobuf::Field::BoolField, :repeated_bool_extension, 43, :extension => true
-    repeated ::Protobuf::Field::StringField, :repeated_string_extension, 44, :extension => true
-    repeated ::Protobuf::Field::BytesField, :repeated_bytes_extension, 45, :extension => true
+    repeated :int32, :repeated_int32_extension, 31, :extension => true
+    repeated :int64, :repeated_int64_extension, 32, :extension => true
+    repeated :uint32, :repeated_uint32_extension, 33, :extension => true
+    repeated :uint64, :repeated_uint64_extension, 34, :extension => true
+    repeated :sint32, :repeated_sint32_extension, 35, :extension => true
+    repeated :sint64, :repeated_sint64_extension, 36, :extension => true
+    repeated :fixed32, :repeated_fixed32_extension, 37, :extension => true
+    repeated :fixed64, :repeated_fixed64_extension, 38, :extension => true
+    repeated :sfixed32, :repeated_sfixed32_extension, 39, :extension => true
+    repeated :sfixed64, :repeated_sfixed64_extension, 40, :extension => true
+    repeated :float, :repeated_float_extension, 41, :extension => true
+    repeated :double, :repeated_double_extension, 42, :extension => true
+    repeated :bool, :repeated_bool_extension, 43, :extension => true
+    repeated :string, :repeated_string_extension, 44, :extension => true
+    repeated :bytes, :repeated_bytes_extension, 45, :extension => true
     repeated ::GoogleUnittest::TestAllTypes::NestedMessage, :repeated_nested_message_extension, 48, :extension => true
     repeated ::GoogleUnittest::ForeignMessage, :repeated_foreign_message_extension, 49, :extension => true
     repeated ::GoogleUnittestImport::ImportMessage, :repeated_import_message_extension, 50, :extension => true
     repeated ::GoogleUnittest::TestAllTypes::NestedEnum, :repeated_nested_enum_extension, 51, :extension => true
     repeated ::GoogleUnittest::ForeignEnum, :repeated_foreign_enum_extension, 52, :extension => true
     repeated ::GoogleUnittestImport::ImportEnum, :repeated_import_enum_extension, 53, :extension => true
-    repeated ::Protobuf::Field::StringField, :repeated_string_piece_extension, 54, :extension => true
-    repeated ::Protobuf::Field::StringField, :repeated_cord_extension, 55, :extension => true
+    repeated :string, :repeated_string_piece_extension, 54, :extension => true
+    repeated :string, :repeated_cord_extension, 55, :extension => true
     repeated ::GoogleUnittest::TestAllTypes::NestedMessage, :repeated_lazy_message_extension, 57, :extension => true
-    optional ::Protobuf::Field::Int32Field, :default_int32_extension, 61, :default => 41, :extension => true
-    optional ::Protobuf::Field::Int64Field, :default_int64_extension, 62, :default => 42, :extension => true
-    optional ::Protobuf::Field::Uint32Field, :default_uint32_extension, 63, :default => 43, :extension => true
-    optional ::Protobuf::Field::Uint64Field, :default_uint64_extension, 64, :default => 44, :extension => true
-    optional ::Protobuf::Field::Sint32Field, :default_sint32_extension, 65, :default => -45, :extension => true
-    optional ::Protobuf::Field::Sint64Field, :default_sint64_extension, 66, :default => 46, :extension => true
-    optional ::Protobuf::Field::Fixed32Field, :default_fixed32_extension, 67, :default => 47, :extension => true
-    optional ::Protobuf::Field::Fixed64Field, :default_fixed64_extension, 68, :default => 48, :extension => true
-    optional ::Protobuf::Field::Sfixed32Field, :default_sfixed32_extension, 69, :default => 49, :extension => true
-    optional ::Protobuf::Field::Sfixed64Field, :default_sfixed64_extension, 70, :default => -50, :extension => true
-    optional ::Protobuf::Field::FloatField, :default_float_extension, 71, :default => 51.5, :extension => true
-    optional ::Protobuf::Field::DoubleField, :default_double_extension, 72, :default => 52000, :extension => true
-    optional ::Protobuf::Field::BoolField, :default_bool_extension, 73, :default => true, :extension => true
-    optional ::Protobuf::Field::StringField, :default_string_extension, 74, :default => "hello", :extension => true
-    optional ::Protobuf::Field::BytesField, :default_bytes_extension, 75, :default => "world", :extension => true
+    optional :int32, :default_int32_extension, 61, :default => 41, :extension => true
+    optional :int64, :default_int64_extension, 62, :default => 42, :extension => true
+    optional :uint32, :default_uint32_extension, 63, :default => 43, :extension => true
+    optional :uint64, :default_uint64_extension, 64, :default => 44, :extension => true
+    optional :sint32, :default_sint32_extension, 65, :default => -45, :extension => true
+    optional :sint64, :default_sint64_extension, 66, :default => 46, :extension => true
+    optional :fixed32, :default_fixed32_extension, 67, :default => 47, :extension => true
+    optional :fixed64, :default_fixed64_extension, 68, :default => 48, :extension => true
+    optional :sfixed32, :default_sfixed32_extension, 69, :default => 49, :extension => true
+    optional :sfixed64, :default_sfixed64_extension, 70, :default => -50, :extension => true
+    optional :float, :default_float_extension, 71, :default => 51.5, :extension => true
+    optional :double, :default_double_extension, 72, :default => 52000, :extension => true
+    optional :bool, :default_bool_extension, 73, :default => true, :extension => true
+    optional :string, :default_string_extension, 74, :default => "hello", :extension => true
+    optional :bytes, :default_bytes_extension, 75, :default => "world", :extension => true
     optional ::GoogleUnittest::TestAllTypes::NestedEnum, :default_nested_enum_extension, 81, :default => ::GoogleUnittest::TestAllTypes::NestedEnum::BAR, :extension => true
     optional ::GoogleUnittest::ForeignEnum, :default_foreign_enum_extension, 82, :default => ::GoogleUnittest::ForeignEnum::FOREIGN_BAR, :extension => true
     optional ::GoogleUnittestImport::ImportEnum, :default_import_enum_extension, 83, :default => ::GoogleUnittestImport::ImportEnum::IMPORT_BAR, :extension => true
-    optional ::Protobuf::Field::StringField, :default_string_piece_extension, 84, :default => "abc", :extension => true
-    optional ::Protobuf::Field::StringField, :default_cord_extension, 85, :default => "123", :extension => true
-    optional ::Protobuf::Field::StringField, :test, 1002, :default => "test", :extension => true
+    optional :string, :default_string_piece_extension, 84, :default => "abc", :extension => true
+    optional :string, :default_cord_extension, 85, :default => "123", :extension => true
+    optional :string, :test, 1002, :default => "test", :extension => true
     optional ::GoogleUnittest::TestRequired, :single, 1000, :extension => true
     repeated ::GoogleUnittest::TestRequired, :multi, 1001, :extension => true
   end
 
   class TestRequired
-    required ::Protobuf::Field::Int32Field, :a, 1
-    optional ::Protobuf::Field::Int32Field, :dummy2, 2
-    required ::Protobuf::Field::Int32Field, :b, 3
-    optional ::Protobuf::Field::Int32Field, :dummy4, 4
-    optional ::Protobuf::Field::Int32Field, :dummy5, 5
-    optional ::Protobuf::Field::Int32Field, :dummy6, 6
-    optional ::Protobuf::Field::Int32Field, :dummy7, 7
-    optional ::Protobuf::Field::Int32Field, :dummy8, 8
-    optional ::Protobuf::Field::Int32Field, :dummy9, 9
-    optional ::Protobuf::Field::Int32Field, :dummy10, 10
-    optional ::Protobuf::Field::Int32Field, :dummy11, 11
-    optional ::Protobuf::Field::Int32Field, :dummy12, 12
-    optional ::Protobuf::Field::Int32Field, :dummy13, 13
-    optional ::Protobuf::Field::Int32Field, :dummy14, 14
-    optional ::Protobuf::Field::Int32Field, :dummy15, 15
-    optional ::Protobuf::Field::Int32Field, :dummy16, 16
-    optional ::Protobuf::Field::Int32Field, :dummy17, 17
-    optional ::Protobuf::Field::Int32Field, :dummy18, 18
-    optional ::Protobuf::Field::Int32Field, :dummy19, 19
-    optional ::Protobuf::Field::Int32Field, :dummy20, 20
-    optional ::Protobuf::Field::Int32Field, :dummy21, 21
-    optional ::Protobuf::Field::Int32Field, :dummy22, 22
-    optional ::Protobuf::Field::Int32Field, :dummy23, 23
-    optional ::Protobuf::Field::Int32Field, :dummy24, 24
-    optional ::Protobuf::Field::Int32Field, :dummy25, 25
-    optional ::Protobuf::Field::Int32Field, :dummy26, 26
-    optional ::Protobuf::Field::Int32Field, :dummy27, 27
-    optional ::Protobuf::Field::Int32Field, :dummy28, 28
-    optional ::Protobuf::Field::Int32Field, :dummy29, 29
-    optional ::Protobuf::Field::Int32Field, :dummy30, 30
-    optional ::Protobuf::Field::Int32Field, :dummy31, 31
-    optional ::Protobuf::Field::Int32Field, :dummy32, 32
-    required ::Protobuf::Field::Int32Field, :c, 33
+    required :int32, :a, 1
+    optional :int32, :dummy2, 2
+    required :int32, :b, 3
+    optional :int32, :dummy4, 4
+    optional :int32, :dummy5, 5
+    optional :int32, :dummy6, 6
+    optional :int32, :dummy7, 7
+    optional :int32, :dummy8, 8
+    optional :int32, :dummy9, 9
+    optional :int32, :dummy10, 10
+    optional :int32, :dummy11, 11
+    optional :int32, :dummy12, 12
+    optional :int32, :dummy13, 13
+    optional :int32, :dummy14, 14
+    optional :int32, :dummy15, 15
+    optional :int32, :dummy16, 16
+    optional :int32, :dummy17, 17
+    optional :int32, :dummy18, 18
+    optional :int32, :dummy19, 19
+    optional :int32, :dummy20, 20
+    optional :int32, :dummy21, 21
+    optional :int32, :dummy22, 22
+    optional :int32, :dummy23, 23
+    optional :int32, :dummy24, 24
+    optional :int32, :dummy25, 25
+    optional :int32, :dummy26, 26
+    optional :int32, :dummy27, 27
+    optional :int32, :dummy28, 28
+    optional :int32, :dummy29, 29
+    optional :int32, :dummy30, 30
+    optional :int32, :dummy31, 31
+    optional :int32, :dummy32, 32
+    required :int32, :c, 33
   end
 
   class TestRequiredForeign
     optional ::GoogleUnittest::TestRequired, :optional_message, 1
     repeated ::GoogleUnittest::TestRequired, :repeated_message, 2
-    optional ::Protobuf::Field::Int32Field, :dummy, 3
+    optional :int32, :dummy, 3
   end
 
   class TestForeignNested
@@ -318,13 +316,13 @@ module GoogleUnittest
   end
 
   class TestReallyLargeTagNumber
-    optional ::Protobuf::Field::Int32Field, :a, 1
-    optional ::Protobuf::Field::Int32Field, :bb, 268435455
+    optional :int32, :a, 1
+    optional :int32, :bb, 268435455
   end
 
   class TestRecursiveMessage
     optional ::GoogleUnittest::TestRecursiveMessage, :a, 1
-    optional ::Protobuf::Field::Int32Field, :i, 2
+    optional :int32, :i, 2
   end
 
   class TestMutualRecursionA
@@ -333,11 +331,11 @@ module GoogleUnittest
 
   class TestMutualRecursionB
     optional ::GoogleUnittest::TestMutualRecursionA, :a, 1
-    optional ::Protobuf::Field::Int32Field, :optional_int32, 2
+    optional :int32, :optional_int32, 2
   end
 
   class TestDupFieldNumber
-    optional ::Protobuf::Field::Int32Field, :a, 1
+    optional :int32, :a, 1
   end
 
   class TestEagerMessage
@@ -350,7 +348,7 @@ module GoogleUnittest
 
   class TestNestedMessageHasBits
     class NestedMessage
-      repeated ::Protobuf::Field::Int32Field, :nestedmessage_repeated_int32, 1
+      repeated :int32, :nestedmessage_repeated_int32, 1
       repeated ::GoogleUnittest::ForeignMessage, :nestedmessage_repeated_foreignmessage, 2
     end
 
@@ -358,58 +356,58 @@ module GoogleUnittest
   end
 
   class TestCamelCaseFieldNames
-    optional ::Protobuf::Field::Int32Field, :PrimitiveField, 1
-    optional ::Protobuf::Field::StringField, :StringField, 2
+    optional :int32, :PrimitiveField, 1
+    optional :string, :StringField, 2
     optional ::GoogleUnittest::ForeignEnum, :EnumField, 3
     optional ::GoogleUnittest::ForeignMessage, :MessageField, 4
-    optional ::Protobuf::Field::StringField, :StringPieceField, 5
-    optional ::Protobuf::Field::StringField, :CordField, 6
-    repeated ::Protobuf::Field::Int32Field, :RepeatedPrimitiveField, 7
-    repeated ::Protobuf::Field::StringField, :RepeatedStringField, 8
+    optional :string, :StringPieceField, 5
+    optional :string, :CordField, 6
+    repeated :int32, :RepeatedPrimitiveField, 7
+    repeated :string, :RepeatedStringField, 8
     repeated ::GoogleUnittest::ForeignEnum, :RepeatedEnumField, 9
     repeated ::GoogleUnittest::ForeignMessage, :RepeatedMessageField, 10
-    repeated ::Protobuf::Field::StringField, :RepeatedStringPieceField, 11
-    repeated ::Protobuf::Field::StringField, :RepeatedCordField, 12
+    repeated :string, :RepeatedStringPieceField, 11
+    repeated :string, :RepeatedCordField, 12
   end
 
   class TestFieldOrderings
-    optional ::Protobuf::Field::StringField, :my_string, 11
-    optional ::Protobuf::Field::Int64Field, :my_int, 1
-    optional ::Protobuf::Field::FloatField, :my_float, 101
+    optional :string, :my_string, 11
+    optional :int64, :my_int, 1
+    optional :float, :my_float, 101
     # Extension Fields
     extensions 2...11
     extensions 12...101
-    optional ::Protobuf::Field::StringField, :my_extension_string, 50, :extension => true
-    optional ::Protobuf::Field::Int32Field, :my_extension_int, 5, :extension => true
+    optional :string, :my_extension_string, 50, :extension => true
+    optional :int32, :my_extension_int, 5, :extension => true
   end
 
   class TestExtremeDefaultValues
-    optional ::Protobuf::Field::BytesField, :escaped_bytes, 1, :default => "\000\001\007\010\014\n\r\t\013\\\\'\"\376"
-    optional ::Protobuf::Field::Uint32Field, :large_uint32, 2, :default => 4294967295
-    optional ::Protobuf::Field::Uint64Field, :large_uint64, 3, :default => 18446744073709551615
-    optional ::Protobuf::Field::Int32Field, :small_int32, 4, :default => -2147483647
-    optional ::Protobuf::Field::Int64Field, :small_int64, 5, :default => -9223372036854775807
-    optional ::Protobuf::Field::Int32Field, :really_small_int32, 21, :default => -2147483648
-    optional ::Protobuf::Field::Int64Field, :really_small_int64, 22, :default => -9223372036854775808
-    optional ::Protobuf::Field::StringField, :utf8_string, 6, :default => "ሴ"
-    optional ::Protobuf::Field::FloatField, :zero_float, 7, :default => 0
-    optional ::Protobuf::Field::FloatField, :one_float, 8, :default => 1
-    optional ::Protobuf::Field::FloatField, :small_float, 9, :default => 1.5
-    optional ::Protobuf::Field::FloatField, :negative_one_float, 10, :default => -1
-    optional ::Protobuf::Field::FloatField, :negative_float, 11, :default => -1.5
-    optional ::Protobuf::Field::FloatField, :large_float, 12, :default => 2e+08
-    optional ::Protobuf::Field::FloatField, :small_negative_float, 13, :default => -8e-28
-    optional ::Protobuf::Field::DoubleField, :inf_double, 14, :default => ::Float::INFINITY
-    optional ::Protobuf::Field::DoubleField, :neg_inf_double, 15, :default => -::Float::INFINITY
-    optional ::Protobuf::Field::DoubleField, :nan_double, 16, :default => ::Float::NAN
-    optional ::Protobuf::Field::FloatField, :inf_float, 17, :default => ::Float::INFINITY
-    optional ::Protobuf::Field::FloatField, :neg_inf_float, 18, :default => -::Float::INFINITY
-    optional ::Protobuf::Field::FloatField, :nan_float, 19, :default => ::Float::NAN
-    optional ::Protobuf::Field::StringField, :cpp_trigraph, 20, :default => "? ? ?? ?? ??? ??/ ??-"
-    optional ::Protobuf::Field::StringField, :string_with_zero, 23, :default => "hello"
-    optional ::Protobuf::Field::BytesField, :bytes_with_zero, 24, :default => "wor\000ld"
-    optional ::Protobuf::Field::StringField, :string_piece_with_zero, 25, :default => "abc"
-    optional ::Protobuf::Field::StringField, :cord_with_zero, 26, :default => "123"
+    optional :bytes, :escaped_bytes, 1, :default => "\000\001\007\010\014\n\r\t\013\\\\'\"\376"
+    optional :uint32, :large_uint32, 2, :default => 4294967295
+    optional :uint64, :large_uint64, 3, :default => 18446744073709551615
+    optional :int32, :small_int32, 4, :default => -2147483647
+    optional :int64, :small_int64, 5, :default => -9223372036854775807
+    optional :int32, :really_small_int32, 21, :default => -2147483648
+    optional :int64, :really_small_int64, 22, :default => -9223372036854775808
+    optional :string, :utf8_string, 6, :default => "ሴ"
+    optional :float, :zero_float, 7, :default => 0
+    optional :float, :one_float, 8, :default => 1
+    optional :float, :small_float, 9, :default => 1.5
+    optional :float, :negative_one_float, 10, :default => -1
+    optional :float, :negative_float, 11, :default => -1.5
+    optional :float, :large_float, 12, :default => 2e+08
+    optional :float, :small_negative_float, 13, :default => -8e-28
+    optional :double, :inf_double, 14, :default => ::Float::INFINITY
+    optional :double, :neg_inf_double, 15, :default => -::Float::INFINITY
+    optional :double, :nan_double, 16, :default => ::Float::NAN
+    optional :float, :inf_float, 17, :default => ::Float::INFINITY
+    optional :float, :neg_inf_float, 18, :default => -::Float::INFINITY
+    optional :float, :nan_float, 19, :default => ::Float::NAN
+    optional :string, :cpp_trigraph, 20, :default => "? ? ?? ?? ??? ??/ ??-"
+    optional :string, :string_with_zero, 23, :default => "hello"
+    optional :bytes, :bytes_with_zero, 24, :default => "wor\000ld"
+    optional :string, :string_piece_with_zero, 25, :default => "abc"
+    optional :string, :cord_with_zero, 26, :default => "123"
   end
 
   class SparseEnumMessage
@@ -417,95 +415,95 @@ module GoogleUnittest
   end
 
   class OneString
-    optional ::Protobuf::Field::StringField, :data, 1
+    optional :string, :data, 1
   end
 
   class MoreString
-    repeated ::Protobuf::Field::StringField, :data, 1
+    repeated :string, :data, 1
   end
 
   class OneBytes
-    optional ::Protobuf::Field::BytesField, :data, 1
+    optional :bytes, :data, 1
   end
 
   class MoreBytes
-    repeated ::Protobuf::Field::BytesField, :data, 1
+    repeated :bytes, :data, 1
   end
 
   class TestPackedTypes
-    repeated ::Protobuf::Field::Int32Field, :packed_int32, 90, :packed => true
-    repeated ::Protobuf::Field::Int64Field, :packed_int64, 91, :packed => true
-    repeated ::Protobuf::Field::Uint32Field, :packed_uint32, 92, :packed => true
-    repeated ::Protobuf::Field::Uint64Field, :packed_uint64, 93, :packed => true
-    repeated ::Protobuf::Field::Sint32Field, :packed_sint32, 94, :packed => true
-    repeated ::Protobuf::Field::Sint64Field, :packed_sint64, 95, :packed => true
-    repeated ::Protobuf::Field::Fixed32Field, :packed_fixed32, 96, :packed => true
-    repeated ::Protobuf::Field::Fixed64Field, :packed_fixed64, 97, :packed => true
-    repeated ::Protobuf::Field::Sfixed32Field, :packed_sfixed32, 98, :packed => true
-    repeated ::Protobuf::Field::Sfixed64Field, :packed_sfixed64, 99, :packed => true
-    repeated ::Protobuf::Field::FloatField, :packed_float, 100, :packed => true
-    repeated ::Protobuf::Field::DoubleField, :packed_double, 101, :packed => true
-    repeated ::Protobuf::Field::BoolField, :packed_bool, 102, :packed => true
+    repeated :int32, :packed_int32, 90, :packed => true
+    repeated :int64, :packed_int64, 91, :packed => true
+    repeated :uint32, :packed_uint32, 92, :packed => true
+    repeated :uint64, :packed_uint64, 93, :packed => true
+    repeated :sint32, :packed_sint32, 94, :packed => true
+    repeated :sint64, :packed_sint64, 95, :packed => true
+    repeated :fixed32, :packed_fixed32, 96, :packed => true
+    repeated :fixed64, :packed_fixed64, 97, :packed => true
+    repeated :sfixed32, :packed_sfixed32, 98, :packed => true
+    repeated :sfixed64, :packed_sfixed64, 99, :packed => true
+    repeated :float, :packed_float, 100, :packed => true
+    repeated :double, :packed_double, 101, :packed => true
+    repeated :bool, :packed_bool, 102, :packed => true
     repeated ::GoogleUnittest::ForeignEnum, :packed_enum, 103, :packed => true
   end
 
   class TestUnpackedTypes
-    repeated ::Protobuf::Field::Int32Field, :unpacked_int32, 90
-    repeated ::Protobuf::Field::Int64Field, :unpacked_int64, 91
-    repeated ::Protobuf::Field::Uint32Field, :unpacked_uint32, 92
-    repeated ::Protobuf::Field::Uint64Field, :unpacked_uint64, 93
-    repeated ::Protobuf::Field::Sint32Field, :unpacked_sint32, 94
-    repeated ::Protobuf::Field::Sint64Field, :unpacked_sint64, 95
-    repeated ::Protobuf::Field::Fixed32Field, :unpacked_fixed32, 96
-    repeated ::Protobuf::Field::Fixed64Field, :unpacked_fixed64, 97
-    repeated ::Protobuf::Field::Sfixed32Field, :unpacked_sfixed32, 98
-    repeated ::Protobuf::Field::Sfixed64Field, :unpacked_sfixed64, 99
-    repeated ::Protobuf::Field::FloatField, :unpacked_float, 100
-    repeated ::Protobuf::Field::DoubleField, :unpacked_double, 101
-    repeated ::Protobuf::Field::BoolField, :unpacked_bool, 102
+    repeated :int32, :unpacked_int32, 90
+    repeated :int64, :unpacked_int64, 91
+    repeated :uint32, :unpacked_uint32, 92
+    repeated :uint64, :unpacked_uint64, 93
+    repeated :sint32, :unpacked_sint32, 94
+    repeated :sint64, :unpacked_sint64, 95
+    repeated :fixed32, :unpacked_fixed32, 96
+    repeated :fixed64, :unpacked_fixed64, 97
+    repeated :sfixed32, :unpacked_sfixed32, 98
+    repeated :sfixed64, :unpacked_sfixed64, 99
+    repeated :float, :unpacked_float, 100
+    repeated :double, :unpacked_double, 101
+    repeated :bool, :unpacked_bool, 102
     repeated ::GoogleUnittest::ForeignEnum, :unpacked_enum, 103
   end
 
   class TestPackedExtensions
     # Extension Fields
     extensions 1...536870912
-    repeated ::Protobuf::Field::Int32Field, :packed_int32_extension, 90, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Int64Field, :packed_int64_extension, 91, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Uint32Field, :packed_uint32_extension, 92, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Uint64Field, :packed_uint64_extension, 93, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Sint32Field, :packed_sint32_extension, 94, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Sint64Field, :packed_sint64_extension, 95, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Fixed32Field, :packed_fixed32_extension, 96, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Fixed64Field, :packed_fixed64_extension, 97, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Sfixed32Field, :packed_sfixed32_extension, 98, :packed => true, :extension => true
-    repeated ::Protobuf::Field::Sfixed64Field, :packed_sfixed64_extension, 99, :packed => true, :extension => true
-    repeated ::Protobuf::Field::FloatField, :packed_float_extension, 100, :packed => true, :extension => true
-    repeated ::Protobuf::Field::DoubleField, :packed_double_extension, 101, :packed => true, :extension => true
-    repeated ::Protobuf::Field::BoolField, :packed_bool_extension, 102, :packed => true, :extension => true
+    repeated :int32, :packed_int32_extension, 90, :packed => true, :extension => true
+    repeated :int64, :packed_int64_extension, 91, :packed => true, :extension => true
+    repeated :uint32, :packed_uint32_extension, 92, :packed => true, :extension => true
+    repeated :uint64, :packed_uint64_extension, 93, :packed => true, :extension => true
+    repeated :sint32, :packed_sint32_extension, 94, :packed => true, :extension => true
+    repeated :sint64, :packed_sint64_extension, 95, :packed => true, :extension => true
+    repeated :fixed32, :packed_fixed32_extension, 96, :packed => true, :extension => true
+    repeated :fixed64, :packed_fixed64_extension, 97, :packed => true, :extension => true
+    repeated :sfixed32, :packed_sfixed32_extension, 98, :packed => true, :extension => true
+    repeated :sfixed64, :packed_sfixed64_extension, 99, :packed => true, :extension => true
+    repeated :float, :packed_float_extension, 100, :packed => true, :extension => true
+    repeated :double, :packed_double_extension, 101, :packed => true, :extension => true
+    repeated :bool, :packed_bool_extension, 102, :packed => true, :extension => true
     repeated ::GoogleUnittest::ForeignEnum, :packed_enum_extension, 103, :packed => true, :extension => true
   end
 
   class TestDynamicExtensions
     class DynamicMessageType
-      optional ::Protobuf::Field::Int32Field, :dynamic_field, 2100
+      optional :int32, :dynamic_field, 2100
     end
 
-    optional ::Protobuf::Field::Fixed32Field, :scalar_extension, 2000
+    optional :fixed32, :scalar_extension, 2000
     optional ::GoogleUnittest::ForeignEnum, :enum_extension, 2001
     optional ::GoogleUnittest::TestDynamicExtensions::DynamicEnumType, :dynamic_enum_extension, 2002
     optional ::GoogleUnittest::ForeignMessage, :message_extension, 2003
     optional ::GoogleUnittest::TestDynamicExtensions::DynamicMessageType, :dynamic_message_extension, 2004
-    repeated ::Protobuf::Field::StringField, :repeated_extension, 2005
-    repeated ::Protobuf::Field::Sint32Field, :packed_extension, 2006, :packed => true
+    repeated :string, :repeated_extension, 2005
+    repeated :sint32, :packed_extension, 2006, :packed => true
   end
 
   class TestRepeatedScalarDifferentTagSizes
-    repeated ::Protobuf::Field::Fixed32Field, :repeated_fixed32, 12
-    repeated ::Protobuf::Field::Int32Field, :repeated_int32, 13
-    repeated ::Protobuf::Field::Fixed64Field, :repeated_fixed64, 2046
-    repeated ::Protobuf::Field::Int64Field, :repeated_int64, 2047
-    repeated ::Protobuf::Field::FloatField, :repeated_float, 262142
-    repeated ::Protobuf::Field::Uint64Field, :repeated_uint64, 262143
+    repeated :fixed32, :repeated_fixed32, 12
+    repeated :int32, :repeated_int32, 13
+    repeated :fixed64, :repeated_fixed64, 2046
+    repeated :int64, :repeated_int64, 2047
+    repeated :float, :repeated_float, 262142
+    repeated :uint64, :repeated_uint64, 262143
   end
 
   class TestParsingMerge
@@ -527,7 +525,7 @@ module GoogleUnittest
   end
 
   class TestCommentInjectionMessage
-    optional ::Protobuf::Field::StringField, :a, 1, :default => "*/ <- Neither should this."
+    optional :string, :a, 1, :default => "*/ <- Neither should this."
   end