[haiku-commits] r40307 - in haiku/trunk: headers/private/shared src/kits/shared src/kits/tracker
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 28 Jan 2011 12:05:26 +0100 (CET)
Author: zooey
Date: 2011-01-28 12:05:26 +0100 (Fri, 28 Jan 2011)
New Revision: 40307
Changeset: http://dev.haiku-os.org/changeset/40307
Added:
haiku/trunk/headers/private/shared/NaturalCompare.h
haiku/trunk/src/kits/shared/NaturalCompare.cpp
Modified:
haiku/trunk/src/kits/shared/Jamfile
haiku/trunk/src/kits/tracker/Utilities.h
Log:
* moved NaturalCompare() from libtracker.so to libshared.a, in order
to make it available elsewhere
Added: haiku/trunk/headers/private/shared/NaturalCompare.h
===================================================================
--- haiku/trunk/headers/private/shared/NaturalCompare.h
(rev 0)
+++ haiku/trunk/headers/private/shared/NaturalCompare.h 2011-01-28 11:05:26 UTC
(rev 40307)
@@ -0,0 +1,49 @@
+/*
+Open Tracker License
+
+Terms and Conditions
+
+Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice applies to all licensees
+and shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE, MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BE INCORPORATED BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN
CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Be Incorporated shall not be
+used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from Be Incorporated.
+
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
trademarks
+of Be Incorporated in the United States and other countries. Other brand
product
+names are registered trademarks or trademarks of their respective holders.
+All rights reserved.
+*/
+
+#ifndef _NATURAL_COMPARE_H
+#define _NATURAL_COMPARE_H
+
+
+namespace BPrivate {
+
+
+//! Compares two strings naturally, as opposed to lexicographically
+int NaturalCompare(const char* stringA, const char* stringB);
+
+
+} // namespace BPrivate
+
+
+#endif // _NATURAL_COMPARE_H
Modified: haiku/trunk/src/kits/shared/Jamfile
===================================================================
--- haiku/trunk/src/kits/shared/Jamfile 2011-01-28 05:31:40 UTC (rev 40306)
+++ haiku/trunk/src/kits/shared/Jamfile 2011-01-28 11:05:26 UTC (rev 40307)
@@ -20,6 +20,7 @@
DragTrackingFilter.cpp
HashString.cpp
Keymap.cpp
+ NaturalCompare.cpp
QueryFile.cpp
RWLockManager.cpp
SHA256.cpp
Added: haiku/trunk/src/kits/shared/NaturalCompare.cpp
===================================================================
--- haiku/trunk/src/kits/shared/NaturalCompare.cpp
(rev 0)
+++ haiku/trunk/src/kits/shared/NaturalCompare.cpp 2011-01-28 11:05:26 UTC
(rev 40307)
@@ -0,0 +1,178 @@
+/*
+Open Tracker License
+
+Terms and Conditions
+
+Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice applies to all licensees
+and shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE, MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BE INCORPORATED BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN
CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Be Incorporated shall not be
+used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from Be Incorporated.
+
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
trademarks
+of Be Incorporated in the United States and other countries. Other brand
product
+names are registered trademarks or trademarks of their respective holders.
+All rights reserved.
+*/
+
+
+#include <NaturalCompare.h>
+
+#include <ctype.h>
+#include <string.h>
+
+#include <StorageDefs.h>
+#include <SupportDefs.h>
+
+
+namespace BPrivate {
+
+
+// #pragma mark - Natural sorting
+
+
+struct natural_chunk {
+ enum chunk_type {
+ NUMBER,
+ ASCII,
+ END
+ };
+ chunk_type type;
+ char buffer[B_FILE_NAME_LENGTH];
+ int32 length;
+};
+
+
+inline int32
+FetchNaturalChunk(natural_chunk& chunk, const char* source)
+{
+ if (chunk.type == natural_chunk::ASCII) {
+ // string chunk
+ int32 pos = 0;
+ while (!isdigit(source[pos]) && !isspace(source[pos])
+ && source[pos] != '\0') {
+ pos++;
+ }
+ strlcpy(chunk.buffer, source, pos + 1);
+ chunk.length = pos;
+ return pos;
+ }
+
+ // skip leading zeros and whitespace characters
+ int32 skip = 0;
+ while (source[0] == '0' || isspace(source[0])) {
+ source++;
+ skip++;
+ }
+
+ // number chunk (stop at next white space)
+ int32 pos = 0;
+ while (isdigit(source[pos]) && source[pos] != '\0') {
+ pos++;
+ }
+ strlcpy(&chunk.buffer[sizeof(chunk.buffer) - 1 - pos], source, pos + 1);
+ chunk.length = pos;
+
+ return pos + skip;
+}
+
+
+//! Makes sure both number strings have the same size
+inline void
+NormalizeNumberChunks(natural_chunk& a, natural_chunk& b)
+{
+ if (a.length > b.length) {
+ memset(&b.buffer[sizeof(b.buffer) - 1 - a.length], ' ',
+ a.length - b.length);
+ b.length = a.length;
+ } else if (b.length > a.length) {
+ memset(&a.buffer[sizeof(a.buffer) - 1 - b.length], ' ',
+ b.length - a.length);
+ a.length = b.length;
+ }
+}
+
+
+//! Compares two strings naturally, as opposed to lexicographically
+int
+NaturalCompare(const char* stringA, const char* stringB)
+{
+ natural_chunk a;
+ natural_chunk b;
+
+ uint32 indexA = 0;
+ uint32 indexB = 0;
+
+ while (true) {
+ // Determine type of next chunks in each string based on first
char
+ if (stringA[indexA] == '\0')
+ a.type = natural_chunk::END;
+ else if (isdigit(stringA[indexA]) || isspace(stringA[indexA]))
+ a.type = natural_chunk::NUMBER;
+ else
+ a.type = natural_chunk::ASCII;
+
+ if (stringB[indexB] == '\0')
+ b.type = natural_chunk::END;
+ else if (isdigit(stringB[indexB]) || isspace(stringB[indexB]))
+ b.type = natural_chunk::NUMBER;
+ else
+ b.type = natural_chunk::ASCII;
+
+ // Check if we reached the end of either string
+ if (a.type == natural_chunk::END)
+ return b.type == natural_chunk::END ? 0 : -1;
+ if (b.type == natural_chunk::END)
+ return 1;
+
+ if (a.type != b.type) {
+ // Different chunk types, just compare the remaining
strings
+ return strcasecmp(&stringA[indexA], &stringB[indexB]);
+ }
+
+ // Fetch the next chunks
+ indexA += FetchNaturalChunk(a, &stringA[indexA]);
+ indexB += FetchNaturalChunk(b, &stringB[indexB]);
+
+ // Compare the two chunks based on their type
+ if (a.type == natural_chunk::ASCII) {
+ // String chunks
+ int result = strcasecmp(a.buffer, b.buffer);
+ if (result != 0)
+ return result;
+ } else {
+ // Number chunks - they are compared as strings to
allow an
+ // arbitrary number of digits.
+ NormalizeNumberChunks(a, b);
+
+ int result = strcmp(a.buffer - 1 + sizeof(a.buffer) -
a.length,
+ b.buffer - 1 + sizeof(b.buffer) - b.length);
+ if (result != 0)
+ return result;
+ }
+
+ // The chunks were equal, proceed with the next chunk
+ }
+
+ return 0;
+}
+
+
+} // namespace BPrivate
Modified: haiku/trunk/src/kits/tracker/Utilities.h
===================================================================
--- haiku/trunk/src/kits/tracker/Utilities.h 2011-01-28 05:31:40 UTC (rev
40306)
+++ haiku/trunk/src/kits/tracker/Utilities.h 2011-01-28 11:05:26 UTC (rev
40307)
@@ -51,6 +51,7 @@
#include <MenuItem.h>
#include <MessageFilter.h>
#include <Mime.h>
+#include <NaturalCompare.h>
#include <ObjectList.h>
#include <Point.h>
#include <Path.h>
@@ -182,136 +183,6 @@
void DisallowFilenameKeys(BTextView *);
-// #pragma mark - Natural sorting
-
-
-struct natural_chunk {
- enum chunk_type {
- NUMBER,
- ASCII,
- END
- };
- chunk_type type;
- char buffer[B_FILE_NAME_LENGTH];
- int32 length;
-};
-
-
-inline int32
-FetchNaturalChunk(natural_chunk& chunk, const char* source)
-{
- if (chunk.type == natural_chunk::ASCII) {
- // string chunk
- int32 pos = 0;
- while (!isdigit(source[pos]) && !isspace(source[pos])
- && source[pos] != '\0') {
- pos++;
- }
- strlcpy(chunk.buffer, source, pos + 1);
- chunk.length = pos;
- return pos;
- }
-
- // skip leading zeros and whitespace characters
- int32 skip = 0;
- while (source[0] == '0' || isspace(source[0])) {
- source++;
- skip++;
- }
-
- // number chunk (stop at next white space)
- int32 pos = 0;
- while (isdigit(source[pos]) && source[pos] != '\0') {
- pos++;
- }
- strlcpy(&chunk.buffer[sizeof(chunk.buffer) - 1 - pos], source, pos + 1);
- chunk.length = pos;
-
- return pos + skip;
-}
-
-
-//! Makes sure both number strings have the same size
-inline void
-NormalizeNumberChunks(natural_chunk& a, natural_chunk& b)
-{
- if (a.length > b.length) {
- memset(&b.buffer[sizeof(b.buffer) - 1 - a.length], ' ',
- a.length - b.length);
- b.length = a.length;
- } else if (b.length > a.length) {
- memset(&a.buffer[sizeof(a.buffer) - 1 - b.length], ' ',
- b.length - a.length);
- a.length = b.length;
- }
-}
-
-
-//! Compares two strings naturally, as opposed to lexicographically
-inline int
-NaturalCompare(const char* stringA, const char* stringB)
-{
- natural_chunk a;
- natural_chunk b;
-
- uint32 indexA = 0;
- uint32 indexB = 0;
-
- while (true) {
- // Determine type of next chunks in each string based on first
char
- if (stringA[indexA] == '\0')
- a.type = natural_chunk::END;
- else if (isdigit(stringA[indexA]) || isspace(stringA[indexA]))
- a.type = natural_chunk::NUMBER;
- else
- a.type = natural_chunk::ASCII;
-
- if (stringB[indexB] == '\0')
- b.type = natural_chunk::END;
- else if (isdigit(stringB[indexB]) || isspace(stringB[indexB]))
- b.type = natural_chunk::NUMBER;
- else
- b.type = natural_chunk::ASCII;
-
- // Check if we reached the end of either string
- if (a.type == natural_chunk::END)
- return b.type == natural_chunk::END ? 0 : -1;
- if (b.type == natural_chunk::END)
- return 1;
-
- if (a.type != b.type) {
- // Different chunk types, just compare the remaining
strings
- return strcasecmp(&stringA[indexA], &stringB[indexB]);
- }
-
- // Fetch the next chunks
- indexA += FetchNaturalChunk(a, &stringA[indexA]);
- indexB += FetchNaturalChunk(b, &stringB[indexB]);
-
- // Compare the two chunks based on their type
- if (a.type == natural_chunk::ASCII) {
- // String chunks
- int result = strcasecmp(a.buffer, b.buffer);
- if (result != 0)
- return result;
- } else {
- // Number chunks - they are compared as strings to
allow an
- // arbitrary number of digits.
- NormalizeNumberChunks(a, b);
-
- int result = strcmp(a.buffer - 1 + sizeof(a.buffer) -
a.length,
- b.buffer - 1 + sizeof(b.buffer) - b.length);
- if (result != 0)
- return result;
- }
-
- // The chunks were equal, proceed with the next chunk
- }
-
- return 0;
-}
-
-
bool ValidateStream(BMallocIO *, uint32, int32 version);
Other related posts:
