|
|
|
@ -216,90 +216,18 @@ class MockErrorCollector : public DescriptorPool::ErrorCollector { |
|
|
|
|
void RecordError(absl::string_view filename, absl::string_view element_name, |
|
|
|
|
const Message* descriptor, ErrorLocation location, |
|
|
|
|
absl::string_view message) override { |
|
|
|
|
const char* location_name = nullptr; |
|
|
|
|
switch (location) { |
|
|
|
|
case NAME: |
|
|
|
|
location_name = "NAME"; |
|
|
|
|
break; |
|
|
|
|
case NUMBER: |
|
|
|
|
location_name = "NUMBER"; |
|
|
|
|
break; |
|
|
|
|
case TYPE: |
|
|
|
|
location_name = "TYPE"; |
|
|
|
|
break; |
|
|
|
|
case EXTENDEE: |
|
|
|
|
location_name = "EXTENDEE"; |
|
|
|
|
break; |
|
|
|
|
case DEFAULT_VALUE: |
|
|
|
|
location_name = "DEFAULT_VALUE"; |
|
|
|
|
break; |
|
|
|
|
case OPTION_NAME: |
|
|
|
|
location_name = "OPTION_NAME"; |
|
|
|
|
break; |
|
|
|
|
case OPTION_VALUE: |
|
|
|
|
location_name = "OPTION_VALUE"; |
|
|
|
|
break; |
|
|
|
|
case INPUT_TYPE: |
|
|
|
|
location_name = "INPUT_TYPE"; |
|
|
|
|
break; |
|
|
|
|
case OUTPUT_TYPE: |
|
|
|
|
location_name = "OUTPUT_TYPE"; |
|
|
|
|
break; |
|
|
|
|
case IMPORT: |
|
|
|
|
location_name = "IMPORT"; |
|
|
|
|
break; |
|
|
|
|
case OTHER: |
|
|
|
|
location_name = "OTHER"; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
absl::SubstituteAndAppend(&text_, "$0: $1: $2: $3\n", filename, |
|
|
|
|
element_name, location_name, message); |
|
|
|
|
element_name, ErrorLocationName(location), |
|
|
|
|
message); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// implements ErrorCollector ---------------------------------------
|
|
|
|
|
void RecordWarning(absl::string_view filename, absl::string_view element_name, |
|
|
|
|
const Message* descriptor, ErrorLocation location, |
|
|
|
|
absl::string_view message) override { |
|
|
|
|
const char* location_name = nullptr; |
|
|
|
|
switch (location) { |
|
|
|
|
case NAME: |
|
|
|
|
location_name = "NAME"; |
|
|
|
|
break; |
|
|
|
|
case NUMBER: |
|
|
|
|
location_name = "NUMBER"; |
|
|
|
|
break; |
|
|
|
|
case TYPE: |
|
|
|
|
location_name = "TYPE"; |
|
|
|
|
break; |
|
|
|
|
case EXTENDEE: |
|
|
|
|
location_name = "EXTENDEE"; |
|
|
|
|
break; |
|
|
|
|
case DEFAULT_VALUE: |
|
|
|
|
location_name = "DEFAULT_VALUE"; |
|
|
|
|
break; |
|
|
|
|
case OPTION_NAME: |
|
|
|
|
location_name = "OPTION_NAME"; |
|
|
|
|
break; |
|
|
|
|
case OPTION_VALUE: |
|
|
|
|
location_name = "OPTION_VALUE"; |
|
|
|
|
break; |
|
|
|
|
case INPUT_TYPE: |
|
|
|
|
location_name = "INPUT_TYPE"; |
|
|
|
|
break; |
|
|
|
|
case OUTPUT_TYPE: |
|
|
|
|
location_name = "OUTPUT_TYPE"; |
|
|
|
|
break; |
|
|
|
|
case IMPORT: |
|
|
|
|
location_name = "IMPORT"; |
|
|
|
|
break; |
|
|
|
|
case OTHER: |
|
|
|
|
location_name = "OTHER"; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
absl::SubstituteAndAppend(&warning_text_, "$0: $1: $2: $3\n", filename, |
|
|
|
|
element_name, location_name, message); |
|
|
|
|
element_name, ErrorLocationName(location), |
|
|
|
|
message); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|