A build issue was discovered where CMake does not create a release string if the git command is present but the git repository is not (for instance when building from a downloaded archive). The git describe command was returning an error and no release string. CMake now detects this situation and sets the release string the same as if no git command is found.
A test issue was discovered on Windows when building from a downloaded archive, which contains Unix format files (newline only) and not DOS format files (CRLF). When the program is run from the regression test script (the program builds fine), the output files are in DOS format, but the compares fail because the expected output files are in Unix format. The cmp command was changed to the diff command, which has an option to ignore the difference in the line separators (the ‑w ignore white space option).
All these changes have been pushed to GitHub and because of the build and test issues found, new tag v0.2‑2 was added. The changes to the Parser were complete (with the attempt to compile next) before the text stream detour and these other minor issues.
[commit 0e85c83d56] [commit 2be4bd2f91]
Wednesday, October 31, 2012
Qt Transition – Strings (File Input)
There was an issue in the way the test files were being read. When the test code was modified to use Qt, the QFile class was used to read the file, where the function used to read a line is actually inherited from the QIODevice class, which QFile is based on. This function returns the line into a QByteArray, which was easily converted to a character array currently used by the Parser.
However, the Parser is being converted to use the QString class. The QString class actually contains QChar characters, which supports 16-bit Unicode. Reading the file as QByteArray would need to be converted to a QString and would not support Unicode text files. After doing some research, it was found that files can be read as Unicode text using the QTextStream class (into a QString).
Therefore, the file reading code was modified to use a QTextStream (where a pointer to the QFile instance is given in the constructor). This will also be used for the standard (console) input for the interactive test modes. The file is opened the same way, but the at end of file check and read line routines from QTextStream are used instead. This read line routine also strips the line separator from the line (ether newline on Linux or CRLF on Windows).
Temporarily, the QString line is converted to a QByteArray, a null character is added to the end and then converted to character array (constant character pointer) to pass to the Parser. So that a type cast to a char * was not needed, the argument and variables in the Parser were changed to const char *, which is fine since the Parser does not modify the input line.
[commit 993aa66765]
However, the Parser is being converted to use the QString class. The QString class actually contains QChar characters, which supports 16-bit Unicode. Reading the file as QByteArray would need to be converted to a QString and would not support Unicode text files. After doing some research, it was found that files can be read as Unicode text using the QTextStream class (into a QString).
Therefore, the file reading code was modified to use a QTextStream (where a pointer to the QFile instance is given in the constructor). This will also be used for the standard (console) input for the interactive test modes. The file is opened the same way, but the at end of file check and read line routines from QTextStream are used instead. This read line routine also strips the line separator from the line (ether newline on Linux or CRLF on Windows).
Temporarily, the QString line is converted to a QByteArray, a null character is added to the end and then converted to character array (constant character pointer) to pass to the Parser. So that a type cast to a char * was not needed, the argument and variables in the Parser were changed to const char *, which is fine since the Parser does not modify the input line.
[commit 993aa66765]
Subscribe to:
Posts (Atom)