[cfe-commits] r67013 - in /cfe/trunk: Driver/clang.cpp test/Lexer/dollar-idents.c

[Daniel Dunbar]

Author: ddunbar
Date: Sat Mar 14 19:11:28 2009
New Revision: 67013

URL: http://llvm.org/viewvc/llvm-project?rev=67013&view=rev
Log:
Don't accept '$' in identifiers in assembler-with-cpp mode.

Added:
    cfe/trunk/test/Lexer/dollar-idents.c
Modified:
    cfe/trunk/Driver/clang.cpp

Modified: cfe/trunk/Driver/clang.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/clang.cpp?rev=67013&r1=67012&r2=67013&view=diff

==============================================================================
--- cfe/trunk/Driver/clang.cpp (original)
+++ cfe/trunk/Driver/clang.cpp Sat Mar 14 19:11:28 2009
@@ -644,7 +644,9 @@
   if (!Options.ObjC1 && LangStd < lang_gnu_START)
     Options.Blocks = 0;
   
-  Options.DollarIdents = 1;  // FIXME: Really a target property.
+  // Never accept '$' in identifiers when preprocessing assembler.
+  if (LK != langkind_asm_cpp)
+    Options.DollarIdents = 1;  // FIXME: Really a target property.
   if (PascalStrings.getPosition())
     Options.PascalStrings = PascalStrings;
   Options.Microsoft = MSExtensions;

Added: cfe/trunk/test/Lexer/dollar-idents.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/dollar-idents.c?rev=67013&view=auto

==============================================================================
--- cfe/trunk/test/Lexer/dollar-idents.c (added)
+++ cfe/trunk/test/Lexer/dollar-idents.c Sat Mar 14 19:11:28 2009
@@ -0,0 +1,7 @@
+// RUN: clang -dump-tokens %s &> %t &&
+// RUN: grep "identifier '\$A'" %t
+// RUN: clang -dump-tokens -x assembler-with-cpp %s &> %t &&
+// RUN: grep "identifier 'A'" %t
+// PR3808
+
+$A