Update to the latest version of most dependencies.

turlodales · May 31, 2020 · 31fec68 · 31fec68
1 parent f78cfe3
commit 31fec68
Show file tree

Hide file tree

Showing 37 changed files with 76 additions and 51 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -157,3 +157,6 @@
 [submodule "leveldb"]
 	path = tst-network/leveldb
 	url = https://github.com/google/leveldb.git
+[submodule "c-ares"]
+	path = min-wireshark/c-ares
+	url = https://github.com/c-ares/c-ares.git
diff --git a/app-shared/flutter-desktop-embedding b/app-shared/flutter-desktop-embedding
diff --git a/env/win32/arpa/inet.h → env/mingw/arpa/inet.h b/env/win32/arpa/inet.h → env/mingw/arpa/inet.h
diff --git a/env/win32/netinet/in.h → env/mingw/netinet/in.h b/env/win32/netinet/in.h → env/mingw/netinet/in.h
diff --git a/env/win32/winsock2.h → env/mingw/winsock2.h b/env/win32/winsock2.h → env/mingw/winsock2.h
diff --git a/env/output.mk b/env/output.mk
@@ -121,13 +121,9 @@ code = $(patsubst @/%,$(output)/$(arch)/%,$(header)) $(sysroot)
 
 # XXX: replace cflags with cflags/ once I fix pwd to not begin with ./
 # in this model, cflags would be something controlled only by the user
-dflags = $(if $(filter ./,$(1)),,$(call dflags,$(dir $(patsubst %/,%,$(1)))) $(cflags/$(1)))
-
-flags = $(qflags)
-flags += $(filter -I%,$(call dflags,$(patsubst ./$(output)/%,%,$(patsubst ./$(output)/$(arch)/%,./$(output)/%,./$(dir $<)))))
-flags += $(patsubst -I@/%,-I$(output)/$(arch)/%,$(cflags))
-flags += $(filter-out -I%,$(call dflags,$(patsubst ./$(output)/%,%,$(patsubst ./$(output)/$(arch)/%,./$(output)/%,./$(dir $<)))))
-flags += $(cflags/./$<)
+flags_ = $(if $(filter ./,$(1)),,$(call flags_,$(dir $(patsubst %/,%,$(1)))) $(cflags/$(1)))
+flags- = $(call flags_,$(patsubst ./$(output)/%,%,$(patsubst ./$(output)/$(arch)/%,./$(output)/%,./$(dir $<))))
+flags = $(qflags) $(patsubst -I@/%,-I$(output)/$(arch)/%,$(filter -I%,$(cflags/./$<) $(flags-) $(cflags)) $(filter-out -I%,$(cflags) $(flags-) $(cflags/./$<)))
 
 $(output)/%.c.o: $$(specific) $$(folder).c $$(code)
 	$(specific)

diff --git a/env/target-apl.mk b/env/target-apl.mk
@@ -79,3 +79,5 @@ export CARGO_TARGET_$(subst -,_,$(call uc,$(triple/$(1))))_RUSTFLAGS := $$(forea
 export CARGO_TARGET_$(subst -,_,$(call uc,$(triple/$(1))))_LINKER := $(firstword $(cc))
 endef
 $(each)
+
+lflags += -lresolv
diff --git a/env/target-win.mk b/env/target-win.mk
@@ -80,6 +80,9 @@ cflags += -fms-extensions
 #cflags += -fms-compatibility
 #cflags += -D__GNUC__
 
+#  warning: 'I64' length modifier is not supported by ISO C
+qflags += -Wno-format-non-iso
+
 mflags += has_function_stpcpy=false
 
 # pragma comment(lib, "...lib")
@@ -89,8 +92,10 @@ cflags += -Wno-unknown-pragmas
 
 cflags += -Wno-unused-const-variable
 
-cflags += -I$(pwd)/win32
-cflags += -Wno-nonportable-include-path
+qflags += -I$(CURDIR)/$(pwd)/win32
+qflags += -Wno-nonportable-include-path
+
+cflags += -I$(pwd)/mingw
 
 msys2 := 
 msys2 += crt-git-7.0.0.5553.e922460c-1

diff --git a/env/win32/Ws2tcpip.h → env/win32/WS2tcpip.h b/env/win32/Ws2tcpip.h → env/win32/WS2tcpip.h
diff --git a/env/win32/WinSock2.h b/env/win32/WinSock2.h
@@ -0,0 +1 @@
+#include_next <winsock2.h>
diff --git a/min-icu4c/icu b/min-icu4c/icu
diff --git a/min-v8/target.mk b/min-v8/target.mk
@@ -129,6 +129,7 @@ $(output)/$(pwd/v8)/torque: $(wildcard $(pwd)/v8/src/torque/*.cc) $(pwd)/v8/src/
 	clang++ -std=c++14 -pthread -o $@ $^ $(vflags)
 
 tqsrc := $(patsubst %.tq,%-tq-csa.cc,$(torque))
+tqsrc += class-debug-readers-tq.cc
 tqsrc += class-definitions-tq.cc
 tqsrc += class-verifiers-tq.cc
 tqsrc += exported-macros-assembler-tq.cc
@@ -138,14 +139,16 @@ tqsrc += builtin-definitions-tq.h
 tqsrc += class-definitions-tq-inl.h
 tqsrc += csa-types-tq.h
 tqsrc += enum-verifiers-tq.cc
+tqsrc += exported-class-definitions-tq-inl.h
+tqsrc += exported-class-definitions-tq.h
 tqsrc += factory-tq.cc
 tqsrc += factory-tq.inc
 tqsrc += field-offsets-tq.h
 tqsrc += instance-types-tq.h
 tqsrc += interface-descriptors-tq.inc
 tqsrc += internal-class-definitions-tq-inl.h
 tqsrc += internal-class-definitions-tq.h
-tqsrc += objects-body-descriptors-tq-inl.h
+tqsrc += objects-body-descriptors-tq-inl.inc
 tqsrc += objects-printer-tq.cc
 tqsrc := $(patsubst %,$(output)/$(pwd/v8)/torque-generated/%,$(tqsrc))
 

diff --git a/min-v8/trace_event b/min-v8/trace_event
diff --git a/min-v8/v8 b/min-v8/v8
diff --git a/min-webrtc/sctp-idata b/min-webrtc/sctp-idata
diff --git a/min-webrtc/usrsctp b/min-webrtc/usrsctp
diff --git a/min-webrtc/webrtc b/min-webrtc/webrtc
diff --git a/min-wireshark/c-ares b/min-wireshark/c-ares
diff --git a/min-wireshark/extra/Ws2tcpip.h b/min-wireshark/extra/Ws2tcpip.h
@@ -0,0 +1,2 @@
+// XXX: tell wireshark to use WS2tcpip.h
+#include_next <ws2tcpip.h>
diff --git a/min-wireshark/libgcrypt b/min-wireshark/libgcrypt
diff --git a/min-wireshark/target.mk b/min-wireshark/target.mk
@@ -51,7 +51,9 @@ cflags/$(pwd/wireshark)/ += -include malloc.h
 cflags/$(pwd/wireshark)/ += -Wno-format
 cflags/$(pwd/wireshark)/ += -Wno-missing-braces
 
+cflags/$(pwd/wireshark)/epan/dissectors/packet-smb2.c += -D_MSC_VER
 cflags/$(pwd/wireshark)/wsutil/getopt_long.c += -DNO_OLDNAMES
+cflags/$(pwd/wireshark)/epan/dissectors/packet-epl-profile-parser.c += -include stdlib.h
 else
 wireshark := $(filter-out \
     %/file_util.c \
@@ -63,6 +65,8 @@ cflags/$(pwd/wireshark)/ += -DHAVE_ARPA_INET_H
 cflags/$(pwd/wireshark)/ += -DHAVE_GRP_H
 cflags/$(pwd/wireshark)/ += -DHAVE_MKSTEMPS
 cflags/$(pwd/wireshark)/ += -DHAVE_PWD_H
+
+cflags/$(pwd/wireshark)/epan/addr_resolv.c += -include netdb.h
 endif
 
 cflags/$(pwd/wireshark)/ += -DHAVE_FCNTL_H
@@ -141,7 +145,7 @@ $(output)/$(pwd)/%.c $(output)/$(pwd)/%_lex.h: $(pwd)/%.l
 $(output)/$(pwd)/%.c $(output)/$(pwd)/%.h: pwd := $(pwd)
 $(output)/$(pwd)/%.c $(output)/$(pwd)/%.h: $(pwd)/%.y
 	@mkdir -p $(dir $(output)/$(pwd)/$*)
-	bison --name-prefix=ascend --output=$(output)/$(pwd)/$*.c --defines=$(output)/$(pwd)/$*.h $<
+	bison --name-prefix=$(notdir $*) --output=$(output)/$(pwd)/$*.c --defines=$(output)/$(pwd)/$*.h $<
 
 $(output)/$(pwd/wireshark)/tools/lemon/lemon: $(pwd/wireshark)/tools/lemon/lemon.c
 	@mkdir -p $(dir $@)
@@ -159,25 +163,21 @@ source += $(output)/$(pwd/wireshark)/epan/radius_dict.c
 source += $(output)/$(pwd/wireshark)/epan/uat_load.c
 source += $(output)/$(pwd/wireshark)/wiretap/k12text.c
 
-source += $(output)/$(pwd/wireshark)/epan/dtd_parse.c
-$(call depend,$(output)/$(pwd/wireshark)/epan/dtd_parse.c.o,$(output)/$(pwd/wireshark)/epan/dtd_grammar.h)
-source += $(output)/$(pwd/wireshark)/epan/dtd_grammar.c
-
-source += $(output)/$(pwd/wireshark)/epan/dfilter/scanner.c
-$(call depend,$(output)/$(pwd/wireshark)/epan/dfilter/scanner.c.o,$(output)/$(pwd/wireshark)/epan/dfilter/grammar.h)
-source += $(output)/$(pwd/wireshark)/epan/dfilter/grammar.c
-$(call depend,$(pwd/wireshark)/epan/dfilter/dfilter.c.o,$(output)/$(pwd/wireshark)/epan/dfilter/scanner_lex.h)
 cflags/$(pwd/wireshark)/epan/dfilter/dfilter.c += -I$(output)/$(pwd/wireshark)/epan/dfilter
 
-source += $(output)/$(pwd/wireshark)/wiretap/ascend_scanner.c
-$(call depend,$(output)/$(pwd/wireshark)/wiretap/ascend_scanner.c.o,$(output)/$(pwd/wireshark)/wiretap/ascend.h)
-source += $(output)/$(pwd/wireshark)/wiretap/ascend.c
-$(call depend,$(output)/$(pwd/wireshark)/wiretap/ascend.c.o,$(output)/$(pwd/wireshark)/wiretap/ascend_scanner_lex.h)
+define parser
+source += $(output)/$(pwd/wireshark)/$(1)$(2).c
+$(call depend,$(output)/$(pwd/wireshark)/$(1)$(2).c.o,$(output)/$(pwd/wireshark)/$(1)$(3).h)
+source += $(output)/$(pwd/wireshark)/$(1)$(3).c
+$(call depend,$(output)/$(pwd/wireshark)/$(1)$(3).c.o,$(output)/$(pwd/wireshark)/$(1)$(2)_lex.h)
+endef
 
-source += $(output)/$(pwd/wireshark)/wiretap/candump_scanner.c
-$(call depend,$(output)/$(pwd/wireshark)/wiretap/candump_scanner.c.o,$(output)/$(pwd/wireshark)/wiretap/candump_parser.h)
-source += $(output)/$(pwd/wireshark)/wiretap/candump_parser.c
-$(call depend,$(output)/$(pwd/wireshark)/wiretap/candump_parser.c.o,$(output)/$(pwd/wireshark)/wiretap/candump_scanner_lex.h)
+$(eval $(call parser,epan/dfilter/,scanner,grammar))
+$(eval $(call parser,epan/dtd_,parse,grammar))
+$(eval $(call parser,epan/protobuf_lang,_scanner,))
+$(eval $(call parser,wiretap/ascend,_scanner,))
+$(eval $(call parser,wiretap/busmaster_,scanner,parser))
+$(eval $(call parser,wiretap/candump_,scanner,parser))
 
 
 # XXX: this is currently shared by libiconv and libgpg-error; it might be sharable by more stuff
@@ -281,3 +281,15 @@ export GNULIB_TOOL := $(GNULIB_SRCDIR)/gnulib-tool
 linked += usr/lib/libiconv.a
 header += @/usr/include/iconv.h
 # }}}
+# c-ares {{{
+$(output)/%/$(pwd)/c-ares/ares_build.h: $(output)/%/$(pwd)/c-ares/Makefile
+	touch $@
+$(output)/%/$(pwd)/c-ares/.libs/libcares.a: $(output)/%/$(pwd)/c-ares/ares_build.h
+	$(MAKE) -C $(dir $<)
+
+cflags/$(pwd/wireshark)/ += -I@/$(pwd)/c-ares
+header += @/$(pwd)/c-ares/ares_build.h
+linked += $(pwd)/c-ares/.libs/libcares.a
+cflags/$(pwd/wireshark)/ += -I$(pwd)/c-ares
+cflags += -DCARES_STATICLIB
+# }}}
diff --git a/min-wireshark/wireshark b/min-wireshark/wireshark
diff --git a/min-zlib/base b/min-zlib/base
diff --git a/min-zlib/build b/min-zlib/build
diff --git a/min-zlib/googletest b/min-zlib/googletest
diff --git a/min-zlib/libz b/min-zlib/libz
diff --git a/p2p/cppcoro b/p2p/cppcoro
diff --git a/p2p/curl b/p2p/curl
diff --git a/p2p/fmt b/p2p/fmt
diff --git a/p2p/jsoncpp b/p2p/jsoncpp
diff --git a/p2p/openvpn3 b/p2p/openvpn3
diff --git a/p2p/secp256k1 b/p2p/secp256k1
diff --git a/vpn-shared/libevent b/vpn-shared/libevent
diff --git a/vpn-shared/libmaxminddb b/vpn-shared/libmaxminddb
diff --git a/vpn-shared/libssh b/vpn-shared/libssh
diff --git a/vpn-shared/sqlite b/vpn-shared/sqlite
diff --git a/vpn-shared/tor b/vpn-shared/tor
+1 −1		.github/workflows/ci.yml
+22 −0		plugins/color_panel/linux/CMakeLists.txt
+0 −111		plugins/color_panel/linux/Makefile
+1 −1		plugins/color_panel/linux/color_panel_plugin.cc
+0 −0		plugins/color_panel/linux/include/color_panel_plugin.h
+4 −2		plugins/color_panel/pubspec.yaml
+22 −0		plugins/file_chooser/linux/CMakeLists.txt
+0 −107		plugins/file_chooser/linux/Makefile
+1 −1		plugins/file_chooser/linux/file_chooser_plugin.cc
+0 −0		plugins/file_chooser/linux/include/file_chooser_plugin.h
+4 −2		plugins/file_chooser/pubspec.yaml
+4 −2		plugins/flutter_plugins/path_provider_fde/pubspec.yaml
+16 −0		plugins/flutter_plugins/url_launcher_fde/linux/CMakeLists.txt
+0 −108		plugins/flutter_plugins/url_launcher_fde/linux/Makefile
+0 −0		plugins/flutter_plugins/url_launcher_fde/linux/include/url_launcher_plugin.h
+1 −1		plugins/flutter_plugins/url_launcher_fde/linux/url_launcher_plugin.cc
+4 −2		plugins/flutter_plugins/url_launcher_fde/pubspec.yaml
+22 −0		plugins/menubar/linux/CMakeLists.txt
+0 −107		plugins/menubar/linux/Makefile
+0 −0		plugins/menubar/linux/include/menubar_plugin.h
+1 −1		plugins/menubar/linux/menubar_plugin.cc
+4 −2		plugins/menubar/pubspec.yaml
+24 −0		plugins/window_size/linux/CMakeLists.txt
+0 −110		plugins/window_size/linux/Makefile
+0 −0		plugins/window_size/linux/include/window_size_plugin.h
+1 −1		plugins/window_size/linux/window_size_plugin.cc
+4 −2		plugins/window_size/pubspec.yaml
+1 −0		testbed/gtk/.gitignore
+82 −0		testbed/gtk/CMakeLists.txt
+0 −85		testbed/gtk/Makefile
+5 −0		testbed/gtk/README.md
+1 −0		testbed/gtk/flutter/.template_version
+77 −0		testbed/gtk/flutter/CMakeLists.txt
+7 −2		testbed/gtk/main.cc
+5 −0		testbed/gtk/window_configuration.cc
+15 −0		testbed/gtk/window_configuration.h
+2 −1		testbed/lib/main.dart
+84 −0		testbed/linux/CMakeLists.txt
+0 −146		testbed/linux/Makefile
+0 −16		testbed/linux/app_configuration.mk
+1 −1		testbed/linux/flutter/.template_version
+108 −0		testbed/linux/flutter/CMakeLists.txt
+3 −3		testbed/linux/flutter/generated_plugin_registrant.cc
+12 −0		testbed/linux/flutter/generated_plugins.cmake
+0 −35		testbed/linux/flutter/generated_plugins.mk
+6 −6		testbed/macos/Flutter/GeneratedPluginRegistrant.swift
+2 −2		testbed/pubspec.yaml
+1 −1		testbed/test/widget_test.dart
-Original file line number
+Diff line change
@@ Expand Up @@
     export CARGO_TARGET_$(subst -,_,$(call uc,$(triple/$(1))))_LINKER := $(firstword $(cc))
     endef
     $(each)
+    lflags += -lresolv
+35 −18		src/netinet/sctp_asconf.c
+1 −2		src/netinet/sctp_auth.c
+1 −1		src/netinet/sctp_bsd_addr.c
+82 −65		src/netinet/sctp_indata.c
+4 −1		src/netinet/sctp_indata.h
+23 −19		src/netinet/sctp_input.c
+17 −30		src/netinet/sctp_os_bsd.h
+1 −0		src/netinet/sctp_os_macosx.h
+16 −16		src/netinet/sctp_os_netbsd.h
+18 −2		src/netinet/sctp_os_userspace.h
+2 −0		src/netinet/sctp_os_windows.h
+102 −25		src/netinet/sctp_output.c
+44 −25		src/netinet/sctp_pcb.c
+1 −0		src/netinet/sctp_pcb.h
+4 −14		src/netinet/sctp_structs.h
+23 −2		src/netinet/sctp_timer.c
+23 −49		src/netinet/sctp_usrreq.c
+3 −6		src/netinet/sctp_var.h
+16 −7		src/netinet/sctputil.c
+12 −7		src/netinet6/sctp6_usrreq.c
+6 −2		fuzzer/pcap2corpus.c
+4 −2		programs/daytime_server.c
+4 −2		programs/daytime_server_upcall.c
+4 −2		programs/discard_server.c
+4 −2		programs/echo_server.c
+16 −10		programs/ekr_client.c
+18 −12		programs/ekr_loop.c
+22 −16		programs/ekr_loop_offload.c
+25 −17		programs/ekr_loop_upcall.c
+15 −9		programs/ekr_peer.c
+16 −10		programs/ekr_server.c
+8 −4		programs/http_client.c
+8 −4		programs/http_client_upcall.c
+14 −6		programs/programs_helper.c
+11 −6		programs/rtcweb.c
+23 −19		programs/st_client.c
+13 −7		programs/tsctp.c
+3 −1		programs/tsctp_upcall.c
+35 −18		usrsctplib/netinet/sctp_asconf.c
+1 −2		usrsctplib/netinet/sctp_auth.c
+1 −1		usrsctplib/netinet/sctp_bsd_addr.c
+82 −65		usrsctplib/netinet/sctp_indata.c
+4 −1		usrsctplib/netinet/sctp_indata.h
+23 −19		usrsctplib/netinet/sctp_input.c
+18 −2		usrsctplib/netinet/sctp_os_userspace.h
+102 −25		usrsctplib/netinet/sctp_output.c
+44 −25		usrsctplib/netinet/sctp_pcb.c
+1 −0		usrsctplib/netinet/sctp_pcb.h
+4 −14		usrsctplib/netinet/sctp_structs.h
+23 −2		usrsctplib/netinet/sctp_timer.c
+23 −49		usrsctplib/netinet/sctp_usrreq.c
+3 −6		usrsctplib/netinet/sctp_var.h
+16 −7		usrsctplib/netinet/sctputil.c
+12 −7		usrsctplib/netinet6/sctp6_usrreq.c
+21 −0		usrsctplib/user_recv_thread.c
+27 −11		usrsctplib/user_socket.c
+11 −7		usrsctplib/usrsctp.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// XXX: tell wireshark to use WS2tcpip.h
		#include_next <ws2tcpip.h>
+5 −12		cipher/ecc-curves.c
+6 −1		cipher/ecc-eddsa.c
+11 −2		cipher/ecc.c
+10 −7		doc/gcrypt.texi
+6 −4		mpi/mpi-inv.c
+1 −2		src/gcrypt.h.in
+2 −1		src/sexp.c
+1 −1		tests/benchmark.c
+6 −11		.travis.yml
+3 −3		README.md
+0 −1		ci/build-linux-bazel.sh
+2 −2		ci/env-linux.sh
+1 −1		ci/install-linux.sh
+16 −16		googlemock/README.md
+9 −0		googlemock/docs/community_created_documentation.md
+1 −1		googlemock/docs/cook_book.md
+5 −3		googlemock/include/gmock/gmock-actions.h
+3 −3		googlemock/include/gmock/internal/gmock-pp.h
+25 −3		googlemock/test/gmock-actions_test.cc
+7 −2		googletest/docs/advanced.md
+1 −1		googletest/docs/primer.md
+6 −3		googletest/include/gtest/gtest.h
+6 −1		googletest/include/gtest/internal/gtest-internal.h
+9 −0		googletest/include/gtest/internal/gtest-port.h
+12 −24		googletest/src/gtest-filepath.cc
+4 −0		googletest/src/gtest-internal-inl.h
+1 −11		googletest/src/gtest-typed-test.cc
+223 −63		googletest/src/gtest.cc
+1 −0		googletest/test/googletest-env-var-test.py
+5 −0		googletest/test/googletest-env-var-test_.cc
+30 −4		googletest/test/googletest-json-output-unittest.py
+1 −0		googletest/test/gtest_help_test.py
+44 −1		googletest/test/gtest_unittest.cc
+2 −2		googletest/test/gtest_xml_outfiles_test.py
+39 −23		googletest/test/gtest_xml_output_unittest.py
+9 −0		googletest/test/gtest_xml_output_unittest_.cc
+2 −1		googletest/test/gtest_xml_test_utils.py
+1 −1		include/cppcoro/net/ipv4_address.hpp
+2 −2		include/cppcoro/shared_task.hpp
+12 −15		CMakeLists.txt
+10 −0		ChangeLog.rst
+3 −1		README.rst
+2 −1		doc/CMakeLists.txt
+6 −7		doc/_templates/layout.html
+10 −4		doc/api.rst
+1 −1		doc/build.py
+2 −2		doc/syntax.rst
+50 −52		include/fmt/chrono.h
+35 −37		include/fmt/color.h
+46 −45		include/fmt/compile.h
+296 −277		include/fmt/core.h
+48 −51		include/fmt/format-inl.h
+636 −682		include/fmt/format.h
+16 −16		include/fmt/locale.h
+5 −5		include/fmt/os.h
+9 −8		include/fmt/ostream.h
+1 −1		include/fmt/posix.h
+66 −54		include/fmt/printf.h
+35 −36		include/fmt/ranges.h
+28 −171		src/format.cc
+13 −12		src/os.cc
+1 −0		support/Vagrantfile
+1 −1		support/manage.py
+2 −1		test/chrono-test.cc
+1 −0		test/color-test.cc
+5 −4		test/compile-test.cc
+118 −37		test/core-test.cc
+5 −4		test/custom-formatter-test.cc
+21 −23		test/format
+42 −46		test/format-impl-test.cc
+81 −251		test/format-test.cc
+2 −2		test/fuzzing/chrono_duration.cpp
+2 −2		test/fuzzing/main.cpp
+2 −2		test/fuzzing/named_arg.cpp
+3 −3		test/fuzzing/one_arg.cpp
+2 −2		test/fuzzing/sprintf.cpp
+2 −2		test/fuzzing/two_args.cpp
+7 −0		test/gmock-gtest-all.cc
+26 −22		test/gtest-extra-test.cc
+3 −3		test/gtest-extra.cc
+3 −2		test/gtest-extra.h
+2 −1		test/locale-test.cc
+4 −4		test/mock-allocator.h
+42 −40		test/os-test.cc
+38 −21		test/ostream-test.cc
+10 −10		test/posix-mock-test.cc
+37 −59		test/printf-test.cc
+18 −5		test/ranges-test.cc
+4 −2		test/scan-test.cc
+11 −11		test/scan.h
+2 −1		test/std-format-test.cc
+1 −0		test/test-assert.h
+1 −0		test/test-main.cc
+1 −0		test/util.cc
+1 −1		test/util.h
+1 −1		README.md
+34 −40		src/lib_json/json_reader.cpp
+53 −55		src/lib_json/json_writer.cpp
+64 −2		src/test_lib_json/main.cpp
+1 −0		test/data/fail_invalid_quote.json