fixed typeparameterparser

2 files changed, 35 insertions, 33 deletions

diff --git a/SharpSwift/SharpSwift/Converters/ParameterSyntaxParser.cs b/SharpSwift/SharpSwift/Converters/ParameterSyntaxParser.cs
index 13aa097..ddad2e1 100644
--- a/SharpSwift/SharpSwift/Converters/ParameterSyntaxParser.cs
+++ b/SharpSwift/SharpSwift/Converters/ParameterSyntaxParser.cs
@@ -43,9 +43,9 @@ namespace SharpSwift.Converters
 
             var typeConstraints = ((MethodDeclarationSyntax)param.Parent.Parent).ConstraintClauses;
             var constraints = typeConstraints
-                .FirstOrDefault(constr => SyntaxNode(constr.Name) == param.Identifier.Text).Constraints;
+                .FirstOrDefault(constr => constr.Name.Identifier.Text == param.Identifier.Text).Constraints;
 
-            return param.Identifier.Text + ": " + string.Join(", ", constraints); //TODO: check if this is the right syntax for multiple constraints
+            return "<" + param.Identifier.Text + ": " + string.Join(", ", constraints) + ">"; //TODO: check if this is the right syntax for multiple constraints
         }
     }
 }
diff --git a/SharpSwift/SharpSwift/test.swift b/SharpSwift/SharpSwift/test.swift
index b2051e0..ebdc1c7 100644
--- a/SharpSwift/SharpSwift/test.swift
+++ b/SharpSwift/SharpSwift/test.swift
@@ -1,36 +1,38 @@
-//Converted with SharpSwift - https://github.com/matthewsot/SharpSwift
-//See https://github.com/matthewsot/DNSwift FMI about these includes
-
-include DNSwift;
-include Something.Else;
+// Converted with SharpSwift - https://github.com/matthewsot/SharpSwift
+import Something.Else;
 
 class anotherClass {
-	func somethingT: IEnumerable<string>, IEnumerator<bool>() -> Void {
-		return;
-	}
+    public static func something<T: IEnumerable<string>, IEnumerator<bool>>() -> Void {
+        return;
+    }
+    
 }
+
 class test: ASCIIEncoding {
-	@Test var something: String = "123";
-	init(something: String) {
-		var m = anotherClass();
-		let constant: String = "123";
-		var intArray: List<Int> = [ 1, 2, 3 ].ToList();
-		var strArray: [String] = [ "hi", "bye", "why" ];
-		for str in strArray {
-		}
-		for var i = 0; i < 10; i++ {
-			var md = i;
-		}
-		switch constant {
-			case "123":
-			    var f = 1;
-			    var mdf = 3;
-			case "456":
-			case "754":
-			    var d = 2;
-			case "643":
-			    var c = 3;
-			default:
-		}
-	}
+     var something: String = "123";
+    init(something: String) {
+        var m = anotherClass();
+        let constant: String = "123";
+        var intArray: List<Int> = [ 1, 2, 3 ].ToList();
+        var strArray: [String] = [ "hi", "bye", "why" ];
+        for str in strArray {
+        }
+        
+        for var i = 0; i < 10; i++ {
+            var md = i;
+        }
+        
+        switch constant {
+            case "123":
+                var f = 1;
+                var mdf = 3;
+            case "456":
+            case "754":
+                var d = 2;
+            case "643":
+                var c = 3;
+            default:
+        }
+    }
+    
 }