diff --git a/desc/protoparse/proto.y b/desc/protoparse/proto.y index 14f5396b..2548ed2a 100644 --- a/desc/protoparse/proto.y +++ b/desc/protoparse/proto.y @@ -357,7 +357,7 @@ aggField : aggName ':' scalarConstant { $$ = []*aggregateEntryNode{a} } -aggName : _NAME { +aggName : name { $$ = &aggregateNameNode{name: $1} $$.setRange($1, $1) } diff --git a/desc/protoparse/proto.y.go b/desc/protoparse/proto.y.go index cde98ca7..3983d7b8 100644 --- a/desc/protoparse/proto.y.go +++ b/desc/protoparse/proto.y.go @@ -204,54 +204,55 @@ var protoExca = [...]int{ const protoPrivate = 57344 -const protoLast = 1545 +const protoLast = 1909 var protoAct = [...]int{ - 118, 8, 268, 8, 8, 361, 250, 79, 126, 111, - 251, 257, 178, 110, 98, 28, 97, 100, 101, 154, - 117, 147, 8, 27, 74, 136, 153, 164, 78, 96, - 112, 177, 142, 76, 77, 286, 81, 252, 286, 156, - 286, 286, 156, 364, 241, 286, 353, 354, 339, 337, - 286, 286, 156, 335, 73, 156, 286, 298, 328, 317, - 286, 209, 355, 156, 316, 297, 342, 156, 287, 211, - 307, 304, 301, 284, 266, 264, 210, 352, 295, 277, - 105, 343, 109, 309, 88, 308, 305, 302, 285, 267, - 265, 137, 333, 148, 195, 346, 234, 195, 321, 315, - 201, 157, 181, 103, 157, 262, 140, 195, 300, 306, - 195, 276, 144, 193, 157, 228, 227, 157, 195, 166, - 169, 303, 143, 229, 211, 157, 196, 104, 356, 157, - 357, 367, 170, 172, 174, 198, 137, 16, 78, 74, - 232, 233, 176, 77, 76, 213, 16, 148, 180, 92, - 91, 140, 90, 89, 358, 349, 348, 347, 341, 4, - 14, 186, 144, 15, 16, 199, 182, 192, 191, 73, - 197, 167, 143, 194, 189, 332, 363, 16, 331, 365, - 151, 312, 152, 95, 94, 150, 202, 203, 204, 205, - 206, 207, 93, 200, 18, 17, 19, 20, 14, 86, - 83, 15, 16, 13, 344, 230, 231, 314, 16, 288, - 242, 238, 103, 236, 258, 235, 363, 248, 74, 247, - 246, 245, 261, 244, 253, 240, 243, 208, 187, 87, - 23, 318, 18, 17, 19, 20, 212, 351, 254, 329, - 5, 13, 151, 270, 22, 161, 162, 150, 115, 11, - 190, 11, 11, 103, 283, 24, 263, 258, 163, 85, - 194, 282, 22, 25, 26, 261, 275, 273, 290, 281, - 11, 292, 293, 74, 294, 74, 255, 291, 296, 215, - 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, - 226, 280, 310, 74, 74, 194, 279, 311, 278, 113, - 10, 299, 10, 10, 103, 184, 179, 161, 158, 322, - 74, 179, 324, 74, 103, 326, 74, 323, 313, 194, - 325, 10, 249, 327, 84, 82, 114, 9, 319, 9, - 9, 330, 149, 169, 146, 169, 345, 169, 3, 158, - 159, 21, 270, 12, 141, 138, 135, 334, 9, 116, - 350, 74, 160, 121, 194, 183, 256, 120, 362, 119, - 259, 362, 359, 74, 272, 102, 366, 99, 105, 108, - 30, 155, 214, 31, 32, 33, 34, 35, 36, 37, + 118, 8, 268, 8, 8, 361, 250, 79, 154, 111, + 251, 153, 257, 110, 178, 98, 97, 100, 101, 164, + 147, 142, 8, 27, 74, 28, 117, 112, 136, 286, + 96, 177, 286, 286, 286, 241, 352, 364, 252, 286, + 353, 339, 337, 76, 77, 286, 81, 335, 126, 286, + 286, 298, 286, 328, 209, 73, 354, 317, 316, 297, + 287, 342, 211, 307, 304, 301, 284, 266, 78, 210, + 264, 355, 295, 277, 105, 333, 343, 315, 308, 305, + 302, 285, 267, 109, 234, 265, 201, 196, 104, 181, + 228, 137, 227, 148, 166, 262, 198, 356, 229, 357, + 211, 309, 306, 303, 213, 4, 14, 92, 91, 15, + 16, 16, 90, 103, 89, 367, 140, 16, 144, 143, + 169, 16, 358, 344, 88, 349, 348, 347, 341, 332, + 156, 331, 312, 152, 232, 233, 137, 95, 94, 74, + 18, 17, 19, 20, 16, 151, 167, 148, 93, 13, + 150, 151, 176, 77, 76, 86, 150, 83, 180, 190, + 363, 140, 194, 189, 186, 199, 182, 191, 144, 143, + 73, 197, 170, 172, 174, 314, 288, 192, 78, 156, + 248, 247, 254, 363, 246, 200, 365, 245, 244, 243, + 208, 187, 87, 23, 318, 212, 202, 203, 204, 205, + 206, 207, 351, 5, 235, 230, 231, 22, 24, 263, + 240, 329, 238, 236, 258, 283, 25, 26, 74, 282, + 255, 156, 103, 281, 156, 22, 253, 215, 216, 217, + 218, 219, 220, 221, 222, 223, 224, 225, 226, 161, + 162, 280, 14, 158, 159, 15, 16, 184, 179, 194, + 242, 275, 163, 279, 278, 161, 160, 258, 158, 179, + 249, 85, 261, 103, 84, 156, 156, 82, 273, 290, + 149, 146, 293, 74, 294, 74, 18, 17, 19, 20, + 12, 141, 138, 270, 194, 13, 299, 291, 3, 135, + 116, 21, 310, 74, 74, 121, 183, 311, 256, 120, + 156, 156, 119, 259, 272, 261, 102, 155, 194, 322, + 74, 292, 324, 74, 103, 326, 74, 323, 296, 313, + 325, 214, 165, 327, 103, 156, 360, 115, 11, 319, + 11, 11, 334, 169, 7, 169, 345, 169, 6, 2, + 1, 330, 0, 194, 0, 0, 156, 0, 0, 11, + 350, 74, 113, 10, 0, 10, 10, 0, 362, 0, + 156, 362, 359, 74, 0, 0, 366, 0, 0, 0, + 0, 0, 0, 0, 10, 0, 0, 99, 105, 108, + 30, 0, 270, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 165, 360, 7, 6, 104, - 2, 1, 0, 0, 0, 0, 0, 274, 106, 107, - 0, 0, 0, 271, 99, 105, 108, 30, 0, 0, + 68, 69, 70, 71, 72, 0, 0, 114, 9, 104, + 9, 9, 0, 0, 0, 0, 0, 274, 106, 107, + 0, 0, 0, 271, 99, 105, 108, 30, 0, 9, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, @@ -264,154 +265,189 @@ var protoAct = [...]int{ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, - 320, 106, 107, 99, 105, 108, 30, 0, 0, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 0, 0, 0, 0, 104, 0, 0, 0, 0, - 0, 0, 0, 0, 106, 107, 30, 29, 0, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 75, 30, 29, 80, - 31, 32, 33, 34, 35, 131, 37, 38, 39, 40, - 125, 124, 123, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 132, - 133, 130, 63, 64, 134, 127, 128, 129, 69, 70, - 71, 72, 0, 0, 122, 0, 0, 340, 30, 29, - 80, 31, 32, 33, 34, 35, 131, 37, 38, 39, - 40, 125, 124, 123, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 132, 133, 130, 63, 64, 134, 127, 128, 129, 69, - 70, 71, 72, 0, 0, 122, 0, 0, 338, 30, - 29, 80, 31, 32, 33, 34, 35, 131, 37, 38, - 39, 40, 125, 124, 123, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 132, 133, 130, 63, 64, 134, 127, 128, 129, - 69, 70, 71, 72, 0, 0, 122, 0, 0, 336, - 30, 29, 80, 31, 32, 33, 34, 35, 131, 37, + 320, 106, 107, 30, 0, 0, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 195, 346, + 0, 0, 0, 30, 0, 157, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 195, 321, + 99, 105, 108, 30, 0, 157, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 0, 0, + 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, + 30, 106, 107, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 0, 0, 260, 0, 0, - 289, 30, 29, 80, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 125, 124, 123, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 0, 0, 145, 0, - 0, 188, 30, 29, 80, 31, 32, 33, 34, 35, - 131, 37, 38, 39, 40, 125, 124, 123, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 132, 133, 130, 63, 64, 134, - 127, 128, 129, 69, 70, 71, 72, 0, 0, 122, - 30, 0, 168, 31, 32, 33, 34, 35, 131, 37, + 68, 69, 70, 71, 72, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 195, 300, 0, 0, 0, + 30, 0, 157, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 0, 0, 139, 0, 0, - 185, 30, 29, 80, 31, 32, 33, 34, 35, 131, - 37, 38, 39, 40, 125, 124, 123, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 132, 133, 130, 63, 64, 134, 127, - 128, 129, 69, 70, 71, 72, 0, 0, 122, 30, - 29, 80, 31, 32, 33, 34, 35, 131, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 0, 0, 260, 30, 29, 80, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 125, 124, 123, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, - 71, 72, 30, 0, 145, 31, 32, 33, 34, 35, - 131, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 0, 0, 139, - 30, 29, 80, 31, 32, 33, 34, 35, 36, 37, + 68, 69, 70, 71, 72, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 195, 276, 0, 0, 0, + 30, 0, 157, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 269, 72, 30, 29, 80, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 30, 29, 80, 31, 32, 33, 34, 35, 36, 37, + 68, 69, 70, 71, 72, 0, 0, 0, 0, 0, + 193, 0, 0, 0, 0, 195, 0, 0, 0, 0, + 30, 0, 157, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 175, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 30, 29, 80, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 173, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 30, 29, 80, 31, 32, 33, 34, 35, 36, 37, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 30, 29, 157, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 171, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 30, 29, 0, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 75, 30, 29, 80, 31, 32, 33, 34, 35, 131, + 37, 38, 39, 40, 125, 124, 123, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 132, 133, 130, 63, 64, 134, 127, + 128, 129, 69, 70, 71, 72, 0, 0, 122, 0, + 0, 340, 30, 29, 80, 31, 32, 33, 34, 35, + 131, 37, 38, 39, 40, 125, 124, 123, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 132, 133, 130, 63, 64, 134, + 127, 128, 129, 69, 70, 71, 72, 0, 0, 122, + 0, 0, 338, 30, 29, 80, 31, 32, 33, 34, + 35, 131, 37, 38, 39, 40, 125, 124, 123, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 132, 133, 130, 63, 64, + 134, 127, 128, 129, 69, 70, 71, 72, 0, 0, + 122, 0, 0, 336, 30, 29, 80, 31, 32, 33, + 34, 35, 131, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 0, + 0, 260, 0, 0, 289, 30, 29, 80, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 125, 124, + 123, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 30, 0, 0, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, + 0, 0, 145, 0, 0, 188, 30, 29, 80, 31, + 32, 33, 34, 35, 131, 37, 38, 39, 40, 125, + 124, 123, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 132, 133, + 130, 63, 64, 134, 127, 128, 129, 69, 70, 71, + 72, 0, 0, 122, 30, 0, 168, 31, 32, 33, + 34, 35, 131, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 0, + 0, 139, 0, 0, 185, 30, 29, 80, 31, 32, + 33, 34, 35, 131, 37, 38, 39, 40, 125, 124, + 123, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 132, 133, 130, + 63, 64, 134, 127, 128, 129, 69, 70, 71, 72, + 0, 0, 122, 30, 29, 80, 31, 32, 33, 34, + 35, 131, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 0, 0, + 260, 30, 29, 80, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 125, 124, 123, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 30, 0, 145, 31, + 32, 33, 34, 35, 131, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 0, 0, 139, 30, 29, 80, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 269, 72, 30, + 29, 80, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 30, 29, 80, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 175, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 30, + 29, 80, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 173, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 30, 29, 80, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 171, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 30, + 29, 0, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 30, 0, 0, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, } var protoPact = [...]int{ - 149, -1000, 187, 187, 177, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, 251, 1448, 619, 1493, 1493, 1268, - 1493, 187, -1000, 321, 146, 320, 255, 145, -1000, -1000, + 95, -1000, 231, 231, 140, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, 204, 1812, 983, 1857, 1857, 1632, + 1857, 231, -1000, 263, 103, 260, 257, 101, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, 176, -1000, 1268, 97, 96, 94, -1000, - -1000, 93, 138, -1000, 130, 129, -1000, 559, 14, 1034, - 1175, 1130, 131, -1000, -1000, -1000, 128, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, 60, -1000, 334, 240, -1000, 110, - 935, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, 1403, 1358, 1313, 1493, 1493, 1493, 1268, - 306, 619, 1493, 38, 301, 983, -1000, -1000, -1000, -1000, - 175, 884, -1000, -1000, -1000, -1000, 193, -1000, -1000, -1000, - -1000, 1493, -1000, 56, -1000, 71, -1000, 1448, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 110, -1000, 33, -1000, -1000, - 1493, 1493, 1493, 1493, 1493, 1493, 174, 7, -1000, 194, - 89, 254, 62, 61, -1000, -1000, -1000, 75, -1000, -1000, - -1000, -1000, 29, -1000, -1000, 60, 430, -1000, 60, -26, - -1000, 1268, 173, 170, 168, 167, 166, 164, 317, -1000, - 619, 306, 233, 1082, 43, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 252, - 21, 20, 303, 302, 1223, -1000, -1000, 363, -1000, 60, - 48, -1000, 11, 293, 291, 286, 264, 256, 249, 19, - -2, -1000, 156, -1000, -1000, -1000, 833, -1000, -1000, -1000, - -1000, 1493, 1268, -1000, -1000, 619, -1000, 619, 10, 1268, - -1000, -1000, -5, -1000, 60, 45, -1000, -1000, 18, 65, - 17, 53, 16, 27, -1000, 619, 619, 127, 559, -1000, - -1000, 154, 36, -6, -11, 180, -1000, -1000, 496, 35, - -1000, -1000, 619, 1034, -1000, 619, 1034, -1000, 619, 1034, - -12, -1000, -1000, -1000, 234, 1493, 124, 121, 25, -1000, - 60, -1000, -17, 782, -21, 731, -22, 680, 104, 12, - 151, -1000, -1000, 1223, 32, 103, -1000, 102, -1000, 101, - -1000, -1000, -1000, 619, 232, 9, -1000, -1000, -1000, -1000, - -24, -7, 74, 100, -1000, 619, -1000, 162, -1000, -27, - 122, -1000, -1000, -1000, 77, -1000, -1000, -1000, + -1000, -1000, -1000, 139, -1000, 1632, 58, 56, 52, -1000, + -1000, 51, 94, -1000, 84, 83, -1000, 686, 15, 1398, + 1539, 1494, 96, -1000, -1000, -1000, 79, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, 923, -1000, 238, 234, -1000, 85, + 1299, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, 1767, 1722, 1677, 1857, 1857, 1857, 1632, + 254, 983, 1857, 25, 243, 1347, -1000, -1000, -1000, -1000, + 138, 1248, -1000, -1000, -1000, -1000, 102, -1000, -1000, -1000, + -1000, 1857, -1000, 863, -1000, 32, -1000, 1812, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 85, -1000, 19, -1000, -1000, + 1857, 1857, 1857, 1857, 1857, 1857, 137, 0, -1000, 153, + 48, 202, 38, 36, -1000, -1000, -1000, 69, -1000, -1000, + -1000, -1000, 17, -1000, -1000, 923, 440, -1000, 923, -35, + -1000, 1632, 136, 135, 134, 131, 128, 127, 255, -1000, + 983, 254, 177, 1446, 33, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 205, + 16, 13, 253, 250, 1587, -1000, -1000, 373, -1000, 923, + 803, -1000, 5, 249, 248, 236, 218, 214, 210, 12, + -10, -1000, 123, -1000, -1000, -1000, 1197, -1000, -1000, -1000, + -1000, 1857, 1632, -1000, -1000, 983, -1000, 983, 4, 1632, + -1000, -1000, -11, -1000, 923, 743, -1000, -1000, 11, 47, + 10, 46, 9, 45, -1000, 983, 983, 78, 686, -1000, + -1000, 122, 14, -12, -13, 143, -1000, -1000, 506, 626, + -1000, -1000, 983, 1398, -1000, 983, 1398, -1000, 983, 1398, + -17, -1000, -1000, -1000, 206, 1857, 77, 75, 8, -1000, + 923, -1000, -23, 1146, -28, 1095, -29, 1044, 74, 7, + 70, -1000, -1000, 1587, 566, 73, -1000, 72, -1000, 71, + -1000, -1000, -1000, 983, 197, -32, -1000, -1000, -1000, -1000, + -30, 2, 43, 68, -1000, 983, -1000, 106, -1000, -33, + 129, -1000, -1000, -1000, 61, -1000, -1000, -1000, } var protoPgo = [...]int{ - 0, 421, 420, 240, 338, 418, 417, 0, 10, 6, - 5, 416, 37, 27, 415, 29, 16, 14, 15, 7, - 8, 372, 371, 18, 17, 365, 364, 26, 19, 30, - 360, 359, 20, 357, 326, 9, 13, 11, 356, 355, - 353, 12, 31, 349, 299, 25, 346, 345, 248, 32, - 344, 343, 21, 334, 332, 2, + 0, 340, 339, 203, 288, 338, 334, 0, 10, 6, + 5, 326, 38, 19, 322, 30, 16, 15, 25, 7, + 48, 321, 307, 18, 17, 306, 304, 11, 8, 27, + 303, 302, 26, 299, 427, 9, 13, 12, 298, 296, + 295, 14, 31, 290, 352, 28, 289, 282, 327, 21, + 281, 280, 20, 271, 270, 2, } var protoR1 = [...]int{ @@ -478,7 +514,7 @@ var protoChk = [...]int{ -33, -40, 54, 22, 21, 20, -20, 45, 46, 47, 41, 15, 39, 40, 44, -46, -45, -7, -47, 54, -18, -50, -49, -29, -32, 54, -53, -52, -7, -54, - 54, 49, 54, -27, -28, -22, 7, 69, 5, 6, + 54, 49, 54, -27, -28, -22, -18, 69, 5, 6, 18, 5, 6, 18, -13, -14, 9, 61, 57, -35, -20, 38, -20, 38, -20, 38, -18, -42, -41, 5, -18, 64, -42, -39, 4, 57, -45, 53, 57, -49, diff --git a/desc/protoprint/testfiles/desc_test_complex_source_info-default.proto b/desc/protoprint/testfiles/desc_test_complex_source_info-default.proto index dac94782..7eaee81e 100644 --- a/desc/protoprint/testfiles/desc_test_complex_source_info-default.proto +++ b/desc/protoprint/testfiles/desc_test_complex_source_info-default.proto @@ -127,3 +127,157 @@ service TestTestService { option (foo.bar.validator) = { authenticated:true permission: }; } } + +// tests cases where field names collide with keywords + +message KeywordCollisions { + optional bool syntax = 1; + + optional bool import = 2; + + optional bool public = 3; + + optional bool weak = 4; + + optional bool package = 5; + + optional string string = 6; + + optional bytes bytes = 7; + + optional int32 int32 = 8; + + optional int64 int64 = 9; + + optional uint32 uint32 = 10; + + optional uint64 uint64 = 11; + + optional sint32 sint32 = 12; + + optional sint64 sint64 = 13; + + optional fixed32 fixed32 = 14; + + optional fixed64 fixed64 = 15; + + optional sfixed32 sfixed32 = 16; + + optional sfixed64 sfixed64 = 17; + + optional bool bool = 18; + + optional float float = 19; + + optional double double = 20; + + optional bool optional = 21; + + optional bool repeated = 22; + + optional bool required = 23; + + optional bool message = 24; + + optional bool enum = 25; + + optional bool service = 26; + + optional bool rpc = 27; + + optional bool option = 28; + + optional bool extend = 29; + + optional bool extensions = 30; + + optional bool reserved = 31; + + optional bool to = 32; + + optional int32 true = 33; + + optional int32 false = 34; + + optional int32 default = 35; +} + +extend google.protobuf.FieldOptions { + optional bool syntax = 20001; + + optional bool import = 20002; + + optional bool public = 20003; + + optional bool weak = 20004; + + optional bool package = 20005; + + optional string string = 20006; + + optional bytes bytes = 20007; + + optional int32 int32 = 20008; + + optional int64 int64 = 20009; + + optional uint32 uint32 = 20010; + + optional uint64 uint64 = 20011; + + optional sint32 sint32 = 20012; + + optional sint64 sint64 = 20013; + + optional fixed32 fixed32 = 20014; + + optional fixed64 fixed64 = 20015; + + optional sfixed32 sfixed32 = 20016; + + optional sfixed64 sfixed64 = 20017; + + optional bool bool = 20018; + + optional float float = 20019; + + optional double double = 20020; + + optional bool optional = 20021; + + optional bool repeated = 20022; + + optional bool required = 20023; + + optional bool message = 20024; + + optional bool enum = 20025; + + optional bool service = 20026; + + optional bool rpc = 20027; + + optional bool option = 20028; + + optional bool extend = 20029; + + optional bool extensions = 20030; + + optional bool reserved = 20031; + + optional bool to = 20032; + + optional int32 true = 20033; + + optional int32 false = 20034; + + optional int32 default = 20035; + + optional KeywordCollisions boom = 20036; +} + +message KeywordCollisionOptions { + optional uint64 id = 1 [(foo.bar.bool) = true, (foo.bar.bytes) = "bytes", (foo.bar.default) = 222, (foo.bar.double) = 3.141590, (foo.bar.enum) = true, (foo.bar.extend) = true, (foo.bar.extensions) = true, (foo.bar.false) = -111, (foo.bar.fixed32) = 3232, (foo.bar.fixed64) = 6464, (foo.bar.float) = 3.140000, (foo.bar.import) = true, (foo.bar.int32) = 32, (foo.bar.int64) = 64, (foo.bar.message) = true, (foo.bar.option) = true, (foo.bar.optional) = true, (foo.bar.package) = true, (foo.bar.public) = true, (foo.bar.repeated) = true, (foo.bar.required) = true, (foo.bar.reserved) = true, (foo.bar.rpc) = true, (foo.bar.service) = true, (foo.bar.sfixed32) = -3232, (foo.bar.sfixed64) = -6464, (foo.bar.sint32) = -32, (foo.bar.sint64) = -64, (foo.bar.string) = "string", (foo.bar.syntax) = true, (foo.bar.to) = true, (foo.bar.true) = 111, (foo.bar.uint32) = 3200, (foo.bar.uint64) = 6400, (foo.bar.weak) = true]; + + optional string name = 2 [(foo.bar.boom) = { syntax:true import:true public:true weak:true package:true string:"string" bytes:"bytes" int32:32 int64:64 uint32:3200 uint64:6400 sint32:-32 sint64:-64 fixed32:3232 fixed64:6464 sfixed32:-3232 sfixed64:-6464 bool:true float:3.14 double:3.14159 optional:true repeated:true required:true message:true enum:true service:true rpc:true option:true extend:true extensions:true reserved:true to:true true:111 false:-111 default:222 }]; +} diff --git a/desc/protoprint/testfiles/desc_test_complex_source_info-multiline-style-comments.proto b/desc/protoprint/testfiles/desc_test_complex_source_info-multiline-style-comments.proto index c0709fab..66eaa1f1 100644 --- a/desc/protoprint/testfiles/desc_test_complex_source_info-multiline-style-comments.proto +++ b/desc/protoprint/testfiles/desc_test_complex_source_info-multiline-style-comments.proto @@ -127,3 +127,157 @@ service TestTestService { option (foo.bar.validator) = { authenticated:true permission: }; } } + +/* tests cases where field names collide with keywords */ + +message KeywordCollisions { + optional bool syntax = 1; + + optional bool import = 2; + + optional bool public = 3; + + optional bool weak = 4; + + optional bool package = 5; + + optional string string = 6; + + optional bytes bytes = 7; + + optional int32 int32 = 8; + + optional int64 int64 = 9; + + optional uint32 uint32 = 10; + + optional uint64 uint64 = 11; + + optional sint32 sint32 = 12; + + optional sint64 sint64 = 13; + + optional fixed32 fixed32 = 14; + + optional fixed64 fixed64 = 15; + + optional sfixed32 sfixed32 = 16; + + optional sfixed64 sfixed64 = 17; + + optional bool bool = 18; + + optional float float = 19; + + optional double double = 20; + + optional bool optional = 21; + + optional bool repeated = 22; + + optional bool required = 23; + + optional bool message = 24; + + optional bool enum = 25; + + optional bool service = 26; + + optional bool rpc = 27; + + optional bool option = 28; + + optional bool extend = 29; + + optional bool extensions = 30; + + optional bool reserved = 31; + + optional bool to = 32; + + optional int32 true = 33; + + optional int32 false = 34; + + optional int32 default = 35; +} + +extend google.protobuf.FieldOptions { + optional bool syntax = 20001; + + optional bool import = 20002; + + optional bool public = 20003; + + optional bool weak = 20004; + + optional bool package = 20005; + + optional string string = 20006; + + optional bytes bytes = 20007; + + optional int32 int32 = 20008; + + optional int64 int64 = 20009; + + optional uint32 uint32 = 20010; + + optional uint64 uint64 = 20011; + + optional sint32 sint32 = 20012; + + optional sint64 sint64 = 20013; + + optional fixed32 fixed32 = 20014; + + optional fixed64 fixed64 = 20015; + + optional sfixed32 sfixed32 = 20016; + + optional sfixed64 sfixed64 = 20017; + + optional bool bool = 20018; + + optional float float = 20019; + + optional double double = 20020; + + optional bool optional = 20021; + + optional bool repeated = 20022; + + optional bool required = 20023; + + optional bool message = 20024; + + optional bool enum = 20025; + + optional bool service = 20026; + + optional bool rpc = 20027; + + optional bool option = 20028; + + optional bool extend = 20029; + + optional bool extensions = 20030; + + optional bool reserved = 20031; + + optional bool to = 20032; + + optional int32 true = 20033; + + optional int32 false = 20034; + + optional int32 default = 20035; + + optional KeywordCollisions boom = 20036; +} + +message KeywordCollisionOptions { + optional uint64 id = 1 [(foo.bar.bool) = true, (foo.bar.bytes) = "bytes", (foo.bar.default) = 222, (foo.bar.double) = 3.141590, (foo.bar.enum) = true, (foo.bar.extend) = true, (foo.bar.extensions) = true, (foo.bar.false) = -111, (foo.bar.fixed32) = 3232, (foo.bar.fixed64) = 6464, (foo.bar.float) = 3.140000, (foo.bar.import) = true, (foo.bar.int32) = 32, (foo.bar.int64) = 64, (foo.bar.message) = true, (foo.bar.option) = true, (foo.bar.optional) = true, (foo.bar.package) = true, (foo.bar.public) = true, (foo.bar.repeated) = true, (foo.bar.required) = true, (foo.bar.reserved) = true, (foo.bar.rpc) = true, (foo.bar.service) = true, (foo.bar.sfixed32) = -3232, (foo.bar.sfixed64) = -6464, (foo.bar.sint32) = -32, (foo.bar.sint64) = -64, (foo.bar.string) = "string", (foo.bar.syntax) = true, (foo.bar.to) = true, (foo.bar.true) = 111, (foo.bar.uint32) = 3200, (foo.bar.uint64) = 6400, (foo.bar.weak) = true]; + + optional string name = 2 [(foo.bar.boom) = { syntax:true import:true public:true weak:true package:true string:"string" bytes:"bytes" int32:32 int64:64 uint32:3200 uint64:6400 sint32:-32 sint64:-64 fixed32:3232 fixed64:6464 sfixed32:-3232 sfixed64:-6464 bool:true float:3.14 double:3.14159 optional:true repeated:true required:true message:true enum:true service:true rpc:true option:true extend:true extensions:true reserved:true to:true true:111 false:-111 default:222 }]; +} diff --git a/desc/protoprint/testfiles/desc_test_complex_source_info-sorted-AND-multiline-style-comments.proto b/desc/protoprint/testfiles/desc_test_complex_source_info-sorted-AND-multiline-style-comments.proto index a853c463..df415f4d 100644 --- a/desc/protoprint/testfiles/desc_test_complex_source_info-sorted-AND-multiline-style-comments.proto +++ b/desc/protoprint/testfiles/desc_test_complex_source_info-sorted-AND-multiline-style-comments.proto @@ -20,6 +20,86 @@ message Another { optional Test.Nested._NestedNested.EEE fff = 2 [default = V1]; } +message KeywordCollisionOptions { + optional uint64 id = 1 [(foo.bar.bool) = true, (foo.bar.bytes) = "bytes", (foo.bar.default) = 222, (foo.bar.double) = 3.141590, (foo.bar.enum) = true, (foo.bar.extend) = true, (foo.bar.extensions) = true, (foo.bar.false) = -111, (foo.bar.fixed32) = 3232, (foo.bar.fixed64) = 6464, (foo.bar.float) = 3.140000, (foo.bar.import) = true, (foo.bar.int32) = 32, (foo.bar.int64) = 64, (foo.bar.message) = true, (foo.bar.option) = true, (foo.bar.optional) = true, (foo.bar.package) = true, (foo.bar.public) = true, (foo.bar.repeated) = true, (foo.bar.required) = true, (foo.bar.reserved) = true, (foo.bar.rpc) = true, (foo.bar.service) = true, (foo.bar.sfixed32) = -3232, (foo.bar.sfixed64) = -6464, (foo.bar.sint32) = -32, (foo.bar.sint64) = -64, (foo.bar.string) = "string", (foo.bar.syntax) = true, (foo.bar.to) = true, (foo.bar.true) = 111, (foo.bar.uint32) = 3200, (foo.bar.uint64) = 6400, (foo.bar.weak) = true]; + + optional string name = 2 [(foo.bar.boom) = { syntax:true import:true public:true weak:true package:true string:"string" bytes:"bytes" int32:32 int64:64 uint32:3200 uint64:6400 sint32:-32 sint64:-64 fixed32:3232 fixed64:6464 sfixed32:-3232 sfixed64:-6464 bool:true float:3.14 double:3.14159 optional:true repeated:true required:true message:true enum:true service:true rpc:true option:true extend:true extensions:true reserved:true to:true true:111 false:-111 default:222 }]; +} + +/* tests cases where field names collide with keywords */ + +message KeywordCollisions { + optional bool syntax = 1; + + optional bool import = 2; + + optional bool public = 3; + + optional bool weak = 4; + + optional bool package = 5; + + optional string string = 6; + + optional bytes bytes = 7; + + optional int32 int32 = 8; + + optional int64 int64 = 9; + + optional uint32 uint32 = 10; + + optional uint64 uint64 = 11; + + optional sint32 sint32 = 12; + + optional sint64 sint64 = 13; + + optional fixed32 fixed32 = 14; + + optional fixed64 fixed64 = 15; + + optional sfixed32 sfixed32 = 16; + + optional sfixed64 sfixed64 = 17; + + optional bool bool = 18; + + optional float float = 19; + + optional double double = 20; + + optional bool optional = 21; + + optional bool repeated = 22; + + optional bool required = 23; + + optional bool message = 24; + + optional bool enum = 25; + + optional bool service = 26; + + optional bool rpc = 27; + + optional bool option = 28; + + optional bool extend = 29; + + optional bool extensions = 30; + + optional bool reserved = 31; + + optional bool to = 32; + + optional int32 true = 33; + + optional int32 false = 34; + + optional int32 default = 35; +} + message Simple { optional string name = 1; @@ -116,6 +196,80 @@ extend google.protobuf.ExtensionRangeOptions { optional string label = 20000; } +extend google.protobuf.FieldOptions { + optional bool syntax = 20001; + + optional bool import = 20002; + + optional bool public = 20003; + + optional bool weak = 20004; + + optional bool package = 20005; + + optional string string = 20006; + + optional bytes bytes = 20007; + + optional int32 int32 = 20008; + + optional int64 int64 = 20009; + + optional uint32 uint32 = 20010; + + optional uint64 uint64 = 20011; + + optional sint32 sint32 = 20012; + + optional sint64 sint64 = 20013; + + optional fixed32 fixed32 = 20014; + + optional fixed64 fixed64 = 20015; + + optional sfixed32 sfixed32 = 20016; + + optional sfixed64 sfixed64 = 20017; + + optional bool bool = 20018; + + optional float float = 20019; + + optional double double = 20020; + + optional bool optional = 20021; + + optional bool repeated = 20022; + + optional bool required = 20023; + + optional bool message = 20024; + + optional bool enum = 20025; + + optional bool service = 20026; + + optional bool rpc = 20027; + + optional bool option = 20028; + + optional bool extend = 20029; + + optional bool extensions = 20030; + + optional bool reserved = 20031; + + optional bool to = 20032; + + optional int32 true = 20033; + + optional int32 false = 20034; + + optional int32 default = 20035; + + optional KeywordCollisions boom = 20036; +} + extend google.protobuf.MessageOptions { repeated Test rept = 20002; diff --git a/desc/protoprint/testfiles/desc_test_complex_source_info-sorted.proto b/desc/protoprint/testfiles/desc_test_complex_source_info-sorted.proto index c63c19f2..5d3bc0a9 100644 --- a/desc/protoprint/testfiles/desc_test_complex_source_info-sorted.proto +++ b/desc/protoprint/testfiles/desc_test_complex_source_info-sorted.proto @@ -20,6 +20,84 @@ message Another { optional Test.Nested._NestedNested.EEE fff = 2 [default = V1]; } +message KeywordCollisionOptions { + optional uint64 id = 1 [(foo.bar.bool) = true, (foo.bar.bytes) = "bytes", (foo.bar.default) = 222, (foo.bar.double) = 3.141590, (foo.bar.enum) = true, (foo.bar.extend) = true, (foo.bar.extensions) = true, (foo.bar.false) = -111, (foo.bar.fixed32) = 3232, (foo.bar.fixed64) = 6464, (foo.bar.float) = 3.140000, (foo.bar.import) = true, (foo.bar.int32) = 32, (foo.bar.int64) = 64, (foo.bar.message) = true, (foo.bar.option) = true, (foo.bar.optional) = true, (foo.bar.package) = true, (foo.bar.public) = true, (foo.bar.repeated) = true, (foo.bar.required) = true, (foo.bar.reserved) = true, (foo.bar.rpc) = true, (foo.bar.service) = true, (foo.bar.sfixed32) = -3232, (foo.bar.sfixed64) = -6464, (foo.bar.sint32) = -32, (foo.bar.sint64) = -64, (foo.bar.string) = "string", (foo.bar.syntax) = true, (foo.bar.to) = true, (foo.bar.true) = 111, (foo.bar.uint32) = 3200, (foo.bar.uint64) = 6400, (foo.bar.weak) = true]; + + optional string name = 2 [(foo.bar.boom) = { syntax:true import:true public:true weak:true package:true string:"string" bytes:"bytes" int32:32 int64:64 uint32:3200 uint64:6400 sint32:-32 sint64:-64 fixed32:3232 fixed64:6464 sfixed32:-3232 sfixed64:-6464 bool:true float:3.14 double:3.14159 optional:true repeated:true required:true message:true enum:true service:true rpc:true option:true extend:true extensions:true reserved:true to:true true:111 false:-111 default:222 }]; +} + +message KeywordCollisions { + optional bool syntax = 1; + + optional bool import = 2; + + optional bool public = 3; + + optional bool weak = 4; + + optional bool package = 5; + + optional string string = 6; + + optional bytes bytes = 7; + + optional int32 int32 = 8; + + optional int64 int64 = 9; + + optional uint32 uint32 = 10; + + optional uint64 uint64 = 11; + + optional sint32 sint32 = 12; + + optional sint64 sint64 = 13; + + optional fixed32 fixed32 = 14; + + optional fixed64 fixed64 = 15; + + optional sfixed32 sfixed32 = 16; + + optional sfixed64 sfixed64 = 17; + + optional bool bool = 18; + + optional float float = 19; + + optional double double = 20; + + optional bool optional = 21; + + optional bool repeated = 22; + + optional bool required = 23; + + optional bool message = 24; + + optional bool enum = 25; + + optional bool service = 26; + + optional bool rpc = 27; + + optional bool option = 28; + + optional bool extend = 29; + + optional bool extensions = 30; + + optional bool reserved = 31; + + optional bool to = 32; + + optional int32 true = 33; + + optional int32 false = 34; + + optional int32 default = 35; +} + message Simple { optional string name = 1; @@ -116,6 +194,80 @@ extend google.protobuf.ExtensionRangeOptions { optional string label = 20000; } +extend google.protobuf.FieldOptions { + optional bool syntax = 20001; + + optional bool import = 20002; + + optional bool public = 20003; + + optional bool weak = 20004; + + optional bool package = 20005; + + optional string string = 20006; + + optional bytes bytes = 20007; + + optional int32 int32 = 20008; + + optional int64 int64 = 20009; + + optional uint32 uint32 = 20010; + + optional uint64 uint64 = 20011; + + optional sint32 sint32 = 20012; + + optional sint64 sint64 = 20013; + + optional fixed32 fixed32 = 20014; + + optional fixed64 fixed64 = 20015; + + optional sfixed32 sfixed32 = 20016; + + optional sfixed64 sfixed64 = 20017; + + optional bool bool = 20018; + + optional float float = 20019; + + optional double double = 20020; + + optional bool optional = 20021; + + optional bool repeated = 20022; + + optional bool required = 20023; + + optional bool message = 20024; + + optional bool enum = 20025; + + optional bool service = 20026; + + optional bool rpc = 20027; + + optional bool option = 20028; + + optional bool extend = 20029; + + optional bool extensions = 20030; + + optional bool reserved = 20031; + + optional bool to = 20032; + + optional int32 true = 20033; + + optional int32 false = 20034; + + optional int32 default = 20035; + + optional KeywordCollisions boom = 20036; +} + extend google.protobuf.MessageOptions { repeated Test rept = 20002; diff --git a/internal/testprotos/desc_test1.pb.go b/internal/testprotos/desc_test1.pb.go index 53d728fe..5096e2b9 100644 --- a/internal/testprotos/desc_test1.pb.go +++ b/internal/testprotos/desc_test1.pb.go @@ -27,6 +27,8 @@ It has these top-level messages: Test Another Validator + KeywordCollisions + KeywordCollisionOptions PrimitiveDefaults StringAndBytesDefaults EnumDefaults diff --git a/internal/testprotos/desc_test_complex.pb.go b/internal/testprotos/desc_test_complex.pb.go index 5ab17ec6..64b08c17 100644 --- a/internal/testprotos/desc_test_complex.pb.go +++ b/internal/testprotos/desc_test_complex.pb.go @@ -337,6 +337,320 @@ func (m *Validator_Permission) GetEntity() string { return "" } +type KeywordCollisions struct { + Syntax *bool `protobuf:"varint,1,opt,name=syntax" json:"syntax,omitempty"` + Import *bool `protobuf:"varint,2,opt,name=import" json:"import,omitempty"` + Public *bool `protobuf:"varint,3,opt,name=public" json:"public,omitempty"` + Weak *bool `protobuf:"varint,4,opt,name=weak" json:"weak,omitempty"` + Package *bool `protobuf:"varint,5,opt,name=package" json:"package,omitempty"` + String_ *string `protobuf:"bytes,6,opt,name=string" json:"string,omitempty"` + Bytes []byte `protobuf:"bytes,7,opt,name=bytes" json:"bytes,omitempty"` + Int32 *int32 `protobuf:"varint,8,opt,name=int32" json:"int32,omitempty"` + Int64 *int64 `protobuf:"varint,9,opt,name=int64" json:"int64,omitempty"` + Uint32 *uint32 `protobuf:"varint,10,opt,name=uint32" json:"uint32,omitempty"` + Uint64 *uint64 `protobuf:"varint,11,opt,name=uint64" json:"uint64,omitempty"` + Sint32 *int32 `protobuf:"zigzag32,12,opt,name=sint32" json:"sint32,omitempty"` + Sint64 *int64 `protobuf:"zigzag64,13,opt,name=sint64" json:"sint64,omitempty"` + Fixed32 *uint32 `protobuf:"fixed32,14,opt,name=fixed32" json:"fixed32,omitempty"` + Fixed64 *uint64 `protobuf:"fixed64,15,opt,name=fixed64" json:"fixed64,omitempty"` + Sfixed32 *int32 `protobuf:"fixed32,16,opt,name=sfixed32" json:"sfixed32,omitempty"` + Sfixed64 *int64 `protobuf:"fixed64,17,opt,name=sfixed64" json:"sfixed64,omitempty"` + Bool *bool `protobuf:"varint,18,opt,name=bool" json:"bool,omitempty"` + Float *float32 `protobuf:"fixed32,19,opt,name=float" json:"float,omitempty"` + Double *float64 `protobuf:"fixed64,20,opt,name=double" json:"double,omitempty"` + Optional *bool `protobuf:"varint,21,opt,name=optional" json:"optional,omitempty"` + Repeated *bool `protobuf:"varint,22,opt,name=repeated" json:"repeated,omitempty"` + Required *bool `protobuf:"varint,23,opt,name=required" json:"required,omitempty"` + Message *bool `protobuf:"varint,24,opt,name=message" json:"message,omitempty"` + Enum *bool `protobuf:"varint,25,opt,name=enum" json:"enum,omitempty"` + Service *bool `protobuf:"varint,26,opt,name=service" json:"service,omitempty"` + Rpc *bool `protobuf:"varint,27,opt,name=rpc" json:"rpc,omitempty"` + Option *bool `protobuf:"varint,28,opt,name=option" json:"option,omitempty"` + Extend *bool `protobuf:"varint,29,opt,name=extend" json:"extend,omitempty"` + Extensions *bool `protobuf:"varint,30,opt,name=extensions" json:"extensions,omitempty"` + Reserved *bool `protobuf:"varint,31,opt,name=reserved" json:"reserved,omitempty"` + To *bool `protobuf:"varint,32,opt,name=to" json:"to,omitempty"` + True *int32 `protobuf:"varint,33,opt,name=true" json:"true,omitempty"` + False *int32 `protobuf:"varint,34,opt,name=false" json:"false,omitempty"` + Default *int32 `protobuf:"varint,35,opt,name=default" json:"default,omitempty"` + XXX_unrecognized []byte `json:"-"` +} + +func (m *KeywordCollisions) Reset() { *m = KeywordCollisions{} } +func (m *KeywordCollisions) String() string { return proto.CompactTextString(m) } +func (*KeywordCollisions) ProtoMessage() {} +func (*KeywordCollisions) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{4} } + +func (m *KeywordCollisions) GetSyntax() bool { + if m != nil && m.Syntax != nil { + return *m.Syntax + } + return false +} + +func (m *KeywordCollisions) GetImport() bool { + if m != nil && m.Import != nil { + return *m.Import + } + return false +} + +func (m *KeywordCollisions) GetPublic() bool { + if m != nil && m.Public != nil { + return *m.Public + } + return false +} + +func (m *KeywordCollisions) GetWeak() bool { + if m != nil && m.Weak != nil { + return *m.Weak + } + return false +} + +func (m *KeywordCollisions) GetPackage() bool { + if m != nil && m.Package != nil { + return *m.Package + } + return false +} + +func (m *KeywordCollisions) GetString_() string { + if m != nil && m.String_ != nil { + return *m.String_ + } + return "" +} + +func (m *KeywordCollisions) GetBytes() []byte { + if m != nil { + return m.Bytes + } + return nil +} + +func (m *KeywordCollisions) GetInt32() int32 { + if m != nil && m.Int32 != nil { + return *m.Int32 + } + return 0 +} + +func (m *KeywordCollisions) GetInt64() int64 { + if m != nil && m.Int64 != nil { + return *m.Int64 + } + return 0 +} + +func (m *KeywordCollisions) GetUint32() uint32 { + if m != nil && m.Uint32 != nil { + return *m.Uint32 + } + return 0 +} + +func (m *KeywordCollisions) GetUint64() uint64 { + if m != nil && m.Uint64 != nil { + return *m.Uint64 + } + return 0 +} + +func (m *KeywordCollisions) GetSint32() int32 { + if m != nil && m.Sint32 != nil { + return *m.Sint32 + } + return 0 +} + +func (m *KeywordCollisions) GetSint64() int64 { + if m != nil && m.Sint64 != nil { + return *m.Sint64 + } + return 0 +} + +func (m *KeywordCollisions) GetFixed32() uint32 { + if m != nil && m.Fixed32 != nil { + return *m.Fixed32 + } + return 0 +} + +func (m *KeywordCollisions) GetFixed64() uint64 { + if m != nil && m.Fixed64 != nil { + return *m.Fixed64 + } + return 0 +} + +func (m *KeywordCollisions) GetSfixed32() int32 { + if m != nil && m.Sfixed32 != nil { + return *m.Sfixed32 + } + return 0 +} + +func (m *KeywordCollisions) GetSfixed64() int64 { + if m != nil && m.Sfixed64 != nil { + return *m.Sfixed64 + } + return 0 +} + +func (m *KeywordCollisions) GetBool() bool { + if m != nil && m.Bool != nil { + return *m.Bool + } + return false +} + +func (m *KeywordCollisions) GetFloat() float32 { + if m != nil && m.Float != nil { + return *m.Float + } + return 0 +} + +func (m *KeywordCollisions) GetDouble() float64 { + if m != nil && m.Double != nil { + return *m.Double + } + return 0 +} + +func (m *KeywordCollisions) GetOptional() bool { + if m != nil && m.Optional != nil { + return *m.Optional + } + return false +} + +func (m *KeywordCollisions) GetRepeated() bool { + if m != nil && m.Repeated != nil { + return *m.Repeated + } + return false +} + +func (m *KeywordCollisions) GetRequired() bool { + if m != nil && m.Required != nil { + return *m.Required + } + return false +} + +func (m *KeywordCollisions) GetMessage() bool { + if m != nil && m.Message != nil { + return *m.Message + } + return false +} + +func (m *KeywordCollisions) GetEnum() bool { + if m != nil && m.Enum != nil { + return *m.Enum + } + return false +} + +func (m *KeywordCollisions) GetService() bool { + if m != nil && m.Service != nil { + return *m.Service + } + return false +} + +func (m *KeywordCollisions) GetRpc() bool { + if m != nil && m.Rpc != nil { + return *m.Rpc + } + return false +} + +func (m *KeywordCollisions) GetOption() bool { + if m != nil && m.Option != nil { + return *m.Option + } + return false +} + +func (m *KeywordCollisions) GetExtend() bool { + if m != nil && m.Extend != nil { + return *m.Extend + } + return false +} + +func (m *KeywordCollisions) GetExtensions() bool { + if m != nil && m.Extensions != nil { + return *m.Extensions + } + return false +} + +func (m *KeywordCollisions) GetReserved() bool { + if m != nil && m.Reserved != nil { + return *m.Reserved + } + return false +} + +func (m *KeywordCollisions) GetTo() bool { + if m != nil && m.To != nil { + return *m.To + } + return false +} + +func (m *KeywordCollisions) GetTrue() int32 { + if m != nil && m.True != nil { + return *m.True + } + return 0 +} + +func (m *KeywordCollisions) GetFalse() int32 { + if m != nil && m.False != nil { + return *m.False + } + return 0 +} + +func (m *KeywordCollisions) GetDefault() int32 { + if m != nil && m.Default != nil { + return *m.Default + } + return 0 +} + +type KeywordCollisionOptions struct { + Id *uint64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` + Name *string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + XXX_unrecognized []byte `json:"-"` +} + +func (m *KeywordCollisionOptions) Reset() { *m = KeywordCollisionOptions{} } +func (m *KeywordCollisionOptions) String() string { return proto.CompactTextString(m) } +func (*KeywordCollisionOptions) ProtoMessage() {} +func (*KeywordCollisionOptions) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{5} } + +func (m *KeywordCollisionOptions) GetId() uint64 { + if m != nil && m.Id != nil { + return *m.Id + } + return 0 +} + +func (m *KeywordCollisionOptions) GetName() string { + if m != nil && m.Name != nil { + return *m.Name + } + return "" +} + var E_Label = &proto.ExtensionDesc{ ExtendedType: (*google_protobuf1.ExtensionRangeOptions)(nil), ExtensionType: (*string)(nil), @@ -382,6 +696,330 @@ var E_Validator = &proto.ExtensionDesc{ Filename: "desc_test_complex.proto", } +var E_Syntax = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20001, + Name: "foo.bar.syntax", + Tag: "varint,20001,opt,name=syntax", + Filename: "desc_test_complex.proto", +} + +var E_Import = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20002, + Name: "foo.bar.import", + Tag: "varint,20002,opt,name=import", + Filename: "desc_test_complex.proto", +} + +var E_Public = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20003, + Name: "foo.bar.public", + Tag: "varint,20003,opt,name=public", + Filename: "desc_test_complex.proto", +} + +var E_Weak = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20004, + Name: "foo.bar.weak", + Tag: "varint,20004,opt,name=weak", + Filename: "desc_test_complex.proto", +} + +var E_Package = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20005, + Name: "foo.bar.package", + Tag: "varint,20005,opt,name=package", + Filename: "desc_test_complex.proto", +} + +var E_String = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*string)(nil), + Field: 20006, + Name: "foo.bar.string", + Tag: "bytes,20006,opt,name=string", + Filename: "desc_test_complex.proto", +} + +var E_Bytes = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: ([]byte)(nil), + Field: 20007, + Name: "foo.bar.bytes", + Tag: "bytes,20007,opt,name=bytes", + Filename: "desc_test_complex.proto", +} + +var E_Int32 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int32)(nil), + Field: 20008, + Name: "foo.bar.int32", + Tag: "varint,20008,opt,name=int32", + Filename: "desc_test_complex.proto", +} + +var E_Int64 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int64)(nil), + Field: 20009, + Name: "foo.bar.int64", + Tag: "varint,20009,opt,name=int64", + Filename: "desc_test_complex.proto", +} + +var E_Uint32 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*uint32)(nil), + Field: 20010, + Name: "foo.bar.uint32", + Tag: "varint,20010,opt,name=uint32", + Filename: "desc_test_complex.proto", +} + +var E_Uint64 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*uint64)(nil), + Field: 20011, + Name: "foo.bar.uint64", + Tag: "varint,20011,opt,name=uint64", + Filename: "desc_test_complex.proto", +} + +var E_Sint32 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int32)(nil), + Field: 20012, + Name: "foo.bar.sint32", + Tag: "zigzag32,20012,opt,name=sint32", + Filename: "desc_test_complex.proto", +} + +var E_Sint64 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int64)(nil), + Field: 20013, + Name: "foo.bar.sint64", + Tag: "zigzag64,20013,opt,name=sint64", + Filename: "desc_test_complex.proto", +} + +var E_Fixed32 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*uint32)(nil), + Field: 20014, + Name: "foo.bar.fixed32", + Tag: "fixed32,20014,opt,name=fixed32", + Filename: "desc_test_complex.proto", +} + +var E_Fixed64 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*uint64)(nil), + Field: 20015, + Name: "foo.bar.fixed64", + Tag: "fixed64,20015,opt,name=fixed64", + Filename: "desc_test_complex.proto", +} + +var E_Sfixed32 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int32)(nil), + Field: 20016, + Name: "foo.bar.sfixed32", + Tag: "fixed32,20016,opt,name=sfixed32", + Filename: "desc_test_complex.proto", +} + +var E_Sfixed64 = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int64)(nil), + Field: 20017, + Name: "foo.bar.sfixed64", + Tag: "fixed64,20017,opt,name=sfixed64", + Filename: "desc_test_complex.proto", +} + +var E_Bool = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20018, + Name: "foo.bar.bool", + Tag: "varint,20018,opt,name=bool", + Filename: "desc_test_complex.proto", +} + +var E_Float = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*float32)(nil), + Field: 20019, + Name: "foo.bar.float", + Tag: "fixed32,20019,opt,name=float", + Filename: "desc_test_complex.proto", +} + +var E_Double = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*float64)(nil), + Field: 20020, + Name: "foo.bar.double", + Tag: "fixed64,20020,opt,name=double", + Filename: "desc_test_complex.proto", +} + +var E_Optional = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20021, + Name: "foo.bar.optional", + Tag: "varint,20021,opt,name=optional", + Filename: "desc_test_complex.proto", +} + +var E_Repeated = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20022, + Name: "foo.bar.repeated", + Tag: "varint,20022,opt,name=repeated", + Filename: "desc_test_complex.proto", +} + +var E_Required = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20023, + Name: "foo.bar.required", + Tag: "varint,20023,opt,name=required", + Filename: "desc_test_complex.proto", +} + +var E_Message = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20024, + Name: "foo.bar.message", + Tag: "varint,20024,opt,name=message", + Filename: "desc_test_complex.proto", +} + +var E_Enum = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20025, + Name: "foo.bar.enum", + Tag: "varint,20025,opt,name=enum", + Filename: "desc_test_complex.proto", +} + +var E_Service = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20026, + Name: "foo.bar.service", + Tag: "varint,20026,opt,name=service", + Filename: "desc_test_complex.proto", +} + +var E_Rpc = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20027, + Name: "foo.bar.rpc", + Tag: "varint,20027,opt,name=rpc", + Filename: "desc_test_complex.proto", +} + +var E_Option = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20028, + Name: "foo.bar.option", + Tag: "varint,20028,opt,name=option", + Filename: "desc_test_complex.proto", +} + +var E_Extend = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20029, + Name: "foo.bar.extend", + Tag: "varint,20029,opt,name=extend", + Filename: "desc_test_complex.proto", +} + +var E_Extensions = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20030, + Name: "foo.bar.extensions", + Tag: "varint,20030,opt,name=extensions", + Filename: "desc_test_complex.proto", +} + +var E_Reserved = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20031, + Name: "foo.bar.reserved", + Tag: "varint,20031,opt,name=reserved", + Filename: "desc_test_complex.proto", +} + +var E_To = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*bool)(nil), + Field: 20032, + Name: "foo.bar.to", + Tag: "varint,20032,opt,name=to", + Filename: "desc_test_complex.proto", +} + +var E_True = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int32)(nil), + Field: 20033, + Name: "foo.bar.true", + Tag: "varint,20033,opt,name=true", + Filename: "desc_test_complex.proto", +} + +var E_False = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int32)(nil), + Field: 20034, + Name: "foo.bar.false", + Tag: "varint,20034,opt,name=false", + Filename: "desc_test_complex.proto", +} + +var E_Default = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*int32)(nil), + Field: 20035, + Name: "foo.bar.default", + Tag: "varint,20035,opt,name=default", + Filename: "desc_test_complex.proto", +} + +var E_Boom = &proto.ExtensionDesc{ + ExtendedType: (*google_protobuf1.FieldOptions)(nil), + ExtensionType: (*KeywordCollisions)(nil), + Field: 20036, + Name: "foo.bar.boom", + Tag: "bytes,20036,opt,name=boom", + Filename: "desc_test_complex.proto", +} + func init() { proto.RegisterType((*Simple)(nil), "foo.bar.Simple") proto.RegisterType((*Test)(nil), "foo.bar.Test") @@ -391,6 +1029,8 @@ func init() { proto.RegisterType((*Another)(nil), "foo.bar.Another") proto.RegisterType((*Validator)(nil), "foo.bar.Validator") proto.RegisterType((*Validator_Permission)(nil), "foo.bar.Validator.Permission") + proto.RegisterType((*KeywordCollisions)(nil), "foo.bar.KeywordCollisions") + proto.RegisterType((*KeywordCollisionOptions)(nil), "foo.bar.KeywordCollisionOptions") proto.RegisterEnum("foo.bar.Test_Nested__NestedNested_EEE", Test_Nested__NestedNested_EEE_name, Test_Nested__NestedNested_EEE_value) proto.RegisterEnum("foo.bar.Validator_Action", Validator_Action_name, Validator_Action_value) proto.RegisterExtension(E_Test_Nested_Fooblez) @@ -400,6 +1040,42 @@ func init() { proto.RegisterExtension(E_Eee) proto.RegisterExtension(E_A) proto.RegisterExtension(E_Validator) + proto.RegisterExtension(E_Syntax) + proto.RegisterExtension(E_Import) + proto.RegisterExtension(E_Public) + proto.RegisterExtension(E_Weak) + proto.RegisterExtension(E_Package) + proto.RegisterExtension(E_String) + proto.RegisterExtension(E_Bytes) + proto.RegisterExtension(E_Int32) + proto.RegisterExtension(E_Int64) + proto.RegisterExtension(E_Uint32) + proto.RegisterExtension(E_Uint64) + proto.RegisterExtension(E_Sint32) + proto.RegisterExtension(E_Sint64) + proto.RegisterExtension(E_Fixed32) + proto.RegisterExtension(E_Fixed64) + proto.RegisterExtension(E_Sfixed32) + proto.RegisterExtension(E_Sfixed64) + proto.RegisterExtension(E_Bool) + proto.RegisterExtension(E_Float) + proto.RegisterExtension(E_Double) + proto.RegisterExtension(E_Optional) + proto.RegisterExtension(E_Repeated) + proto.RegisterExtension(E_Required) + proto.RegisterExtension(E_Message) + proto.RegisterExtension(E_Enum) + proto.RegisterExtension(E_Service) + proto.RegisterExtension(E_Rpc) + proto.RegisterExtension(E_Option) + proto.RegisterExtension(E_Extend) + proto.RegisterExtension(E_Extensions) + proto.RegisterExtension(E_Reserved) + proto.RegisterExtension(E_To) + proto.RegisterExtension(E_True) + proto.RegisterExtension(E_False) + proto.RegisterExtension(E_Default) + proto.RegisterExtension(E_Boom) } // Reference imports to suppress errors if they are not otherwise used. @@ -510,69 +1186,140 @@ var _TestTestService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("desc_test_complex.proto", fileDescriptor3) } var fileDescriptor3 = []byte{ - // 1023 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x41, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0xec, 0xac, 0x37, 0xbb, 0x2f, 0x4d, 0x3a, 0x1a, 0x02, 0x18, 0x4b, 0xa5, 0xae, 0x41, - 0x91, 0x15, 0xa1, 0xcd, 0xc6, 0x49, 0x0a, 0x32, 0x2d, 0x52, 0x50, 0xad, 0x28, 0x82, 0x26, 0xb0, - 0x2d, 0xa9, 0x04, 0x96, 0xc2, 0xda, 0x3b, 0x6b, 0x6f, 0x59, 0xef, 0x58, 0xbb, 0xe3, 0xa8, 0x09, - 0x3d, 0x11, 0x89, 0x1f, 0x90, 0x53, 0x0f, 0x39, 0x80, 0x39, 0x20, 0x01, 0x47, 0x2e, 0x1c, 0xb9, - 0x95, 0x4a, 0x95, 0xb8, 0x72, 0x42, 0x72, 0x7e, 0x02, 0x70, 0x47, 0x33, 0xbb, 0x71, 0xea, 0x36, - 0x28, 0xe2, 0xe0, 0x7d, 0x3b, 0xf3, 0xde, 0xf7, 0xcd, 0xbc, 0xf7, 0xbe, 0xb7, 0x86, 0x57, 0x7d, - 0x96, 0xb6, 0x77, 0x05, 0x4b, 0xc5, 0x6e, 0x9b, 0xf7, 0xfa, 0x11, 0x7b, 0x60, 0xf7, 0x13, 0x2e, - 0x38, 0x9d, 0x0e, 0x38, 0xb7, 0x5b, 0x5e, 0x52, 0x2a, 0x77, 0x38, 0xef, 0x44, 0x6c, 0x49, 0x6d, - 0xb7, 0x06, 0xc1, 0x92, 0x44, 0x24, 0x61, 0x5f, 0xf0, 0x24, 0x0b, 0xad, 0xbc, 0x05, 0xc6, 0x9d, - 0x50, 0x62, 0x29, 0x05, 0x3d, 0xf6, 0x7a, 0xac, 0x88, 0xca, 0xa8, 0x6a, 0xb9, 0xea, 0x9d, 0xce, - 0x81, 0x16, 0xfa, 0x45, 0xad, 0x8c, 0xaa, 0xba, 0xab, 0x85, 0x7e, 0xe5, 0xa9, 0x0e, 0xfa, 0x5d, - 0x96, 0x0a, 0x4a, 0x01, 0x07, 0x9c, 0xe7, 0xb1, 0x85, 0x87, 0x01, 0xe7, 0x0f, 0xe9, 0x3c, 0x14, - 0xbc, 0x24, 0xf1, 0xf6, 0x8b, 0x5a, 0x19, 0x57, 0x0b, 0x6e, 0xb6, 0xa0, 0x57, 0x00, 0xa5, 0x45, - 0x5c, 0x46, 0xd5, 0x99, 0xda, 0x65, 0x3b, 0xbf, 0x97, 0x9d, 0x1d, 0xe9, 0xa2, 0x54, 0xba, 0x93, - 0xa2, 0x5e, 0xc6, 0xe7, 0xba, 0x13, 0x5a, 0x01, 0xd4, 0x2b, 0x16, 0x94, 0x7b, 0x7e, 0xec, 0x96, - 0x37, 0xb0, 0x6f, 0x37, 0x62, 0x91, 0xec, 0xbb, 0xa8, 0x47, 0x57, 0x01, 0xb5, 0x8a, 0x46, 0x19, - 0x55, 0x2f, 0xd5, 0x17, 0x9a, 0x8e, 0xe3, 0x34, 0x1d, 0x67, 0xb9, 0xe9, 0x38, 0xb5, 0xa6, 0xe3, - 0xac, 0x34, 0x1d, 0x67, 0xb5, 0xe9, 0x38, 0x6b, 0x4d, 0xc7, 0xb9, 0xde, 0x74, 0x9c, 0xb7, 0x83, - 0x41, 0xcb, 0x4b, 0xae, 0xb9, 0xa8, 0x55, 0x5a, 0x05, 0x23, 0xa3, 0xa0, 0x04, 0xf0, 0x17, 0x6c, - 0x3f, 0xcf, 0x45, 0xbe, 0xca, 0x4c, 0xf6, 0xbc, 0x68, 0xc0, 0x54, 0xe6, 0x05, 0x37, 0x5b, 0xd4, - 0xb5, 0x77, 0x50, 0xe9, 0x5b, 0x0d, 0x8c, 0x2d, 0x96, 0x0a, 0xe6, 0x97, 0xfe, 0x40, 0x30, 0xbb, - 0x9b, 0xbd, 0xe7, 0x3b, 0x9b, 0x40, 0x9f, 0x5d, 0x67, 0x4f, 0x7a, 0x2d, 0x2b, 0x99, 0xe2, 0x9f, - 0xa9, 0xcd, 0x4e, 0x64, 0xe1, 0x2a, 0x57, 0x9d, 0x1c, 0x8d, 0xac, 0x4b, 0x80, 0xbb, 0x9c, 0x0f, - 0x0d, 0x3d, 0xed, 0x73, 0x5e, 0xb9, 0x09, 0xb8, 0xd1, 0x68, 0x50, 0x03, 0xb4, 0xed, 0x0f, 0xc8, - 0x94, 0xb4, 0x3b, 0xcb, 0x04, 0x29, 0x5b, 0x23, 0x9a, 0xb2, 0x2b, 0x04, 0x2b, 0xbb, 0x4a, 0x74, - 0x65, 0xd7, 0x48, 0x41, 0xd9, 0xeb, 0xc4, 0xa8, 0x55, 0xc1, 0xdc, 0xed, 0x78, 0x49, 0x2b, 0x62, - 0x07, 0x74, 0xf2, 0xc4, 0xa2, 0xaf, 0xd2, 0x9c, 0xde, 0xc8, 0xbc, 0xf5, 0xf9, 0xa3, 0x91, 0x35, - 0x03, 0xb8, 0x23, 0x8f, 0xc6, 0x2d, 0xce, 0x1f, 0x8d, 0xac, 0x7f, 0xb6, 0x6a, 0xef, 0x82, 0x94, - 0x90, 0x82, 0x5f, 0xb5, 0x33, 0x0d, 0xd9, 0xa7, 0x1a, 0xb2, 0x6f, 0xb3, 0x34, 0xf5, 0x3a, 0x6c, - 0xbb, 0x2f, 0x42, 0x1e, 0xa7, 0xc5, 0xef, 0x8e, 0x91, 0xaa, 0xd2, 0x29, 0x62, 0xb1, 0x60, 0xfa, - 0xe4, 0x37, 0xb4, 0x48, 0xcc, 0x9f, 0x34, 0xf2, 0xa7, 0x56, 0x32, 0xbf, 0x1a, 0x59, 0xfa, 0x7d, - 0xef, 0xe0, 0x60, 0x91, 0x98, 0x7f, 0x63, 0xf2, 0xbd, 0x7e, 0xb6, 0x53, 0x79, 0xa4, 0xc1, 0xf4, - 0x7a, 0xcc, 0x45, 0x97, 0x25, 0xb2, 0x4e, 0xe2, 0xbf, 0xeb, 0x24, 0x5d, 0xf4, 0x06, 0xe0, 0x20, - 0x08, 0x54, 0x57, 0xe6, 0x6a, 0x0b, 0x93, 0x7a, 0xc8, 0xaa, 0x6d, 0x4f, 0x74, 0xc4, 0x6e, 0x34, - 0x1a, 0x75, 0x6d, 0x67, 0xd9, 0x95, 0xb0, 0xfa, 0x8f, 0xe8, 0x68, 0x64, 0xbd, 0x01, 0xd8, 0x6b, - 0xb5, 0x09, 0x22, 0x1a, 0xc1, 0xa5, 0x69, 0xa5, 0x62, 0xf2, 0x65, 0x05, 0x03, 0x0a, 0xe4, 0x23, - 0xad, 0x60, 0xf2, 0x18, 0x1f, 0x8d, 0xac, 0xab, 0x80, 0x7d, 0x16, 0x10, 0x4c, 0x34, 0x82, 0x4a, - 0x26, 0xe0, 0x96, 0x97, 0x90, 0x5f, 0x35, 0x19, 0xd2, 0x51, 0x71, 0x47, 0x23, 0xab, 0xa0, 0x42, - 0x7e, 0x1f, 0x59, 0x68, 0x78, 0x62, 0x69, 0x64, 0x6a, 0x78, 0x62, 0xbd, 0x0c, 0x2f, 0x2d, 0xe6, - 0x9c, 0xfe, 0x62, 0x8e, 0x7a, 0x2c, 0xdd, 0xd3, 0x50, 0x00, 0xdc, 0x5b, 0xe8, 0x0d, 0x4f, 0x2c, - 0x00, 0xb3, 0x64, 0x80, 0xbe, 0xcf, 0x23, 0x3e, 0x3c, 0xb1, 0x4c, 0x30, 0x4a, 0x3a, 0x79, 0x7a, - 0x68, 0x0c, 0x4f, 0x2c, 0x1d, 0x34, 0x82, 0x72, 0xab, 0x55, 0xfe, 0x42, 0x60, 0xed, 0x78, 0x51, - 0xe8, 0x7b, 0x82, 0x27, 0xf4, 0x4d, 0x98, 0xf5, 0x06, 0xa2, 0xcb, 0x62, 0x11, 0xb6, 0x3d, 0xc1, - 0x7c, 0x55, 0x25, 0xd3, 0x9d, 0xdc, 0xa4, 0x37, 0x01, 0xfa, 0x2c, 0xe9, 0x85, 0x69, 0x1a, 0xf2, - 0x58, 0x8d, 0xe1, 0x4c, 0xed, 0xca, 0xb8, 0x4c, 0x63, 0x36, 0xfb, 0xa3, 0x71, 0x90, 0xfb, 0x0c, - 0xa0, 0x74, 0x0f, 0xe0, 0xcc, 0x43, 0x97, 0xc1, 0xf0, 0xda, 0xb2, 0xc5, 0xea, 0xac, 0xb9, 0xda, - 0x6b, 0xe7, 0x10, 0xad, 0xab, 0x00, 0x37, 0x0f, 0xa4, 0xaf, 0x80, 0x21, 0x2f, 0x23, 0xf6, 0x55, - 0x8b, 0x2c, 0x37, 0x5f, 0x55, 0xaa, 0x60, 0x64, 0x91, 0xd4, 0x82, 0xc2, 0x87, 0xdb, 0x1b, 0x9b, - 0x5b, 0x64, 0x8a, 0x9a, 0xa0, 0xbb, 0x8d, 0xf5, 0x5b, 0x04, 0xc9, 0xcd, 0x7b, 0xee, 0xe6, 0xdd, - 0x06, 0xd1, 0x6a, 0x5f, 0x23, 0xb8, 0x2c, 0xdb, 0x29, 0x7f, 0x77, 0x58, 0xb2, 0x17, 0xb6, 0x19, - 0xbd, 0x01, 0xe6, 0x27, 0x29, 0x4b, 0xd6, 0x07, 0xa2, 0xfb, 0x9c, 0x98, 0x4b, 0x93, 0xcb, 0x0a, - 0x7d, 0x72, 0x68, 0xcc, 0x99, 0x88, 0x82, 0x39, 0x45, 0x8d, 0x76, 0x14, 0xb2, 0x58, 0xd0, 0x35, - 0xc0, 0x1b, 0x4c, 0x5c, 0x00, 0x24, 0x4f, 0x0e, 0x8d, 0x4b, 0x26, 0xa2, 0xa6, 0x89, 0xa8, 0x3e, - 0x48, 0x59, 0x52, 0x7f, 0x0f, 0x0a, 0x91, 0xd7, 0x62, 0x11, 0x5d, 0x78, 0x41, 0xff, 0x8d, 0x07, - 0x82, 0xc5, 0xaa, 0x78, 0x5e, 0x7c, 0x36, 0x06, 0xdf, 0x1c, 0xe7, 0x1f, 0x43, 0x05, 0xab, 0xdf, - 0x02, 0x3d, 0x61, 0x7d, 0x71, 0xf1, 0xf8, 0x0c, 0x8f, 0x91, 0xea, 0xd3, 0xf3, 0x82, 0x97, 0xe8, - 0xfa, 0x67, 0x80, 0x19, 0x63, 0x17, 0x93, 0xfc, 0x70, 0x8c, 0xfe, 0xcf, 0x4c, 0xb8, 0x92, 0xb5, - 0xbe, 0x0e, 0xc8, 0xbb, 0x98, 0xfa, 0xe7, 0xe3, 0x6c, 0x20, 0xc9, 0x98, 0x3a, 0x1f, 0x58, 0x17, - 0x79, 0xf5, 0x8f, 0xc1, 0xda, 0x1b, 0x6b, 0xf4, 0xf5, 0x73, 0xa8, 0x44, 0x97, 0xfb, 0xa7, 0x4c, - 0xbf, 0x7c, 0xae, 0x88, 0xe8, 0x8b, 0x3a, 0x72, 0xcf, 0x58, 0xde, 0x5f, 0xf9, 0x74, 0xb9, 0x13, - 0x8a, 0xee, 0xa0, 0x65, 0xb7, 0x79, 0x6f, 0xe9, 0x7e, 0x77, 0xd0, 0xeb, 0x67, 0x7f, 0x5f, 0x09, - 0x0b, 0x22, 0xd6, 0x16, 0x4b, 0x61, 0x2c, 0x58, 0x12, 0x7b, 0xd1, 0x92, 0xfc, 0x24, 0x28, 0x4f, - 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x31, 0xe4, 0xc0, 0x0a, 0x07, 0x00, 0x00, + // 2154 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x98, 0x5d, 0x8c, 0xd4, 0xd6, + 0x15, 0xc7, 0xf7, 0xd8, 0x33, 0xb3, 0xbe, 0x97, 0x2f, 0xe3, 0x90, 0x60, 0x26, 0x05, 0xcc, 0xa4, + 0x42, 0x23, 0x54, 0xcd, 0xce, 0xce, 0x0e, 0x9b, 0xd6, 0x49, 0xca, 0x42, 0x33, 0x25, 0x28, 0x0d, + 0xa4, 0x4e, 0x4a, 0xaa, 0x76, 0x25, 0xf0, 0xcc, 0xdc, 0xd9, 0x75, 0xf0, 0x8c, 0xa7, 0xb6, 0x87, + 0xb0, 0x34, 0x52, 0x56, 0x45, 0x8d, 0xe8, 0x53, 0x29, 0xea, 0x03, 0xaa, 0x36, 0x12, 0x6c, 0xda, + 0x86, 0x34, 0x69, 0x4b, 0xd3, 0x2f, 0x92, 0x7e, 0x41, 0xd3, 0x07, 0x1a, 0x29, 0x12, 0xea, 0x13, + 0x7d, 0x49, 0x90, 0xbd, 0xaa, 0x78, 0x44, 0x4a, 0x91, 0x92, 0x27, 0xaa, 0xfb, 0x61, 0xcf, 0x2e, + 0x50, 0x39, 0x59, 0x89, 0xb5, 0xcf, 0xbd, 0xe7, 0x77, 0x3f, 0x8f, 0xcf, 0xf9, 0xb3, 0x78, 0x63, + 0x9b, 0x04, 0xad, 0x43, 0x21, 0x09, 0xc2, 0x43, 0x2d, 0xaf, 0xdb, 0x77, 0xc9, 0xb1, 0x4a, 0xdf, + 0xf7, 0x42, 0x4f, 0x1b, 0xed, 0x78, 0x5e, 0xa5, 0x69, 0xfb, 0x45, 0x63, 0xc6, 0xf3, 0x66, 0x5c, + 0x32, 0xc6, 0x9a, 0x9b, 0x83, 0xce, 0x18, 0x25, 0x7c, 0xa7, 0x1f, 0x7a, 0x3e, 0x77, 0x2d, 0x7d, + 0x01, 0x17, 0x9e, 0x71, 0x28, 0xab, 0x69, 0x38, 0xd7, 0xb3, 0xbb, 0x44, 0x07, 0x03, 0xca, 0xc8, + 0x62, 0xef, 0xda, 0x5a, 0x2c, 0x39, 0x6d, 0x5d, 0x32, 0xa0, 0x9c, 0xb3, 0x24, 0xa7, 0x5d, 0x7a, + 0x3f, 0x87, 0x73, 0xcf, 0x92, 0x20, 0xd4, 0x34, 0x2c, 0x77, 0x3c, 0x4f, 0xf8, 0xe6, 0x5f, 0xec, + 0x78, 0xde, 0x8b, 0xda, 0x06, 0x9c, 0xb7, 0x7d, 0xdf, 0x9e, 0xd3, 0x25, 0x43, 0x2e, 0xe7, 0x2d, + 0x6e, 0x68, 0x9b, 0x31, 0x04, 0xba, 0x6c, 0x40, 0x79, 0x55, 0x6d, 0x5d, 0x45, 0xac, 0xab, 0xc2, + 0xa7, 0xb4, 0x20, 0xa0, 0xdd, 0xbe, 0x9e, 0x33, 0xe4, 0x7b, 0x76, 0xfb, 0x5a, 0x09, 0x43, 0x57, + 0xcf, 0xb3, 0xee, 0x0d, 0x69, 0x37, 0x5d, 0x41, 0xe5, 0xa9, 0x46, 0x2f, 0xf4, 0xe7, 0x2c, 0xe8, + 0x6a, 0x75, 0x0c, 0x4d, 0xbd, 0x60, 0x40, 0x79, 0xb5, 0xb9, 0x7d, 0xba, 0x5a, 0xad, 0x4e, 0x57, + 0xab, 0xe3, 0xd3, 0xd5, 0x6a, 0x6d, 0xba, 0x5a, 0x9d, 0x98, 0xae, 0x56, 0xeb, 0xd3, 0xd5, 0xea, + 0xce, 0xe9, 0x6a, 0x75, 0x72, 0xba, 0x5a, 0x7d, 0xb8, 0x33, 0x68, 0xda, 0xfe, 0x36, 0x0b, 0x9a, + 0xc5, 0x3a, 0x2e, 0xf0, 0x21, 0x34, 0x15, 0xcb, 0x47, 0xc8, 0x9c, 0xd8, 0x0b, 0x7d, 0xa5, 0x3b, + 0x39, 0x6a, 0xbb, 0x03, 0xc2, 0x76, 0x9e, 0xb7, 0xb8, 0x61, 0x4a, 0x5f, 0x84, 0xe2, 0x39, 0x09, + 0x17, 0xf6, 0x93, 0x20, 0x24, 0xed, 0xe2, 0xbf, 0x01, 0xaf, 0x39, 0xc4, 0xdf, 0x45, 0xcb, 0x3e, + 0xac, 0x2d, 0xb7, 0xf9, 0x6f, 0x6d, 0x1b, 0x3f, 0x32, 0x36, 0xfe, 0xaa, 0xda, 0x9a, 0x15, 0xbb, + 0xb0, 0x58, 0x97, 0xa9, 0x9e, 0x8e, 0xd0, 0x6a, 0x2c, 0xcf, 0x7a, 0xde, 0x62, 0x21, 0x17, 0xf4, + 0x3d, 0xaf, 0xf4, 0x18, 0x96, 0x1b, 0x8d, 0x86, 0x56, 0xc0, 0xd2, 0x81, 0x27, 0xd5, 0x11, 0xfa, + 0x3c, 0x38, 0xae, 0x02, 0x7b, 0xd6, 0x54, 0x89, 0x3d, 0x27, 0x54, 0x99, 0x3d, 0xeb, 0x6a, 0x8e, + 0x3d, 0x77, 0xaa, 0x79, 0xf6, 0x9c, 0x54, 0x0b, 0xb5, 0x32, 0x56, 0x0e, 0xcd, 0xd8, 0x7e, 0xd3, + 0x25, 0xc7, 0xb5, 0x95, 0x33, 0xea, 0x6d, 0xb6, 0xcd, 0xd1, 0xbd, 0xbc, 0xd7, 0xdc, 0x70, 0x3a, + 0x42, 0xab, 0xb0, 0x3c, 0x43, 0xa7, 0x96, 0x9b, 0x9e, 0x77, 0x26, 0x42, 0xb7, 0xf6, 0xd7, 0x1e, + 0xc1, 0x34, 0x84, 0x18, 0xbe, 0xb5, 0xc2, 0x63, 0xa8, 0x92, 0xc4, 0x50, 0xe5, 0x29, 0x12, 0x04, + 0xf6, 0x0c, 0x39, 0xd0, 0x0f, 0x1d, 0xaf, 0x17, 0xe8, 0xaf, 0x2e, 0x00, 0x3b, 0xa5, 0x84, 0xd8, + 0x91, 0x57, 0xda, 0xea, 0x3f, 0x61, 0x87, 0xaa, 0xbc, 0x29, 0xa9, 0x1f, 0x4a, 0x45, 0xe5, 0x7b, + 0x11, 0xca, 0x3d, 0x6f, 0x1f, 0x3f, 0xbe, 0x43, 0x55, 0xfe, 0x2b, 0xab, 0xaf, 0xe5, 0x86, 0x2d, + 0xa5, 0x33, 0x12, 0x1e, 0xdd, 0xdd, 0xf3, 0xc2, 0x59, 0xe2, 0xd3, 0x73, 0x0a, 0xff, 0xff, 0x39, + 0xd1, 0x2e, 0xed, 0x51, 0x2c, 0x77, 0x3a, 0x1d, 0x76, 0x2b, 0x6b, 0x6b, 0xdb, 0x57, 0xc6, 0x03, + 0x3f, 0xed, 0xca, 0x8a, 0x1b, 0xa9, 0x34, 0x1a, 0x0d, 0x53, 0x3a, 0x38, 0x6e, 0x51, 0xcc, 0x7c, + 0x03, 0x4e, 0x47, 0xe8, 0x21, 0x2c, 0xdb, 0xcd, 0x96, 0x0a, 0xaa, 0xa4, 0xca, 0xc5, 0x51, 0x16, + 0xc5, 0xea, 0x77, 0x4b, 0x32, 0x86, 0x0e, 0xfd, 0x15, 0x94, 0x64, 0xf5, 0x8a, 0x7c, 0x3a, 0x42, + 0x5b, 0xb1, 0xdc, 0x26, 0x1d, 0x55, 0x56, 0x25, 0x15, 0x8a, 0x0a, 0x96, 0x9b, 0xb6, 0xaf, 0x5e, + 0x96, 0xa8, 0xcb, 0x0c, 0xf3, 0x3b, 0x1d, 0xa1, 0x3c, 0x73, 0xb9, 0x1a, 0x21, 0x58, 0x8c, 0x91, + 0xa4, 0x8e, 0x2c, 0xc6, 0xe8, 0x7e, 0x7c, 0xdf, 0x0e, 0x31, 0x66, 0x7b, 0x87, 0xa0, 0xae, 0xd0, + 0xee, 0x51, 0x9c, 0xc7, 0x72, 0x77, 0x7b, 0x77, 0x31, 0x46, 0x18, 0x2b, 0xc5, 0x02, 0xce, 0xcd, + 0x79, 0xae, 0xb7, 0x18, 0x23, 0x05, 0x17, 0x8a, 0x39, 0xf5, 0xfd, 0x13, 0x85, 0xc5, 0x18, 0xe5, + 0xb0, 0xa4, 0x82, 0x78, 0x4a, 0xa5, 0x8f, 0x00, 0xa3, 0x83, 0xb6, 0xeb, 0xb4, 0xed, 0xd0, 0xf3, + 0xb5, 0xcf, 0xe3, 0x35, 0xf6, 0x20, 0x9c, 0x25, 0xbd, 0xd0, 0x69, 0xd9, 0x21, 0x69, 0xb3, 0x53, + 0x52, 0xac, 0x95, 0x8d, 0xda, 0x63, 0x18, 0xf7, 0x89, 0xdf, 0x75, 0x82, 0xc0, 0xf1, 0x7a, 0xec, + 0x33, 0x5c, 0x55, 0xdb, 0x9c, 0x1e, 0x53, 0x3a, 0x5a, 0xe5, 0xe9, 0xd4, 0xc9, 0x5a, 0x06, 0x14, + 0x9f, 0xc3, 0x78, 0xd8, 0xa3, 0x8d, 0xe3, 0x82, 0xdd, 0xa2, 0x57, 0xcc, 0xe6, 0x5a, 0x5b, 0xdb, + 0x74, 0x8f, 0x81, 0x76, 0x33, 0x07, 0x4b, 0x38, 0x6a, 0x0f, 0xe0, 0x02, 0x5d, 0x4c, 0x38, 0xc7, + 0xae, 0x08, 0x59, 0xc2, 0x2a, 0x95, 0x71, 0x81, 0x7b, 0x6a, 0x08, 0xe7, 0xbf, 0x76, 0x60, 0xef, + 0xbe, 0xfd, 0xea, 0x88, 0xa6, 0xe0, 0x9c, 0xd5, 0xd8, 0xfd, 0xb8, 0x0a, 0xb4, 0xf1, 0x39, 0x6b, + 0xdf, 0xb3, 0x0d, 0x55, 0x2a, 0x7d, 0x58, 0xc0, 0xeb, 0x9f, 0x24, 0x73, 0x2f, 0x78, 0x7e, 0xfb, + 0x2b, 0x9e, 0xeb, 0x3a, 0x74, 0x25, 0x01, 0x1d, 0x37, 0x98, 0xeb, 0x85, 0xf6, 0x31, 0xb1, 0x6d, + 0x61, 0xd1, 0x76, 0xa7, 0xdb, 0xf7, 0xfc, 0x90, 0xcd, 0xa7, 0x58, 0xc2, 0xa2, 0xed, 0xfd, 0x41, + 0xd3, 0x75, 0x5a, 0x2c, 0xf1, 0x28, 0x96, 0xb0, 0x68, 0x8a, 0x7b, 0x81, 0xd8, 0x47, 0xf4, 0x1c, + 0x6b, 0x65, 0xef, 0x9a, 0x8e, 0x47, 0xfb, 0x76, 0xeb, 0x88, 0x3d, 0x43, 0xf4, 0x3c, 0x6b, 0x4e, + 0x4c, 0x36, 0x6b, 0xe8, 0x3b, 0xbd, 0x19, 0x96, 0x5c, 0x90, 0x25, 0x2c, 0x9a, 0x1d, 0x9a, 0x73, + 0x21, 0x09, 0xf4, 0x51, 0x9a, 0x73, 0x2c, 0x6e, 0xd0, 0x56, 0xa7, 0x17, 0x4e, 0xd4, 0x74, 0x85, + 0xe7, 0x0c, 0x66, 0x88, 0xd6, 0xc9, 0xba, 0x8e, 0x0c, 0x28, 0xcb, 0x16, 0x37, 0xe8, 0xc8, 0x03, + 0xee, 0x8c, 0x0d, 0x28, 0xaf, 0xb1, 0x84, 0x95, 0xb4, 0x4f, 0xd6, 0xf5, 0x55, 0x2c, 0xe5, 0x0a, + 0x8b, 0xad, 0x84, 0xfb, 0xaf, 0x36, 0xa0, 0xbc, 0xde, 0x12, 0x56, 0xd2, 0x3e, 0x59, 0xd7, 0xd7, + 0x18, 0x50, 0xd6, 0x2c, 0x61, 0xd1, 0x3d, 0x75, 0x9c, 0x63, 0xa4, 0x3d, 0x51, 0xd3, 0xd7, 0x1a, + 0x50, 0x1e, 0xb5, 0x12, 0x33, 0xed, 0x99, 0xac, 0xeb, 0xeb, 0x0c, 0x28, 0x17, 0xac, 0xc4, 0xd4, + 0x8a, 0x58, 0x09, 0x12, 0x48, 0x35, 0xa0, 0xbc, 0xce, 0x4a, 0xed, 0x61, 0xdf, 0x64, 0x5d, 0x5f, + 0x6f, 0x40, 0x59, 0xb5, 0x52, 0x9b, 0x9e, 0x69, 0xd3, 0xf3, 0x5c, 0x5d, 0xe3, 0x67, 0x4a, 0xdf, + 0xe9, 0xae, 0x3b, 0xae, 0x67, 0x87, 0xfa, 0x7d, 0x06, 0x94, 0x25, 0x8b, 0x1b, 0x74, 0xb5, 0x6d, + 0x6f, 0xd0, 0x74, 0x89, 0xbe, 0xc1, 0x80, 0x32, 0x58, 0xc2, 0xa2, 0xa3, 0x7b, 0x2c, 0x97, 0xd8, + 0xae, 0x7e, 0x3f, 0x1b, 0x25, 0xb5, 0x69, 0x9f, 0x4f, 0xfa, 0x84, 0x85, 0xfc, 0x03, 0xbc, 0x2f, + 0xb1, 0x79, 0xdf, 0x77, 0x06, 0x8e, 0x4f, 0xda, 0xfa, 0xc6, 0xa4, 0x8f, 0xdb, 0x74, 0x9f, 0x5d, + 0x9e, 0xa6, 0x74, 0x9d, 0xdf, 0xaa, 0x30, 0xe9, 0x7a, 0x49, 0x6f, 0xd0, 0xd5, 0x37, 0xf1, 0xf5, + 0xd2, 0x77, 0xea, 0x1d, 0x10, 0xff, 0xa8, 0xd3, 0x22, 0x7a, 0x91, 0x7b, 0x0b, 0x93, 0xd6, 0x06, + 0xbf, 0xdf, 0xd2, 0x1f, 0x64, 0xad, 0xf4, 0x95, 0xee, 0x82, 0xaf, 0x4e, 0xff, 0x1c, 0x8f, 0x2d, + 0x6e, 0xb1, 0xd8, 0x3f, 0x16, 0x92, 0x5e, 0x5b, 0xdf, 0xcc, 0xdb, 0xb9, 0xa5, 0x6d, 0xc1, 0x98, + 0xbd, 0xb1, 0x48, 0xd6, 0xb7, 0xb0, 0xbe, 0x65, 0x2d, 0x7c, 0x17, 0x74, 0x3a, 0xd2, 0xd6, 0xb7, + 0x26, 0xbb, 0xe0, 0x36, 0x2d, 0xbf, 0xa1, 0xa7, 0x1b, 0xac, 0x55, 0x0a, 0x3d, 0xba, 0xf6, 0xd0, + 0x1f, 0x10, 0x7d, 0x1b, 0x0b, 0x31, 0xf6, 0xce, 0xce, 0xda, 0x76, 0x03, 0xa2, 0x97, 0x78, 0xdc, + 0x31, 0x83, 0xee, 0xa8, 0x4d, 0x3a, 0xf6, 0xc0, 0x0d, 0xf5, 0x87, 0x78, 0x76, 0x16, 0x66, 0xe9, + 0x27, 0x32, 0xde, 0x78, 0xe7, 0x17, 0x26, 0x52, 0xb9, 0xf6, 0x2f, 0x60, 0xf5, 0x9e, 0x7e, 0x64, + 0xb9, 0x3d, 0x97, 0xe1, 0x64, 0x84, 0xe0, 0x54, 0x84, 0xe0, 0x4c, 0x84, 0xe0, 0x6c, 0x84, 0xe0, + 0x7c, 0x84, 0xe0, 0xad, 0x08, 0x89, 0xef, 0xe0, 0x9d, 0x08, 0xf1, 0xd0, 0xbf, 0x14, 0x21, 0xe3, + 0x4a, 0x84, 0xa6, 0xae, 0x46, 0x68, 0x7e, 0xd3, 0xb5, 0x08, 0xcd, 0xd7, 0xae, 0x47, 0x68, 0xd7, + 0x8d, 0x08, 0xbd, 0x74, 0x2b, 0x42, 0x67, 0x57, 0x8f, 0x8c, 0x7c, 0x12, 0xa1, 0xa9, 0x4d, 0x23, + 0xec, 0xe7, 0xfb, 0x31, 0x3a, 0xfc, 0xd1, 0xed, 0xdb, 0x3f, 0x88, 0xd1, 0xa5, 0xff, 0xdc, 0x66, + 0x3f, 0xa7, 0x62, 0x04, 0xaf, 0xc4, 0xe8, 0xdd, 0x5b, 0x4f, 0x4c, 0x9d, 0x8b, 0x51, 0xef, 0xe5, + 0x07, 0x6f, 0x7e, 0xb2, 0x0d, 0x4d, 0x9d, 0x8f, 0x11, 0x5c, 0x88, 0x11, 0x5c, 0x8c, 0x11, 0x5c, + 0x8a, 0x11, 0x5c, 0x89, 0x11, 0x5c, 0x8d, 0x11, 0x5c, 0x8b, 0x11, 0x5c, 0x8f, 0x11, 0xdc, 0x88, + 0x11, 0xdc, 0x8c, 0x11, 0x7c, 0x1c, 0x23, 0x98, 0x5f, 0x42, 0x70, 0x72, 0x09, 0x79, 0xa7, 0x96, + 0xd0, 0x8f, 0x6e, 0x8b, 0x1f, 0x38, 0xb3, 0x84, 0x3e, 0x00, 0xaa, 0x59, 0xb4, 0xd7, 0x41, 0x08, + 0x1b, 0x96, 0x93, 0xf6, 0xfc, 0x18, 0x16, 0x97, 0xd0, 0x0f, 0x41, 0x01, 0x15, 0xd8, 0x46, 0xa1, + 0x26, 0xf6, 0x63, 0xf2, 0xdd, 0x4c, 0x19, 0x4f, 0x4c, 0x3d, 0x3d, 0xbf, 0xe9, 0x9b, 0xf3, 0xb5, + 0xc3, 0xbb, 0x66, 0x5f, 0x1a, 0xd0, 0xf5, 0xcf, 0xa5, 0xab, 0x07, 0xb6, 0x78, 0x48, 0xd7, 0x0e, + 0xf0, 0x0a, 0xb0, 0x95, 0x43, 0xba, 0x70, 0x80, 0x0b, 0x00, 0x17, 0x01, 0x2e, 0x01, 0x5c, 0x01, + 0xb8, 0x0a, 0x70, 0x0d, 0xe0, 0x3a, 0xc0, 0x0d, 0x80, 0x9b, 0x00, 0x1f, 0x03, 0xcc, 0x4b, 0x70, + 0x52, 0xf2, 0x4e, 0x49, 0xcb, 0x96, 0x2a, 0x7d, 0x00, 0x5c, 0x6f, 0xd5, 0x5e, 0x06, 0xbc, 0x8e, + 0x56, 0x33, 0xfa, 0xef, 0x19, 0x11, 0x82, 0x8f, 0x62, 0xe5, 0x1b, 0x01, 0xf1, 0x77, 0x0f, 0xc2, + 0xd9, 0x3b, 0x6a, 0x79, 0x71, 0xa5, 0x59, 0xd2, 0xde, 0x3b, 0x51, 0x58, 0xab, 0x80, 0x86, 0x95, + 0x11, 0xad, 0xd0, 0x72, 0x1d, 0xd2, 0x0b, 0xb5, 0x9d, 0x58, 0xde, 0x4b, 0xc2, 0x0c, 0x50, 0x7d, + 0xef, 0x44, 0x61, 0xb5, 0x02, 0x9a, 0xa2, 0x80, 0x96, 0x1b, 0x04, 0xc4, 0x37, 0xbf, 0x8c, 0xf3, + 0xae, 0xdd, 0x24, 0xae, 0xb6, 0xfd, 0xae, 0xf2, 0xdf, 0x48, 0x62, 0xd7, 0xb2, 0x7b, 0x43, 0x15, + 0x70, 0x76, 0x41, 0x68, 0x41, 0x86, 0x99, 0x8f, 0xe3, 0x9c, 0x4f, 0xfa, 0x61, 0xb6, 0x7a, 0x58, + 0x5c, 0x00, 0x56, 0xa6, 0xee, 0xac, 0xf7, 0x94, 0x36, 0xbf, 0x8d, 0x65, 0x42, 0x48, 0xf6, 0x20, + 0xbf, 0x58, 0x80, 0xcf, 0x22, 0x09, 0x2c, 0x3a, 0xaa, 0xb9, 0x1b, 0x83, 0x9d, 0x3d, 0xf4, 0xef, + 0x16, 0xb8, 0x1e, 0x51, 0xd3, 0xa1, 0x85, 0x5e, 0xb1, 0xc0, 0x36, 0xbf, 0x8e, 0xd1, 0xd1, 0xb4, + 0x44, 0x6f, 0xb9, 0xc7, 0x50, 0xe1, 0xac, 0xd7, 0x4e, 0x46, 0x7a, 0xfb, 0x30, 0x1b, 0x48, 0xbb, + 0xbb, 0x8c, 0x5a, 0xc3, 0x51, 0xcc, 0x87, 0x93, 0x52, 0xa7, 0x6d, 0xbe, 0x6b, 0xbc, 0xaf, 0x3a, + 0xc4, 0x4d, 0x87, 0x3b, 0xb7, 0xb0, 0xa2, 0x16, 0x52, 0x50, 0x54, 0xbf, 0x0c, 0x70, 0x31, 0x01, + 0xb9, 0x3b, 0x05, 0x45, 0x79, 0xcc, 0x00, 0x5f, 0x4d, 0x40, 0xee, 0x6e, 0x4e, 0xf0, 0x6a, 0x9a, + 0x85, 0xfd, 0x54, 0x60, 0xcc, 0xd9, 0xfc, 0x52, 0x5a, 0x6e, 0xb3, 0xb8, 0x9f, 0x09, 0x2e, 0xf1, + 0x67, 0x47, 0xc3, 0x2b, 0x70, 0x06, 0xf9, 0x73, 0x11, 0x8b, 0xc9, 0x87, 0xbd, 0x53, 0x14, 0xec, + 0x2c, 0xee, 0x35, 0xc6, 0x25, 0x15, 0x9d, 0x62, 0xbc, 0xcc, 0x66, 0x60, 0xe7, 0x85, 0x00, 0xe6, + 0xde, 0x02, 0x9b, 0xac, 0x67, 0x61, 0xaf, 0x33, 0x2c, 0xd1, 0x04, 0x74, 0x77, 0x83, 0x4f, 0x35, + 0x1d, 0x0f, 0xf6, 0x54, 0x34, 0x24, 0x60, 0xf6, 0x84, 0x6f, 0x30, 0x30, 0x55, 0x15, 0xec, 0x3c, + 0x3f, 0xd5, 0x8c, 0x6f, 0x32, 0x30, 0x95, 0x1d, 0x09, 0x98, 0x3d, 0xe3, 0x2f, 0x19, 0x98, 0xea, + 0x12, 0x7a, 0xf9, 0x89, 0xa4, 0xc8, 0x20, 0x7f, 0xc5, 0xc8, 0xa1, 0x70, 0x49, 0xd1, 0xec, 0x49, + 0x7f, 0xcd, 0xd0, 0xa1, 0xb2, 0x31, 0x1f, 0x19, 0x2a, 0x9b, 0x2c, 0xf6, 0x02, 0x63, 0x97, 0x49, + 0x9f, 0x21, 0x9c, 0x3d, 0xf1, 0x6f, 0x18, 0xbc, 0x4c, 0x1b, 0xd1, 0x2f, 0x84, 0xe9, 0xa1, 0x0c, + 0xf0, 0xad, 0xe4, 0x0b, 0xa1, 0xce, 0x34, 0x7e, 0xb8, 0x5e, 0xca, 0xa0, 0x7e, 0xcb, 0xa8, 0x44, + 0x5d, 0xd1, 0x4b, 0x11, 0x7a, 0x2a, 0x83, 0xe3, 0x19, 0x2d, 0x95, 0x5f, 0x74, 0x87, 0xa9, 0xdc, + 0xca, 0x40, 0x7f, 0x2f, 0x16, 0x9a, 0x02, 0x14, 0x4e, 0xf5, 0x58, 0x06, 0xfc, 0x87, 0x04, 0x4e, + 0x00, 0x0e, 0x0b, 0xc1, 0x96, 0x01, 0xff, 0x71, 0x08, 0x73, 0x80, 0x06, 0x44, 0x22, 0xe9, 0x32, + 0xd8, 0x8b, 0x49, 0x22, 0x11, 0xfe, 0xf4, 0x5a, 0x98, 0xec, 0xcb, 0xe0, 0xde, 0x4e, 0xae, 0x85, + 0x3a, 0xd3, 0xf9, 0x12, 0x51, 0x98, 0xc1, 0xbd, 0x93, 0xcc, 0x27, 0xfc, 0xcd, 0x71, 0x26, 0x22, + 0xb3, 0xb0, 0x3f, 0x09, 0x8c, 0xfa, 0xd2, 0xdb, 0x14, 0xba, 0x32, 0x83, 0xfa, 0x73, 0x92, 0x94, + 0xb9, 0x3b, 0x05, 0x85, 0xf0, 0xcc, 0x00, 0xff, 0x92, 0x80, 0xdc, 0xdd, 0xdc, 0xb5, 0x5c, 0xa7, + 0x66, 0xc1, 0x7f, 0x15, 0xf0, 0x32, 0x84, 0xdf, 0xa6, 0x10, 0xae, 0x19, 0xf8, 0xdf, 0x86, 0xb7, + 0xc9, 0x01, 0x73, 0x8c, 0x2a, 0xdd, 0x2c, 0xec, 0x92, 0xc0, 0xa4, 0xd0, 0xa3, 0x77, 0xc8, 0xe4, + 0x6f, 0x06, 0x72, 0x59, 0xe4, 0x66, 0xe6, 0xcc, 0x3e, 0x2d, 0x26, 0x8f, 0x33, 0xa8, 0xbf, 0x27, + 0x19, 0x9d, 0x79, 0xd3, 0xab, 0x17, 0xea, 0x39, 0x0b, 0x7c, 0x37, 0xf9, 0x5b, 0x88, 0xf0, 0x37, + 0x0f, 0xb0, 0x0c, 0x90, 0x19, 0x6a, 0xff, 0x10, 0x2a, 0xa3, 0x98, 0x8a, 0x83, 0xbb, 0xfe, 0x13, + 0xcc, 0xb2, 0x43, 0x77, 0xcf, 0xc4, 0xb7, 0xc6, 0x67, 0x9c, 0x70, 0x76, 0xd0, 0xac, 0xb4, 0xbc, + 0xee, 0xd8, 0xf3, 0xb3, 0x83, 0x6e, 0x9f, 0xff, 0x75, 0xcf, 0x27, 0x1d, 0x97, 0xb4, 0xc2, 0x31, + 0xa7, 0x17, 0x12, 0xbf, 0x67, 0xbb, 0x63, 0x21, 0x09, 0x42, 0xd6, 0x13, 0xfc, 0x2f, 0x00, 0x00, + 0xff, 0xff, 0x25, 0xdc, 0x18, 0x4d, 0x29, 0x14, 0x00, 0x00, } diff --git a/internal/testprotos/desc_test_complex.proto b/internal/testprotos/desc_test_complex.proto index ba46947a..115f15bd 100644 --- a/internal/testprotos/desc_test_complex.proto +++ b/internal/testprotos/desc_test_complex.proto @@ -119,3 +119,109 @@ service TestTestService { }; } } + +// tests cases where field names collide with keywords + +message KeywordCollisions { + optional bool syntax = 1; + optional bool import = 2; + optional bool public = 3; + optional bool weak = 4; + optional bool package = 5; + optional string string = 6; + optional bytes bytes = 7; + optional int32 int32 = 8; + optional int64 int64 = 9; + optional uint32 uint32 = 10; + optional uint64 uint64 = 11; + optional sint32 sint32 = 12; + optional sint64 sint64 = 13; + optional fixed32 fixed32 = 14; + optional fixed64 fixed64 = 15; + optional sfixed32 sfixed32 = 16; + optional sfixed64 sfixed64 = 17; + optional bool bool = 18; + optional float float = 19; + optional double double = 20; + optional bool optional = 21; + optional bool repeated = 22; + optional bool required = 23; + optional bool message = 24; + optional bool enum = 25; + optional bool service = 26; + optional bool rpc = 27; + optional bool option = 28; + optional bool extend = 29; + optional bool extensions = 30; + optional bool reserved = 31; + optional bool to = 32; + optional int32 true = 33; + optional int32 false = 34; + optional int32 default = 35; +} + +extend google.protobuf.FieldOptions { + optional bool syntax = 20001; + optional bool import = 20002; + optional bool public = 20003; + optional bool weak = 20004; + optional bool package = 20005; + optional string string = 20006; + optional bytes bytes = 20007; + optional int32 int32 = 20008; + optional int64 int64 = 20009; + optional uint32 uint32 = 20010; + optional uint64 uint64 = 20011; + optional sint32 sint32 = 20012; + optional sint64 sint64 = 20013; + optional fixed32 fixed32 = 20014; + optional fixed64 fixed64 = 20015; + optional sfixed32 sfixed32 = 20016; + optional sfixed64 sfixed64 = 20017; + optional bool bool = 20018; + optional float float = 20019; + optional double double = 20020; + optional bool optional = 20021; + optional bool repeated = 20022; + optional bool required = 20023; + optional bool message = 20024; + optional bool enum = 20025; + optional bool service = 20026; + optional bool rpc = 20027; + optional bool option = 20028; + optional bool extend = 20029; + optional bool extensions = 20030; + optional bool reserved = 20031; + optional bool to = 20032; + optional int32 true = 20033; + optional int32 false = 20034; + optional int32 default = 20035; + optional KeywordCollisions boom = 20036; +} + +message KeywordCollisionOptions { + optional uint64 id = 1 [ + (syntax) = true, (import) = true, (public) = true, (weak) = true, (package) = true, + (string) = "string", (bytes) = "bytes", (bool) = true, + (float) = 3.14, (double) = 3.14159, + (int32) = 32, (int64) = 64, (uint32) = 3200, (uint64) = 6400, (sint32) = -32, (sint64) = -64, + (fixed32) = 3232, (fixed64) = 6464, (sfixed32) = -3232, (sfixed64) = -6464, + (optional) = true, (repeated) = true, (required) = true, + (message) = true, (enum) = true, (service) = true, (rpc) = true, + (option) = true, (extend) = true, (extensions) = true, (reserved) = true, + (to) = true, (true) = 111, (false) = -111, (default) = 222 + ]; + optional string name = 2 [ + (boom) = { + syntax: true, import: true, public: true, weak: true, package: true, + string: "string", bytes: "bytes", bool: true, + float: 3.14, double: 3.14159, + int32: 32, int64: 64, uint32: 3200, uint64: 6400, sint32: -32, sint64: -64, + fixed32: 3232, fixed64: 6464, sfixed32: -3232, sfixed64: -6464, + optional: true, repeated: true, required: true, + message: true, enum: true, service: true, rpc: true, + option: true, extend: true, extensions: true, reserved: true, + to: true, true: 111, false: -111, default: 222 + } + ]; +} \ No newline at end of file diff --git a/internal/testprotos/desc_test_complex.protoset b/internal/testprotos/desc_test_complex.protoset index 49ef12af..f6eb174c 100644 Binary files a/internal/testprotos/desc_test_complex.protoset and b/internal/testprotos/desc_test_complex.protoset differ diff --git a/internal/testprotos/desc_test_complex_source_info.protoset b/internal/testprotos/desc_test_complex_source_info.protoset index b75f7fc2..62853cc5 100644 Binary files a/internal/testprotos/desc_test_complex_source_info.protoset and b/internal/testprotos/desc_test_complex_source_info.protoset differ diff --git a/internal/testprotos/make_protos.sh b/internal/testprotos/make_protos.sh index c43c6dbf..18c9cbe8 100755 --- a/internal/testprotos/make_protos.sh +++ b/internal/testprotos/make_protos.sh @@ -37,3 +37,4 @@ ${PROTOC} --descriptor_set_out=./desc_test_complex.protoset -I. desc_test_comple ${PROTOC} --descriptor_set_out=./desc_test_complex_source_info.protoset --include_source_info --include_imports -I. desc_test_complex.proto ${PROTOC} --descriptor_set_out=./descriptor.protoset --include_source_info --include_imports -I./protoc/include/ google/protobuf/descriptor.proto ${PROTOC} --descriptor_set_out=./duration.protoset -I./protoc/include/ google/protobuf/duration.proto +