Cleanup

sersoft-gmbh · Mar 29, 2022 · 6d52fa6 · 6d52fa6
1 parent c47d919
commit 6d52fa6
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 41 deletions.
diff --git a/Package.swift b/Package.swift
@@ -6,8 +6,8 @@ import PackageDescription
 let package = Package(
     name: "simple-formatting",
     products: [
-        .library(name: "SimpleDurationFormatting",
-                 targets: ["SimpleDurationFormatting"]),
+        .library(name: "DurationFormatting",
+                 targets: ["DurationFormatting"]),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -49,13 +49,13 @@ let package = Package(
 //                "CICUIO",
             ]),
         .target(
-            name: "SimpleDurationFormatting",
+            name: "DurationFormatting",
             dependencies: ["CICUShims"]),
         .testTarget(
-            name: "SimpleDurationFormattingTests",
+            name: "DurationFormattingTests",
             dependencies: [
                 "CICUShims",
-                "SimpleDurationFormatting",
+                "DurationFormatting",
             ]),
     ],
     cxxLanguageStandard: .cxx14

diff --git a/[email protected] b/[email protected]
@@ -6,8 +6,8 @@ import PackageDescription
 let package = Package(
     name: "simple-formatting",
     products: [
-        .library(name: "SimpleDurationFormatting",
-                 targets: ["SimpleDurationFormatting"]),
+        .library(name: "DurationFormatting",
+                 targets: ["DurationFormatting"]),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -49,13 +49,13 @@ let package = Package(
 //                "CICUIO",
             ]),
         .target(
-            name: "SimpleDurationFormatting",
+            name: "DurationFormatting",
             dependencies: ["CICUShims"]),
         .testTarget(
-            name: "SimpleDurationFormattingTests",
+            name: "DurationFormattingTests",
             dependencies: [
                 "CICUShims",
-                "SimpleDurationFormatting",
+                "DurationFormatting",
             ]),
     ],
     cxxLanguageStandard: .cxx14

diff --git a/Sources/CICUCommon/CICUCommon.h b/Sources/CICUCommon/CICUCommon.h
@@ -4,9 +4,5 @@
 //#include <unicode/utypes.h>
 //#include <unicode/unistr.h>
 //#include <unicode/locid.h>
-//#include <unicode/numberformatter.h>
-//#include <unicode/measfmt.h>
-//#include <unicode/msgfmt.h>
-//#include <unicode/rbnf.h>
 
 #endif /* CICUCommon_h */
diff --git a/Sources/CICUCommon/module.modulemap b/Sources/CICUCommon/module.modulemap
@@ -1,4 +1,5 @@
 module CICUCommon [system] {
+    requires cplusplus11
     umbrella header "CICUCommon.h"
     link "icuuc"
 }
diff --git a/Sources/CICUData/CICUData.h b/Sources/CICUData/CICUData.h
@@ -1,12 +1,4 @@
 #ifndef CICUData_h
 #define CICUData_h
 
-//#include <unicode/utypes.h>
-//#include <unicode/unistr.h>
-//#include <unicode/locid.h>
-//#include <unicode/numberformatter.h>
-//#include <unicode/measfmt.h>
-//#include <unicode/msgfmt.h>
-//#include <unicode/rbnf.h>
-
 #endif /* CICUData_h */
diff --git a/Sources/CICUData/module.modulemap b/Sources/CICUData/module.modulemap
@@ -1,4 +1,5 @@
 module CICUData [system] {
+    requires cplusplus11
     umbrella header "CICUData.h"
     link "icudata"
 }
diff --git a/Sources/CICUI18N/CICUI18N.h b/Sources/CICUI18N/CICUI18N.h
@@ -1,9 +1,6 @@
 #ifndef CICUI18N_h
 #define CICUI18N_h
 
-//#include <unicode/utypes.h>
-//#include <unicode/unistr.h>
-//#include <unicode/locid.h>
 //#include <unicode/numberformatter.h>
 //#include <unicode/measfmt.h>
 //#include <unicode/msgfmt.h>

