Rename NOT_FOUND & OHTER

Author: nploi

library/Java/Lang/String/String.cpp

@@ -224,7 +224,7 @@ int String::indexOf(int character) const {
 	if (found != std::string::npos) {
 		return found;
 	} else {
-		return NOT_FOUND;
+		return DO_NOT_FOUND;
 	}
 }
 
@@ -314,7 +314,7 @@ int String::lastIndexOf(String subString) const {
 	std::reverse(currentReversedString.begin(), currentReversedString.end());
 	std::size_t found = currentReversedString.find(reversedString.original);
 	if (found == std::string::npos) {
-		return NOT_FOUND;
+		return DO_NOT_FOUND;
 	}
 	return ((int) this->original.size() - (int) (found + subString.original.size()));
 }
@@ -337,7 +337,7 @@ int String::lastIndexOf(String subString, int fromIndex) const {
 	std::string reversedString = subString.toCharPointer();
 	std::reverse(reversedString.begin(), reversedString.end());
 	int result = subStringFromIndex.find(reversedString);
-	if (result == NOT_FOUND) {
+	if (result == DO_NOT_FOUND) {
 		return result;
 	}
 

library/Java/Lang/String/StringTest.cpp

@@ -530,7 +530,7 @@ TEST (JavaLangString, LastIndexOf) {
 
         // Test false with wrong subString
         result = validString.lastIndexOf(wrongString);
-        assertEquals(NOT_FOUND, result);
+        assertEquals(DO_NOT_FOUND, result);
     }
 
     {

library/Kernel/Type.hpp

@@ -27,7 +27,7 @@
 #ifndef NATIVE_TYPE_HPP
 #define NATIVE_TYPE_HPP
 
-#define NOT_FOUND -1
+#define DO_NOT_FOUND -1
 #define MAX_STRING_LENGTH 100000
 
 #ifdef WIN
@@ -58,7 +58,7 @@ typedef unsigned char byte;
 #define DOUBLE                  16
 #define CHAR_POINTER            17
 #define INT_POINTER             18
-#define OTHER                   19
+#define DEFAULT                 19
 
 #define typename(x)  _Generic((x),                                            \
         _Bool: _BOOL,                  unsigned char: UNSIGNED_CHAR,          \
@@ -70,6 +70,6 @@ long long int: LONG_LONG_INT, unsigned long long int: UNSIGNED_LONG_LONG_INT, \
         float: FLOAT,                         double: DOUBLE,                 \
   long double: LONG_DOUBLE,                   char *: CHAR_POINTER,           \
        void *: VOID_POINTER,                   int *: INT_POINTER,            \
-      default: OTHER)
+      default: DEFAULT)
 
 #endif//NATIVE_TYPE_HPP