Merge branch 'maint'

* maint:
  [erts] Remove unnecessary regex lib

erts/lib_src/yielding_c_fun/GNUmakefile

@@ -194,13 +194,13 @@ cmake_compile: CMakeLists.txt
 	cd cmake_mkdir && cmake ..
 
 clang_tidy:
-	(ls *.c ; echo lib/tiny_regex_c/re.c ; echo lib/simple_c_gc/simple_c_gc.c) | xargs -I{} -n1 clang-tidy -warnings-as-errors=*  {} -- $(YCF_INCLUDE_DIRS) $(YCF_CFLAGS)
+	(ls *.c ; echo lib/simple_c_gc/simple_c_gc.c) | xargs -I{} -n1 clang-tidy -warnings-as-errors=*  {} -- $(YCF_INCLUDE_DIRS) $(YCF_CFLAGS)
 
 clang_format:
 	clang-format -style="{BasedOnStyle: LLVM}" -i *.c *.h
 
 clean:
-	rm -f lib/simple_c_gc/*.o lib/tiny_regex_c/*.o ./*.o ./*~ core trap parse $(YCF_EXECUTABLE) CMakeLists.txt
+	rm -f lib/simple_c_gc/*.o ./*.o ./*~ core trap parse $(YCF_EXECUTABLE) CMakeLists.txt
 
 # Produce a CMakeLists.txt to build with cmake
 CMakeLists.txt: $(YCF_SOURCES)

erts/lib_src/yielding_c_fun/Makefile

@@ -16,39 +16,36 @@
 # building YCF independently of Erlang/OTP.
 #
 
-./bin/yielding_c_fun.bin: simple_c_gc.o re.o ycf_lexer.o ycf_main.o ycf_node.o ycf_parser.o ycf_printers.o ycf_string.o ycf_symbol.o ycf_utils.o ycf_yield_fun.o
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS) -o ./bin/yielding_c_fun.bin  simple_c_gc.o re.o ycf_lexer.o ycf_main.o ycf_node.o ycf_parser.o ycf_printers.o ycf_string.o ycf_symbol.o ycf_utils.o ycf_yield_fun.o
+./bin/yielding_c_fun.bin: simple_c_gc.o ycf_lexer.o ycf_main.o ycf_node.o ycf_parser.o ycf_printers.o ycf_string.o ycf_symbol.o ycf_utils.o ycf_yield_fun.o
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS) -o ./bin/yielding_c_fun.bin  simple_c_gc.o ycf_lexer.o ycf_main.o ycf_node.o ycf_parser.o ycf_printers.o ycf_string.o ycf_symbol.o ycf_utils.o ycf_yield_fun.o
 
 simple_c_gc.o: ./lib/simple_c_gc/simple_c_gc.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o simple_c_gc.o ./lib/simple_c_gc/simple_c_gc.c
-
-re.o: ./lib/tiny_regex_c/re.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o re.o ./lib/tiny_regex_c/re.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o simple_c_gc.o ./lib/simple_c_gc/simple_c_gc.c
 
 ycf_lexer.o: ./ycf_lexer.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_lexer.o ./ycf_lexer.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_lexer.o ./ycf_lexer.c
 
 ycf_main.o: ./ycf_main.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_main.o ./ycf_main.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_main.o ./ycf_main.c
 
 ycf_node.o: ./ycf_node.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_node.o ./ycf_node.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_node.o ./ycf_node.c
 
 ycf_parser.o: ./ycf_parser.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_parser.o ./ycf_parser.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_parser.o ./ycf_parser.c
 
 ycf_printers.o: ./ycf_printers.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_printers.o ./ycf_printers.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_printers.o ./ycf_printers.c
 
 ycf_string.o: ./ycf_string.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_string.o ./ycf_string.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_string.o ./ycf_string.c
 
 ycf_symbol.o: ./ycf_symbol.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_symbol.o ./ycf_symbol.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_symbol.o ./ycf_symbol.c
 
 ycf_utils.o: ./ycf_utils.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_utils.o ./ycf_utils.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_utils.o ./ycf_utils.c
 
 ycf_yield_fun.o: ./ycf_yield_fun.c
-	$(CC) -I. -I./lib/tiny_regex_c -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_yield_fun.o ./ycf_yield_fun.c
+	$(CC) -I. -I./lib/simple_c_gc $(CFLAGS)  -c -o ycf_yield_fun.o ./ycf_yield_fun.c