diff --git a/Sources/CICUI18N/module.modulemap b/Sources/CICUI18N/module.modulemap
@@ -1,4 +1,5 @@
 module CICUI18N [system] {
+    requires cplusplus11
     umbrella header "CICUI18N.h"
     link "icui18n"
 }
diff --git a/Sources/CICUIO/CICUIO.h b/Sources/CICUIO/CICUIO.h
@@ -1,12 +1,4 @@
 #ifndef CICUIO_h
 #define CICUIO_h
 
-//#include <unicode/utypes.h>
-//#include <unicode/unistr.h>
-//#include <unicode/locid.h>
-//#include <unicode/numberformatter.h>
-//#include <unicode/measfmt.h>
-//#include <unicode/msgfmt.h>
-//#include <unicode/rbnf.h>
-
 #endif /* CICUIO_h */
diff --git a/Sources/CICUIO/module.modulemap b/Sources/CICUIO/module.modulemap
@@ -1,4 +1,5 @@
 module CICUIO [system] {
+    requires cplusplus11
     umbrella header "CICUIO.h"
     link "icuio"
 }
diff --git a/Sources/CICUShims/DurationFormat.cpp b/Sources/CICUShims/DurationFormat.cpp
@@ -21,12 +21,12 @@ _CICUResultTypeImpl(Formatting, const char * CICUNonnull, true);
 
 CICUFormattingResult _cicu_makeResultFromUnicodeString(UErrorCode status, icu::UnicodeString str) {
     if (U_FAILURE(status)) return CICUFormattingResultMakeFailure(status);
-    // FIXME: Is there a way to use const char directly?
+    // FIXME: Is there a way to use (const) char directly?
     std::string outBuf;
     str.toUTF8String(outBuf);
     char *coutBuf = (char *)calloc(outBuf.length() + 1, sizeof(char));
     auto copied = outBuf.copy(coutBuf, outBuf.length());
-    assert(copied == outBuf.length() || "Incomplete string copy!");
+    assert(copied == outBuf.length() && "Incomplete string copy!");
     return CICUFormattingResultMake(status, coutBuf);
 }
 

diff --git a/Sources/CICUShims/include/Defines.h b/Sources/CICUShims/include/Defines.h
@@ -68,7 +68,7 @@
 #endif
 
 #ifndef cicu_swift_newtype
-#if __has_attribute(__swift_newtype__)
+#if __has_attribute(__swift_newtype__) && !defined(CICU_NO_SWIFT_ANNOTATIONS)
 #define cicu_swift_newtype(type) __attribute__((__swift_newtype__(type)))
 #else
 #define cicu_swift_newtype(type)

diff --git a/Sources/CICUShims/include/TimeComponents.h b/Sources/CICUShims/include/TimeComponents.h
@@ -1,7 +1,7 @@
 #ifndef TimeComponents_h
 #define TimeComponents_h
 
-#include "stdbool.h"
+#include <stdbool.h>
 #include "Defines.h"
 
 #ifdef __cplusplus

diff --git a/...nFormatting/SimpleDurationFormatter.swift → ...urationFormatting/DurationFormatter.swift b/...nFormatting/SimpleDurationFormatter.swift → ...urationFormatting/DurationFormatter.swift
@@ -34,7 +34,7 @@ public struct TimeComponents {
     }
 }
 
-public struct SimpleDurationFormatter {
+public struct DurationFormatter {
     public enum Width {
         case numeric, short, narrow
 

diff --git a/...Tests/SimpleDurationFormattingTests.swift → ...attingTests/DurationFormattingTests.swift b/...Tests/SimpleDurationFormattingTests.swift → ...attingTests/DurationFormattingTests.swift
@@ -1,10 +1,10 @@
 import XCTest
 import CICUShims
-import SimpleDurationFormatting
+import DurationFormatting
 
-final class SimpleDurationFormattingTests: XCTestCase {
+final class DurationFormattingTests: XCTestCase {
     private func _testTimeComponents(_ timeComponents: TimeComponents,
-                                     with formatter: SimpleDurationFormatter,
+                                     with formatter: DurationFormatter,
                                      expecting result: String,
                                      file: StaticString = #filePath,
                                      line: UInt = #line) {