Added #ifdefnot which is a short for

#ifdef
#else
but also allows:
#ifdefnot
….
#else
…
#endif

which means
#ifdef
#else
….
#endif
#ifdef
….
#endif

Author: H_Leusmann

pypreprocessor/__init__.py

@@ -100,6 +100,14 @@ def lexer(self, line):
             else:
                 self.__excludeblock = False
                 return False, True  
+        # handle #ifnotdef directives (is the same as: #ifdef X #else)
+        elif line[:9] == self.escapeChar + 'ifdefnot':
+            if len(line.split()) != 2:
+                self.exit_error(self.escapeChar + 'ifdefnot')
+            else:
+                self.__ifblocks.append(not(self.search_defines(line.split()[1])))
+                self.__ifconditions.append(line.split()[1])  
+                return False, True
         # handle #ifdef directives
         elif line[:6] == self.escapeChar + 'ifdef':
             if len(line.split()) != 2:
@@ -114,7 +122,7 @@ def lexer(self, line):
             if len(line.split()) != 2:
                 self.exit_error(self.escapeChar + 'elseif')
             else:
-                self.__ifblocks[-1]=not(self.search_defines(self.__ifconditions[-1]))
+                self.__ifblocks[-1]=not(self.__ifblocks[-1])#self.search_defines(self.__ifconditions[-1]))
                 self.__ifblocks.append(self.search_defines(line.split()[1]))
                 self.__ifconditions.append(line.split()[1]) 
             return False, True          
@@ -123,7 +131,7 @@ def lexer(self, line):
             if len(line.split()) != 1:
                 self.exit_error(self.escapeChar + 'else')
             else:
-                self.__ifblocks[-1]=not(self.search_defines(self.__ifconditions[-1]))
+                self.__ifblocks[-1]=not(self.__ifblocks[-1])#self.search_defines(self.__ifconditions[-1]))
             return False, True    
         # handle #endif..              
         # handle #endifall directives

test.py

@@ -18,6 +18,13 @@
 tests += ['#define: failed']
 #endif
 
+#ifdefnot testdefine
+tests += ['#definenot: failed']
+#else
+tests += ['#definenot: passed']
+#endif
+
+
 # #not define test
 #ifdef testdefine2
 tests += ['#not define: failed']