Changeset 677

Timestamp:

11/17/14 15:33:15 (5 years ago)

Author:

jls17

Message:

• the sorting does now use lower-case-values again
• fixed compile errors because of missing stdexcept include
• updated IndexSorter? tests
• updated ARInside.vsproj file regarding breakpad-support

Location:

branches/work_320

Files:

• ARInside.vcproj (modified) (10 diffs)
• lists/support/BasicStringList.cpp (modified) (3 diffs)
• lists/support/BasicStringList.h (modified) (1 diff)
• lists/support/IndexSorterTest.cpp (modified) (2 diffs)
• lists/support/UTF8StringList.cpp (modified) (4 diffs)
• lists/support/UTF8StringList.h (modified) (2 diffs)
• stdafx.h (modified) (1 diff)

branches/work_320/ARInside.vcproj

@@ -25 +25 @@
                         IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
                         ConfigurationType="1"
-                        CharacterSet="2"
+                        CharacterSet="1"
                         >
                         <Tool
@@ -45 +45 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include"
+                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include;thirdparty\breakpad\src"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARINSIDE_BREAKPAD_SUPPORT"
                                 MinimalRebuild="true"
@@ -122 +122 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include;&quot;thirdparty\breakpad\src&quot;"
+                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include;thirdparty\breakpad\src"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ARINSIDE_BREAKPAD_SUPPORT"
                                 MinimalRebuild="true"
@@ -177 +177 @@
                         IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
                         ConfigurationType="1"
-                        CharacterSet="2"
+                        CharacterSet="1"
                         WholeProgramOptimization="1"
                         >
@@ -199 +199 @@
                                 Optimization="2"
                                 EnableIntrinsicFunctions="true"
-                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include"
+                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include;thirdparty\breakpad\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARINSIDE_BREAKPAD_SUPPORT"
                                 RuntimeLibrary="2"
                                 EnableFunctionLevelLinking="true"
                                 UsePrecompiledHeader="2"
+                                PrecompiledHeaderThrough="ARInsideMain.h"
                                 WarningLevel="3"
                                 DebugInformationFormat="3"
@@ -277 +278 @@
                                 Optimization="2"
                                 EnableIntrinsicFunctions="true"
-                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include;&quot;thirdparty\breakpad\src&quot;"
+                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include;thirdparty\breakpad\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARINSIDE_BREAKPAD_SUPPORT"
                                 RuntimeLibrary="2"
@@ -333 +334 @@
                         IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
                         ConfigurationType="1"
-                        CharacterSet="2"
+                        CharacterSet="1"
                         WholeProgramOptimization="1"
                         >
@@ -355 +356 @@
                                 Optimization="2"
                                 EnableIntrinsicFunctions="true"
-                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include"
+                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include;thirdparty\breakpad\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARINSIDE_BREAKPAD_SUPPORT"
                                 RuntimeLibrary="2"
@@ -410 +411 @@
                         IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\$(ProjectName)"
                         ConfigurationType="1"
-                        CharacterSet="2"
+                        CharacterSet="1"
                         WholeProgramOptimization="1"
                         >
@@ -433 +434 @@
                                 Optimization="2"
                                 EnableIntrinsicFunctions="true"
-                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include"
+                                AdditionalIncludeDirectories="..\..\api810\include;.\;..\..\libs\zlib\include;thirdparty\breakpad\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ARINSIDE_BREAKPAD_SUPPORT"
                                 RuntimeLibrary="2"

branches/work_320/lists/support/BasicStringList.cpp

@@ -40 +40 @@
 
         strncpy(list->nameList[list->numItems], &value[skippedSpaces], AR_MAX_NAME_SIZE);
+        MakeLower(list->nameList[list->numItems]);
         list->nameList[list->numItems][AR_MAX_NAME_SIZE] = 0;
         list->numItems++;
@@ -50 +51 @@
 
         strncpy(list->nameList[list->numItems], (value.c_str() + skippedSpaces), AR_MAX_NAME_SIZE);
+        MakeLower(list->nameList[list->numItems]);
         list->nameList[list->numItems][AR_MAX_NAME_SIZE] = 0;
         list->numItems++;
@@ -58 +60 @@
         return (strcoll(list->nameList[l], list->nameList[r]) < 0);
 }
+
+void BasicStringList::MakeLower(ARNameType &name)
+{
+        for (unsigned int idx = 0; idx < AR_MAX_NAME_SIZE; ++idx)
+        {
+                char c = name[idx];
+                if (c == 0) break;
+                name[idx] = tolower(c);
+        }       
+}

branches/work_320/lists/support/BasicStringList.h

@@ -32 +32 @@
 
         ARNameList *list;
