Merge pull request #439 from xamarin/injectorizer

Added CSInject and SLInject

Author: stephen-hawley

Dynamo/Dynamo.CSLang/CSInject.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace Dynamo.CSLang {
+	// CSInject is a way to more formalize the notion of code that is just plain easier to
+	// inject as raw text. It's not strictly necessary, but when you see a CSInject, it will make
+	// it clear that you're doing something not quite on the up and up.
+	public class CSInject : CSIdentifier {
+		public CSInject (string name)
+			: base (name)
+		{
+		}
+
+		public static explicit operator CSInject (string name)
+		{
+			return new CSInject (name);
+		}
+	}
+}

Dynamo/Dynamo.SwiftLang/SLInject.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace Dynamo.SwiftLang {
+	public class SLInject : SLIdentifier {
+		// SLInject is a way to more formalize the notion of code that is just plain easier to
+		// inject as raw text. It's not strictly necessary, but when you see a CSInject, it will make
+		// it clear that you're doing something not quite on the up and up.
+		public SLInject (string name)
+			: base (name)
+		{
+		}
+
+		public static explicit operator SLInject (string name)
+		{
+			return new SLInject (name);
+		}
+	}
+}

Dynamo/Dynamo.csproj

@@ -142,6 +142,8 @@
     <Compile Include="Dynamo.SwiftLang\SLComment.cs" />
     <Compile Include="Dynamo.CSLang\CSInitializer.cs" />
     <Compile Include="Dynamo.CSLang\CSConditionalCompilation.cs" />
+    <Compile Include="Dynamo.CSLang\CSInject.cs" />
+    <Compile Include="Dynamo.SwiftLang\SLInject.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

SwiftReflector/MarshalEngineCSafeSwiftToCSharp.cs

