updates to script

Author: lrvideckis

tests/Makefile

@@ -5,8 +5,6 @@ help:
 	@echo "                                     |"
 	@echo "make compile_clang                   | compile all tests with clang, -std=c++20 for warnings"
 	@echo "                                     |"
-	@echo "make compile_commented_snippets      | compile code in @code...@endcode comments"
-	@echo "                                     |"
 	@echo "make grep_clangformat_cppcheck       | various greps to catch certain things, clang-format, cppcheck"
 	@echo "                                     |"
 	@echo "make do_format                       | format with clang-format"
@@ -54,6 +52,3 @@ update_main:
 
 print_which_tests_havent_run:
 	./scripts/print_which_tests_havent_run.sh
-
-compile_commented_snippets:
-	./scripts/compile_commented_snippets.sh

tests/scripts/build_pdf.sh

@@ -10,15 +10,15 @@ echo "DON'T PUSH ANY OF THESE CHANGES TO THE REPO!!!!!!!!"
 echo "if you push these changes, I'll slap your butt"
 
 # remove some files not suitable for PDF:
-rm ../library/data_structures_\[l,r\)/bit_uncommon/rupq.hpp || exit 1
-rm ../library/data_structures_\[l,r\)/bit_uncommon/rurq.hpp || exit 1
-rm ../library/data_structures_\[l,r\)/uncommon/seg_tree.png || exit 1
-rm ../library/data_structures_\[l,r\)/seg_tree_uncommon/distinct_query.hpp || exit 1
-rm ../library/data_structures_\[l,r\)/seg_tree_uncommon/implicit.hpp || exit 1
-rm ../library/data_structures_\[l,r\)/seg_tree_uncommon/kth_smallest_query.hpp || exit 1
-rm ../library/data_structures_\[l,r\)/uncommon/mode_query.hpp || exit 1
-rm ../library/data_structures_\[l,r\)/uncommon/priority_queue_of_updates.hpp || exit 1
-rm ../library/data_structures_\[l,r\)/uncommon/deque_op.hpp || exit 1
+rm "../library/data_structures_[l,r)/bit_uncommon/rupq.hpp" || exit 1
+rm "../library/data_structures_[l,r)/bit_uncommon/rurq.hpp" || exit 1
+rm "../library/data_structures_[l,r)/uncommon/seg_tree.png" || exit 1
+rm "../library/data_structures_[l,r)/seg_tree_uncommon/distinct_query.hpp" || exit 1
+rm "../library/data_structures_[l,r)/seg_tree_uncommon/implicit.hpp" || exit 1
+rm "../library/data_structures_[l,r)/seg_tree_uncommon/kth_smallest_query.hpp" || exit 1
+rm "../library/data_structures_[l,r)/uncommon/mode_query.hpp" || exit 1
+rm "../library/data_structures_[l,r)/uncommon/priority_queue_of_updates.hpp" || exit 1
+rm "../library/data_structures_[l,r)/uncommon/deque_op.hpp" || exit 1
 rm ../library/graphs/strongly_connected_components/add_edges_strongly_connected.hpp || exit 1
 rm ../library/graphs/strongly_connected_components/offline_incremental_scc.hpp || exit 1
 rm ../library/graphs/uncommon/bridges.hpp || exit 1
@@ -58,7 +58,10 @@ cat ../library/**/*.hpp |
 echo "check no multiline comments. Generating hashes of file-prefixes requires this."
 grep --extended-regexp "\/\*" --recursive ../library/**/*.hpp && exit 1
 
-make compile_commented_snippets || exit 1
+find ../library/ -path "../library/data_structures_\[l,r\]" -prune -o -type f -name "*.hpp" -print | ./scripts/compile_commented_snippets.sh || exit 1
+rm entire_library_without_main || exit 1
+rm entire_library.cpp || exit 1
+find "../library/data_structures_[l,r]" -type f -name "*.hpp" | ./scripts/compile_commented_snippets.sh || exit 1
 
 # remove #pragma once
 sed --in-place '/^#pragma once$/d' ../library/**/*.hpp

tests/scripts/compile_commented_snippets.sh

@@ -5,15 +5,17 @@ shopt -s globstar
 git submodule init
 git submodule update
 
-# build cpp file with everything in the library with all code in @code ...
+# Intended usage:
+# find ../library/ -type f -name "*.hpp" | ./scripts/compile_commented_snippets.sh
+# build cpp file with all files passed in via stdin and with all code in @code ...
 # @endcode comments in main
 
 {
 	echo "#include <bits/stdc++.h>"
 	echo "using namespace std;"
 	cat library_checker_aizu_tests/kactl_macros.hpp
 	echo "const ll mod = (119 << 23) + 1, root = 62;"
-	find ../library/ -type f -name "*.hpp" | grep --invert-match --file=.config/.code_snippet_excluded_file_list | sort | sed 's/^/#include "/; s/$/"/' | cpp -nostdinc -C -P | grep --invert-match --extended-regexp "const int mod = |const ll mod = "
+	cat | grep --invert-match --file=.config/.code_snippet_excluded_file_list | sort | sed 's/^/#include "/; s/$/"/' | cpp -nostdinc -C -P | grep --invert-match --extended-regexp "const int mod = |const ll mod = "
 	echo "int main() {"
 	echo "vi a,b,subset;"
 	echo "vl left,bottom;"