wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Preprocessor: Avoid using "%.*hs" in log format string, since cppformat doesn't support it.

Browse Source 
This was SVN commit r16189.
This commit is contained in:
Ykkrosh 2015-01-22 20:38:16 +00:00
parent 568c415d0a
commit afa492f473
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/ps/Preprocessor.cpp
View File

@ -231,8 +231,8 @@ static void DefaultError (void *iData, int iLine, const char *iError,
{
(void)iData;
if (iToken)
LOGERROR("Preprocessor error: line %d: %s: '%.*hs'\n",
iLine, iError, int (iTokenLen), iToken);
LOGERROR("Preprocessor error: line %d: %s: '%s'\n",
iLine, iError, std::string (iToken, iTokenLen));
else
LOGERROR("Preprocessor error: line %d: %s\n", iLine, iError);
}

46
source/ps/tests/test_Preprocessor.h Normal file
View File

@ -0,0 +1,46 @@
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lib/self_test.h"
#include "ps/Preprocessor.h"
class TestPreprocessor : public CxxTest::TestSuite
{
public:
void test_basic()
{
CPreprocessor preproc;
const char* in = "#define TEST 2\n1+1=TEST\n";
size_t len = 0;
char* out = preproc.Parse(in, strlen(in), len);
TS_ASSERT_EQUALS(std::string(out, len), "\n1+1=2\n");
}
void test_error()
{
TestLogger logger;
CPreprocessor preproc;
const char* in = "foo\n#if ()\nbar\n";
size_t len = 0;
char* out = preproc.Parse(in, strlen(in), len);
TS_ASSERT_EQUALS(std::string(out, len), "");
TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "ERROR: Preprocessor error: line 2: Unclosed parenthesis in #if expression\n");
}
};