Move files around to incorporate class/function naming scheme

hlopko · hlopko · commit 5c18ef442906 · 2020-09-28T09:59:12.000+02:00
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-non-type-parameter.h b/test/Interop/Cxx/templates/Inputs/class-template-non-type-parameter.h
@@ -0,0 +1,11 @@
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_NON_TYPE_PARAMETER_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_NON_TYPE_PARAMETER_H
+
+template<class T, auto Size>
+struct MagicArray {
+    T t[Size];
+};
+
+typedef MagicArray<int, 2> MagicIntPair;
+
+#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_NON_TYPE_PARAMETER_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-template-parameter.h b/test/Interop/Cxx/templates/Inputs/class-template-template-parameter.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_TEMPLATE_TEMPLATE_PARAMETER_H
-#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_TEMPLATE_TEMPLATE_PARAMETER_H
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_TEMPLATE_PARAMETER_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_TEMPLATE_PARAMETER_H
 
 struct IntWrapper {
   int value;
@@ -20,4 +20,4 @@ struct TemplatedMagicWrapper {
 
 typedef TemplatedMagicWrapper<MagicWrapper> TemplatedWrappedMagicInt;
 typedef MagicWrapper<IntWrapper> WrappedMagicInt;
-#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_TEMPLATE_TEMPLATE_PARAMETER_H
+#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_TEMPLATE_PARAMETER_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-variadic.h b/test/Interop/Cxx/templates/Inputs/class-template-variadic.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_VARIADIC_CLASS_TEMPLATE_H
-#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_VARIADIC_CLASS_TEMPLATE_H
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_VARIADIC_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_VARIADIC_H
 
 template <class... Ts> struct Tuple {};
 
@@ -27,4 +27,4 @@ struct IntWrapper {
 
 typedef Tuple<IntWrapper, IntWrapper> Pair;
 
-#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_VARIADIC_CLASS_TEMPLATE_H
+#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_VARIADIC_H
diff --git a/test/Interop/Cxx/templates/Inputs/module.modulemap b/test/Interop/Cxx/templates/Inputs/module.modulemap
@@ -38,14 +38,14 @@ module LinkageOfSwiftSymbolsForImportedTypes {
   header "linkage-of-swift-symbols-for-imported-types.h"
 }
 
-module VariadicClassTemplate {
-  header "variadic-class-template.h"
+module ClassTemplateVariadic {
+  header "class-template-variadic.h"
 }
 
-module NonTypeParameter {
-  header "non-type-parameter.h"
+module ClassTemplateNonTypeParameter {
+  header "class-template-non-type-parameter.h"
 }
 
-module TemplateTemplateParameter {
-  header "template-template-parameter.h"
+module ClassTemplateTemplateParameter {
+  header "class-template-template-parameter.h"
 }
diff --git a/test/Interop/Cxx/templates/Inputs/non-type-parameter.h b/test/Interop/Cxx/templates/Inputs/non-type-parameter.h
diff --git a/test/Interop/Cxx/templates/class-template-non-type-parameter.swift b/test/Interop/Cxx/templates/class-template-non-type-parameter.swift
@@ -2,7 +2,7 @@
 //
 // REQUIRES: executable_test
 
-import NonTypeParameter
+import ClassTemplateNonTypeParameter
 import StdlibUnittest
 
 var TemplatesTestSuite = TestSuite("TemplatesTestSuite")
diff --git a/test/Interop/Cxx/templates/class-template-template-parameter.swift b/test/Interop/Cxx/templates/class-template-template-parameter.swift
@@ -2,7 +2,7 @@
 //
 // REQUIRES: executable_test
 
-import TemplateTemplateParameter
+import ClassTemplateTemplateParameter
 import StdlibUnittest
 
 var TemplatesTestSuite = TestSuite("TemplatesTestSuite")
diff --git a/test/Interop/Cxx/templates/class-template-variadic.swift b/test/Interop/Cxx/templates/class-template-variadic.swift
@@ -2,7 +2,7 @@
 //
 // REQUIRES: executable_test
 
-import VariadicClassTemplate
+import ClassTemplateVariadic
 import StdlibUnittest
 
 var TemplatesTestSuite = TestSuite("TemplatesTestSuite")

Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,14 @@ module LinkageOfSwiftSymbolsForImportedTypes {`
`38`	`38`	`header "linkage-of-swift-symbols-for-imported-types.h"`
`39`	`39`	`}`
`40`	`40`
`41`		`-module VariadicClassTemplate {`
`42`		`- header "variadic-class-template.h"`
	`41`	`+module ClassTemplateVariadic {`
	`42`	`+ header "class-template-variadic.h"`
`43`	`43`	`}`
`44`	`44`
`45`		`-module NonTypeParameter {`
`46`		`- header "non-type-parameter.h"`
	`45`	`+module ClassTemplateNonTypeParameter {`
	`46`	`+ header "class-template-non-type-parameter.h"`
`47`	`47`	`}`
`48`	`48`
`49`		`-module TemplateTemplateParameter {`
`50`		`- header "template-template-parameter.h"`
	`49`	`+module ClassTemplateTemplateParameter {`
	`50`	`+ header "class-template-template-parameter.h"`
`51`	`51`	`}`