+
+private:
+        void MakeLower(ARNameType &value);
 };

branches/work_320/lists/support/IndexSorterTest.cpp

@@ -31 +31 @@
         testList.push_back("\xc3\x81ndre");
         testList.push_back("B\xc3\xbcro");
+        testList.push_back("ugly");
 
         vector<int> indexList;
@@ -39 +40 @@
         indexList.push_back(4); // this is the index of testList's "Ándre" value
         indexList.push_back(5); // this is the index of testList's "Büro" value
+        indexList.push_back(6); // this is the index of testList's "ugly" value
 
         IndexSorter indexSorter(true);
         indexSorter.SortBy(testList).Sort(indexList);
 
-        ASSERT_EQ(4, indexList[0]); // the value of "Ándre"
-        ASSERT_EQ(5, indexList[1]); // the value of "Büro"
-        ASSERT_EQ(3, indexList[2]); // the value of "Hallo Welt"
-        ASSERT_EQ(2, indexList[3]); // the value of "Überschrift"
-        ASSERT_EQ(0, indexList[4]); // the value of "Umgang"
-        ASSERT_EQ(1, indexList[5]); // the value of "Wartung"
+        ASSERT_EQ(4, indexList[0]); // the value of "ándre"
+        ASSERT_EQ(5, indexList[1]); // the value of "büro"
+        ASSERT_EQ(3, indexList[2]); // the value of "hallo welt"
+        ASSERT_EQ(2, indexList[3]); // the value of "überschrift"
+        ASSERT_EQ(6, indexList[4]); // the value of "ugly"
+        ASSERT_EQ(0, indexList[5]); // the value of "umgang"
+        ASSERT_EQ(1, indexList[6]); // the value of "wartung"
 }

branches/work_320/lists/support/UTF8StringList.cpp

@@ -22 +22 @@
 UTF8StringList::UTF8StringList()
 #ifdef WIN32
-: systemLocale(""), coll(std::use_facet<std::collate<sort_char_t> >(systemLocale))
+#define UTF8_SORT_LOCALE systemLocale
+: systemLocale(""), coll(std::use_facet<std::collate<sort_char_t> >(UTF8_SORT_LOCALE))
 #else
-: coll(std::use_facet<std::collate<char> >(localeDetection.sortLocale))
+#define UTF8_SORT_LOCALE localeDetection.sortLocale
+: coll(std::use_facet<std::collate<char> >(UTF8_SORT_LOCALE))
 #endif
 {
@@ -40 +42 @@
 
 #ifdef WIN32
-        vector<wchar_t> wideString;
+        std::wstring wideString;
+        wideString.reserve(AR_MAX_NAME_SIZE + 1);
         utf8::utf8to16(&value[skippedSpaces], &value[strlen(value)], back_inserter(wideString));
-        wideString.push_back(0);
-        
-        wchar_t *uStr = &wideString[0];
-        list.push_back(uStr);
+        MakeLower(wideString);
+
+        list.push_back(wideString);
 #else
         list.push_back(&value[skippedSpaces]);
@@ -57 +59 @@
 
 #ifdef WIN32
-        vector<wchar_t> wideString;
+        std::wstring wideString;
+        wideString.reserve(AR_MAX_NAME_SIZE + 1);
         utf8::utf8to16(value.begin() + skippedSpaces, value.end(), back_inserter(wideString));
-        wideString.push_back(0);
+        MakeLower(wideString);
         
-        wchar_t *uStr = &wideString[0];
-        list.push_back(uStr);
+        list.push_back(wideString);
 #else
         list.push_back(value.c_str() + skippedSpaces);
@@ -75 +77 @@
                             ) < 0);
 }
+
+UTF8StringList::sort_char_t UTF8StringList::operator () (sort_char_t c)
+{
+        return std::tolower(c, UTF8_SORT_LOCALE);
+}
+
+void UTF8StringList::MakeLower(list_string_t &str)
+{
+        std::transform(str.begin(), str.end(), str.begin(), *this);
+}

branches/work_320/lists/support/UTF8StringList.h

@@ -18 +18 @@
 
 #include "InternalNameList.h"
+#ifndef WIN32
+#include "LocaleDetector.h"
+#endif
 
 class UTF8StringList : public InternalNameList
@@ -46 +49 @@
 
         bool operator()(int l, int r);
+        sort_char_t operator() (sort_char_t c);
 
         vector<list_string_t> list;
+
+private:
+        void MakeLower(list_string_t &str);
 };

branches/work_320/stdafx.h

@@ -32 +32 @@
 #include <functional>
 #include <assert.h>
+#include <stdexcept>
 
 #ifdef WIN32 // JLS17 LINUX