fix ci (#8)

Author: iliabylich

.github/workflows/test.yml

@@ -38,7 +38,7 @@ jobs:
             ld: ld
             ar: ar
             run: |
-              $CC --version
+              $CXX --version
               make tests/run
 
           - name: test on windows (msvc)
@@ -49,16 +49,6 @@ jobs:
             run: |
               make tests/run
 
-          - name: test on windows (mingw)
-            os: windows-latest
-            target: x86_64-pc-windows-gnu
-            cxx: g++
-            ld: ld
-            ar: ar
-            run: |
-              gcc --version
-              make tests/run
-
           - name: valgrind
             os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
@@ -77,7 +67,7 @@ jobs:
             cxx: clang++-12
             ld: ld.lld-12
             ar: llvm-ar-12
-            run: ASAN_OPTIONS=detect_leaks=1 CXXFLAGS="-fsanitize=address" make tests/run
+            run: ASAN_OPTIONS=detect_leaks=1:alloc_dealloc_mismatch=0 CXXFLAGS="-fsanitize=address" make tests/run
 
     steps:
       - name: setup msvc on windows
@@ -103,7 +93,7 @@ jobs:
           RUSTFLAGS: ""
         run: |
           make do-codegen
-          make token_ids.h
+          make token_ids.hpp
 
       - name: run tests
         run: ${{ matrix.build.run }}

header/build.mk

@@ -10,10 +10,10 @@ $(info O = $(O))
 $(info A = $(A))
 $(info STATIC_LIB_FILE = $(STATIC_LIB_FILE))
 $(info LIST_DEPS = $(LIST_DEPS))
-$(info CFLAGS = $(CFLAGS))
+$(info CXXFLAGS = $(CXXFLAGS))
 
 $(info add_to_lib = $(call add_to_lib,lib.$(A),object.$(O)))
-$(info build_cxx_obj = $(call build_cxx_obj,file.c,file.$(O)))
+$(info build_cxx_obj = $(call build_cxx_obj,file.cpp,file.$(O)))
 $(info build_cxx_exe = $(call build_cxx_exe,file.$(O),out))
 
 $(info )

header/build.sh

@@ -6,7 +6,7 @@ A = a
 STATIC_LIB_FILE = libruby_parser_cpp.$(A)
 LIST_DEPS = otool -L
 
-CXXFLAGS += -Wall -Wextra -Wpedantic -Weverything -g
+CXXFLAGS += -std=c++17 -Wall -Wextra -Wpedantic -Weverything -g
 # but disable -Wpadded, we inherit Rust layouts
 CXXFLAGS += -Wno-padded
 # ignore C++98 compatibility

scripts/setup_target.mk

@@ -0,0 +1,30 @@
+$(info Compiling x86_64-pc-windows-msvc target)
+
+O = obj
+A = lib
+
+STATIC_LIB_FILE = ruby_parser_cpp.$(A)
+LIST_DEPS = dumpbin /dependents
+
+# /nologo
+CXXFLAGS += /std:c++17 /bigobj /MT /Zi
+
+ifeq ($(BUILD_ENV), debug)
+CXXFLAGS += /Od /DEBUG /DTEST_ENV
+else
+CXXFLAGS += /O2
+endif
+
+define add_to_lib
+lib.exe $(1) $(2) /OUT:$(1)
+endef
+
+define build_cxx_obj
+$(CXX) $(1) $(CXXFLAGS) /c /Fo
+endef
+
+define build_cxx_exe
+$(CXX) ws2_32.lib advapi32.lib userenv.lib $(1) $(CXXFLAGS) /link /OUT:$(2)
+endef
+
+BENCHMARK_RUNNER_ASSET_NAME = rust-parser-x86_64-pc-windows-msvc.exe

scripts/targets/x86_64-apple-darwin.mk

@@ -0,0 +1,29 @@
+$(info Compiling x86_64-unknown-linux-gnu target)
+
+O = o
+A = a
+
+STATIC_LIB_FILE = libruby_parser_cpp.$(A)
+LIST_DEPS = ldd
+
+CXXFLAGS += -std=c++17 -Wall -Wextra -g -target $(TARGET)
+
+ifeq ($(BUILD_ENV), debug)
+CXXFLAGS += -O0 -DTEST_ENV
+else
+CXXFLAGS += -O3
+endif
+
+define add_to_lib
+$(AR) r $(1) $(2)
+endef
+
+define build_cxx_obj
+$(CXX) $(1) $(CXXFLAGS) -c -o $(2)
+endef
+
+define build_cxx_exe
+$(CXX) $(1) $(CXXFLAGS) -lpthread -ldl -lm -o $(2)
+endef
+
+BENCHMARK_RUNNER_ASSET_NAME = rust-parser-x86_64-unknown-linux-gnu

scripts/targets/x86_64-pc-windows-msvc.mk

@@ -3,6 +3,7 @@
 
 #include <cassert>
 #include <cstring>
+#include <cstdint>
 #include <utility>
 
 #define BLOB(T)                       \