Merge branch 'develop' of github.com:PDB-REDO/libcifpp into develop

include/cif++/parser.hpp

@@ -29,7 +29,6 @@
 #include "cif++/row.hpp"
 #include "cif++/row.hpp"
 
 
 #include <map>
 #include <map>
-#include <regex>
 
 
 namespace cif
 namespace cif
 {
 {
@@ -214,18 +213,14 @@ class sac_parser
 	std::streambuf &m_source;
 	std::streambuf &m_source;
 
 
 	// Parser state
 	// Parser state
-	bool m_validate;
 	uint32_t m_line_nr;
 	uint32_t m_line_nr;
 	bool m_bol;
 	bool m_bol;
 	CIFToken m_lookahead;
 	CIFToken m_lookahead;
-	// std::string m_token_value;
-	// CIFValue mTokenType;
-	// std::vector<int> m_buffer;	// retract buffer, used to be a stack<char>
 
 
-	static constexpr size_t kBufferSize = 128;
+	static constexpr size_t kRetractBufferSize = 128;
 
 
-	int m_buffer[kBufferSize];
-	int *m_buffer_ptr = m_buffer;
+	int m_retract_buffer[kRetractBufferSize];
+	int *m_retract_buffer_ptr = m_retract_buffer;
 
 
 	// token buffer
 	// token buffer
 	std::vector<char> m_token_buffer;
 	std::vector<char> m_token_buffer;

src/utilities.cpp

@@ -40,7 +40,6 @@
 #include <iostream>
 #include <iostream>
 #include <map>
 #include <map>
 #include <mutex>
 #include <mutex>
-#include <regex>
 #include <sstream>
 #include <sstream>
 #include <thread>
 #include <thread>
 
 

test/unit-v2-test.cpp

@@ -2357,8 +2357,6 @@ _test.text ??
 
 
 BOOST_AUTO_TEST_CASE(output_test_1)
 BOOST_AUTO_TEST_CASE(output_test_1)
 {
 {
-	cif::VERBOSE = 5;
-
 	auto data1 = R"(
 	auto data1 = R"(
 data_Q
 data_Q
 loop_
 loop_