Reordering.

src/textparser.cpp

@@ -14,14 +14,6 @@ ccp TextParser::findEnd_(ccp line) const {
 }
 
 
-bool strmatch(ccpc begin, ccpc end, ccpc str) {
-  ccp p;
-  ccp q;
-  for (p = begin, q = str; p < end and *q and *p == *q; p++, q++);
-  return p == end and not *q;
-}
-
-
 void TextParser::parse(char& result, ccpc begin, ccpc end) const {
   result = 0;
   if (begin < end) {

src/textparser.h

@@ -1,49 +1,8 @@
 #pragma once
 
-#include <stdlib.h>
 #include <string.h>
 
-typedef char const* ccp;  //!< Pointer to a constant string.
-typedef ccp const ccpc;   //!< Constant pointer to a constant string.
-
-/*! Integer number.
- *
- * \tparam T Integer type.
- * \tparam base Integer base.
- */
-template <class T, size_t base>
-struct Number {
-  T value;  //!< Value.
-};
-
-/*! Boolean.
- *
- * \tparam truth Truth value.
- */
-template <ccp truth>
-struct Bool {
-  bool value;  //!< Value.
-};
-
-/*! Category.
- *
- * \tparam T Integer type.
- * \tparam .
- */
-template <class T, ccp* labels>
-struct Category {
-  T value;  //!< Value.
-};
-
-
-/*! String comparison.
- *
- * \param[in] begin Pointer to the first C string.
- * \param[in] end Pointer to end of the first C string.
- * \param[in] str Pointer to the second C string.
- */
-bool strmatch(ccpc begin, ccpc end, ccpc str);
-
+#include "texttypes.h"
 
 /*! Line based text parser. */
 class TextParser {

src/texttypes.cpp

@@ -0,0 +1,8 @@
+#include "texttypes.h"
+
+bool strmatch(ccpc begin, ccpc end, ccpc str) {
+  ccp p;
+  ccp q;
+  for (p = begin, q = str; p < end and *q and *p == *q; p++, q++);
+  return p == end and not *q;
+}

src/texttypes.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <stdlib.h>
+
+typedef char const* ccp;  //!< Pointer to a constant string.
+typedef ccp const ccpc;   //!< Constant pointer to a constant string.
+
+/*! Integer number.
+ *
+ * \tparam T Integer type.
+ * \tparam base Integer base.
+ */
+template <class T, size_t base>
+struct Number {
+  T value;  //!< Value.
+};
+
+/*! Boolean.
+ *
+ * \tparam truth Truth value.
+ */
+template <ccp truth>
+struct Bool {
+  bool value;  //!< Value.
+};
+
+/*! Category.
+ *
+ * \tparam T Integer type.
+ * \tparam .
+ */
+template <class T, ccp* labels>
+struct Category {
+  T value;  //!< Value.
+};
+
+
+/*! String comparison.
+ *
+ * \param[in] begin Pointer to the first C string.
+ * \param[in] end Pointer to end of the first C string.
+ * \param[in] str Pointer to the second C string.
+ */
+bool strmatch(ccpc begin, ccpc end, ccpc str);

tests/Makefile

@@ -2,7 +2,7 @@ EXEC := run_tests
 MAIN := test_lib
 TESTS := test_parser
 FIXTURES :=
-LIBS := ../src/textparser
+LIBS := ../src/textparser ../src/texttypes
 
 
 CC := g++