Browse Source

Swift: Simplify mixed test case to make it version agnostic

Issue: #16742
Gregor Jasny 8 years ago
parent
commit
77139e320c
2 changed files with 3 additions and 20 deletions
  1. 1 7
      Tests/SwiftMix/ObjCMain.m
  2. 2 13
      Tests/SwiftMix/SwiftMain.swift

+ 1 - 7
Tests/SwiftMix/ObjCMain.m

@@ -1,10 +1,4 @@
 #import "SwiftMix-Swift.h"
 int ObjCMain(int argc, char const* const argv[]) {
-  if ([SwiftMainClass respondsToSelector:@selector(SwiftMain:argv:)]) {
-    return [SwiftMainClass SwiftMain:argc argv:argv];
-  }
-  if ([SwiftMainClass respondsToSelector:@selector(SwiftMainWithArgc:argv:)]) {
-    return [SwiftMainClass SwiftMainWithArgc:argc argv:argv];
-  }
-  return -1;
+  return [SwiftMainClass SwiftMain];
 }

+ 2 - 13
Tests/SwiftMix/SwiftMain.swift

@@ -1,19 +1,8 @@
 import Foundation
 
 @objc class SwiftMainClass : NSObject {
-  class func SwiftMain(argc:Int, argv:UnsafePointer<UnsafePointer<CChar>>) -> Int32 {
-    dump("argc: \(argc)")
-#if swift(>=3.0)
-    for i in 0 ..< argc {
-      let argi = String(cString:argv[i]);
-      dump("arg[\(i)]: \(argi)");
-    }
-#else
-    for (var i = 0; i < argc; ++i) {
-      let argi = String.fromCString(argv[i])
-      dump("arg[\(i)]: \(argi)");
-    }
-#endif
+  class func SwiftMain() -> Int32 {
+    dump("Hello World!");
     return 0;
   }
 }