Renamed wapc_host to wapc-ffi

Use better name to identify this portion of the code.
wapc · Apr 23, 2021 · 0183412 · 0183412
1 parent b0b2b01
commit 0183412
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/Package.swift b/Package.swift
@@ -19,12 +19,12 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
-            name: "wapc-host",
+            name: "wapc-ffi",
             dependencies: []
         ),
         .target(
             name: "wapc",
-            dependencies: ["wapc-host"]),
+            dependencies: ["wapc-ffi"]),
         .testTarget(
             name: "wapcTests",
             dependencies: ["wapc"]),

diff --git a/Sources/wapc-host/include/wapc_host.h → Sources/wapc-ffi/include/wapc_ffi.h b/Sources/wapc-host/include/wapc_host.h → Sources/wapc-ffi/include/wapc_ffi.h
@@ -1,5 +1,5 @@
-#ifndef __WAPC_HOST_H__
-#define __WAPC_HOST_H__
+#ifndef __WAPC_FFI_H__
+#define __WAPC_FFI_H__
 
 #include <stdlib.h>
 #include <stdbool.h>
@@ -35,4 +35,4 @@ __host_error(char *payload);
 __attribute__((__import_module__("wapc"), __import_name__("__console_log"))) extern void
 __console_log(const char *payload, size_t payload_len);
 
-#endif
+#endif
diff --git a/Sources/wapc-ffi/module.modulemap b/Sources/wapc-ffi/module.modulemap
@@ -0,0 +1,5 @@
+module wapc {
+  header "include/wapc_ffi.h"
+  link "wapc_ffi"
+  export *
+}
diff --git a/Sources/wapc-ffi/wapc_ffi.c b/Sources/wapc-ffi/wapc_ffi.c
@@ -0,0 +1 @@
+#include "wapc_ffi.h"
diff --git a/Sources/wapc-host/module.modulemap b/Sources/wapc-host/module.modulemap
diff --git a/Sources/wapc-host/wapc_host.c b/Sources/wapc-host/wapc_host.c
diff --git a/Sources/wapc/wapc.swift b/Sources/wapc/wapc.swift
@@ -1,4 +1,4 @@
-import wapc_host
+import wapc_ffi
 import Foundation
 
 public func handleCall(operation_size: UInt, payload_size: UInt) -> Bool {
@@ -7,7 +7,7 @@ public func handleCall(operation_size: UInt, payload_size: UInt) -> Bool {
     defer {
         operationBuf.deinitialize(count: Int(operation_size) + 1)
         operationBuf.deallocate()
-    
+
         payloadBuf.deinitialize(count: Int(payload_size) + 1)
         payloadBuf.deallocate()
     }
@@ -68,7 +68,7 @@ public func hostCall(
         // Add NULL terminations
         let tailErrorBuf = errorBuf + Int(errorLen)
         tailErrorBuf.pointee = 0
-        
+
         let error = String(cString: errorBuf)
 
         consoleLog(msg: "Host error: \(error)")
@@ -100,5 +100,4 @@ public func registerFunction(name: String, fn: @escaping (String) -> String) {
     wapcFunctions[name] = fn
 }
 
-var wapcFunctions: 
-Dictionary<String, (String) -> String> = [:]
+var wapcFunctions: Dictionary<String, (String) -> String> = [:]