[PATCH] D106598: [llvm-rc] Allow dashes as part of resource name strings

[Martin Storsjö via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG0a1683f8cc0d: [llvm-rc] Allow dashes as part of resource name strings (authored by mstorsjo).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D106598

Files:
  llvm/test/tools/llvm-rc/Inputs/resname-string.rc
  llvm/test/tools/llvm-rc/Inputs/tokens.rc
  llvm/test/tools/llvm-rc/resname-string.test
  llvm/test/tools/llvm-rc/tokenizer.test
  llvm/tools/llvm-rc/ResourceScriptToken.cpp


Index: llvm/tools/llvm-rc/ResourceScriptToken.cpp
===================================================================
--- llvm/tools/llvm-rc/ResourceScriptToken.cpp
+++ llvm/tools/llvm-rc/ResourceScriptToken.cpp
@@ -288,7 +288,7 @@
   assert(!streamEof());
   const char CurChar = Data[Pos];
   return std::isalnum(CurChar) || CurChar == '_' || CurChar == '.' ||
-         CurChar == '/' || CurChar == '\\';
+         CurChar == '/' || CurChar == '\\' || CurChar == '-';
 }
 
 bool Tokenizer::canStartInt() const {
Index: llvm/test/tools/llvm-rc/tokenizer.test
===================================================================
--- llvm/test/tools/llvm-rc/tokenizer.test
+++ llvm/test/tools/llvm-rc/tokenizer.test
@@ -27,6 +27,7 @@
 ; CHECK-NEXT:  BlockEnd: End
 ; CHECK-NEXT:  Identifier: He11o
 ; CHECK-NEXT:  Identifier: LLVM
+; CHECK-NEXT:  Identifier: identifier-with-dashes
 ; CHECK-NEXT:  String: "RC string test."
 ; CHECK-NEXT:  Comma: ,
 ; CHECK-NEXT:  String: L"Another RC string test.'&{"
Index: llvm/test/tools/llvm-rc/resname-string.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-rc/resname-string.test
@@ -0,0 +1,5 @@
+; RUN: llvm-rc -no-preprocess /FO %t.res -- %p/Inputs/resname-string.rc
+; RUN: llvm-readobj %t.res | FileCheck %s
+
+; CHECK: Resource name (string): STRINGNAME
+; CHECK: Resource name (string): NAME-WITH-DASHES/AND/SLASHES
Index: llvm/test/tools/llvm-rc/Inputs/tokens.rc
===================================================================
--- llvm/test/tools/llvm-rc/Inputs/tokens.rc
+++ llvm/test/tools/llvm-rc/Inputs/tokens.rc
@@ -1,5 +1,6 @@
 1 + 2 - 3214L & 0x120894 032173 2|&~+(-7){0xabcdef 0xABCDEFl} Begin End
 He11o LLVM
+identifier-with-dashes
 
 "RC string test.",L"Another RC string test.'&{",42,100
 
Index: llvm/test/tools/llvm-rc/Inputs/resname-string.rc
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-rc/Inputs/resname-string.rc
@@ -0,0 +1,2 @@
+stringname RCDATA { "foo" }
+name-with-dashes/and/slashes RCDATA { "foo" }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D106598.361313.patch
Type: text/x-patch
Size: 2102 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210723/4a17f37c/attachment.bin>