Fix parsing mmCIF files with an unquoted string ??

CMakeLists.txt

@@ -25,7 +25,7 @@
 cmake_minimum_required(VERSION 3.16)
 cmake_minimum_required(VERSION 3.16)
 
 
 # set the project name
 # set the project name
-project(cifpp VERSION 3.0.2 LANGUAGES CXX)
+project(cifpp VERSION 3.0.4 LANGUAGES CXX)
 
 
 list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 

changelog

+Version 3.0.4
+- Fix in mmCIF parser, now correctly handles the unquoted
+  string ??
+
 Version 3.0.3
 Version 3.0.3
 - Better configuration checks, for atomic e.g.
 - Better configuration checks, for atomic e.g.
 - Fixed a problem introduced in refactoring mmcif::Atom
 - Fixed a problem introduced in refactoring mmcif::Atom
@@ -17,6 +21,9 @@ Version 3.0.0
 - Upgraded mmcif::Structure
 - Upgraded mmcif::Structure
 - various other small fixes
 - various other small fixes
 
 
+Version 2.0.5
+- Backporting updated CMakeLists.txt file
+
 Version 2.0.4
 Version 2.0.4
 - Reverted a too strict test when reading cif files.
 - Reverted a too strict test when reading cif files.
 
 

include/cif++/CifParser.hpp

 /*-
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  * SPDX-License-Identifier: BSD-2-Clause
- * 
+ *
  * Copyright (c) 2020 NKI/AVL, Netherlands Cancer Institute
  * Copyright (c) 2020 NKI/AVL, Netherlands Cancer Institute
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice, this
  * 1. Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer
  *    list of conditions and the following disclaimer
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -139,7 +139,7 @@ class SacParser
 	int getNextChar();
 	int getNextChar();
 
 
 	void retract();
 	void retract();
-	void restart();
+	int restart(int start);
 
 
 	CIFToken getNextToken();
 	CIFToken getNextToken();
 	void match(CIFToken token);
 	void match(CIFToken token);
@@ -181,8 +181,9 @@ class SacParser
 		eStateTextField,
 		eStateTextField,
 		eStateFloat = 100,
 		eStateFloat = 100,
 		eStateInt = 110,
 		eStateInt = 110,
-		//		eStateNumericSuffix = 200,
-		eStateValue = 300
+		eStateValue = 300,
+		eStateDATA,
+		eStateSAVE
 	};
 	};
 
 
 	std::istream &mData;
 	std::istream &mData;
@@ -191,7 +192,6 @@ class SacParser
 	bool mValidate;
 	bool mValidate;
 	uint32_t mLineNr;
 	uint32_t mLineNr;
 	bool mBol;
 	bool mBol;
-	int mState, mStart;
 	CIFToken mLookahead;
 	CIFToken mLookahead;
 	std::string mTokenValue;
 	std::string mTokenValue;
 	CIFValueType mTokenType;
 	CIFValueType mTokenType;