fixed Objective C++ lexing: it is now handled by cpp.tes

 * the *.mm extension is for Objective C++. Therefore cpp.tes
   should be responsible.
 * Objective C keywords have been added to lexer.c.basekeywords.
   It does not hurt adding them to all C descendants.

2 files changed, 14 insertions, 11 deletions

diff --git a/lib/lexers/c.tes b/lib/lexers/c.tes
index 3dd3d95..434bf14 100644
--- a/lib/lexers/c.tes
+++ b/lib/lexers/c.tes
@@ -8,17 +8,23 @@
 
 @[lexer.test.c]{
   :EN*.cQ*"S -1 '
-  :EN*.mQ*"S -1 '
-  :EN*.mmQ*
+  :EN*.mQ*
 }
 
-!* Keywords used by all languages directly derived from C *!
+!*
+ * Keywords used by all languages directly derived from C.
+ * This includes the Objective C keywords used by Objective C++ as well
+ *!
 [lexer.c.basekeywords]
   alignas alignof asm auto bool break case char complex const continue
   default do double else enum extern false float for goto
   if imaginary inline int long noreturn register restrict return
   short signed sizeof static static_assert struct switch
-  true typedef union unsigned void volatile wchar_t while
+  true typedef union unsigned void volatile wchar_t while
+  @class @defs @protocol @required @optional @end @interface
+  @public @package @protected @private @property @implementation @synthesize @dynamic
+  @throw @try @catch @finally @synchronized @autoreleasepool @selector @encode
+  @compatibility_alias
 !* Doxygen keywords *!
 [lexer.c.doxygenkeywords]
   a addindex addtogroup anchor arg attention author b brief bug c class code
@@ -34,11 +40,7 @@
   ESSETLEXERLANGUAGEcpp
   0ESSETKEYWORDS
     Q[lexer.c.basekeywords] _Alignas _Alignof _Atomic
-    _Bool _Complex _Generic _Imaginary _Noreturn _Static_assert _Thread_local
-    @class @defs @protocol @required @optional @end @interface
-    @public @package @protected @private @property @implementation @synthesize @dynamic
-    @throw @try @catch @finally @synchronized @autoreleasepool @selector @encode
-    @compatibility_alias
+    _Bool _Complex _Generic _Imaginary _Noreturn _Static_assert _Thread_local
   ! Doxygen keywords !
   2ESSETKEYWORDSQ[lexer.c.doxygenkeywords]
   :M[color.comment],1M[color.set]
diff --git a/lib/lexers/cpp.tes b/lib/lexers/cpp.tes
index 851e82a..699d175 100644
--- a/lib/lexers/cpp.tes
+++ b/lib/lexers/cpp.tes
@@ -1,6 +1,6 @@
 !*
- * C++ Lexing: Also used for all *.h headers since
- * they cannot be distinguished.
+ * C++/Objective C++ Lexing: Also used for all *.h headers since
+ * they cannot be distinguished between C descendants.
  *!
 
 @[lexer.test.cpp]{
@@ -12,6 +12,7 @@
   :EN*.hppQ*"S -1 '
   :EN*.hxxQ*"S -1 '
   :EN*.ippQ*"S -1 '
+  :EN*.mmQ*"S -1 '
   :EN*.smaQ*
 }