anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

filter: Remove lowercase() function 

And switch everything over to using the new implementation.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-01-30 09:35:24 -05:00
parent 7733e24c07
commit 6c4dc5b1db
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/filter.cpp
View File

@ -132,10 +132,3 @@ void filter :: search(const std::string &text, std::set<unsigned int> &res)
for (it++; it != parsed.end(); it++)
find_intersection(*it, res);
}
std::string filter :: lowercase(const std::string &text)
{
std::list<std::string> parsed;
parse_text(text, parsed);
return reassemble_text(parsed);
}

6
core/tags/generic.cpp
View File

@ -2,13 +2,13 @@
* @file
* Copyright 2014 (c) Anna Schumaker.
*/
#include <core/filter.h>
#include <core/string.h>
#include <core/tags/generic.h>
GenericTag :: GenericTag() {}
GenericTag :: GenericTag(const std::string &name)
: _name(name), _lower(filter :: lowercase(name))
: _name(name), _lower(string :: lowercase(name))
{
}
@ -25,7 +25,7 @@ const std::string GenericTag :: primary_key() const
void GenericTag :: read(File &file)
{
_name = file.getline();
_lower = filter :: lowercase(_name);
_lower = string :: lowercase(_name);
}
void GenericTag :: write(File &file)

20
tests/core/filter.cpp
View File

@ -6,25 +6,6 @@
#include <core/filter.h>
#include <tests/test.h>
static void do_test_lowercase(const std::string &text, const std::string &lc)
{
test_equal(filter :: lowercase(text), lc);
}
static void test_lowercase()
{
do_test_lowercase(" ", "");
do_test_lowercase(" test \
text", "test text");
do_test_lowercase("test text", "test text");
do_test_lowercase("Test Text", "test text");
do_test_lowercase("Test? Text!", "test text");
do_test_lowercase("Test?123 Text!456", "test123 text456");
do_test_lowercase("Test?123 Text!456", "test123 text456");
do_test_lowercase("Test(text);123-456", "test text 123 456");
do_test_lowercase("Test((text));;123--456", "test text 123 456");
}
static void do_test_add(const std::string &text, const std::string &lc)
{
static unsigned int i = 0;
@ -106,7 +87,6 @@ static void test_search()
int main(int argc, char **argv)
{
test :: run("Filter Lowercase Test", test_lowercase);
test :: run("Filter Add Test", test_add);
test :: run("Filter Search Test", test_search);
return 0;