[symbolizer][NFC] Reorganize parsing input binary file

[sepavloff]

Summary

Now llvm-symbolizer prints input string if parsing command failed,
whithout explanation that is wrong. As a first step in making the
interface more user-friendly, this change reorganize parsing so that
generation of messages becomes easier.

[ikudrin]

LGTM

llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp

213–214

Use else if here to reduce the nesting.

217–221

The new code has a different result than the old one if, for example, InputString consists of only one word, i.e. ModuleName was set to this word, while with the changed code it remains empty.

[jhenderson]

LGTM, with nits.

llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp

183

Here and below "is already seen" -> "has already been seen"

197

I'd probably add a blank line before this if.

199

"is already" -> "has already been"
"in command line" -> "on the command-line"

215

219

[sepavloff]

Thanks!

llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp

static StringRef getSpaceDelimitedWord(StringRef &Source) {
   Source = StringRef(Pos, Source.end() - Pos);
   return Result;
 }
 
 static bool parseCommand(StringRef BinaryName, bool IsAddr2Line,
                          StringRef InputString, Command &Cmd,
                          std::string &ModuleName, object::BuildID &BuildID,
                          uint64_t &ModuleOffset) {
-  ModuleName = "";
+  ModuleName = BinaryName;
   if (InputString.consume_front("CODE ")) {
     Cmd = Command::Code;
   } else if (InputString.consume_front("DATA ")) {
     Cmd = Command::Data;
   } else if (InputString.consume_front("FRAME ")) {
     Cmd = Command::Frame;
   } else {
     // If no cmd, assume it's CODE.
     Cmd = Command::Code;
   }
 
-  // Skip delimiters and parse input filename (if needed).
-  if (BinaryName.empty() && BuildID.empty()) {
-    bool HasFilePrefix = false;
-    bool HasBuildIDPrefix = false;
-    while (true) {
-      if (InputString.consume_front("FILE:")) {
-        if (HasFilePrefix)
-          return false;
-        HasFilePrefix = true;
-        continue;
-      }
-      if (InputString.consume_front("BUILDID:")) {
-        if (HasBuildIDPrefix)
-          return false;
-        HasBuildIDPrefix = true;
-        continue;
-      }
-      break;
-    }
-    if (HasFilePrefix && HasBuildIDPrefix)
+  // Parse optional input file specification.
+  while (!InputString.empty()) {
+    InputString = InputString.ltrim();
+      if (HasFilePrefix || HasBuildIDPrefix)
+        // Input file specification prefix is already seen.
+      if (HasBuildIDPrefix || HasFilePrefix)
+        // Input file specification prefix is already seen.
+  if (HasBuildIDPrefix || HasFilePrefix) {
+    if (!BinaryName.empty() || !BuildID.empty())
+      // Input file is already specified in command line.
       return false;
-
-    ModuleName = getSpaceDelimitedWord(InputString);
-    if (ModuleName.empty())
+    StringRef Name = getSpaceDelimitedWord(InputString);
+    if (Name.empty())
+      // Wrong name for module file.
       return false;
     if (HasBuildIDPrefix) {
-      BuildID = parseBuildID(ModuleName);
+      BuildID = parseBuildID(Name);
       if (BuildID.empty())
+        // Wrong format of BuildID hash.
         return false;
-      ModuleName.clear();
+    } else {
+      ModuleName = Name;
     }
   } else {
-    ModuleName = BinaryName.str();
+    if (BinaryName.empty() && BuildID.empty()) {
+      // No input file is specified. If the input string contains at least two
+      // items, assume that the first item is a file name.
+      StringRef Name = getSpaceDelimitedWord(InputString);
+      if (Name.empty() || InputString.empty())
+        // No input filename is specified.
+        return false;
+      ModuleName = Name;
+    }
   }
 
   // Skip delimiters and parse module offset.
   InputString = InputString.ltrim();
   int OffsetLength = InputString.find_first_of(" \n\r");
   StringRef Offset = InputString.substr(0, OffsetLength);
   // GNU addr2line assumes the offset is hexadecimal and allows a redundant
   // "0x" or "0X" prefix; do the same for compatibility.