[llvm-rc] Allow optional commas between the string table index and value

[mstorsjo]

Summary

This form is even used in one of the examples at https://msdn.microsoft.com/en-us/library/windows/desktop/aa381050(v=vs.85).aspx.

[zturner]

test/tools/llvm-rc/Inputs/tag-stringtable-basic.rc

9

Can you put a comment above this that says "commas are optional, so we make sure to test both cases"?

This way someone editing this test in the future knows to preserve the commas.

Alternatively, you could break this out into a separate test called tag-stringtable-commas.rc

[mstorsjo]

test/tools/llvm-rc/Inputs/tag-stringtable-basic.rc

9

Sure, I'll add a comment.

[amccarth]

As I recall, commas may be optionally allowed in several places besides string tables. We'll have to check that and, if necessary, address in a subsequent patch.

test/tools/llvm-rc/Inputs/tag-stringtable-basic.rc

 STRINGTABLE
 VERSION 32
 CHARACTERISTICS 0x32 {
   0 "a"
 }
 
 STRINGTABLE {
-  1 "b"
-  16 "bb"
+  1, "b"
+  16, "bb"
 }
 
 STRINGTABLE
 VERSION 100
 LANGUAGE 4, 7 {
   16 "hello"
   17 "world"
 }

tools/llvm-rc/ResourceScriptParser.cpp

auto Table =
       llvm::make_unique<StringTableResource>(std::move(*OptStatements));
 
   // Read strings until we reach the end of the block.
   while (!consumeOptionalType(Kind::BlockEnd)) {
     // Each definition consists of string's ID (an integer) and a string.
     // Some examples in documentation suggest that there might be a comma in
     // between, however we strictly adhere to the single statement definition.
     ASSIGN_OR_RETURN(IDResult, readInt());
+    consumeOptionalType(Kind::Comma);
     ASSIGN_OR_RETURN(StrResult, readString());
     Table->addString(*IDResult, *StrResult);
   }
 
   return std::move(Table);
 }
 
 Expected<std::unique_ptr<VersionInfoBlock>>