[PATCH] D146924: [clang] Add support for dollar sign in ud_suffix of numeric constants

[Anna Arad via Phabricator via cfe-commits]

annara created this revision.
Herald added a project: All.
annara requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D146924

Files:
  clang/lib/Lex/Lexer.cpp
  clang/test/CXX/lex/lex.literal/lex.ext/p3.cpp


Index: clang/test/CXX/lex/lex.literal/lex.ext/p3.cpp
===
--- clang/test/CXX/lex/lex.literal/lex.ext/p3.cpp
+++ clang/test/CXX/lex/lex.literal/lex.ext/p3.cpp
@@ -16,3 +16,6 @@
 
 template constexpr int operator "" _x3() { return sizeof...(Cs); }
 static_assert(123456789012345678901234567890123456789012345678901234567890_x3 
== 60, "");
+
+int operator "" _$ (unsigned long long);
+int i6 = 42_$;
Index: clang/lib/Lex/Lexer.cpp
===
--- clang/lib/Lex/Lexer.cpp
+++ clang/lib/Lex/Lexer.cpp
@@ -1971,6 +1971,10 @@
 return LexNumericConstant(Result, CurPtr);
   if (!isASCII(C) && tryConsumeIdentifierUTF8Char(CurPtr))
 return LexNumericConstant(Result, CurPtr);
+  if (C == '$' && LangOpts.DollarIdents) {
+CurPtr = ConsumeChar(CurPtr, Size, Result);
+return LexNumericConstant(Result, CurPtr);
+  }
 
   // Update the location of token as well as BufferPtr.
   const char *TokStart = BufferPtr;


Index: clang/test/CXX/lex/lex.literal/lex.ext/p3.cpp
===
--- clang/test/CXX/lex/lex.literal/lex.ext/p3.cpp
+++ clang/test/CXX/lex/lex.literal/lex.ext/p3.cpp
@@ -16,3 +16,6 @@
 
 template constexpr int operator "" _x3() { return sizeof...(Cs); }
 static_assert(123456789012345678901234567890123456789012345678901234567890_x3 == 60, "");
+
+int operator "" _$ (unsigned long long);
+int i6 = 42_$;
Index: clang/lib/Lex/Lexer.cpp
===
--- clang/lib/Lex/Lexer.cpp
+++ clang/lib/Lex/Lexer.cpp
@@ -1971,6 +1971,10 @@
 return LexNumericConstant(Result, CurPtr);
   if (!isASCII(C) && tryConsumeIdentifierUTF8Char(CurPtr))
 return LexNumericConstant(Result, CurPtr);
+  if (C == '$' && LangOpts.DollarIdents) {
+CurPtr = ConsumeChar(CurPtr, Size, Result);
+return LexNumericConstant(Result, CurPtr);
+  }
 
   // Update the location of token as well as BufferPtr.
   const char *TokStart = BufferPtr;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D146924: [clang] Add support for dollar sign in ud_suffix of numeric constants

[Anna Arad via Phabricator via cfe-commits]

annara added a comment.

After a second look at the standard, you are right.
It's not in the range of any of the universal-character-names.
That being said, it is allowed as an identifier by default in clang (as 
@tahonermann) mentioned.
It also works in current versions of clang if you use the UCN in the numeric 
constant (and leave the user-defined literal operator declaration with a $ 
sign).
As you stated, GCC also accepts this syntax.

I can make sure dollar signs not part of a ud-sufffix will be rejected, if you 
think the general idea is acceptable.

Regarding the difference between the dollar and the euro sign. It seems the 
lexer lexes the euro sign as part of the numeric constant (like any other 
ud_suffix) and probably fails at a later stage (I'm not sure where yet).
I suspect the dollar sign passes at that step because of 
`-fdollars-in-identifiers` being true by default.
But, I need to look into it further to give a real answer.

Please let me know if you think it's worth pursuing.


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D146924

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D146924: [clang] Add support for dollar sign in ud_suffix of numeric constants

[Anna Arad via Phabricator via cfe-commits]

annara added a comment.

Thanks for all the input!

I'll work on @cor3ntin points and take a look at the crash


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D146924

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits