Merge pull request #416 from xamarin/namespace-juggling

stephen-hawley · web-flow · commit 8f04b678c3ec · 2020-08-28T15:19:39.000-04:00
let's move namespaces!
diff --git a/SwiftReflector/CustomSwiftCompiler.cs b/SwiftReflector/CustomSwiftCompiler.cs
@@ -9,7 +9,7 @@
 using System.Xml.Linq;
 using SwiftReflector.SwiftXmlReflection;
 using System.Collections.Generic;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Linq;
 using Dynamo;
 using System.Text.RegularExpressions;
diff --git a/SwiftReflector/Demangling/Decomposer.cs b/SwiftReflector/Demangling/Decomposer.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Text;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/Demangling/Swift4Demangler.cs b/SwiftReflector/Demangling/Swift4Demangler.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Text;
 using ObjCRuntime;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 
 namespace SwiftReflector.Demangling {
 	public class Swift4Demangler {
diff --git a/SwiftReflector/Demangling/Swift4NodeToTLDefinition.cs b/SwiftReflector/Demangling/Swift4NodeToTLDefinition.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 
 namespace SwiftReflector.Demangling {
 	public class Swift4NodeToTLDefinition {
diff --git a/SwiftReflector/ExceptionTools/ErrorHelper.cs b/SwiftReflector/ExceptionTools/ErrorHelper.cs
@@ -27,7 +27,7 @@
 #endif
 #endif
 #elif BINDING_TOOLS_FOR_SWIFT
-using ProductException = SwiftReflector.Exceptions.RuntimeException;
+using ProductException = SwiftReflector.ExceptionTools.RuntimeException;
 #else
 #error Only supports XI or XM
 #endif
diff --git a/SwiftReflector/ExceptionTools/RuntimeException.cs b/SwiftReflector/ExceptionTools/RuntimeException.cs
@@ -10,7 +10,7 @@
 namespace ObjCRuntime {
 #endif
 #if BINDING_TOOLS_FOR_SWIFT
-namespace SwiftReflector.Exceptions {
+namespace SwiftReflector.ExceptionTools {
 #endif
 
 	public class RuntimeException : Exception {
diff --git a/SwiftReflector/IOUtils/SwiftModuleFinder.cs b/SwiftReflector/IOUtils/SwiftModuleFinder.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Linq;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/IOUtils/TempDirectoryStreamProvider.cs b/SwiftReflector/IOUtils/TempDirectoryStreamProvider.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using ObjCRuntime;
 
 namespace SwiftReflector.IOUtils {
diff --git a/SwiftReflector/Importing/MemberImporter.cs b/SwiftReflector/Importing/MemberImporter.cs
@@ -7,7 +7,7 @@
 using Dynamo.CSLang;
 using Mono.Cecil;
 using ObjCRuntime;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.SwiftXmlReflection;
 using SwiftReflector.TypeMapping;
 
diff --git a/SwiftReflector/Inventory/ClassContents.cs b/SwiftReflector/Inventory/ClassContents.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Linq;
 using System.Collections.Generic;
 using System.IO;
diff --git a/SwiftReflector/Inventory/ClassInventory.cs b/SwiftReflector/Inventory/ClassInventory.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.IO;
 using SwiftReflector.Demangling;
 using ObjCRuntime;
diff --git a/SwiftReflector/Inventory/FunctionInventory.cs b/SwiftReflector/Inventory/FunctionInventory.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
diff --git a/SwiftReflector/Inventory/ModuleInventory.cs b/SwiftReflector/Inventory/ModuleInventory.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.IO;
 using Xamarin;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.IOUtils;
 using SwiftReflector.Demangling;
 using ObjCRuntime;
diff --git a/SwiftReflector/Inventory/OverloadInventory.cs b/SwiftReflector/Inventory/OverloadInventory.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.IO;
 using SwiftReflector.Demangling;
 using ObjCRuntime;
diff --git a/SwiftReflector/Inventory/PropertyContents.cs b/SwiftReflector/Inventory/PropertyContents.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.Demangling;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/Inventory/PropertyInventory.cs b/SwiftReflector/Inventory/PropertyInventory.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
diff --git a/SwiftReflector/Inventory/ProtocolContents.cs b/SwiftReflector/Inventory/ProtocolContents.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.Demangling;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/Inventory/VariableInventory.cs b/SwiftReflector/Inventory/VariableInventory.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.IO;
 using SwiftReflector.Demangling;
 using ObjCRuntime;
diff --git a/SwiftReflector/Inventory/WitnessInventory.cs b/SwiftReflector/Inventory/WitnessInventory.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
diff --git a/SwiftReflector/MarshalEngine.cs b/SwiftReflector/MarshalEngine.cs
@@ -11,7 +11,7 @@
 using SwiftRuntimeLibrary.SwiftMarshal;
 using Dynamo;
 using SwiftReflector.SwiftXmlReflection;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.Demangling;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/MarshalEngineCSafeSwiftToCSharp.cs b/SwiftReflector/MarshalEngineCSafeSwiftToCSharp.cs
@@ -7,7 +7,7 @@
 using Dynamo;
 using Dynamo.CSLang;
 using SwiftReflector.SwiftXmlReflection;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftRuntimeLibrary;
 using SwiftRuntimeLibrary.SwiftMarshal;
 using ObjCRuntime;
diff --git a/SwiftReflector/MethodWrapping.cs b/SwiftReflector/MethodWrapping.cs
@@ -8,7 +8,7 @@
 using Dynamo;
 using System.IO;
 using Dynamo.SwiftLang;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.IOUtils;
 using SwiftReflector.Inventory;
 using SwiftReflector.SwiftXmlReflection;
diff --git a/SwiftReflector/NewClassCompiler.cs b/SwiftReflector/NewClassCompiler.cs
@@ -13,7 +13,7 @@
 using Dynamo;
 using Dynamo.CSLang;
 using SwiftReflector.Demangling;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.Inventory;
 using SwiftReflector.IOUtils;
 using SwiftReflector.SwiftXmlReflection;
diff --git a/SwiftReflector/NominalStructTypeDescriptor.cs b/SwiftReflector/NominalStructTypeDescriptor.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.Demangling;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/ObjCProtocolCompiler.cs b/SwiftReflector/ObjCProtocolCompiler.cs
@@ -7,7 +7,7 @@
 using SwiftReflector.SwiftXmlReflection;
 using System.Linq;
 using SwiftReflector.TypeMapping;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using Dynamo.CSLang;
 using System.IO;
 using System.Text;
diff --git a/SwiftReflector/OverrideBuilder.cs b/SwiftReflector/OverrideBuilder.cs
@@ -8,7 +8,7 @@
 using System.Linq;
 using SwiftReflector.TypeMapping;
 using Dynamo;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Text;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/ReflectorError.cs b/SwiftReflector/ReflectorError.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using ObjCRuntime;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 
 namespace SwiftReflector {
 
diff --git a/SwiftReflector/SwiftCompilerLocation.cs b/SwiftReflector/SwiftCompilerLocation.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using ObjCRuntime;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.IOUtils;
 
 namespace SwiftReflector 
diff --git a/SwiftReflector/SwiftReflector.csproj b/SwiftReflector/SwiftReflector.csproj
@@ -161,8 +161,8 @@
     <Compile Include="Importing\MemberImporter.cs" />
     <Compile Include="Importing\CSMethodComparator.cs" />
     <Compile Include="Downloaded\StringUtils.cs" />
-    <Compile Include="Exceptions\RuntimeException.cs" />
-    <Compile Include="Exceptions\ErrorHelper.cs" />
+    <Compile Include="ExceptionTools\RuntimeException.cs" />
+    <Compile Include="ExceptionTools\ErrorHelper.cs" />
     <Compile Include="Importing\TypeAggregator.cs" />
     <Compile Include="Importing\TypeAggregator.iOS.cs" />
     <Compile Include="Importing\TypeAggregator.MacOS.cs" />
@@ -176,7 +176,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="IOUtils\" />
-    <Folder Include="Exceptions\" />
+    <Folder Include="ExceptionTools\" />
     <Folder Include="SwiftXmlReflection\" />
     <Folder Include="Inventory\" />
     <Folder Include="TypeMapping\" />
diff --git a/SwiftReflector/SwiftXmlReflection/BaseDeclaration.cs b/SwiftReflector/SwiftXmlReflection/BaseDeclaration.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Xml.Linq;
 using System.Text;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using ObjCRuntime;
 using SwiftReflector.TypeMapping;
 
diff --git a/SwiftReflector/SwiftXmlReflection/EnumDeclaration.cs b/SwiftReflector/SwiftXmlReflection/EnumDeclaration.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Xml.Linq;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/SwiftXmlReflection/EnumElement.cs b/SwiftReflector/SwiftXmlReflection/EnumElement.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.IOUtils;
 using System.Xml.Linq;
 using ObjCRuntime;
diff --git a/SwiftReflector/SwiftXmlReflection/ExtensionDeclaration.cs b/SwiftReflector/SwiftXmlReflection/ExtensionDeclaration.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Xml.Linq;
 using ObjCRuntime;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.IOUtils;
 
 namespace SwiftReflector.SwiftXmlReflection {
diff --git a/SwiftReflector/SwiftXmlReflection/FunctionDeclaration.cs b/SwiftReflector/SwiftXmlReflection/FunctionDeclaration.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Xml.Linq;
 using ObjCRuntime;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 
 namespace SwiftReflector.SwiftXmlReflection {
 	public class FunctionDeclaration : Member {
diff --git a/SwiftReflector/SwiftXmlReflection/Inheritance.cs b/SwiftReflector/SwiftXmlReflection/Inheritance.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
diff --git a/SwiftReflector/SwiftXmlReflection/ParameterItem.cs b/SwiftReflector/SwiftXmlReflection/ParameterItem.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.IOUtils;
 using ObjCRuntime;
 
diff --git a/SwiftReflector/SwiftXmlReflection/PropertyDeclaration.cs b/SwiftReflector/SwiftXmlReflection/PropertyDeclaration.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Xml.Linq;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.Collections.Generic;
 using System.Linq;
 using ObjCRuntime;
diff --git a/SwiftReflector/SwiftXmlReflection/Reflector.cs b/SwiftReflector/SwiftXmlReflection/Reflector.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Xml.Linq;
 using System.Collections.Generic;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using System.IO;
 using SwiftReflector.IOUtils;
 using System.Diagnostics;
diff --git a/SwiftReflector/SwiftXmlReflection/ShamDeclaration.cs b/SwiftReflector/SwiftXmlReflection/ShamDeclaration.cs
@@ -3,7 +3,7 @@
 
 using System;
 using ObjCRuntime;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 
 namespace SwiftReflector.SwiftXmlReflection {
 	public class ShamDeclaration : TypeDeclaration {
diff --git a/SwiftReflector/SwiftXmlReflection/TypeDeclaration.cs b/SwiftReflector/SwiftXmlReflection/TypeDeclaration.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Xml.Linq;
 using SwiftReflector.IOUtils;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.Demangling;
 using SwiftReflector.TypeMapping;
 using ObjCRuntime;
diff --git a/SwiftReflector/SwiftXmlReflection/TypeSpecParser.cs b/SwiftReflector/SwiftXmlReflection/TypeSpecParser.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using ObjCRuntime;
 
 namespace SwiftReflector.SwiftXmlReflection {
diff --git a/SwiftReflector/SwiftXmlReflection/TypeSpecTokenizer.cs b/SwiftReflector/SwiftXmlReflection/TypeSpecTokenizer.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Text;
 using System.IO;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using ObjCRuntime;
 
 namespace SwiftReflector.SwiftXmlReflection {
diff --git a/SwiftReflector/TopLevelFunctionCompiler.cs b/SwiftReflector/TopLevelFunctionCompiler.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using Dynamo;
 using Dynamo.CSLang;
-using SwiftReflector.Exceptions;
+using SwiftReflector.ExceptionTools;
 using SwiftReflector.TypeMapping;
 using SwiftReflector.SwiftXmlReflection;
 using SwiftRuntimeLibrary;
diff --git a/SwiftReflector/TypeMapping/SwiftTypeToSLType.cs b/SwiftReflector/TypeMapping/SwiftTypeToSLType.cs
diff --git a/SwiftReflector/TypeMapping/TypeDatabase.cs b/SwiftReflector/TypeMapping/TypeDatabase.cs
diff --git a/SwiftReflector/TypeMapping/TypeMapper.cs b/SwiftReflector/TypeMapping/TypeMapper.cs
diff --git a/SwiftReflector/TypeMapping/TypeSpecToSLType.cs b/SwiftReflector/TypeMapping/TypeSpecToSLType.cs
diff --git a/SwiftReflector/ValueWitnessTable.cs b/SwiftReflector/ValueWitnessTable.cs
diff --git a/SwiftReflector/WrappingCompiler.cs b/SwiftReflector/WrappingCompiler.cs
diff --git a/tom-swifty/Program.cs b/tom-swifty/Program.cs
diff --git a/tom-swifty/SwiftyOptions.cs b/tom-swifty/SwiftyOptions.cs
diff --git a/type-o-matic/type-o-matic.csproj b/type-o-matic/type-o-matic.csproj
