Try run on apple silicon.

sheredom · Feb 2, 2024 · cfdee7c · cfdee7c
1 parent 06aa578
commit cfdee7c
Show file tree

Hide file tree

Showing 10 changed files with 931 additions and 323 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -10,15 +10,20 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macos-11, macos-14]
         type: [Debug, RelWithDebInfo, MinSizeRel, Release]
-        compiler: [default, clang, gcc]
+        compiler: [default, clang, gcc, tcc]
         exclude:
-          - {os: "macOS-latest", compiler: "clang"}
-          - {os: "windows-latest", compiler: "gcc"}
-          - {os: "macOS-latest", compiler: "gcc"}
+          - {os: "macos-11", compiler: "clang"}
+          - {os: "macos-11", compiler: "gcc"}
+          - {os: "macos-11", compiler: "tcc"}
+          - {os: "macos-14", compiler: "clang"}
+          - {os: "macos-14", compiler: "gcc"}
+          - {os: "macos-14", compiler: "tcc"}
           - {os: "ubuntu-latest", compiler: "default"}
           - {os: "ubuntu-latest", compiler: "default"}
+          - {os: "windows-latest", compiler: "gcc"}
+          - {os: "windows-latest", compiler: "tcc"}
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -29,7 +34,7 @@ jobs:
 
     - name: Setup dependencies
       if: startsWith(matrix.os, 'ubuntu')
-      run: sudo apt-get install -y gcc-10 g++-10 clang-10
+      run: sudo apt-get install -y gcc-10 g++-10 clang tcc
 
     - name: Configure CMake
       shell: bash
@@ -43,11 +48,17 @@ jobs:
       working-directory: ${{github.workspace}}/build
       run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10
 
