diff options
| -rw-r--r-- | flang/runtime/format.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/flang/runtime/format.h b/flang/runtime/format.h index 40a0f30..d0b16bb 100644 --- a/flang/runtime/format.h +++ b/flang/runtime/format.h @@ -150,11 +150,24 @@ private: void ReportBadFormat(Context &context, const char *msg, int offset) const { if constexpr (std::is_same_v<CharType, char>) { - context.SignalError(IostatErrorInFormat, - "%s; at offset %d in format '%s'", msg, offset, format_); - } else { - context.SignalError(IostatErrorInFormat, "%s; at offset %d", msg, offset); + // Echo the bad format in the error message, but trim any leading or + // trailing spaces. + int firstNonBlank{0}; + while (firstNonBlank < formatLength_ && format_[firstNonBlank] == ' ') { + ++firstNonBlank; + } + int lastNonBlank{formatLength_ - 1}; + while (lastNonBlank > firstNonBlank && format_[lastNonBlank] == ' ') { + --lastNonBlank; + } + if (firstNonBlank <= lastNonBlank) { + context.SignalError(IostatErrorInFormat, + "%s; at offset %d in format '%.*s'", msg, offset, + lastNonBlank - firstNonBlank + 1, format_ + firstNonBlank); + return; + } } + context.SignalError(IostatErrorInFormat, "%s; at offset %d", msg, offset); } // Data members are arranged and typed so as to reduce size. |