From 58d06f520d52a7282b60720246fb22defde2ce6c Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Fri, 22 Jan 2010 12:53:44 +0100
Subject: [PATCH] Manually reverted parts of
 d61eb9c8936807d8e6d8fdbbaa2d53a4c3f3a700.

---
 .../cplusplus/ObjectiveCTypeQualifiers.cpp    | 107 +++---------------
 .../cplusplus/ObjectiveCTypeQualifiers.h      |  11 --
 2 files changed, 13 insertions(+), 105 deletions(-)

diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp b/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
index 654ce88104e..988076f3a7c 100644
--- a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
+++ b/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
@@ -32,88 +32,27 @@
 using namespace CPlusPlus;
 
 static inline int classify2(const char *s) {
-    if (s[0] == 'N') {
-        if (s[1] == 'O') {
-            return Token_NO;
-        }
-    }
-    else if (s[0] == 'i') {
-        if (s[1] == 'd') {
-            return Token_id;
-        }
-        else if (s[1] == 'n') {
-            return Token_in;
-        }
+  if (s[0] == 'i') {
+    if (s[1] == 'n') {
+      return Token_in;
     }
-    return Token_identifier;
+  }
+  return Token_identifier;
 }
 
 static inline int classify3(const char *s) {
-    if (s[0] == 'I') {
-        if (s[1] == 'M') {
-            if (s[2] == 'P') {
-                return Token_IMP;
-            }
-        }
-    }
-    else if (s[0] == 'N') {
-        if (s[1] == 'i') {
-            if (s[2] == 'l') {
-                return Token_Nil;
-            }
-        }
-    }
-    else if (s[0] == 'S') {
-        if (s[1] == 'E') {
-            if (s[2] == 'L') {
-                return Token_SEL;
-            }
-        }
-    }
-    else if (s[0] == 'Y') {
-        if (s[1] == 'E') {
-            if (s[2] == 'S') {
-                return Token_YES;
-            }
-        }
-    }
-    else if (s[0] == 'n') {
-        if (s[1] == 'i') {
-            if (s[2] == 'l') {
-                return Token_nil;
-            }
-        }
-    }
-    else if (s[0] == 'o') {
-        if (s[1] == 'u') {
-            if (s[2] == 't') {
-                return Token_out;
-            }
-        }
+  if (s[0] == 'o') {
+    if (s[1] == 'u') {
+      if (s[2] == 't') {
+        return Token_out;
+      }
     }
-    return Token_identifier;
+  }
+  return Token_identifier;
 }
 
 static inline int classify4(const char *s) {
-    if (s[0] == '_') {
-        if (s[1] == 'c') {
-            if (s[2] == 'm') {
-                if (s[3] == 'd') {
-                    return Token__cmd;
-                }
-            }
-        }
-    }
-    else if (s[0] == 'B') {
-        if (s[1] == 'O') {
-            if (s[2] == 'O') {
-                if (s[3] == 'L') {
-                    return Token_BOOL;
-                }
-            }
-        }
-    }
-    else if (s[0] == 'c') {
+    if (s[0] == 'c') {
         if (s[1] == 'o') {
             if (s[2] == 'p') {
                 if (s[3] == 'y') {
@@ -122,15 +61,6 @@ static inline int classify4(const char *s) {
             }
         }
     }
-    else if (s[0] == 's') {
-        if (s[1] == 'e') {
-            if (s[2] == 'l') {
-                if (s[3] == 'f') {
-                    return Token_self;
-                }
-            }
-        }
-    }
     return Token_identifier;
 }
 
@@ -157,17 +87,6 @@ static inline int classify5(const char *s) {
       }
     }
   }
-  else if (s[0] == 's') {
-      if (s[1] == 'u') {
-          if (s[2] == 'p') {
-              if (s[3] == 'e') {
-                  if (s[4] == 'r') {
-                      return Token_super;
-                  }
-              }
-          }
-      }
-  }
   return Token_identifier;
 }
 
diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h b/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
index 731dd9c6aff..d0db4274616 100644
--- a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
+++ b/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
@@ -35,22 +35,11 @@
 namespace CPlusPlus {
 
 enum {
-  Token_NO,
-  Token_id,
   Token_in,
-  Token_YES,
-  Token_IMP,
-  Token_Nil,
-  Token_SEL,
-  Token_nil,
   Token_out,
-  Token__cmd,
-  Token_BOOL,
   Token_copy,
-  Token_self,
   Token_byref,
   Token_inout,
-  Token_super,
   Token_assign,
   Token_bycopy,
   Token_getter,
-- 
GitLab