@@ -460,13 +460,13 @@ public List<ICodeElement> MarshalFromLambdaReceiverToCSProp (CSProperty prop, CS
 			CSIdentifier csharpCall = null;
 			var thisTypeName = hasAssociatedTypes ? csProxyName : thisType.ToString ();
 			if (forProtocol && !hasAssociatedTypes) {
-				csharpCall = new CSIdentifier ($"SwiftObjectRegistry.Registry.InterfaceForExistentialContainer<{thisTypeName}> (self).{prop.Name.Name}");
+				csharpCall = new CSInject ($"SwiftObjectRegistry.Registry.InterfaceForExistentialContainer<{thisTypeName}> (self).{prop.Name.Name}");
 			} else {
 				var call = isObjC ?
 					$"ObjCRuntime.Runtime.GetNSObject<{thisTypeName}> (self).{prop.Name.Name}" :
 					$"SwiftObjectRegistry.Registry.CSObjectForSwiftObject<{thisTypeName}> (self).{prop.Name.Name}";
 
-				csharpCall = new CSIdentifier (call);
+				csharpCall = new CSInject (call);
 			}
 
 			if (funcDecl.IsGetter) {
@@ -559,7 +559,7 @@ public List<ICodeElement> MarshalFromLambdaReceiverToCSProp (CSProperty prop, CS
 						var proxObjName = MarshalEngine.Uniqueify ("proxyObj", identifiersUsed);
 						identifiersUsed.Add (proxObjName);
 						var proxyObjId = new CSIdentifier (proxObjName);
-						var proxyObjDecl = CSVariableDeclaration.VarLine (proxyObjId, new CSIdentifier ($"SwiftObjectRegistry.Registry.CSObjectForSwiftObject<{thisTypeName}> ({delegateParams [1].Name})"));
+						var proxyObjDecl = CSVariableDeclaration.VarLine (proxyObjId, new CSInject ($"SwiftObjectRegistry.Registry.CSObjectForSwiftObject<{thisTypeName}> ({delegateParams [1].Name})"));
 						body.Add (proxyObjDecl);
 						valueExpr = new CSCastExpression (methodType, new CSParenthesisExpression (new CSBinaryExpression (CSBinaryOperator.NullCoalesce, proxyObjId.Dot (NewClassCompiler.kInterfaceImpl), proxyObjId)));
 					} else {

SwiftReflector/MethodWrapping.cs

@@ -868,7 +868,7 @@ SLClosure MakePayloadClosure (string elemName, SLType enumType, SLType elemType)
 			var elseclause = new SLCodeBlock (null).And (new SLThrow (new SLIdentifier ("SwiftEnumError.undefined")));
 
 
-			var ifcase = new SLIfElse (new SLIdentifier (String.Format (".{0}(let {1}) = {2}", elemName, patXId.Name, valId.Name)),
+			var ifcase = new SLIfElse (new SLInject (String.Format (".{0}(let {1}) = {2}", elemName, patXId.Name, valId.Name)),
 						  ifclause, elseclause, true);
 			body.Add (ifcase);
 

tests/tom-swifty-test/SwiftReflector/CharacterTests.cs

@@ -70,12 +70,12 @@ public init (c : Character) { C = c }
 				CSLine instance = CSVariableDeclaration.VarLine ((CSSimpleType)"CharacterEcho", (CSIdentifier)"Foo", CSFunctionCall.Ctor ("CharacterEcho", ctorParam));
 
 				// First the properties
-				var explicitCastProp = (CSIdentifier)"(string)Foo.Value";
+				var explicitCastProp = (CSInject)"(string)Foo.Value";
 				var toStringProp = (CSIdentifier)"Foo.Value.ToString ()";
 
 				// Then the function returns as well
-				var explicitCastFun = (CSIdentifier)"(string)Foo.GetValue ()";
-				var toStringFun = (CSIdentifier)"Foo.GetValue ().ToString ()";
+				var explicitCastFun = (CSInject)"(string)Foo.GetValue ()";
+				var toStringFun = (CSInject)"Foo.GetValue ().ToString ()";
 
 				block.Add (instance);
 				foreach (var call in new CSBaseExpression [] { explicitCastProp, toStringProp, explicitCastFun, toStringFun }) 

tests/tom-swifty-test/SwiftReflector/NewClassCompilerTests.cs

@@ -778,7 +778,7 @@ public enum PrivAccess {
 ";
 			var miID = new CSIdentifier ("mi");
 			var miDecl = CSVariableDeclaration.VarLine (CSSimpleType.Var, miID, new CSFunctionCall ("typeof(PrivAccess).GetMethod", false, CSConstant.Val ("__GetValueIVal"),
-				new CSIdentifier ("System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance")));
+				new CSInject ("System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance")));
 			var printer = CSFunctionCall.ConsoleWriteLine (miID.Dot (new CSIdentifier ("IsPublic")));
 			var callingCode = new CodeElementCollection<ICodeElement> () { miDecl, printer };
 			TestRunning.TestAndExecute (swiftCode, callingCode, "False\n");

tests/tom-swifty-test/TestRunning.cs

@@ -191,7 +191,7 @@ static CodeElementCollection<ICodeElement> CaptureSwiftOutputPostlude (string fi
 			block.Add (new CSIdentifier ("\n#if _MAC_TS_TEST_\n"));
 			block.Add (CSVariableDeclaration.VarLine (CSSimpleType.String, pathID,
 							      new CSFunctionCall ("Path.Combine", false,
-									       new CSIdentifier ("Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)") +
+									       new CSInject ("Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)") +
 									       CSConstant.Val ("/Documents/"),
 									       CSConstant.Val (fileName))));
 			block.Add (new CSIdentifier ("\n#else\n"));
@@ -508,7 +508,7 @@ public static CSNamespace CreateManagedConsoleRedirect ()
 					),
 					CSCodeBlock.Create (
 						new CSIfElse (
-							new CSIdentifier ("string.IsNullOrEmpty (Filename)"),
+							new CSInject ("string.IsNullOrEmpty (Filename)"),
 							CSCodeBlock.Create (CSFunctionCall.FunctionCallLine ("global::System.Console.Write", new CSIdentifier ("value"))),
 							CSCodeBlock.Create (CSFunctionCall.FunctionCallLine ("System.IO.File.AppendAllText", new CSIdentifier ("Filename"), new CSIdentifier ("value")))
 						)
@@ -528,7 +528,7 @@ public static CSNamespace CreateManagedConsoleRedirect ()
 						CSFunctionCall.FunctionCallLine (
 							"write",
 							false,
-							new CSIdentifier ("value?.ToString ()")
+							new CSInject ("value?.ToString ()")
 						)
 					)
 				)
@@ -547,7 +547,7 @@ public static CSNamespace CreateManagedConsoleRedirect ()
 						CSFunctionCall.FunctionCallLine (
 							"write",
 							false,
-							new CSIdentifier ("value == null ? string.Empty : string.Format (value, args)")
+							new CSInject ("value == null ? string.Empty : string.Format (value, args)")
 						)
 					)
 				)
@@ -565,7 +565,7 @@ public static CSNamespace CreateManagedConsoleRedirect ()
 						CSFunctionCall.FunctionCallLine (
 							"write",
 							false,
-							new CSIdentifier ("value?.ToString () + Environment.NewLine")
+							new CSInject ("value?.ToString () + Environment.NewLine")
 						)
 					)
 				)
@@ -584,7 +584,7 @@ public static CSNamespace CreateManagedConsoleRedirect ()
 						CSFunctionCall.FunctionCallLine (
 							"write",
 							false,
-							new CSIdentifier ("(value == null ? string.Empty : string.Format (value, args)) + Environment.NewLine")
+							new CSInject ("(value == null ? string.Empty : string.Format (value, args)) + Environment.NewLine")
 						)
 					)
 				)