1. use Static String

L1MeN9Yu · Dec 6, 2019 · d7c3390 · d7c3390
1 parent d7f18ef
commit d7c3390
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/Source/Frontend/DefaultLogger.swift b/Source/Frontend/DefaultLogger.swift
@@ -5,32 +5,32 @@
 
 import Foundation
 
-public func log(flag: LogFlag, message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+public func log(flag: LogFlag, message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
     if let allMessage = __messageConvert(message, filename, function, line).cString(using: .utf8) {
         senna_default_logger_log(flag.unsignedIntValue, allMessage)
     }
 }
 
-public func logTrace(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+public func logTrace(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
     log(flag: .trace, message: message, filename: filename, function: function, line: line)
 }
 
-public func logDebug(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+public func logDebug(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
     log(flag: .debug, message: message, filename: filename, function: function, line: line)
 }
 
-public func logInfo(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+public func logInfo(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
     log(flag: .info, message: message, filename: filename, function: function, line: line)
 }
 
-public func logWarning(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
-    log(flag: .warning, message: message, filename: filename, function: function, line: line)
+public func logWarning(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+    log(flag: .warn, message: message, filename: filename, function: function, line: line)
 }
 
-public func logError(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+public func logError(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
     log(flag: .error, message: message, filename: filename, function: function, line: line)
 }
 
-public func logCritical(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
-    log(flag: .critical, message: message, filename: filename, function: function, line: line)
+public func logCritical(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+    log(flag: .crit, message: message, filename: filename, function: function, line: line)
 }
diff --git a/Source/Frontend/LogFlag.swift b/Source/Frontend/LogFlag.swift
@@ -9,9 +9,9 @@ public enum LogFlag {
     case trace
     case debug
     case info
-    case warning
+    case warn
     case error
-    case critical
+    case crit
     case off
 
     public init?(unsignedIntValue: CUnsignedInt) {
@@ -23,11 +23,11 @@ public enum LogFlag {
         case 2:
             self = .info
         case 3:
-            self = .warning
+            self = .warn
         case 4:
             self = .error
         case 5:
-            self = .critical
+            self = .crit
         case 6:
             self = .off
         default:
@@ -45,11 +45,11 @@ public extension LogFlag {
             return 1
         case .info:
             return 2
-        case .warning:
+        case .warn:
             return 3
         case .error:
             return 4
-        case .critical:
+        case .crit:
             return 5
         case .off:
             return 6

diff --git a/Source/Frontend/Logger.swift b/Source/Frontend/Logger.swift
@@ -106,34 +106,34 @@ extension Logger {
 
 // MARK: - Log
 extension Logger {
-    public func log(flag: LogFlag, message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+    public func log(flag: LogFlag, message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         if let allMessage = __messageConvert(message, filename, function, line).cString(using: .utf8),
            let loggerName = self.name.cString(using: .utf8) {
             senna_log_action(loggerName, flag.unsignedIntValue, allMessage)
         }
     }
 
-    public func trace(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+    public func trace(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         self.log(flag: .trace, message: message, filename: filename, function: function, line: line)
     }
 
-    public func debug(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+    public func debug(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         self.log(flag: .debug, message: message, filename: filename, function: function, line: line)
     }
 
-    public func info(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+    public func info(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         self.log(flag: .info, message: message, filename: filename, function: function, line: line)
     }
 
-    public func warning(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
-        self.log(flag: .warning, message: message, filename: filename, function: function, line: line)
+    public func warning(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+        self.log(flag: .warn, message: message, filename: filename, function: function, line: line)
     }
 
-    public func error(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
+    public func error(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         self.log(flag: .error, message: message, filename: filename, function: function, line: line)
     }
 
-    public func critical(message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
-        self.log(flag: .critical, message: message, filename: filename, function: function, line: line)
+    public func critical(message: CustomStringConvertible?, filename: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+        self.log(flag: .crit, message: message, filename: filename, function: function, line: line)
     }
 }
diff --git a/Source/Frontend/Senna.swift b/Source/Frontend/Senna.swift
@@ -35,14 +35,14 @@ public func drop(logger: Logger) {
     }
 }
 
-public typealias MessageConvert = (_ message: CustomStringConvertible?, _ filename: String, _ function: String, _ line: Int) -> String
+public typealias MessageConvert = (_ message: CustomStringConvertible?, _ filename: StaticString, _ function: StaticString, _ line: Int) -> String
 
 public func register(messageConvert: @escaping MessageConvert) {
     __messageConvert = messageConvert
 }
 
 var __messageConvert: MessageConvert = { message, filename, function, line in
-    let allMessage = "[\(URL(fileURLWithPath: filename).lastPathComponent):\(line)] \(function) - \(message?.description ?? "")"
+    let allMessage = "[\(URL(fileURLWithPath: "\(filename)").lastPathComponent):\(line)] \(function) - \(message?.description ?? "")"
     return allMessage
 }