+    - name: Configure CMake with TCC (Ubuntu)
+      shell: bash
+      if: matrix.compiler == 'tcc' && startsWith(matrix.os, 'ubuntu')
+      working-directory: ${{github.workspace}}/build
+      run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=tcc -DCMAKE_CXX_COMPILER=g++-10
+
     - name: Configure CMake with Clang (Ubuntu)
       shell: bash
       if: (matrix.compiler == 'clang') && startsWith(matrix.os, 'ubuntu')
       working-directory: ${{github.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clang++-10
+      run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
 
     - name: Configure CMake with Clang (Windows)
       shell: bash

diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
@@ -25,7 +25,7 @@ jobs:
 
     - name: Setup dependencies
       if: startsWith(matrix.os, 'ubuntu')
-      run: sudo apt-get install -y clang-10
+      run: sudo apt-get install -y clang
 
     - name: Configure CMake (macOS)
       shell: bash
@@ -37,7 +37,7 @@ jobs:
       shell: bash
       if: startsWith(matrix.os, 'ubuntu')
       working-directory: ${{github.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clang++-10  -DJSON_USE_SANITIZER=${{ matrix.sanitizer }}
+      run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DJSON_USE_SANITIZER=${{ matrix.sanitizer }}
 
     - name: Build
       working-directory: ${{github.workspace}}/build

diff --git a/json.h b/json.h
@@ -50,12 +50,18 @@
 #include <stddef.h>
 #include <string.h>
 
+#if defined(__TINYC__)
+#define JSON_ATTRIBUTE(a) __attribute((a))
+#else
+#define JSON_ATTRIBUTE(a) __attribute__((a))
+#endif
+
 #if defined(_MSC_VER) || defined(__WATCOMC__)
 #define json_weak __inline
-#elif defined(__clang__) || defined(__GNUC__)
-#define json_weak __attribute__((weak))
+#elif defined(__clang__) || defined(__GNUC__) || defined(__TINYC__)
+#define json_weak JSON_ATTRIBUTE(weak)
 #else
-#error Non clang, non gcc, non MSVC, non WATCOM compiler found!
+#error Non clang, non gcc, non MSVC, non tcc, non WATCOM compiler found!
 #endif
 
 #ifdef __cplusplus
@@ -435,6 +441,11 @@ typedef struct json_parse_result_s {
 /* Who cares if nullptr doesn't work with C++98, we don't use it there! */
 #pragma clang diagnostic ignored "-Wc++98-compat"
 #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+
+#if __has_warning("-Wunsafe-buffer-usage")
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+#endif
+
 #elif defined(_MSC_VER)
 #pragma warning(push)
 

diff --git a/test/allocator.cpp b/test/allocator.cpp
@@ -81,7 +81,6 @@ UTEST(allocator, null) {
   struct json_parse_result_s result;
   struct json_value_s *value =
       json_parse_ex(payload, strlen(payload), 0, &_::alloc, 0, &result);
-  struct json_object_s *object = 0;
 
   ASSERT_FALSE(value);
 

diff --git a/test/allow_c_style_comments.cpp b/test/allow_c_style_comments.cpp
@@ -151,8 +151,6 @@ UTEST_F_TEARDOWN(allow_c_style_comments) {
   struct json_value_s *value = utest_fixture->value;
   struct json_object_s *object = 0;
   struct json_value_s *value2 = 0;
-  size_t size = 0;
-  void *json = 0;
 
   ASSERT_TRUE(value);
   ASSERT_TRUE(value->payload);

diff --git a/test/allow_equals_in_object.c b/test/allow_equals_in_object.c
@@ -317,8 +317,6 @@ UTEST_F_TEARDOWN(allow_equals_in_object) {
   struct json_value_s *value = utest_fixture->value;
   struct json_object_s *object = 0;
   struct json_value_s *value2 = 0;
-  size_t size = 0;
-  void *json = 0;
 
   ASSERT_TRUE(value);
   ASSERT_TRUE(value->payload);

diff --git a/test/allow_global_object.c b/test/allow_global_object.c
@@ -345,8 +345,6 @@ UTEST_F_TEARDOWN(allow_global_object) {
   struct json_value_s *value = utest_fixture->value;
   struct json_object_s *object = 0;
   struct json_value_s *value2 = 0;
-  size_t size = 0;
-  void *json = 0;
 
   ASSERT_TRUE(value);
   ASSERT_TRUE(value->payload);

diff --git a/test/allow_json5.c b/test/allow_json5.c
@@ -55,9 +55,6 @@ UTEST(allow_json5, example1) {
                          "}";
   struct json_value_s *value = json_parse_ex(
       payload, strlen(payload), json_parse_flags_allow_json5, 0, 0, 0);
-  struct json_object_s *object = 0;
-  struct json_value_s *value2 = 0;
-  struct json_string_s *string = 0;
 
   ASSERT_TRUE(value);
 
@@ -111,9 +108,6 @@ UTEST(allow_json5, example2) {
       "}\n";
   struct json_value_s *value = json_parse_ex(
       payload, strlen(payload), json_parse_flags_allow_json5, 0, 0, 0);
-  struct json_object_s *object = 0;
-  struct json_value_s *value2 = 0;
-  struct json_string_s *string = 0;
 
   ASSERT_TRUE(value);
 

diff --git a/test/allow_no_commas.c b/test/allow_no_commas.c
@@ -143,7 +143,6 @@ UTEST(allow_no_commas, array_one) {
       payload, strlen(payload), json_parse_flags_allow_no_commas, 0, 0, 0);
   struct json_array_s *array = 0;
   struct json_array_element_s *element = 0;
-  struct json_value_s *value2 = 0;
 
   ASSERT_TRUE(value);
   ASSERT_TRUE(value->payload);
@@ -189,7 +188,6 @@ UTEST_F_TEARDOWN(allow_no_commas) {
   struct json_value_s *value = utest_fixture->value;
   struct json_array_s *array = 0;
   struct json_array_element_s *element = 0;
-  struct json_value_s *value2 = 0;
 
   ASSERT_TRUE(value);
   ASSERT_TRUE(value->payload);