Revert my user-defined literal commits - r1124{58,60,67} pending

some issues being sorted out.

llvm-svn: 112493

3 files changed, 34 insertions, 59 deletions

diff --git a/clang/test/Parser/cxx0x-literal-operators.cpp b/clang/test/Parser/cxx0x-literal-operators.cpp
index cc979b3ef41..30b290382cb 100644
--- a/clang/test/Parser/cxx0x-literal-operators.cpp
+++ b/clang/test/Parser/cxx0x-literal-operators.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -verify -std=c++0x %s
 
 void operator "" (const char *); // expected-error {{expected identifier}}
-void operator "k" _foo(const char *); // expected-error {{string literal after 'operator' must be '""'}}
-void operator "" _tester (const char *);
+void operator "k" foo(const char *); // expected-error {{string literal after 'operator' must be '""'}}
+void operator "" tester (const char *);
diff --git a/clang/test/SemaCXX/literal-operator-dcls.cpp b/clang/test/SemaCXX/literal-operator-dcls.cpp
deleted file mode 100644
index 88bf2b936fd..00000000000
--- a/clang/test/SemaCXX/literal-operator-dcls.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++0x %s
-
-#include <stddef.h>
-
-struct tag {
-  void operator "" _tag_bad (const char *); // expected-error {{literal operator 'operator "" _tag_bad' must be in a namespace or global scope}}
-  friend void operator "" _tag_good (const char *);
-};
-
-namespace ns { void operator "" _ns_good (const char *); }
-
-// Check extern "C++" declarations
-extern "C++" void operator "" _extern_good (const char *);
-extern "C++" { void operator "" _extern_good (const char *); }
-
-void fn () { void operator "" _fn_bad (const char *); } // expected-error {{literal operator 'operator "" _fn_bad' must be in a namespace or global scope}}
-
-// Warning name
-void operator "" warn (const char *); // expected-warning {{reserved for future standardization}}
-
-// One-param declarations (const char * was already checked)
-void operator "" _good (char);
-void operator "" _good (wchar_t);
-void operator "" _good (char16_t);
-void operator "" _good (char32_t);
-void operator "" _good (unsigned long long);
-void operator "" _good (long double);
-
-// Two-param declarations
-void operator "" _good (const char *, size_t);
-void operator "" _good (const wchar_t *, size_t);
-void operator "" _good (const char16_t *, size_t);
-void operator "" _good (const char32_t *, size_t);
-
-// Check typedef and array equivalences
-void operator "" _good (const char[]);
-typedef const char c;
-void operator "" _good (c*);
-
-// Check extra cv-qualifiers
-void operator "" _cv_good (volatile const char *, const size_t);
-
-// Template delcaration (not implemented yet)
-// template <char...> void operator "" good ();
-
-// FIXME: Test some invalid decls that might crop up.
diff --git a/clang/test/SemaCXX/literal-operators.cpp b/clang/test/SemaCXX/literal-operators.cpp
index 93fd4b6a142..ec585a61da9 100644
--- a/clang/test/SemaCXX/literal-operators.cpp
+++ b/clang/test/SemaCXX/literal-operators.cpp
@@ -2,21 +2,42 @@
 
 #include <stddef.h>
 
-template <typename T, typename U> struct same_type {
-  static const bool value = false;
+struct tag {
+  void operator "" tag_bad (const char *); // expected-error {{literal operator 'operator "" tag_bad' must be in a namespace or global scope}}
+  friend void operator "" tag_good (const char *);
 };
 
-template <typename T> struct same_type<T, T> {
-  static const bool value = true;
-};
+namespace ns { void operator "" ns_good (const char *); }
+
+// Check extern "C++" declarations
+extern "C++" void operator "" extern_good (const char *);
+extern "C++" { void operator "" extern_good (const char *); }
+
+void fn () { void operator "" fn_bad (const char *); } // expected-error {{literal operator 'operator "" fn_bad' must be in a namespace or global scope}}
+
+// One-param declarations (const char * was already checked)
+void operator "" good (char);
+void operator "" good (wchar_t);
+void operator "" good (char16_t);
+void operator "" good (char32_t);
+void operator "" good (unsigned long long);
+void operator "" good (long double);
 
-int operator "" _int (const char *, size_t);
-static_assert(same_type<int, decltype(""_int)>::value, "not the same type!");
+// Two-param declarations
+void operator "" good (const char *, size_t);
+void operator "" good (const wchar_t *, size_t);
+void operator "" good (const char16_t *, size_t);
+void operator "" good (const char32_t *, size_t);
 
-int i = ""_int;
-int j = L""_int; // expected-error {{no matching literal operator function}}
+// Check typedef and array equivalences
+void operator "" good (const char[]);
+typedef const char c;
+void operator "" good (c*);
 
-int operator "" _int (const wchar_t *, size_t);
+// Check extra cv-qualifiers
+void operator "" cv_good (volatile const char *, const size_t);
 
-int k = L""_int;
+// Template delcaration (not implemented yet)
+// template <char...> void operator "" good ();
 
+// FIXME: Test some invalid decls that might crop up.