[flang-commits] [PATCH] D129024: [flang][runtime] Trim FORMATs echoed to error messages

[Peter Klausler via Phabricator via flang-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG7c708adb4a14: [flang][runtime] Trim FORMATs echoed to error messages (authored by klausler).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D129024/new/

https://reviews.llvm.org/D129024

Files:
  flang/runtime/format.h


Index: flang/runtime/format.h
===================================================================
--- flang/runtime/format.h
+++ flang/runtime/format.h
@@ -150,11 +150,24 @@
 
   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.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D129024.442750.patch
Type: text/x-patch
Size: 1338 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/flang-commits/attachments/20220707/457655b4/attachment.bin>