Reimplemented version.h:

- Use macros to form version number and string. CPPCHECK_MAJOR, CPPCHECK_MINOR and CPPCHECK_DEVMINOR now contain the parts of the version number.
- "dev" status is now detected by comparison of CPPCHECK_MINOR and CPPCHECK_DEVMINOR, version string created accordingly.

Fixed two comments.

cli/main.cpp

@@ -86,7 +86,7 @@ void CheckOther::checkZeroDivision()
  *   - Macros are expanded
  * -# Tokenize the file (see Tokenizer)
  * -# Run the runChecks of all check classes.
- * -# Simplify the tokenlist (Tokenizer::simplifyTokenList)
+ * -# Simplify the tokenlist (Tokenizer::simplifyTokenList2)
  * -# Run the runSimplifiedChecks of all check classes
  *
  * When errors are found, they are reported back to the CppCheckExecutor through the ErrorLogger interface

lib/tokenize.h

@@ -585,7 +585,7 @@ public:
 
     /**
      * assert that tokens are ok - used during debugging for example
-     * to catch problems in simplifyTokenList.
+     * to catch problems in simplifyTokenList1/2.
      */
     void validate() const;
 

lib/version.h

@@ -1,3 +1,13 @@
-#define CPPCHECK_VERSION_STRING "1.67 dev"
-#define CPPCHECK_VERSION 1,66,99,0
+#define CPPCHECK_MAJOR 1
+#define CPPCHECK_MINOR 66
+#define CPPCHECK_DEVMINOR 67
+
+#define STRINGIFY(VER) #VER
+#if CPPCHECK_MINOR == CPPCHECK_DEVMINOR
+#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR) "." STRINGIFY(CPPCHECK_DEVMINOR)
+#define CPPCHECK_VERSION CPPCHECK_MAJOR,CPPCHECK_MINOR,0,0
+#else
+#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR) "." STRINGIFY(CPPCHECK_DEVMINOR) " dev"
+#define CPPCHECK_VERSION CPPCHECK_MAJOR,CPPCHECK_MINOR,99,0
+#endif
 #define LEGALCOPYRIGHT L"Copyright (C) 2007-2014 Daniel Marjam\x00E4ki and Cppcheck team."